[Libreoffice-commits] .: 2 commits - cui/source editeng/source
cui/source/customize/cfg.cxx |3 ++-
cui/source/inc/cfg.hxx |3 ---
editeng/source/outliner/outliner.cxx |4
3 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 243630f394d5a332a7b214970b1f9924650f0255
Author: David Tardon
Date: Mon Dec 17 08:30:18 2012 +0100
fdo#58362 do not crash on customize toolbar
Change-Id: I7102a1635329b3bcdd3bf6bc250555cc71e0977e
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 1c234cb..aadccd8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3706,9 +3706,10 @@ ToolbarSaveInData::ToolbarSaveInData(
m_aDescriptorContainer ( ITEM_DESCRIPTOR_CONTAINER )
{
+uno::Reference xContext =
::comphelper::getProcessComponentContext();
// Initialize the m_xPersistentWindowState variable which is used
// to get the default properties of system toolbars such as name
-uno::Reference< container::XNameAccess > xPWSS =
css::ui::WindowStateConfiguration::create( m_xContext );
+uno::Reference< container::XNameAccess > xPWSS =
css::ui::WindowStateConfiguration::create( xContext );
xPWSS->getByName( aModuleId ) >>= m_xPersistentWindowState;
}
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 87c758d..0dc86a5 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -132,9 +132,6 @@ public:
GetParentImageManager() { return m_xParentImgMgr; };
::com::sun::star::uno::Reference
-< com::sun::star::uno::XComponentContext > m_xContext;
-
-::com::sun::star::uno::Reference
< com::sun::star::container::XNameAccess > m_xCommandToLabelMap;
com::sun::star::uno::Sequence
commit 7cc485c88f1722b14bdc0dc07b7ada7ab3cf65d9
Author: David Tardon
Date: Tue Dec 11 16:10:50 2012 +0100
drop useless check
Change-Id: I3da8370930bafa6e1744291391c71871d203bb00
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 4fa52bd..607e66a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -556,10 +556,6 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
ImplBlockInsertionCallbacks( sal_True );
pEditEngine->SetText(rPObj.GetTextObject());
-if( rPObj.Count() != pEditEngine->GetParagraphCount() )
-{
-int nop=0;nop++;
-}
bFirstParaIsEmpty = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #52 from Joren De Cuyper --- I add "Bug 58376 - EDITING: PAGE FORMAT page layaut -> Only right -> CRASH" because of the regression with LibreOffice 3.6. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Joren De Cuyper changed: What|Removed |Added Depends on||58376 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: postprocess/CustomTarget_config.mk postprocess/Package_config.mk
postprocess/CustomTarget_config.mk |5 + postprocess/Package_config.mk |2 -- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 2295d4b50b2a97e318856e552ee0e3c9a8f27346 Author: Matúš Kukan Date: Sun Dec 16 23:37:50 2012 +0100 postprocess: hopefully solve dependency problems Change-Id: I48c3a6c621e5faa46eba9eb4f34428b2f947a86f diff --git a/postprocess/CustomTarget_config.mk b/postprocess/CustomTarget_config.mk index 284a43a..89c606c 100644 --- a/postprocess/CustomTarget_config.mk +++ b/postprocess/CustomTarget_config.mk @@ -15,6 +15,11 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/config,\ .PHONY: $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip +# We need this dependency for delivering in package postprocess_config: +$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \ + $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip + @true + $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : $(SRCDIR)/postprocess/packconfig/packconfig.pl $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) cd $(SRCDIR)/postprocess/packconfig \ diff --git a/postprocess/Package_config.mk b/postprocess/Package_config.mk index 4800b5f..ce2b0a5 100644 --- a/postprocess/Package_config.mk +++ b/postprocess/Package_config.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,postprocess_config,$(call gb_CustomTarget_get_workdir,postprocess/config))) -$(eval $(call gb_Package_use_custom_target,postprocess_config,postprocess/config)) - $(eval $(call gb_Package_add_file,postprocess_config,bin/uiconfig.zip,uiconfig.zip)) $(eval $(call gb_Package_add_files,postprocess_config,bin,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: pywizards: Fix "Finish Wizard" on Windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1354 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/1354/1 pywizards: Fix "Finish Wizard" on Windows Change-Id: I7ed2cef99e989aba387917fdeb16a82debd1053f --- M wizards/com/sun/star/wizards/common/FileAccess.py M wizards/com/sun/star/wizards/document/OfficeDocument.py M wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py M wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py 4 files changed, 10 insertions(+), 25 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1354 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ed2cef99e989aba387917fdeb16a82debd1053f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Xisco Faulí ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: pywizards: handle UnknownPropertyException
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1355 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/1355/1 pywizards: handle UnknownPropertyException Change-Id: I922d27f584ef39d543ee2bba997680dbea06d95f --- M wizards/com/sun/star/wizards/text/TextFieldHandler.py 1 file changed, 5 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1355 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I922d27f584ef39d543ee2bba997680dbea06d95f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Xisco Faulí ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-website] possible unplanned gerrit shutdown
Hello, Florian Effenberger wrote on 2012-12-16 11:15: it seems (the raising SMART error count tells me so) that we need to replace one hard disk on the machine where the gerrit VM runs on. We're currently running a disk test, and depending on the result I can either do a planned or an unplanned shutdown, determined by the emergency of the failure. I'll keep you posted, and would like to excuse in advance for any inconveniences. a quick update on this: The disk needs to be exchanged, will try to get this arranged early next week, ideally tomorrow, December 17th. Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 Jabber: flo...@jabber.org | SIP: flo...@iptel.org The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0c87eb68aa658bd13fdfc1d530e65c2e1fe3c308 Author: Andras Timar Date: Sun Dec 16 20:52:09 2012 +0100 Updated core Project: translations c6cfd71c3d302bdb0999888f9c867d70acb40708 update translations for LibreOffice 4.0 beta2 diff --git a/translations b/translations index 85f724f..c6cfd71 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 85f724f5aa1d6a59662a7d1c7ea406a641814bd2 +Subproject commit c6cfd71c3d302bdb0999888f9c867d70acb40708 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4a1520c58f8bbbaf5027222c071374afb559611 Author: Andras Timar Date: Sun Dec 16 20:52:09 2012 +0100 Updated core Project: translations d0d252860637d5c022c735f7497894c248473cec update translations for LibreOffice 4.0 beta2 diff --git a/translations b/translations index 7bedb66..d0d2528 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7bedb66aace7979064f69df8df2038fb197dc270 +Subproject commit d0d252860637d5c022c735f7497894c248473cec ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
update core
Xisco Faulí has abandoned this change. Change subject: update core .. Patch Set 1: Abandoned mistake -- To view, visit https://gerrit.libreoffice.org/1353 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib671210a00a7e9ad517441863239c1e7257c5aec Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Xisco Faulí ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] update core
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1353 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/1353/1 update core Change-Id: Ib671210a00a7e9ad517441863239c1e7257c5aec --- M dictionaries M helpcontent2 2 files changed, 0 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1353 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib671210a00a7e9ad517441863239c1e7257c5aec Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Xisco Faulí ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - wizards/com
wizards/com/sun/star/wizards/common/FileAccess.py | 12 -
wizards/com/sun/star/wizards/document/OfficeDocument.py | 21 --
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |1
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |1
wizards/com/sun/star/wizards/text/TextFieldHandler.py |8 ++-
5 files changed, 15 insertions(+), 28 deletions(-)
New commits:
commit ce212151b4ff75c221e7fc7bbd6d146d7f5c6fb6
Author: Xisco Fauli
Date: Sun Dec 16 20:04:34 2012 +0100
pywizards: Fix "Finish Wizard" on Windows
Change-Id: I7ed2cef99e989aba387917fdeb16a82debd1053f
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py
b/wizards/com/sun/star/wizards/common/FileAccess.py
index ae31c28..fd7a97c 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -16,7 +16,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
import traceback
-from os import path as osPath
from .NoValidPathException import NoValidPathException
from com.sun.star.ucb import CommandAbortedException
@@ -213,17 +212,6 @@ class FileAccess(object):
return sTitle
-def getURL(self, path, childPath=None):
-try:
-f = open(path, 'w')
-
-r = self.filenameConverter.getFileURLFromSystemPath(path,
- osPath.abspath(path))
-return r
-except Exception:
-traceback.print_exc()
-return None
-
def getPath(self, parentURL, childURL):
string = ""
if childURL is not None and childURL is not "":
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py
b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index 8abc1e1..85c49bc 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -17,7 +17,7 @@
#
import uno
import traceback
-import unohelper
+from unohelper import absolutize, systemPathToFileUrl
from ..ui.event.CommonListener import TerminateListenerProcAdapter
from ..common.Desktop import Desktop
@@ -105,7 +105,7 @@ class OfficeDocument(object):
xComponent = None
try:
xComponent = frame.loadComponentFromURL(
-sURL, "_self", 0, tuple(loadValues))
+systemPathToFileUrl(sURL), "_self", 0, tuple(loadValues))
except Exception:
traceback.print_exc()
@@ -183,6 +183,8 @@ class OfficeDocument(object):
def load(self, xInterface, sURL, sFrame, xValues):
xComponent = None
try:
+if not sURL.startswith("file://"):
+sURL = systemPathToFileUrl(sURL)
xComponent = xInterface.loadComponentFromURL(
sURL, sFrame, 0, tuple(xValues))
except Exception:
@@ -205,21 +207,18 @@ class OfficeDocument(object):
oStoreProperties[1].Value = xMSF.createInstance(
"com.sun.star.comp.uui.UUIInteractionHandler")
else:
-oStoreProperties = list(range(0))
-
-if StorePath.startswith("file://"):
-#Unix
-StorePath = StorePath[7:]
+oStoreProperties = list(range(0))
sPath = StorePath[:(StorePath.rfind("/") + 1)]
sFile = StorePath[(StorePath.rfind("/") + 1):]
xComponent.storeToURL(
-unohelper.absolutize(
-unohelper.systemPathToFileUrl(sPath),
-unohelper.systemPathToFileUrl(sFile)),
-tuple(oStoreProperties))
+absolutize(systemPathToFileUrl(sPath), sFile),
+tuple(oStoreProperties))
return True
except ErrorCodeIOException:
+#Throw this exception when trying to save a file
+#which is already opened in Libreoffice
+#TODO: handle it properly
return True
pass
except Exception:
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 8bfc6c4..9aa2d72 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -155,7 +155,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.myPathSelection.triggerPathPicker()
self.sPath = self.myPathSelection.getSelectedPath()
-self.sPath = fileAccess.getURL(self.sPath)
#first, if the filename was not changed, thus
#it is coming from a saved session, check if the
# file exists and warn the user.
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index e9ace51..7d50619 100644
--- a/wizards/com/sun/star/wizards/le
[Libreoffice-commits] .: postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a18c4b0f38eddc3c106091a3cc2f17655eedf286
Author: Norbert Thiebaud
Date: Sun Dec 16 09:58:23 2012 -0600
dumb down the recipe to accomodate the feature-poor BSD 'find'
Change-Id: I25bf1a16768e964b2771099262215ea157e39358
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index f302c85..26291b3 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -576,7 +576,7 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
&& unzip $< \
&& cd .. \
&& echo '' > $@ \
- && find fcfg_langpack_$*.unzip -name *.xcu -size +0c -printf
'%p\n' >> $@ \
+ && ( find fcfg_langpack_$*.unzip -name *.xcu -size +0c -print0 | xargs
-n1 -0 -I '{}' echo '{}\n') >> $@ \
&& echo '' >> $@ \
)
@@ -596,7 +596,7 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
&& rm -rf * \
&& unzip $(call gb_Zip_get_target,registry_$*) \
&& cd .. \
- && find registry_$*.unzip -name *.xcu -printf
'%p\n' >> $@ \
+ && (find registry_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}'
echo '{}\n') >> $@ \
)
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
# Add fcfg_drivers_*.zip content to *.list:
@@ -607,7 +607,7 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
&& rm -rf * \
&& unzip $(call gb_Zip_get_target,$(driver)_$*) \
&& cd .. \
- && find $(driver)_$*.unzip -name *.xcu -printf
'%p\n' >> $@ \
+ && (find $(driver)_$*.unzip -name *.xcu -print0 | xargs -n1 -0
-I '{}' echo '{}\n') >> $@ \
) \
)
endif
@@ -618,7 +618,7 @@ ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
&& rm -rf * \
&& unzip $(call gb_Zip_get_target,updchk_$*) \
&& cd .. \
- && find updchk_$*.unzip -name *.xcu -printf '%p\n'
>> $@ \
+ && (find updchk_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}'
echo '{}\n') >> $@ \
)
endif
echo '' >> $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO 4.0 beta1+ builds but fails to install
On 16 December 2012 12:08, Andras Timar wrote: > Hi, > > On Sun, Dec 16, 2012 at 10:50 AM, Arnaud Versini > wrote: >> After a fresh build I got this error : >> >> ERROR: Removing file autotextshare_qtz.zip from file list. >> >> Seems to have an issue after all >> >> The only option in the autogen.lastrun is : --with-lang=fr >> > > "--with-lang=en-US fr" would instantly solve your build problem. The > process somehow assumes that you always have en-US there, and fails, > if it is not there. I don't think it is new, I always include en-US, > because I remember that I had similar problems log ago. > We should clean this up one day, because WITH_LANG, WITH_LANG_LIST, > gb_WITH_LANG and alllangiso are too many variables for the same thing. > When dmake finally dies out, it will be a good time to do that. Don't forget gb_AllLangResTarget_LANGS gb_Configuration_LANGS gb_UI_LANGS ... :-) IIRC for me 'make scp2.clean && make dev-install' solved the problem but probably the best is indeed to add en-US to --with-lang option. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#57203: Launching .vbs before LibO causes error "Unknown option: -Embedding" and command line help appears
Hello,
this patch should fix fdo#57203 in LibreOffice 3.6.
However, I only tested it on Ubuntu against libreoffice/core.
>From f41f5ae0055e23c3c1d01a4fdc473b6d9bb09a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aurimas=20Fi=C5=A1eras?=
Date: Sun, 16 Dec 2012 13:41:31 +0200
Subject: fdo#57203 Unknown option: -Embedding
Ignore this option on Windows. It is appended when LibreOffice is called by COM+
Change-Id: I32cbfa276a6699eda99b87580cf9ef23366c40bc
---
desktop/source/app/cmdlineargs.cxx | 9 +
1 file changed, 9 insertions(+)
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 2320a18..d6b9dc7 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -502,6 +502,15 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg
return true;
}
#endif
+#ifdef WIN32
+/* fdo#57203 ignore -Embedding on Windows
+ when LibreOffice is launched by COM+
+ */
+else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Embedding" )) )
+{
+return true;
+}
+#endif
else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter=")))
{
m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")));
--
1.8.0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: postprocess/Package_config.mk solenv/gbuild solenv/Package_gdb.mk
postprocess/Package_config.mk |2 ++ solenv/Package_gdb.mk |2 +- solenv/gbuild/Package.mk |6 ++ 3 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 74b960ef3cd96f0f0e170234bc0947bfb51723f4 Author: Matúš Kukan Date: Sun Dec 16 12:45:31 2012 +0100 add missing dep: gb_Package_use_custom_target Change-Id: I888d9efe8bad905c108a6c824f2e2c7228fdd56d diff --git a/postprocess/Package_config.mk b/postprocess/Package_config.mk index ce2b0a5..4800b5f 100644 --- a/postprocess/Package_config.mk +++ b/postprocess/Package_config.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,postprocess_config,$(call gb_CustomTarget_get_workdir,postprocess/config))) +$(eval $(call gb_Package_use_custom_target,postprocess_config,postprocess/config)) + $(eval $(call gb_Package_add_file,postprocess_config,bin/uiconfig.zip,uiconfig.zip)) $(eval $(call gb_Package_add_files,postprocess_config,bin,\ diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk index a516a08..946bc07 100644 --- a/solenv/Package_gdb.mk +++ b/solenv/Package_gdb.mk @@ -35,6 +35,6 @@ $(eval $(call gb_Package_add_files,solenv_gdb,lib,\ $(call gb_Library_get_runtime_filename,tl)-gdb.py \ )) -$(call gb_Package_get_preparation_target,solenv_gdb) : $(call gb_CustomTarget_get_target,solenv/gdb) +$(eval $(call gb_Package_use_custom_target,solenv_gdb,solenv/gdb)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 31728bbf..2292faa 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -115,6 +115,12 @@ $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(file),$(file))) endef +# Package files from custom target +define gb_Package_use_custom_target +$(call gb_Package_get_preparation_target,$(1)) :| $(call gb_CustomTarget_get_target,$(2)) + +endef + # Package files from unpacked tarball of an external project define gb_Package_use_unpacked $(call gb_Package_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_target,$(2)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO 4.0 beta1+ builds but fails to install
Hi, On Sun, Dec 16, 2012 at 10:50 AM, Arnaud Versini wrote: > After a fresh build I got this error : > > ERROR: Removing file autotextshare_qtz.zip from file list. > > Seems to have an issue after all > > The only option in the autogen.lastrun is : --with-lang=fr > "--with-lang=en-US fr" would instantly solve your build problem. The process somehow assumes that you always have en-US there, and fails, if it is not there. I don't think it is new, I always include en-US, because I remember that I had similar problems log ago. We should clean this up one day, because WITH_LANG, WITH_LANG_LIST, gb_WITH_LANG and alllangiso are too many variables for the same thing. When dmake finally dies out, it will be a good time to do that. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Added bulletsandnumbering .ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1352 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/1352/1 Added bulletsandnumbering .ui Change-Id: I224baa5e62454afd998d1cb35144b1594d54d759 --- M sw/UI_swriter.mk A sw/uiconfig/swriter/ui/bulletsandnumbering.ui 2 files changed, 1,240 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1352 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I224baa5e62454afd998d1cb35144b1594d54d759 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
possible unplanned gerrit shutdown
Hello, it seems (the raising SMART error count tells me so) that we need to replace one hard disk on the machine where the gerrit VM runs on. We're currently running a disk test, and depending on the result I can either do a planned or an unplanned shutdown, determined by the emergency of the failure. I'll keep you posted, and would like to excuse in advance for any inconveniences. Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 Jabber: flo...@jabber.org | SIP: flo...@iptel.org The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: editeng/inc sc/inc sc/Library_sc.mk
editeng/inc/editeng/itemtype.hxx |1
sc/Library_sc.mk |2
sc/inc/pch/precompiled_sc.cxx| 12
sc/inc/pch/precompiled_sc.hxx| 931 +++
4 files changed, 945 insertions(+), 1 deletion(-)
New commits:
commit 5402ff6cd96c8142b9a54f7cc7f3ed1e7adea2b9
Author: LuboÅ¡ LuÅák
Date: Sun Dec 16 10:30:33 2012 +0100
PCH for Library_sc
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index 66e052b..422cb3b 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -34,7 +34,6 @@ class Color;
class IntlWrapper;
// static and prototypes -
-static const sal_Unicode cDelim = ',';
static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
EDITENG_DLLPUBLIC String GetSvxString( sal_uInt16 nId );
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 045e422..e83d110 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -26,6 +26,8 @@ $(eval $(call gb_Library_add_sdi_headers,sc,sc/sdi/scslots))
$(eval $(call gb_Library_set_componentfile,sc,sc/util/sc))
+$(eval $(call
gb_Library_set_precompiled_header,sc,$(SRCDIR)/sc/inc/pch/precompiled_sc))
+
$(eval $(call gb_Library_set_include,sc,\
-I$(SRCDIR)/sc/source/core/inc \
-I$(SRCDIR)/sc/source/filter/inc \
diff --git a/sc/inc/pch/precompiled_sc.cxx b/sc/inc/pch/precompiled_sc.cxx
new file mode 100644
index 000..11e95b0
--- /dev/null
+++ b/sc/inc/pch/precompiled_sc.cxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "precompiled_sc.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
new file mode 100644
index 000..2a5d020
--- /dev/null
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -0,0 +1,931 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include
+#include "basegfx/polygon/b2dpolygontools.hxx"
+#include
+#include "basegfx/range/b2drange.hxx"
+#include
+#include "basic/basmgr.hxx"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "comphelper/processfactory.hxx"
+#include
+#include
+#include
+#include
+#include
+#include
+#include "comphelper/string.hxx"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#includ
Re: LO 4.0 beta1+ builds but fails to install
After a fresh build I got this error : ERROR: Removing file autotextshare_qtz.zip from file list. Seems to have an issue after all The only option in the autogen.lastrun is : --with-lang=fr Thanks 2012/12/15 Jean-Baptiste Faure > Hi Andras, > > Le 15/12/2012 18:38, Andras Timar a écrit : > > [...] > >> I tested it on master and it worked fine, I'll see if there is a > >> problem on libreoffice-4-0 and I'll fix it ASAP. Thanks for testing. > Thank you very much. > > I did not see any problem with my make dev-install. I built it from > > scratch, after make clean. > > If the problem persists, please send more details (autogen.lastrun, > > config_host.mk etc.) > Argh ! I should get the idea that, even after a successful build, it may > be necessary to do a make clean. > Yes, with a make dev-install after a make clean, I got a successful > installation. And the new language KeyID in the UI. > > Does this installation problem could be the sign of a dependency not > managed in the makefile ? > > Sorry for the noise. :-( > JBF > > -- > Seuls des formats ouverts peuvent assurer la pérennité de vos documents. > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Arnaud Versini ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - src/lib
src/lib/VDXParser.cpp| 13 ---
src/lib/VSDTypes.h |1
src/lib/VSDXMLParserBase.cpp | 20 +--
src/lib/VSDXParser.cpp |2 -
src/lib/VisioDocument.cpp| 75 ---
5 files changed, 56 insertions(+), 55 deletions(-)
New commits:
commit bf00f969aa16573f29ff6dac0d234f838009ee11
Author: David Tardon
Date: Sun Dec 16 10:31:14 2012 +0100
coverity: copying uninitialized value
diff --git a/src/lib/VSDTypes.h b/src/lib/VSDTypes.h
index ef1db44..0b0d299 100644
--- a/src/lib/VSDTypes.h
+++ b/src/lib/VSDTypes.h
@@ -65,6 +65,7 @@ struct XForm
// Utilities
struct ChunkHeader
{
+ ChunkHeader() : chunkType(0), id(0), list(0), dataLength(0), level(0),
unknown(0), trailer(0) {}
unsigned chunkType; // 4 bytes
unsigned id; // 4 bytes
unsigned list; // 4 bytes
commit dddcceca764a1b557405c8dbc61d357d05e56344
Author: David Tardon
Date: Sun Dec 16 10:26:36 2012 +0100
coverity: do not let VisioDocument::parse throw
diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp
index 1392a9e..03f0a8d 100644
--- a/src/lib/VisioDocument.cpp
+++ b/src/lib/VisioDocument.cpp
@@ -164,47 +164,58 @@ static bool parseBinaryVisioDocument(WPXInputStream
*input, libwpg::WPGPaintInte
docStream->seek(0x1A, WPX_SEEK_SET);
- unsigned char version = libvisio::readU8(docStream);
libvisio::VSDParser *parser = 0;
- switch(version)
+ try
{
- case 1:
- case 2:
- case 3:
- case 4:
- case 5:
-parser = new libvisio::VSD5Parser(docStream, painter);
-break;
- case 6:
-parser = new libvisio::VSD6Parser(docStream, painter);
-break;
- case 11:
-parser = new libvisio::VSDParser(docStream, painter);
-break;
- default:
-break;
- }
+unsigned char version = libvisio::readU8(docStream);
+switch(version)
+{
+case 1:
+case 2:
+case 3:
+case 4:
+case 5:
+ parser = new libvisio::VSD5Parser(docStream, painter);
+ break;
+case 6:
+ parser = new libvisio::VSD6Parser(docStream, painter);
+ break;
+case 11:
+ parser = new libvisio::VSDParser(docStream, painter);
+ break;
+default:
+ break;
+}
- bool retValue = false;
- if (parser)
- {
-if (isStencilExtraction)
- retValue = parser->extractStencils();
-else if (!isStencilExtraction)
- retValue = parser->parseMain();
+bool retValue = false;
+if (parser)
+{
+ if (isStencilExtraction)
+retValue = parser->extractStencils();
+ else if (!isStencilExtraction)
+retValue = parser->parseMain();
+}
+else
+{
+ if (docStream != input)
+delete docStream;
+ return false;
+}
+
+delete parser;
+if (docStream != input)
+ delete docStream;
+
+return retValue;
}
- else
+ catch (...)
{
+delete parser;
if (docStream != input)
delete docStream;
-return false;
}
- delete parser;
- if (docStream != input)
-delete docStream;
-
- return retValue;
+ return false;
}
static bool isOpcVisioDocument(WPXInputStream *input)
commit 8b38ba731cfebefcf7d3c7ab1769c0b2e0f1e7b2
Author: David Tardon
Date: Sun Dec 16 10:18:15 2012 +0100
coverity: drop duplicated code
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 2c99b80..96d5166 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -783,17 +783,6 @@ void libvisio::VDXParser::readTextBlock(xmlTextReaderPtr
reader)
}
while ((XML_TEXTBLOCK != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret);
- if (bgClrId < 0)
-bgClrId = 0;
- if (bgClrId)
- {
-std::map::const_iterator iter =
m_colours.find(bgClrId-1);
-if (iter != m_colours.end())
- bgColour = iter->second;
-else
- bgColour = Colour();
- }
-
if (m_isInStyles)
m_collector->collectTextBlockStyle(level, leftMargin, rightMargin,
topMargin, bottomMargin,
verticalAlign, !!bgClrId, bgColour,
defaultTabStop, textDirection);
commit f8cdb0f948457a2183d117a438dee5ca3f603c4e
Author: David Tardon
Date: Sun Dec 16 10:10:40 2012 +0100
coverity: consistently check ret. value of read*Data
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 6ff9cdf..2c99b80 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -342,7 +342,7 @@ void libvisio::VDXParser::readLine(xmlTextReaderPtr reader)
break;
case XML_LINECOLOR:
if (XML_READER_TYPE_ELEMENT == tokenType)
-readExtendedColourData(colour, reader);
+ret = readExtendedColourData(colour, reader);
break;
case XML_LINEPATTERN:
if (XML_READER_TYPE_ELEMENT == tokenType)
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index 1f8c9f2..e18c8bb 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -1264,7 +1264,7 @@ void
libvisio::VSDXMLParserBase
[Libreoffice-commits] .: src/lib
src/lib/MSPUBParser.h |4 ++--
src/lib/MSPUBTypes.h |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a74548fe38dffd8a6e8ae1fce787053a5d3be41d
Author: David Tardon
Date: Sun Dec 16 09:30:00 2012 +0100
coverity: pass structs by const ref
diff --git a/src/lib/MSPUBParser.h b/src/lib/MSPUBParser.h
index 75fc3aa..3d2b989 100644
--- a/src/lib/MSPUBParser.h
+++ b/src/lib/MSPUBParser.h
@@ -93,7 +93,7 @@ protected:
struct TextSpanReference
{
-TextSpanReference(unsigned short f, unsigned short l, CharacterStyle cs) :
first(f), last(l), charStyle(cs) { }
+TextSpanReference(unsigned short f, unsigned short l, const
CharacterStyle& cs) : first(f), last(l), charStyle(cs) { }
unsigned short first;
unsigned short last;
CharacterStyle charStyle;
@@ -101,7 +101,7 @@ protected:
struct TextParagraphReference
{
-TextParagraphReference(unsigned short f, unsigned short l, ParagraphStyle
ps) : first(f), last(l), paraStyle(ps) { }
+TextParagraphReference(unsigned short f, unsigned short l, const
ParagraphStyle& ps) : first(f), last(l), paraStyle(ps) { }
unsigned short first;
unsigned short last;
ParagraphStyle paraStyle;
diff --git a/src/lib/MSPUBTypes.h b/src/lib/MSPUBTypes.h
index e565f10..9e08207 100644
--- a/src/lib/MSPUBTypes.h
+++ b/src/lib/MSPUBTypes.h
@@ -168,14 +168,14 @@ struct ParagraphStyle
struct TextSpan
{
- TextSpan(std::vector c, CharacterStyle s) : chars(c),
style(s) { }
+ TextSpan(const std::vector& c, const CharacterStyle& s) :
chars(c), style(s) { }
std::vector chars;
CharacterStyle style;
};
struct TextParagraph
{
- TextParagraph(std::vector sp, ParagraphStyle st) : spans(sp),
style(st) { }
+ TextParagraph(const std::vector& sp, const ParagraphStyle& st) :
spans(sp), style(st) { }
std::vector spans;
ParagraphStyle style;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Rainer Bielefeld changed: What|Removed |Added Depends on||58129 --- Comment #51 from Rainer Bielefeld --- I add "Bug 58129 - FILESAVE as ppt and pps (MSO97): rejected by MSO with warning message". Completely broken .ppt export more or less a blocker? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
