Re: make check fails on master with --enable-ext-numbertext
Hi, On Tue, Aug 28, 2012 at 12:48:15PM -0700, julien2412 wrote: Hello, On pc Debian x86-64 with master sources updated today, I runned make check. I had this: : SUCCESS: Source for services.rdb: /home/julien/compile-libreoffice/libo/solver/unxlngx6/xml/services.rdb : : ERROR: Removing file numbertext.oxt from file list. It was a typo in the extension's name in extras/Package_extensions.mk . I am sorry for that. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extras/Package_extensions.mk
extras/Package_extensions.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e19f1afb2c253944968f85b963934a60b87f472a Author: David Tardon dtar...@redhat.com Date: Wed Aug 29 08:20:33 2012 +0200 fix typo Change-Id: Iba7b0c0cf200306d3fc53488021d1e92d8af0e75 diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk index 9579032..d53be0a 100644 --- a/extras/Package_extensions.mk +++ b/extras/Package_extensions.mk @@ -24,7 +24,7 @@ ifneq ($(HUNART_EXTENSION_PACK),) $(eval $(call gb_Package_add_file,extras_extensions,bin/hunart.oxt,$(HUNART_EXTENSION_PACK))) endif ifneq ($(NUMBERTEXT_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/numberext.oxt,$(NUMBERTEXT_EXTENSION_PACK))) +$(eval $(call gb_Package_add_file,extras_extensions,bin/numbertext.oxt,$(NUMBERTEXT_EXTENSION_PACK))) endif ifneq ($(OOOBLOGGER_EXTENSION_PACK),) $(eval $(call gb_Package_add_file,extras_extensions,bin/oooblogger.oxt,$(OOOBLOGGER_EXTENSION_PACK))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: jurt/com
jurt/com/sun/star/lib/uno/environments/remote/Job.java |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 2323ca6bc367f6c8125eb994d02e7988cc4d276c
Author: Noel Grandin n...@peralex.com
Date: Tue Aug 21 09:07:44 2012 +0200
Java cleanup - remove unnecessary null checks
Change-Id: I72a847b1180e9aeb8dec18bcaedee7286eee7754
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
index 281c4df..e95f5f4 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
@@ -109,8 +109,7 @@ public class Job {
// Here we have to be aware of non-UNO exceptions, because
// they may kill a remote side which does not know anything
// about their types:
-if (exception != null
- !(exception instanceof com.sun.star.uno.Exception)
+if (!(exception instanceof com.sun.star.uno.Exception)
!(exception instanceof
com.sun.star.uno.RuntimeException))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] java cleanup patches
On 08/28/2012 04:24 PM, Noel Grandin wrote: The change to Job.java was OK, because 3 lines up we had already checked the exception field for null, so it was not possible for it to be null at that point. Ach, of course. Didn't look closely enough. Pushed now, too. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - oox/inc oox/source sw/CppunitTest_sw_subsequent_ooxmlimport.mk sw/qa
oox/inc/oox/vml/vmlshape.hxx| 10
oox/source/vml/vmlshape.cxx | 70 +---
sw/CppunitTest_sw_subsequent_ooxmlimport.mk |1
sw/qa/extras/ooxmlimport/data/n777345.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 20
5 files changed, 74 insertions(+), 27 deletions(-)
New commits:
commit dcc140204a65d3e7075b0e67ac3ffa0a5737d4ea
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 29 09:25:53 2012 +0100
n#777345 testcase
Change-Id: I4dce0dfaf6f1c94024dd60df51d70a259689d6d9
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
index 6dbf787..c06de2a 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
@@ -66,6 +66,7 @@ $(eval $(call
gb_CppunitTest_use_ure,sw_subsequent_ooxmlimport))
$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\
comphelper/util/comphelp \
configmgr/source/configmgr \
+embeddedobj/util/embobj \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
framework/util/fwk \
diff --git a/sw/qa/extras/ooxmlimport/data/n777345.docx
b/sw/qa/extras/ooxmlimport/data/n777345.docx
new file mode 100644
index 000..dc62588
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n777345.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index e61f123..f5c3661 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -30,6 +30,7 @@
#include com/sun/star/awt/XBitmap.hpp
#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/document/XEmbeddedObjectSupplier2.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/style/XStyleFamiliesSupplier.hpp
@@ -86,9 +87,11 @@ public:
void testAllGapsWord();
void testN775906();
void testN775899();
+void testN777345();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
+#if 0
CPPUNIT_TEST(testN751054);
CPPUNIT_TEST(testN751117);
CPPUNIT_TEST(testN751017);
@@ -116,6 +119,8 @@ public:
CPPUNIT_TEST(testN775906);
CPPUNIT_TEST(testN775899);
#endif
+CPPUNIT_TEST(testN777345);
+#endif
CPPUNIT_TEST_SUITE_END();
private:
@@ -765,6 +770,21 @@ void Test::testN775899()
CPPUNIT_ASSERT_EQUAL(sal_False, xParaEnum-hasMoreElements());
}
+void Test::testN777345()
+{
+// The problem was that v:imagedata inside v:rect was ignored.
+load(n777345.docx);
+
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencedocument::XEmbeddedObjectSupplier2
xSupplier(xDraws-getByIndex(0), uno::UNO_QUERY);
+uno::Referencegraphic::XGraphic xGraphic =
xSupplier-getReplacementGraphic();
+Graphic aGraphic(xGraphic);
+// If this changes later, feel free to update it, but make sure it's not
+// the checksum of a white/transparent placeholder rectangle.
+CPPUNIT_ASSERT_EQUAL(sal_uLong(2404338915), aGraphic.GetChecksum());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 7fe05dc95d0c9a584e07483c04b13c071d55293f
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 29 09:25:40 2012 +0100
add SimpleShape::createPictureObject to avoid code duplication
Change-Id: Id4bb0550ab2ce9bbb7edf568a086be18c1576b33
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 728ca15..8fab5f7 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -272,6 +272,10 @@ protected:
implConvertAndInsert(
const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
const ::com::sun::star::awt::Rectangle rShapeRect
) const;
+/** Used by both RectangleShape and ComplexShape. */
+
com::sun::star::uno::Referencecom::sun::star::drawing::XShapecreatePictureObject(
+const com::sun::star::uno::Reference
com::sun::star::drawing::XShapes rxShapes,
+const com::sun::star::awt::Rectangle rShapeRect, OUString
rGraphicPath ) const;
private:
::rtl::OUString maService; /// Name of the UNO shape service.
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 5c8e728..a32030b 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -447,6 +447,36 @@ Reference XShape SimpleShape::implConvertAndInsert(
const Reference XShapes
return xShape;
}
+Reference XShape SimpleShape::createPictureObject( const Reference XShapes
rxShapes, const Rectangle rShapeRect, OUString rGraphicPath ) const
+{
+Reference XShape xShape =
[PATCH] Change in core[libreoffice-3-6]: fdo#36149: Do not display error dialogs while showing a menu
From Stephan Bergmann sberg...@redhat.com: Stephan Bergmann has uploaded a new change for review. Change subject: fdo#36149: Do not display error dialogs while showing a menu .. fdo#36149: Do not display error dialogs while showing a menu ...it apparently leads to crashes, but is probably not good from a usability perspective anyway (as the menu closes again when the dialog appears/is operated on by the user). For now, just disable the Java specific interaction handler here; might make sense to address this more generally though (there's framework::QuietInteraction btw). Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 (cherry picked from commit 9cfc64c66ff9e0f0251a006f039bf4e26a63147a) --- M framework/source/uielement/menubarmanager.cxx 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/504/1 -- To view, visit https://gerrit.libreoffice.org/504 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: fdo#36149: Do not display error dialogs while showing a menu
From Stephan Bergmann sberg...@redhat.com: Stephan Bergmann has uploaded a new change for review. Change subject: fdo#36149: Do not display error dialogs while showing a menu .. fdo#36149: Do not display error dialogs while showing a menu ...it apparently leads to crashes, but is probably not good from a usability perspective anyway (as the menu closes again when the dialog appears/is operated on by the user). For now, just disable the Java specific interaction handler here; might make sense to address this more generally though (there's framework::QuietInteraction btw). (cherry picked from commit 9cfc64c66ff9e0f0251a006f039bf4e26a63147a) Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 --- M framework/source/uielement/menubarmanager.cxx 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/505/1 -- To view, visit https://gerrit.libreoffice.org/505 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[feature/killsdf]: Renew localization and kill sdf 1.step
From Zolnai Tamás zolnaitamas2...@gmail.com: Zolnai Tamás has uploaded a new change for review. Change subject: Renew localization and kill sdf 1.step .. Renew localization and kill sdf 1.step Extract strings from source directly to pot files Implement PoHeader and PoEntry classes Renew fomrat of pot/po files Implement conversion from old po to new po Change-Id: I411b6041f7d525e76b189d7f31adc5b9ab60f6d6 --- M Repository.mk M l10ntools/Executable_localize.mk A l10ntools/Executable_renewpo.mk M l10ntools/Module_l10ntools.mk M l10ntools/StaticLibrary_transex.mk A l10ntools/inc/po.hxx M l10ntools/source/localize.cxx A l10ntools/source/po.cxx A l10ntools/source/renewpo.cxx 9 files changed, 718 insertions(+), 39 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/506/1 -- To view, visit https://gerrit.libreoffice.org/506 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I411b6041f7d525e76b189d7f31adc5b9ab60f6d6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6] fdo#53337 crash in search in help
This is reported on the vanilla MacOSX and Linux build binaries, but doesn't happen locally for more recent tool chains. My guess is that its visibility related and missing typeinfo so the exception doesn't get caught where it should be. So http://cgit.freedesktop.org/libreoffice/core/commit/?id=715e2109f60b016f661d98a59aef674e0951a2ad should fix that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[feature/killsdf]: Some improvement in po classes
From Zolnai Tamás zolnaitamas2...@gmail.com: Zolnai Tamás has uploaded a new change for review. Change subject: Some improvement in po classes .. Some improvement in po classes Raise general po functionalities from PoEntry to the GenPoEntry class. Thus PoEntry contains only the specific things with which LibreOffice localization tool works. Improve escaping text. Change-Id: I98894e7c218d37c226f48b30a1f8b59a5ff1a0bf --- M l10ntools/inc/po.hxx M l10ntools/source/localize.cxx M l10ntools/source/po.cxx 3 files changed, 172 insertions(+), 136 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/507/1 -- To view, visit https://gerrit.libreoffice.org/507 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98894e7c218d37c226f48b30a1f8b59a5ff1a0bf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in distro-configs/LibreOfficeMinGW.conf libxmlsec/makefile.mk libxmlsec/xmlsec1-configure-libxml-libxslt.patch libxmlsec/xmlsec1-configure.patch libxmlsec/xmlsec1-mi
Repository.mk|5
configure.in |5
distro-configs/LibreOfficeMinGW.conf |1
libxmlsec/makefile.mk| 25
libxmlsec/xmlsec1-configure-libxml-libxslt.patch | 20
libxmlsec/xmlsec1-configure.patch| 656 ---
libxmlsec/xmlsec1-mingw32.patch | 97 ---
scp2/source/ooo/file_library_ooo.scp | 13
xmlsecurity/Library_xsec_xmlsec.mk | 10
9 files changed, 59 insertions(+), 773 deletions(-)
New commits:
commit 02f6e55231c8b1646cbafc0e3e591da8122e2bf1
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Aug 29 09:48:00 2012 +0200
Fix MinGW build - libxmlsec builds now.
This also removes patching of the generated 'configure' in libxmlsec;
instead,
autoreconf is called.
Change-Id: I28c1cc38432d195dd0219fb5a0ab0ea1a35f7a32
diff --git a/Repository.mk b/Repository.mk
index cadf342..e80ac3b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -676,13 +676,16 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1 \
xmlsec1-nss \
+))
+ifneq ($(CROSS_COMPILING),YES)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1-mscrypto \
))
+endif
else
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
xmlsec1 \
xmlsec1-nss \
-xmlsec1-mscrypto \
))
endif
diff --git a/configure.in b/configure.in
index 885bd6c..7a29c97 100644
--- a/configure.in
+++ b/configure.in
@@ -2788,6 +2788,7 @@ AC_SUBST(DISABLE_ATL)
if test $cross_compiling = yes; then
CROSS_COMPILING=YES
+SCPDEFS=$SCPDEFS -DCROSS_COMPILING
else
CROSS_COMPILING=
BUILD_TYPE=$BUILD_TYPE NATIVE
@@ -4840,6 +4841,10 @@ using namespace std;
if test -n $MINGW_GXXDLL; then
mingw_gxxdll_root=${MINGW_GXXDLL%.dll}
mingw_gxxdll_root=${mingw_gxxdll_root#lib}
+if test $CROSS_COMPILING = YES ; then
+dnl m4 escaping!
+mingw_gxxdll_root=${mingw_gxxdll_root%-[[0-9]]}
+fi
MINGW_SHARED_LIBSTDCPP=-l$mingw_gxxdll_root
MINGW_SHARED_GXXLIB=YES
AC_MSG_RESULT([$MINGW_GXXDLL])
diff --git a/distro-configs/LibreOfficeMinGW.conf
b/distro-configs/LibreOfficeMinGW.conf
index 32df782..1673d9d 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -27,5 +27,4 @@
--disable-directx
--disable-extension-integration
--disable-mozilla
---disable-xmlsec
--disable-postgresql-sdbc
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 18c46fb..2f0550f 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -97,13 +97,24 @@ xmlsec_LIBS=
.IF $(MINGW_SHARED_GXXLIB)==YES
xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
+CONF_ILIB=
+.IF $(ILIB) !=
+CONF_ILIB=-L$(ILIB:s/;/ -L/)
+.ENDIF
+
CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
+CONFIGURE_ACTION=autoreconf ; .$/configure
+
+.IF $(CROSS_COMPILING)==YES
+BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
MINGW_SYSROOT=$(MINGW_SYSROOT)
+.ELSE
+BUILD_AND_HOST=--build=i586-pc-mingw32 --host=i586-pc-mingw32
--with-mozilla_ver=1.7.5 --enable-mscrypto
+.ENDIF
# Note that this is obsolete crack for building *locally* on Windows with
MinGW,
# something we don't see the point in here in LibreOffice
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no
--with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl
--build=i586-pc-mingw32 --host=i586-pc-mingw32 CC=$(xmlsec_CC)
LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/) LIBS=$(xmlsec_LIBS)
LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP=$(WRAPCMD) objdump
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no
--disable-crypto-dl $(BUILD_AND_HOST) CC=$(xmlsec_CC)
LDFLAGS=-Wl,--no-undefined $(CONF_ILIB) LIBS=$(xmlsec_LIBS)
LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP=$(WRAPCMD) objdump
.IF $(SYSTEM_NSS) != YES
CONFIGURE_FLAGS+=--enable-pkgconfig=no
@@ -154,7 +165,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
.ENDIF
CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure ADDCFLAGS=$(xmlsec_CFLAGS)
CPPFLAGS=$(xmlsec_CPPFLAGS)
+CONFIGURE_ACTION=autoreconf ; .$/configure ADDCFLAGS=$(xmlsec_CFLAGS)
CPPFLAGS=$(xmlsec_CPPFLAGS)
CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl
--with-libxslt=no --with-gnutls=no LIBXML2LIB=$(LIBXML2LIB)
.IF $(CROSS_COMPILING)==YES
@@ -193,8 +204,12 @@ OUTDIR2INC=include$/xmlsec
.IF $(OS)==WNT
.IF $(COM)==GCC
-OUT2LIB+=src$/.libs$/libxmlsec1.dll.a src$/nss$/.libs$/libxmlsec1-nss.dll.a
src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll.a
-OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll
src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll
+OUT2LIB+=src$/.libs$/libxmlsec1.dll.a src$/nss$/.libs$/libxmlsec1-nss.dll.a
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/Executable_localize.mk l10ntools/Executable_renewpo.mk l10ntools/inc l10ntools/Module_l10ntools.mk l10ntools/source l10ntools/StaticLibrar
Repository.mk |1 l10ntools/Executable_localize.mk |9 + l10ntools/Executable_renewpo.mk| 36 l10ntools/Module_l10ntools.mk |1 l10ntools/StaticLibrary_transex.mk |1 l10ntools/inc/po.hxx | 97 +++ l10ntools/source/localize.cxx | 135 +++- l10ntools/source/po.cxx| 309 + l10ntools/source/renewpo.cxx | 168 9 files changed, 718 insertions(+), 39 deletions(-) New commits: commit 437ae002185a81802cb31b00fa777a7b5d8f9847 Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Wed Aug 29 09:47:26 2012 +0200 Renew localization and kill sdf 1.step Extract strings from source directly to pot files Implement PoHeader and PoEntry classes Renew fomrat of pot/po files Implement conversion from old po to new po Change-Id: I411b6041f7d525e76b189d7f31adc5b9ab60f6d6 Reviewed-on: https://gerrit.libreoffice.org/506 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/Repository.mk b/Repository.mk index cadf342..8e58474 100644 --- a/Repository.mk +++ b/Repository.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ rdbmaker \ regsingleton \ regsvrex \ + renewpo \ rsc \ rscdep \ saxparser \ diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk index 511604a..6184a89 100644 --- a/l10ntools/Executable_localize.mk +++ b/l10ntools/Executable_localize.mk @@ -26,10 +26,19 @@ $(eval $(call gb_Executable_Executable,localize)) +$(eval $(call gb_Executable_set_include,localize,\ +-I$(SRCDIR)/l10ntools/inc \ +$$(INCLUDE) \ +)) + $(eval $(call gb_Executable_use_libraries,localize,\ sal \ )) +$(eval $(call gb_Executable_use_static_libraries,localize,\ +transex \ +)) + $(eval $(call gb_Executable_add_exception_objects,localize,\ l10ntools/source/localize \ )) diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk new file mode 100644 index 000..33e38b2 --- /dev/null +++ b/l10ntools/Executable_renewpo.mk @@ -0,0 +1,36 @@ +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky d.ostrov...@gmx.de (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,renewpo)) + +$(eval $(call gb_Executable_set_include,renewpo,\ +-I$(SRCDIR)/l10ntools/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,renewpo,\ +sal \ +)) + +$(eval $(call gb_Executable_use_static_libraries,renewpo,\ +transex \ +)) + +$(eval $(call gb_Executable_add_exception_objects,renewpo,\ +l10ntools/source/renewpo \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index e3c1134..fb2a3b3 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_transex3 \ Executable_helpindexer \ Executable_helplinker \ +Executable_renewpo \ StaticLibrary_transex \ Library_helplinker \ Package_inc \ diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index e8c84b7..21f50e5 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -37,6 +37,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ l10ntools/source/merge \ l10ntools/source/file \ l10ntools/source/directory \ + l10ntools/source/po \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx new file mode 100644 index 000..de01053 --- /dev/null +++ b/l10ntools/inc/po.hxx @@ -0,0 +1,97 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be
[PATCH] Change in core[feature/killsdf]: Make renew working well
From Zolnai Tamás zolnaitamas2...@gmail.com: Zolnai Tamás has uploaded a new change for review. Change subject: Make renew working well .. Make renew working well Change po2lo output: write out the untranslated sdf line too, write out translated sdf line only if there is translation to the komponent, write out fuzzy entries and indicate which entries are fuzzy. Change GenPoEntry to write out fuzzy flag Change renewpo to write out all type of entries not just text and to remove id duplicates which are made by xrmex Change-Id: Idc9b6062638d1d5fcbbae75e0396996b63e9a7a0 --- M l10ntools/inc/po.hxx M l10ntools/scripts/po2lo M l10ntools/source/localize.cxx M l10ntools/source/po.cxx M l10ntools/source/renewpo.cxx 5 files changed, 85 insertions(+), 35 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/508/1 -- To view, visit https://gerrit.libreoffice.org/508 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc9b6062638d1d5fcbbae75e0396996b63e9a7a0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[feature/killsdf]: Renew localization and kill sdf 1.step
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: Renew localization and kill sdf 1.step .. Renew localization and kill sdf 1.step Extract strings from source directly to pot files Implement PoHeader and PoEntry classes Renew fomrat of pot/po files Implement conversion from old po to new po Change-Id: I411b6041f7d525e76b189d7f31adc5b9ab60f6d6 --- M Repository.mk M l10ntools/Executable_localize.mk A l10ntools/Executable_renewpo.mk M l10ntools/Module_l10ntools.mk M l10ntools/StaticLibrary_transex.mk A l10ntools/inc/po.hxx M l10ntools/source/localize.cxx A l10ntools/source/po.cxx A l10ntools/source/renewpo.cxx 9 files changed, 718 insertions(+), 39 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/506 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I411b6041f7d525e76b189d7f31adc5b9ab60f6d6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source
l10ntools/inc/po.hxx | 58 ++---
l10ntools/source/localize.cxx |4
l10ntools/source/po.cxx | 248 ++
3 files changed, 173 insertions(+), 137 deletions(-)
New commits:
commit 0319a1c8d1df4a86b847f5d6178966a29e7c24cb
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Wed Aug 29 09:51:44 2012 +0200
Some improvement in po classes
Raise general po functionalities from PoEntry to the
GenPoEntry class. Thus PoEntry contains only the specific
things with which LibreOffice localization tool works.
Improve escaping text.
Change-Id: I98894e7c218d37c226f48b30a1f8b59a5ff1a0bf
Reviewed-on: https://gerrit.libreoffice.org/507
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index de01053..ffdb0d2 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -32,7 +32,7 @@
#include fstream
#include rtl/string.hxx
-class PoEntry
+class GenPoEntry
{
private:
@@ -44,31 +44,55 @@ private:
OStringm_sUnTransStr;
OStringm_sTransStr;
-OStringm_sKeyId;
-
-protected:
-voidsetExtractCom(const OString rExtCom)
-{ m_sExtractCom = rExtCom; }
-
public:
-PoEntry();
-PoEntry(const OString i_rSDFLine,
-const sal_uInt16 eType = TEXT);
-virtual ~PoEntry();
-
-virtual voidwriteToFile(std::ofstream io_rOFStream);
-
-voidsetTransStr(const OString rTransStr);
+GenPoEntry();
+virtual ~GenPoEntry();
+
+virtual voidsetWhiteSpace(const OString rWhiteSpace)
+{ m_sWhiteSpace = rWhiteSpace; }
+virtual voidsetExtractCom(const OString rExtractCom)
+{ m_sExtractCom = rExtractCom; }
+virtual voidsetReference(const OString rReference)
+{ m_sReference = rReference; }
+virtual voidsetContext(const OString rContext)
+{ m_sContext = rContext; }
+virtual voidsetUnTransStr(const OString rUnTransStr)
+{ m_sUnTransStr = rUnTransStr; }
+virtual voidsetTransStr(const OString rTransStr)
+{ m_sTransStr = rTransStr; }
+
+virtual voidwriteToFile(std::ofstream io_rOFStream);
+};
+class PoEntry: public GenPoEntry
+{
+public:
enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID,
LOCALID, HELPID, PLATFORM, WIDTH, LANGUAGEID,
TEXT, HELPTEXT, QUICKHELPTEXT, TITLE, TIMESTAMP };
-};
+enum TYPE { TTEXT=TEXT, TQUICKHELPTEXT=QUICKHELPTEXT, TTITLE=TITLE };
+private:
+
+OString m_sSourceFile;
+OString m_sGroupId;
+OString m_sLocalId;
+OString m_sResourceType;
+TYPEm_eType;
+OString m_sHelpText;
+OString m_sKeyId;
+public:
+
+PoEntry(const OString i_rSDFLine,
+const TYPE eType = TTEXT);
+virtual ~PoEntry();
+virtual voidsetUnTransStr(const OString rUnTransStr);
+virtual voidsetTransStr(const OString rTransStr);
+};
-class PoHeader: public PoEntry
+class PoHeader: public GenPoEntry
{
private:
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index c10c3f5..ac24ed6 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -286,9 +286,9 @@ void handleCommand(
if (!sLine.getToken(PoEntry::TEXT,'\t').isEmpty())
PoEntry(sLine).writeToFile(outPut);
if (!sLine.getToken(PoEntry::QUICKHELPTEXT,'\t').isEmpty())
-PoEntry(sLine,PoEntry::QUICKHELPTEXT).writeToFile(outPut);
+PoEntry(sLine,PoEntry::TQUICKHELPTEXT).writeToFile(outPut);
if (!sLine.getToken(PoEntry::TITLE,'\t').isEmpty())
-PoEntry(sLine,PoEntry::TITLE).writeToFile(outPut);
+PoEntry(sLine,PoEntry::TTITLE).writeToFile(outPut);
}
std::getline(in, s);
};
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index ab92679..98364f3 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -30,42 +30,15 @@
#include ctime
#include vector
-#define ESCAPED OString(\\n\\t\\r\\\)
-#define UNESCAPED OString(\n\t\r\\\)
+#define POESCAPED OString(\\n\\t\\r\\\)
+#define POUNESCAPED OString(\n\t\r\\\)
-
-//Get actual time in YEAR-MO-DA HO:MI+ZONE form
-OString ImplGetTime()
-{
-time_t aNow(time(NULL));
-struct tm* pNow(localtime(aNow));
-char pBuff[50];
-strftime( pBuff, sizeof pBuff, %Y-%m-%d %H:%M%z, pNow );
-return pBuff;
-}
-
-//Split string at the delimiter char
-void ImplSplitAt(const
[PUSHED] Change in core[feature/killsdf]: Some improvement in po classes
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: Some improvement in po classes .. Some improvement in po classes Raise general po functionalities from PoEntry to the GenPoEntry class. Thus PoEntry contains only the specific things with which LibreOffice localization tool works. Improve escaping text. Change-Id: I98894e7c218d37c226f48b30a1f8b59a5ff1a0bf --- M l10ntools/inc/po.hxx M l10ntools/source/localize.cxx M l10ntools/source/po.cxx 3 files changed, 172 insertions(+), 136 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/507 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98894e7c218d37c226f48b30a1f8b59a5ff1a0bf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/scripts l10ntools/source
l10ntools/inc/po.hxx |3 +
l10ntools/scripts/po2lo | 29 +++--
l10ntools/source/localize.cxx | 16 -
l10ntools/source/po.cxx |3 +
l10ntools/source/renewpo.cxx | 69 --
5 files changed, 85 insertions(+), 35 deletions(-)
New commits:
commit 305ecb308a9b6f54263fd526cfdda9167fcaab56
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Wed Aug 29 09:54:30 2012 +0200
Make renew working well
Change po2lo output: write out the untranslated
sdf line too, write out translated sdf line only
if there is translation to the komponent, write out
fuzzy entries and indicate which entries are fuzzy.
Change GenPoEntry to write out fuzzy flag
Change renewpo to write out all type of
entries not just text and to remove id
duplicates which are made by xrmex
Change-Id: Idc9b6062638d1d5fcbbae75e0396996b63e9a7a0
Reviewed-on: https://gerrit.libreoffice.org/508
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index ffdb0d2..fddd907 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -43,6 +43,7 @@ private:
OStringm_sContext;
OStringm_sUnTransStr;
OStringm_sTransStr;
+bool m_bFuzzy;
public:
GenPoEntry();
@@ -60,6 +61,8 @@ public:
{ m_sUnTransStr = rUnTransStr; }
virtual voidsetTransStr(const OString rTransStr)
{ m_sTransStr = rTransStr; }
+virtual voidsetFuzzy(bool bFuzzy)
+{ m_bFuzzy = bFuzzy; }
virtual voidwriteToFile(std::ofstream io_rOFStream);
};
diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo
index cdf8892..5796991 100755
--- a/l10ntools/scripts/po2lo
+++ b/l10ntools/scripts/po2lo
@@ -41,6 +41,7 @@ class Entry:
Represents a single line in an SDF file.
def __init__(self, items):
+self.has_translation = None;
self.items = items # list of 15 fields
path = self.items[1].split('\\')
self.po = %s/%s/%s.po % (options.input.replace('\\', '/'),
self.items[0], /.join(path[:-1]))
@@ -65,13 +66,20 @@ class Entry:
Translates text in the entry based on translations.
self.items[9] = options.language
+self.items[2] =
+self.has_translation = False
for idx, key in self.keys:
try:
-self.items[idx] = translations.data[(self.po, key)]
+if translations.data[(self.po, key)][1]:
+self.items[2] += 1
+else:
+self.items[2] += 0
+self.items[idx] = translations.data[(self.po, key)][0]
+self.has_translation = True
self.items[14] = 2002-02-02 02:02:02
except KeyError:
-pass
+self.items[idx]=
self.items[14] = self.items[14].strip()
def sdf2po(self, s):
@@ -95,8 +103,10 @@ class Template:
sock = xopen(options.output, w, encoding='utf-8')
for line in self.lines:
+sock.write(\t.join(line.items))
line.translate(translations)
-sock.write(\t.join(line.items)+\r\n)
+if line.has_translation:
+sock.write(\t.join(line.items)+\r\n)
sock.close()
class Translations:
@@ -120,10 +130,10 @@ class Translations:
elif line.startswith(msgstr ):
trans = line.strip()[8:-1]
if len(trans):
+self.setdata(path, key, trans, fuzzy)
if fuzzy:
fuzzy = False
else:
-self.setdata(path, key, trans)
multiline = False
else:
buf = []
@@ -132,16 +142,15 @@ class Translations:
elif multiline and line.startswith(''):
buf.append(line.strip()[1:-1])
elif multiline and not len(line.strip()) and
len(.join(buf)):
+self.setdata(path, key, .join(buf),fuzzy)
if fuzzy:
fuzzy = False
-else:
-self.setdata(path, key, .join(buf))
buf = []
multiline = False
-if multiline and len(.join(buf)) and not fuzzy:
-self.setdata(path, key, .join(buf))
+if multiline and len(.join(buf)):
+self.setdata(path, key, .join(buf),fuzzy)
-def setdata(self, path, key, s):
+def setdata(self, path, key, s, fuzzy = False):
Sets the translation for a
[Libreoffice-commits] .: 2 commits - i18npool/source libxmlsec/xmlsec1-configure.patch officecfg/registry sw/inc sw/qa sw/source
i18npool/source/breakiterator/data/README |7
libxmlsec/xmlsec1-configure.patch |2
officecfg/registry/data/org/openoffice/Office/Writer.xcu | 10 -
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 13 +
sw/inc/swscanner.hxx |6
sw/qa/core/swdoc-test.cxx | 110 +
sw/source/core/txtnode/txtedt.cxx | 79 ++---
sw/source/ui/config/optload.cxx| 24 ++
sw/source/ui/config/optload.hrc|5
sw/source/ui/config/optload.src| 20 ++
sw/source/ui/inc/optload.hxx |3
11 files changed, 239 insertions(+), 40 deletions(-)
New commits:
commit 3a4403fbdc5b3460795668d244d02d135d18843f
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 09:10:25 2012 +0100
additional -lsoftokn3 lib materalized
Change-Id: Ie5e8dab3fc938436339dcddeb3d52a5c5cba41af
diff --git a/libxmlsec/xmlsec1-configure.patch
b/libxmlsec/xmlsec1-configure.patch
index 9eeb5b2..40a7175 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -51,7 +51,7 @@
+ ;;
+
+*)
-+ NSS_LIBS_LIST=-lnss3 -lsoftokn3 -lsmime3
++ NSS_LIBS_LIST=-lnss3 -lsmime3
+ NSPR_LIBS_LIST=-lnspr4 -lplds4 -lplc4
+ ;;
+esac
commit 42a15f45ff4e02f98229de02efd0d8c19f10bcd5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Aug 28 17:10:35 2012 +0100
Resolves: fdo#38983 allow extra word boundary characters
i.e. word overrides emdash and endash to be word boundary characters
for the purposes of counting words. And there are some who want
to treat =,- etc similarly.
Default to a configuration that gives the same results as Word for
word counting.
Change-Id: Ia8ce6ac12011a1d6e547f11644c76163c4c993c5
diff --git a/i18npool/source/breakiterator/data/README
b/i18npool/source/breakiterator/data/README
index 7d67cf0..6858f7a 100644
--- a/i18npool/source/breakiterator/data/README
+++ b/i18npool/source/breakiterator/data/README
@@ -22,12 +22,6 @@ Date: Sat Jan 29 12:51:52 2011 +
Resolves: fdo#31271 wrong line break with (
-commit 109fa8224194edfc4ca75ee5cc5e760e54d76a3f
-Author: Thomas Lange [tl] t...@openoffice.org
-Date: Wed Dec 8 14:39:09 2010 +0100
-
-cws tl84: #i89042# word count fix
-
commit 42be5541baf18e3292a14a9d478eda33f61e10ab
Author: Mattias Johnsson m.t.johns...@gmail.com
Date: Thu Nov 4 23:25:02 2010 +1100
@@ -585,6 +579,7 @@ Date: Mon Mar 8 16:17:05 2004 +
done, regression tests added:
+#i89042# word count fix (regression test is in writer)
#i58513# add break iterator rules for Finish
#i19716# fix wrong line break on bracket characters
#i21290# extend Greek script type
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index 55ab299..861b777 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -735,9 +735,9 @@
/prop
/node
/node
-node oor:name=Notes
-prop oor:name=ShowAnkor
-valuefalse/value
-/prop
-/node
+ node oor:name=Notes
+ prop oor:name=ShowAnkor
+ valuefalse/value
+ /prop
+ /node
/oor:component-data
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index e797988..cffc740 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5736,6 +5736,19 @@
valuefalse/value
/prop
/group
+ group oor:name=WordCount
+ info
+ descContains settings for word counting/desc
+ /info
+ prop oor:name=AdditionalSeperators
oor:type=xs:string oor:nillable=false
+ info
+ authorcmc/author
+ descconfigures additional word seperators for
word counting/desc
+ labelAdditional Word Seperators/label
+ /info
+ valueââ/value
+ /prop
+/group
group oor:name=Navigator
info
descContains settings for the
Navigator./desc
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index f657f23..7a71c0a 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -43,13 +43,15 @@ class SwScanner
{
rtl::OUString aWord;
const SwTxtNode rNode;
-const rtl::OUString aText;
+const rtl::OUString aPreDashReplacementText;
+rtl::OUString
[PUSHED] Change in core[feature/killsdf]: Make renew working well
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: Make renew working well .. Make renew working well Change po2lo output: write out the untranslated sdf line too, write out translated sdf line only if there is translation to the komponent, write out fuzzy entries and indicate which entries are fuzzy. Change GenPoEntry to write out fuzzy flag Change renewpo to write out all type of entries not just text and to remove id duplicates which are made by xrmex Change-Id: Idc9b6062638d1d5fcbbae75e0396996b63e9a7a0 --- M l10ntools/inc/po.hxx M l10ntools/scripts/po2lo M l10ntools/source/localize.cxx M l10ntools/source/po.cxx M l10ntools/source/renewpo.cxx 5 files changed, 85 insertions(+), 35 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/508 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc9b6062638d1d5fcbbae75e0396996b63e9a7a0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - framework/source
framework/source/uielement/menubarmanager.cxx | 40 ++
1 file changed, 40 insertions(+)
New commits:
commit 88c8616270c2157d1a54ba54ddc4bdfae1cd1825
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 28 17:07:56 2012 +0200
fdo#36149: Do not display error dialogs while showing a menu
...it apparently leads to crashes, but is probably not good from a usability
perspective anyway (as the menu closes again when the dialog appears/is
operated
on by the user).
For now, just disable the Java specific interaction handler here; might make
sense to address this more generally though (there's
framework::QuietInteraction
btw).
(cherry picked from commit 9cfc64c66ff9e0f0251a006f039bf4e26a63147a)
Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331
Reviewed-on: https://gerrit.libreoffice.org/505
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 5b9cfb3..2234b05 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -57,6 +57,7 @@
#include com/sun/star/container/XEnumeration.hpp
#include com/sun/star/util/XStringWidth.hpp
#include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/uno/XCurrentContext.hpp
#include com/sun/star/lang/XMultiComponentFactory.hpp
#include com/sun/star/frame/XPopupMenuController.hpp
#include com/sun/star/frame/XUIControllerRegistration.hpp
@@ -76,6 +77,8 @@
#include comphelper/processfactory.hxx
#include comphelper/extract.hxx
#include svtools/menuoptions.hxx
+#include svtools/javainteractionhandler.hxx
+#include uno/current_context.hxx
#include unotools/historyoptions.hxx
#include unotools/pathoptions.hxx
#include unotools/cmdoptions.hxx
@@ -819,11 +822,48 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16
nItemId)
// vcl handler
//_
+namespace {
+
+class QuietInteractionContext:
+public cppu::WeakImplHelper1 com::sun::star::uno::XCurrentContext ,
+private boost::noncopyable
+{
+public:
+QuietInteractionContext(
+com::sun::star::uno::Reference com::sun::star::uno::XCurrentContext
+const context):
+context_(context) {}
+
+private:
+virtual ~QuietInteractionContext() {}
+
+virtual com::sun::star::uno::Any SAL_CALL getValueByName(
+rtl::OUString const Name)
+throw (com::sun::star::uno::RuntimeException)
+{
+return
+(!Name.equalsAsciiL(
+RTL_CONSTASCII_STRINGPARAM(JAVA_INTERACTION_HANDLER_NAME))
+ context_.is())
+? context_-getValueByName(Name)
+: com::sun::star::uno::Any();
+}
+
+com::sun::star::uno::Reference com::sun::star::uno::XCurrentContext
+context_;
+};
+
+}
+
IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, framework, ocke.jans...@sun.com,
MenuBarManager::Activate );
if ( pMenu == m_pVCLMenu )
{
+com::sun::star::uno::ContextLayer layer(
+new QuietInteractionContext(
+com::sun::star::uno::getCurrentContext()));
+
// set/unset hiding disabled menu entries
sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
const StyleSettings rSettings =
Application::GetSettings().GetStyleSettings();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - framework/source
framework/source/uielement/menubarmanager.cxx | 37 ++
1 file changed, 37 insertions(+)
New commits:
commit ba08ba5b30f906b795360ce4579721b25e316ae7
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 28 17:07:56 2012 +0200
fdo#36149: Do not display error dialogs while showing a menu
...it apparently leads to crashes, but is probably not good from a usability
perspective anyway (as the menu closes again when the dialog appears/is
operated
on by the user).
For now, just disable the Java specific interaction handler here; might make
sense to address this more generally though (there's
framework::QuietInteraction
btw).
Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331
(cherry picked from commit 9cfc64c66ff9e0f0251a006f039bf4e26a63147a)
Reviewed-on: https://gerrit.libreoffice.org/504
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 0aedb9c..685d988 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -57,6 +57,7 @@
#include com/sun/star/container/XEnumeration.hpp
#include com/sun/star/util/XStringWidth.hpp
#include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/uno/XCurrentContext.hpp
#include com/sun/star/lang/XMultiComponentFactory.hpp
#include com/sun/star/frame/XPopupMenuController.hpp
#include com/sun/star/frame/XUIControllerRegistration.hpp
@@ -76,6 +77,8 @@
#include comphelper/processfactory.hxx
#include comphelper/extract.hxx
#include svtools/menuoptions.hxx
+#include svtools/javainteractionhandler.hxx
+#include uno/current_context.hxx
#include unotools/historyoptions.hxx
#include unotools/pathoptions.hxx
#include unotools/cmdoptions.hxx
@@ -815,11 +818,45 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16
nItemId)
// vcl handler
//_
+namespace {
+
+class QuietInteractionContext:
+public cppu::WeakImplHelper1 com::sun::star::uno::XCurrentContext ,
+private boost::noncopyable
+{
+public:
+QuietInteractionContext(
+com::sun::star::uno::Reference com::sun::star::uno::XCurrentContext
+const context):
+context_(context) {}
+
+private:
+virtual ~QuietInteractionContext() {}
+
+virtual com::sun::star::uno::Any SAL_CALL getValueByName(
+rtl::OUString const Name)
+throw (com::sun::star::uno::RuntimeException)
+{
+return Name != JAVA_INTERACTION_HANDLER_NAME context_.is()
+? context_-getValueByName(Name)
+: com::sun::star::uno::Any();
+}
+
+com::sun::star::uno::Reference com::sun::star::uno::XCurrentContext
+context_;
+};
+
+}
+
IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, framework, ocke.jans...@sun.com,
MenuBarManager::Activate );
if ( pMenu == m_pVCLMenu )
{
+com::sun::star::uno::ContextLayer layer(
+new QuietInteractionContext(
+com::sun::star::uno::getCurrentContext()));
+
// set/unset hiding disabled menu entries
sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
const StyleSettings rSettings =
Application::GetSettings().GetStyleSettings();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/core/data/column3.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cedaa445535e9337294a46cb75c4850294e4f715
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Aug 28 18:47:37 2012 +0200
prevent double delete of broadcaster, fdo#54074, fdo#53364
Change-Id: I7d94525daaeb7c8268fb10594c8a21ebcd52311c
Signed-off-by: Noel Power noel.po...@suse.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index aab315c..6495ca6 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -401,8 +401,11 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
SvtBroadcaster* pBC = pOldCell-GetBroadcaster();
bool bKeepBC = pBC pBC-HasListeners();
// #i99844# do not release broadcaster from old cell, it still
has to notify deleted content
-if ( bKeepBC)
-pNoteCell = new ScNoteCell( pBC );
+if (bKeepBC)
+{
+pNoteCell = new ScNoteCell( pBC );
+pOldCell-ReleaseBroadcaster();
+}
// remove cell entry in cell item list
SCROW nOldRow = maItems[nIdx].nRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#36149: Do not display error dialogs while showing a menu
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has submitted this change and it was merged. Change subject: fdo#36149: Do not display error dialogs while showing a menu .. fdo#36149: Do not display error dialogs while showing a menu ...it apparently leads to crashes, but is probably not good from a usability perspective anyway (as the menu closes again when the dialog appears/is operated on by the user). For now, just disable the Java specific interaction handler here; might make sense to address this more generally though (there's framework::QuietInteraction btw). Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 (cherry picked from commit 9cfc64c66ff9e0f0251a006f039bf4e26a63147a) --- M framework/source/uielement/menubarmanager.cxx 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/504 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-5]: fdo#36149: Do not display error dialogs while showing a menu
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has submitted this change and it was merged. Change subject: fdo#36149: Do not display error dialogs while showing a menu .. fdo#36149: Do not display error dialogs while showing a menu ...it apparently leads to crashes, but is probably not good from a usability perspective anyway (as the menu closes again when the dialog appears/is operated on by the user). For now, just disable the Java specific interaction handler here; might make sense to address this more generally though (there's framework::QuietInteraction btw). (cherry picked from commit 9cfc64c66ff9e0f0251a006f039bf4e26a63147a) Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 --- M framework/source/uielement/menubarmanager.cxx 1 file changed, 40 insertions(+), 0 deletions(-) Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/505 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ae303c0084549b5339d219e158cdb89e5a6b331 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][REVIEW-3-6] fix for fdo#54074, fdo#53364 and maybe for fdo#49520, don't delete broadcasters in formula cells twice
On 28/08/12 18:02, Markus Mohrhard wrote: Hey, [1] fixes a serious bug in calc that happens in a formula cell with a broadcaster that has listeners is deleted. The problem is that the Broadcaster is deleted twice. Once as part of the ScFormulaCell and once as part of the ScNoteCell that is used as replacement for the ScFormulaCell. We need to release the broadcaster from ScFormulaCell because the ScNoteCell is taking over control and is only there to keep track of the Broadcaster. yes, I was in parallel looking at the same thing and at least fdo#54074, fdo#53364 are definitely fixed by this Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 36149, which changed state. Bug 36149 Summary: CRASH hovering over Menu File Send if no JRE is available and MediaWiki Publisher installed https://bugs.freedesktop.org/show_bug.cgi?id=36149 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit cc9c380b157d03ca10d66c66f4500ddaf5e42f7e Author: Stephan Bergmann sberg...@redhat.com Date: Wed Aug 29 11:22:50 2012 +0200 .gitignore config.Build.log Change-Id: I48bdd2045a9b85153a9d39ee667c9083ab6a5a61 diff --git a/.gitignore b/.gitignore index 0583d87..eab21d9 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,7 @@ /autogen.lastrun /autogen.lastrun.bak /ChangeLog +/config.Build.log /config.guess /config.log /config.status ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: make check fails on master with --enable-ext-numbertext
Thank you David for your fix, I didn't how to search from logs, it works now. Il n'y a que ceux qui ne font rien qui ne font pas d'erreur :-) (Only those who do nothing, don't make mistakes) Julien -- View this message in context: http://nabble.documentfoundation.org/make-check-fails-on-master-with-enable-ext-numbertext-tp4004097p4004210.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Status of master mingw nss?
Trying a mingw cross build of current master on Fedora 17, it fails in module nss. First problem should be fixable with diff --git a/nss/makefile.mk b/nss/makefile.mk index 8603fbb..ecd7e22 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -134,8 +134,7 @@ BUILD_ACTION += NSS_USE_SYSTEM_SQLITE=1 PATCH_FILES+=nss.patch.mingw -moz_build:=$(shell cygpath -p $(MOZILLABUILD)) -PATH!:=$(moz_build)/bin:$(PATH) +PATH!:=$(MOZILLABUILD)/bin:$(PATH) nss_CC=$(CC) nss_CXX=$(CXX) but then application of nss.patch.mingw still fails. --with-system-nss does not work for me either, as I have no idea which rpms (if available at all) I would need to install for that on Fedora 17. And nss is apparently non-optional in our master builds these days. Did anyone successfully build master mingw recently? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: berkeleydb/makefile.mk cairo/cairo cairo/pixman libxmlsec/makefile.mk libxslt/makefile.mk moz/seamonkey-source-1.1.14.patch nss/nss.patch odk/settings redland/raptor redland/r
berkeleydb/makefile.mk|6 +++--- cairo/cairo/makefile.mk |2 +- cairo/pixman/makefile.mk |4 ++-- libxmlsec/makefile.mk |4 ++-- libxslt/makefile.mk |4 ++-- moz/seamonkey-source-1.1.14.patch | 35 +-- nss/nss.patch | 28 +--- odk/settings/settings.mk |4 ++-- redland/raptor/makefile.mk|2 +- redland/rasqal/makefile.mk|2 +- redland/redland/makefile.mk |2 +- registry/workben/makefile.mk |4 ++-- solenv/gbuild/platform/unxgcc.mk |4 ++-- solenv/inc/unxgcc.mk |8 stlport/STLport-4.5.patch |4 ++-- 15 files changed, 71 insertions(+), 42 deletions(-) New commits: commit 34ca8dd9adb62c1154f979887a38483d73da978b Author: Jung-uk Kim j...@freebsd.org Date: Wed Aug 29 11:27:23 2012 +0200 fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGIN Signed-off-by: Stephan Bergmann sberg...@redhat.com: * bulk replacement of -Wl,-z,origin,-rpath,... with -Wl,-z,origin -Wl,rpath,... * additional hunk for directory/c-sdk/config/FreeBSD.mk in moz/seamonkey-source-1.1.14.patch did not apply and has been dropped Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7 diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 6ee001d..eff14b8 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -89,14 +89,14 @@ CXXFLAGS+=-g .ENDIF .IF $(GUI)==UNX -.IF $(OS)$(COM)==LINUXGCC -LDFLAGS:=-Wl,-rpath,'ORIGIN' +.IF $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC +LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'ORIGIN' .EXPORT: LDFLAGS #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out # the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map .EXPORT: LDFLAGSVERSION -.ENDIF # $(OS)$(COM)==LINUXGCC +.ENDIF # $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC .IF $(OS)$(COM)==SOLARISC52 LDFLAGS:=$(ARCH_FLAGS) -R\''ORIGIN'\' .EXPORT: LDFLAGS diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 2b079d0..e5d0b94 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -137,7 +137,7 @@ OUT2INC+=src$/cairo-quartz.h .ELSE # --- Unix - .IF $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC -cairo_LDFLAGS+=-Wl,-rpath,\ORIGIN:\ORIGIN/../ure-link/lib -Wl,-z,noexecstack +cairo_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\ORIGIN:\ORIGIN/../ure-link/lib -Wl,-z,noexecstack .ELIF $(OS)$(COM)==SOLARISC52 cairo_LDFLAGS+=-Wl,-R\ORIGIN:\ORIGIN/../ure-link/lib .ENDIF # $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index a584b52..316d2d6 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -97,8 +97,8 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # --- Unix - .IF $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC -LDFLAGS:=-Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' -Wl,-z,noexecstack -.ENDIF # $(OS)$(COM)==LINUXGCC +LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' -Wl,-z,noexecstack +.ENDIF # $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC .IF $(OS)$(COM)==SOLARISC52 LDFLAGS:=-Wl,-R'ORIGIN:ORIGIN/../ure-link/lib' diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 2f0550f..38ce013 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -154,8 +154,8 @@ xmlsec_CPPFLAGS+=$(EXTRA_CDEFS) .ENDIF .IF $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC -xmlsec_LDFLAGS+=-Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' -.ENDIF # $(OS)$(COM)==LINUXGCC +xmlsec_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' +.ENDIF # $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC .IF $(OS)$(COM)==SOLARISC52 xmlsec_LDFLAGS+=-Wl,-R'ORIGIN:ORIGIN/../ure-link/lib' .ENDIF # $(OS)$(COM)==SOLARISC52 diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 7c86a4c..670ebb9 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -103,8 +103,8 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE .IF $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC -LDFLAGS:=-Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -.ENDIF # $(OS)$(COM)==LINUXGCC +LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec +.ENDIF # $(OS)$(COM)==LINUXGCC || $(OS)$(COM)==FREEBSDGCC .IF $(OS)$(COM)==SOLARISC52 LDFLAGS:=-Wl,-R'ORIGIN:ORIGIN/../ure-link/lib' .ENDIF # $(OS)$(COM)==SOLARISC52 diff --git
License statement
Dear all, All of my contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Thanks, Jack ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: using syslog instead of console for messages
while in headless mode i'd like to have messages delivered to syslog instead of stderr / stdout, looking at the SAL_* implementation it looks like what i want is to substitute the std::fputs in osl/all/log.cxx::log() with syslog() plus some map between these levels and syslog ones. Is that ok? Why not just calling the application with 21 | logger -t libo in this case ? Also does libo makes sense as message prefix? thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice 3.7 Most Annoying Bugs tracking bug created
Hi all, after a short discussion on the QA mailing list, I have created the new LibreOffice 3.7 most annoying bugs tracking bug. You find it at https://bugs.freedesktop.org/show_bug.cgi?id=54157 Please add all critical bugs which have appeared first in our 3.7 daily builds to the Depends on: field of this new tracking bug. And (this one goes to our developers) please take a look at this page from time to time and try to give the issues reported there special priority. Thank you! Additionally, I have followed Rainer’s suggestion to create a special wiki page about the MAB handling procedure which we can correct, expand, and translate as necessary -- you will find it at https://wiki.documentfoundation.org/Most_Annoying_Bugs Feel free to improve that page, if necessary, or to translate it to the various wiki languages. (I will complete the German translation soon.) Special hint to native speakers: you are very welcome to improve my poor English grammar and style ;-) Thank you all for your good work, and best regards, Roman ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5bc406541c3845985d2239056c35fcfb4e84b093 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Aug 29 13:40:53 2012 +0300 WaE: this decimal constant is unsigned only in ISO C90 Change-Id: Ica3bf96289d142be2ef19d3a0bb3a4006ef5317d diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index f5c3661..00e36b8 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -782,7 +782,7 @@ void Test::testN777345() Graphic aGraphic(xGraphic); // If this changes later, feel free to update it, but make sure it's not // the checksum of a white/transparent placeholder rectangle. -CPPUNIT_ASSERT_EQUAL(sal_uLong(2404338915), aGraphic.GetChecksum()); +CPPUNIT_ASSERT_EQUAL(sal_uLong(2404338915U), aGraphic.GetChecksum()); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - basic/source i18npool/qa i18npool/source sc/source solenv/inc svl/source svtools/source svx/source vcl/source
basic/source/runtime/step0.cxx | 13 +++--
i18npool/qa/cppunit/test_breakiterator.cxx | 22 --
i18npool/source/breakiterator/data/README | 21 +++--
sc/source/ui/view/output2.cxx |7 ---
solenv/inc/settings.mk |2 +-
svl/source/numbers/zforfind.cxx| 15 +--
svl/source/numbers/zformat.cxx | 16 ++--
svtools/source/svhtml/parhtml.cxx | 10 +++---
svx/source/svdraw/svdotxat.cxx |7 ---
vcl/source/control/field2.cxx |8 +---
10 files changed, 70 insertions(+), 51 deletions(-)
New commits:
commit 7a1bac5cca8257e9ec35b59be1ddb7b492f465f3
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 11:39:44 2012 +0100
ecj knows about -source -target
Change-Id: Ieb26135bb55cd472becf704e75bcbeeb8518
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 36234fc..7c28ad5 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -116,7 +116,7 @@ JAVAI:=$(JAVAINTERPRETER)
.IF $(JAVACISGCJ) == yes
JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
.ENDIF
-.IF $(JDK) != gcj $(JAVACISKAFFE) != yes
+.IF $(JAVACISKAFFE) != yes
JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
.ENDIF
commit cbba41823a2e67add2620e4901bf0ead542c2932
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 11:22:25 2012 +0100
String::Expand - string::padToLength
Change-Id: I684e371c31ba76d2e9b563eed70449764346161b
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 667a805..40d8f69 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include comphelper/string.hxx
#include vcl/msgbox.hxx
#include tools/fsys.hxx
@@ -1305,13 +1306,13 @@ void SbiRuntime::StepPRINT()// print TOS
void SbiRuntime::StepPRINTF() // print TOS in field
{
SbxVariableRef p = PopVar();
-String s1 = p-GetString();
-String s;
+OUString s1 = p-GetString();
+OUStringBuffer s;
if( p-GetType() = SbxINTEGER p-GetType() = SbxDOUBLE )
-s = ' ';
-s += s1;
-s.Expand( 14, ' ' );
-rtl::OString aByteStr(rtl::OUStringToOString(s,
osl_getThreadTextEncoding()));
+s.append(' ');
+s.append(s1);
+comphelper::string::padToLength(s, 14, ' ');
+OString aByteStr(OUStringToOString(s.makeStringAndClear(),
osl_getThreadTextEncoding()));
pIosys-Write( aByteStr );
Error( pIosys-GetError() );
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 956bf68..edfdf60 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -65,6 +65,7 @@
#include fillinfo.hxx
#include com/sun/star/i18n/DirectionProperty.hpp
+#include comphelper/string.hxx
#include boost/ptr_container/ptr_vector.hpp
@@ -566,9 +567,9 @@ void ScDrawStringsVars::RepeatToFill( long colWidth )
return;
long nCharsToInsert = aSpaceToFill / charWidth;
-String aFill;
-aFill.Expand( nCharsToInsert, nChar);
-aString.Insert( aFill, nPos);
+StringBuffer aFill;
+comphelper::string::padToLength(aFill, nCharsToInsert, nChar);
+aString.Insert( aFill.makeStringAndClear(), nPos);
TextChanged();
}
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 83ac5f3..6d0cbdc 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1122,14 +1122,16 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern(
sal_uInt16 nStartPatternAt )
nPat += nLen - 1;
else if (nPat + nLen rPat.getLength()
sStrArray[nNext].GetChar(nLen-1) == ' ')
{
+using namespace comphelper::string;
// Trailing blanks in input.
-String
aStr(comphelper::string::stripEnd(sStrArray[nNext], ' '));
+OUStringBuffer aBuf(stripEnd(sStrArray[nNext], '
'));
// Expand again in case of pattern M. D. and
// input M. D. , maybe fetched far, but..
-aStr.Expand( rPat.getLength() - nPat, ' ');
+padToLength(aBuf, rPat.getLength() - nPat, ' ');
+OUString aStr = aBuf.makeStringAndClear();
bOk = (rPat.indexOf( aStr, nPat) == nPat);
if (bOk)
-nPat += aStr.Len() - 1;
+nPat += aStr.getLength() - 1;
}
}
break;
@@ -1196,9 +1198,10 @@ bool ImpSvNumberInputScan::SkipDatePatternSeparator(
[Libreoffice-commits] .: android/sdremote sd/source
android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
| 19 --
sd/source/ui/remotecontrol/Communicator.cxx
|2 +
2 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 9f1716173ed8b859326e4d946e5a1909cd62b5fb
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Wed Aug 29 12:57:09 2012 +0200
Return to StartPresentationActivity when slideshow finishes.
Change-Id: Id91226046ecb89c2cd14d03eb4a99d0ad4b7b027
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
index 407540a..955459c 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
@@ -10,6 +10,9 @@ package org.libreoffice.impressremote.communication;
import java.util.ArrayList;
+import org.libreoffice.impressremote.PresentationActivity;
+import org.libreoffice.impressremote.StartPresentationActivity;
+
import android.content.Context;
import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
@@ -43,9 +46,19 @@ public class Receiver {
int aCurrentSlide = Integer.parseInt(aCommand.get(2));
mSlideShow.setLength(aSlideShowlength);
mSlideShow.setCurrentSlide(aCurrentSlide);
-Intent aIntent = new Intent(
-CommunicationService.MSG_SLIDESHOW_STARTED);
-LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
+//Intent aIntent = new Intent(
+//
CommunicationService.MSG_SLIDESHOW_STARTED);
+//
LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
+Intent aIntent = new Intent(mContext.getApplicationContext(),
+PresentationActivity.class);
+aIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+mContext.getApplicationContext().startActivity(aIntent);
+} else if (aInstruction.equals(slideshow_finished)) {
+mSlideShow = new SlideShow(mContext);
+Intent aIntent = new Intent(mContext.getApplicationContext(),
+StartPresentationActivity.class);
+aIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+mContext.getApplicationContext().startActivity(aIntent);
} else {
if (mSlideShow == null)
return;
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx
b/sd/source/ui/remotecontrol/Communicator.cxx
index 58f2130..779ccf5 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -95,6 +95,8 @@ void Communicator::execute()
void Communicator::informListenerDestroyed()
{
+pTransmitter-addMessage( slideshow_finished\n\n,
+ Transmitter::PRIORITY_HIGH );
mListener.clear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/output2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 04414085d12763c5aa7419f5a0d6928189ff45b0 Author: Caolán McNamara caol...@redhat.com Date: Wed Aug 29 12:11:04 2012 +0100 fix typo Change-Id: Id278f406673b79347c72203d89c1c7b22105c727 diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index edfdf60..de84767 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -567,7 +567,7 @@ void ScDrawStringsVars::RepeatToFill( long colWidth ) return; long nCharsToInsert = aSpaceToFill / charWidth; -StringBuffer aFill; +OUStringBuffer aFill; comphelper::string::padToLength(aFill, nCharsToInsert, nChar); aString.Insert( aFill.makeStringAndClear(), nPos); TextChanged(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source
l10ntools/inc/po.hxx|4 +-
l10ntools/source/po.cxx | 92 ++--
2 files changed, 38 insertions(+), 58 deletions(-)
New commits:
commit 6c03bb4ab1e954e246c57db6f474c56e10763d9a
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Wed Aug 29 12:42:11 2012 +0200
Improve KeyId generation
Move KeyId from PoEntry to GenPoEntry to make
these classes more separated.
Replace crc24 with crc32 (boost/crc).
Extend KeyId's charset to [33,126] intervallum of ASCII
Change-Id: If761a572e2a2651af3eab253a1582569ea68e440
Reviewed-on: https://gerrit.libreoffice.org/509
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index fddd907..3330afb 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -44,6 +44,7 @@ private:
OStringm_sUnTransStr;
OStringm_sTransStr;
bool m_bFuzzy;
+OStringm_sKeyId;
public:
GenPoEntry();
@@ -63,7 +64,7 @@ public:
{ m_sTransStr = rTransStr; }
virtual voidsetFuzzy(bool bFuzzy)
{ m_bFuzzy = bFuzzy; }
-
+virtual voidgenKeyId();
virtual voidwriteToFile(std::ofstream io_rOFStream);
};
@@ -82,7 +83,6 @@ private:
OString m_sResourceType;
TYPEm_eType;
OString m_sHelpText;
-OString m_sKeyId;
public:
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 9bedf4d..c488c87 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -29,12 +29,29 @@
#include po.hxx
#include ctime
#include vector
+#include boost/crc.hpp
#define POESCAPED OString(\\n\\t\\r\\\)
#define POUNESCAPED OString(\n\t\r\\\)
//Class GenPoEntry
+//Generate KeyId
+OString ImplGenKeyId(const OString rGenerator)
+{
+boost::crc_32_type aCRC32;
+aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength());
+sal_uInt32 nCRC = aCRC32.checksum();
+OString sKeyId = ;
+while ( sKeyId.getLength() 4 )
+{
+//Concat a char from the [33,126] intervallum of ASCII
+sKeyId += OString(char(int(double(nCRC 255)/255*93)+33));
+nCRC = 8;
+}
+return sKeyId;
+}
+
//Escape text
OString ImplEscapeText(const OString rText,
const OString rUnEscaped= POUNESCAPED,
@@ -101,6 +118,7 @@ GenPoEntry::GenPoEntry()
, m_sUnTransStr( OString() )
, m_sTransStr( OString() )
, m_bFuzzy( false )
+, m_sKeyId( OString() )
{
}
@@ -109,15 +127,21 @@ GenPoEntry::~GenPoEntry()
{
}
+//Set keyid
+void GenPoEntry::genKeyId()
+{
+m_sKeyId = ImplGenKeyId(m_sReference + m_sContext + m_sUnTransStr);
+}
+
//Write to file
void GenPoEntry::writeToFile(std::ofstream io_rOFStream)
{
if ( !m_sWhiteSpace.isEmpty() )
io_rOFStream m_sWhiteSpace.getStr();
if ( !m_sExtractCom.isEmpty() )
-io_rOFStream #.
- m_sExtractCom.replaceAll(\n,\n#. ).getStr()
- std::endl;
+io_rOFStream #. m_sExtractCom.getStr() std::endl;
+if ( !m_sKeyId.isEmpty() )
+io_rOFStream #. m_sKeyId.getStr() std::endl;
if ( !m_sReference.isEmpty() )
io_rOFStream #: m_sReference.getStr() std::endl;
if ( m_bFuzzy )
@@ -125,14 +149,12 @@ void GenPoEntry::writeToFile(std::ofstream io_rOFStream)
if ( !m_sContext.isEmpty() )
io_rOFStream msgctxt
ImplGenMsgString(m_sContext).getStr() std::endl;
-io_rOFStream msgid
- ImplGenMsgString(
-ImplEscapeText(m_sUnTransStr)).getStr()
- std::endl;
-io_rOFStream msgstr
- ImplGenMsgString(
-ImplEscapeText(m_sTransStr)).getStr()
- std::endl;
+io_rOFStream msgid
+ ImplGenMsgString(ImplEscapeText(m_sUnTransStr)).getStr()
+ std::endl;
+io_rOFStream msgstr
+ ImplGenMsgString(ImplEscapeText(m_sTransStr)).getStr()
+ std::endl;
}
//Class PoEntry
@@ -156,48 +178,7 @@ void ImplSplitAt(const OString rSource, const sal_Int32
nDelimiter,
o_vParts.push_back(rSource.copy(nLastSplit));
}
-//Generate crc24
-sal_Int32 ImplGenCRC24(const OString rKey)
-{
-const sal_Int32 CRC24_INIT = 0x00b704ce;
-const sal_Int32 CRC24_POLY = 0x00864cfb;
-sal_Int32 nCRC = CRC24_INIT;
-sal_Int32 nPosition = 0;
-while ( nPosition rKey.getLength() )
-{
-nCRC ^= sal_Int32(rKey[nPosition]) 16;
-for (sal_uInt16 i = 0; i 8; ++i)
-{
-nCRC = 1;
-if (nCRC 0x0100)
-nCRC ^= CRC24_POLY;
-}
-++nPosition;
-}
-return nCRC 0x00ff;
-}
-
-//Generate KeyId
-OString
[PUSHED] Change in core[feature/killsdf]: Improve KeyId generation
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: Improve KeyId generation .. Improve KeyId generation Move KeyId from PoEntry to GenPoEntry to make these classes more separated. Replace crc24 with crc32 (boost/crc). Extend KeyId's charset to [33,126] intervallum of ASCII Change-Id: If761a572e2a2651af3eab253a1582569ea68e440 --- M l10ntools/inc/po.hxx M l10ntools/source/po.cxx 2 files changed, 38 insertions(+), 58 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/509 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If761a572e2a2651af3eab253a1582569ea68e440 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/inc
sfx2/inc/sfx2/frame.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 3ef14b0a5a8b421169cf584a5604e14eed72a3c5 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Aug 29 13:26:42 2012 +0200 Unused declarations Change-Id: Iec879819cb328bade35de8a946f38a419fa8737a diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index d1fae0d..63220ca 100644 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -71,9 +71,7 @@ class SfxObjectFactory; class SfxViewFrame; class SfxFrameDescriptor; class SfxFrameSetDescriptor; -class SfxMedium; class SfxDispatcher; -class SfxMedium; class Rectangle; class SfxRequest; class SfxUnoControllerItem; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/w32/module.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e54da07147a3cd065100e4eac32407a5c7f46495
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 13:10:16 2012 +0100
allow NULL pModuleName for WNT in osl_getModuleHandle
osl_getModuleHandle under unix can have a NULL pModuleName and the
underlying
GetModuleHandle on windows allows a NULL modulename as well
Change-Id: Iaf154e635e9c96cbc62d525a7552339ce132f3dc
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 026cf51..bd680a8 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -151,7 +151,8 @@ oslModule osl_loadModuleRelativeAscii(
sal_Bool SAL_CALL
osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
{
-HINSTANCE hInstance =
GetModuleHandleW(reinterpret_castLPCWSTR(pModuleName-buffer));
+LPCWSTR pName = pModuleName ?
reinterpret_castLPCWSTR(pModuleName-buffer) : NULL;
+HINSTANCE hInstance = GetModuleHandleW(pName);
if( hInstance )
{
*pResult = (oslModule) hInstance;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 51034, which changed state. Bug 51034 Summary: FILESAVE: # in hyperlink corrupts .docx (MSO2007) document https://bugs.freedesktop.org/show_bug.cgi?id=51034 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
Regression in isHidden-Property of Frames
Hi, We're currently in the process of switching from OpenOffice.org 3.2.1 to LibreOffice. As a part of this, we're testing our extension WollMux (www.wollmux.org) with LO. During these tests we found a change in the behaviour of the isHidden-Property of frames. We're using a com.sun.star.document.XEventListener to listen to the onViewCreated-Event. We then test, if the document is visible, and only then WollMux will process the document. In OOo 3.2.1 a new document created with File/New would have isHidden == false. In LO the document now returns isHidden == true. I have searched in the sources of LO and found a change in ./framework/source/services/frame.cxx. This was introduced with the commit 74ffe76476d5b8941454a2acce569737237fc1d7. I believe that this change is wrong and should be reverted. Before the change isHidden represented the intended state of a frame. A document that was openened hidden, returned hidden. A document opened visible returned not hidden. Now it will always return isHidden == true. If this isn't changed back, there needs to be another property to check the intended visibilty. Greetings Andor Ertsey ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: distro-configs/LibreOfficeMinGW.conf
distro-configs/LibreOfficeMinGW.conf |1 + 1 file changed, 1 insertion(+) New commits: commit f309083c5a3928ec3ccff335682970c928240510 Author: Jan Holesovsky ke...@suse.cz Date: Wed Aug 29 14:52:18 2012 +0200 --with-system-nss for MinGW. Change-Id: Id94b5d0aa4d4b6236831f3720cb24efca70be649 diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index 1673d9d..b7cfd36 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -16,6 +16,7 @@ --with-system-lpsolve --with-system-mythes --with-system-neon +--with-system-nss --with-system-openssl --with-system-redland --without-junit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nss/makefile.mk
nss/makefile.mk |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 54928e17451c1fc415be3254f7d73a83e93a8205 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Aug 29 14:53:04 2012 +0200 Mingw build is cross-compiling, not using cygwin Change-Id: Icc0b617bd639666e44effbb4554bb4f7f0e778e8 diff --git a/nss/makefile.mk b/nss/makefile.mk index 8603fbb..ecd7e22 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -134,8 +134,7 @@ BUILD_ACTION += NSS_USE_SYSTEM_SQLITE=1 PATCH_FILES+=nss.patch.mingw -moz_build:=$(shell cygpath -p $(MOZILLABUILD)) -PATH!:=$(moz_build)/bin:$(PATH) +PATH!:=$(MOZILLABUILD)/bin:$(PATH) nss_CC=$(CC) nss_CXX=$(CXX) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - 3 commits - sw/uiconfig vcl/inc vcl/source
sw/uiconfig/swriter/ui/linenumbering.ui |2 +-
vcl/inc/vcl/dialog.hxx |1 +
vcl/source/control/fixed.cxx|2 ++
vcl/source/window/builder.cxx | 26 +-
vcl/source/window/dialog.cxx|7 ++-
5 files changed, 31 insertions(+), 7 deletions(-)
New commits:
commit cd4d85b161096ed124258a236be73c1018305108
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 14:16:04 2012 +0100
GetProcAddress doesn't work like dlsym with executable's handle
underlying GetProcAddress on windows, unlike dlsym, doesn't search
through all loaded .dlls searching for the symbol when given the
default module. So load the module by name.
Change-Id: I148250c9d8dd5aa2b802581d049533f2c5e83caf
diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui
b/sw/uiconfig/swriter/ui/linenumbering.ui
index 35a8965..045bf88 100644
--- a/sw/uiconfig/swriter/ui/linenumbering.ui
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -207,7 +207,7 @@
/packing
/child
child
- object class=SwNumberingTypeListBox
id=formatdropdown
+ object class=swlo:SwNumberingTypeListBox
id=formatdropdown
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c45494f..fdf6a49 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -26,7 +26,7 @@
* instead of those above.
*/
-#include osl/module.h
+#include osl/module.hxx
#include vcl/builder.hxx
#include vcl/button.hxx
#include vcl/dialog.hxx
@@ -342,6 +342,8 @@ bool VclBuilder::extractModel(const rtl::OString id,
stringmap rMap)
return false;
}
+extern C { static void SAL_CALL thisModule() {} }
+
Window *VclBuilder::makeObject(Window *pParent, const rtl::OString name,
const rtl::OString id, stringmap rMap)
{
bool bIsPlaceHolder = name.isEmpty();
@@ -472,10 +474,24 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString name, const
pWindow = new Window(pParent);
else
{
-rtl::OString sFunction = rtl::OString(make) + name;
-customMakeWidget pFunction =
(customMakeWidget)osl_getAsciiFunctionSymbol(NULL, sFunction.getStr());
-if (pFunction)
-pWindow = (*pFunction)(pParent);
+sal_Int32 nDelim = name.indexOf(':');
+if (nDelim != -1)
+{
+rtl::OUStringBuffer sModule;
+#ifdef SAL_DLLPREFIX
+sModule.append(SAL_DLLPREFIX);
+#endif
+sModule.append(rtl::OStringToOUString(name.copy(0, nDelim),
RTL_TEXTENCODING_UTF8));
+#ifdef SAL_DLLEXTENSION
+sModule.append(SAL_DLLEXTENSION);
+#endif
+rtl::OUString
sFunction(rtl::OStringToOUString(rtl::OString(make) + name.copy(nDelim+1),
RTL_TEXTENCODING_UTF8));
+osl::Module aModule;
+aModule.loadRelative(thisModule, sModule.makeStringAndClear());
+customMakeWidget pFunction =
(customMakeWidget)aModule.getFunctionSymbol(sFunction);
+if (pFunction)
+pWindow = (*pFunction)(pParent);
+}
}
if (!pWindow)
fprintf(stderr, TO-DO, implement %s or add a make%s function\n,
name.getStr(), name.getStr());
commit c644065868e7e4e981bc11eabdd3e86fd333bf3e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 27 09:33:40 2012 +0100
seperate layout from resize
so layout can be triggered by queue_resize without calling
virtual overrides of Resize
Change-Id: Ibf7a4b763d05d9aa401cb15e510632410aeca30b
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index a56f12b..aa3c9cd 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -101,6 +101,7 @@ public:
virtual voidResize();
boolisLayoutEnabled() const;
voidsetInitialLayoutSize();
+voidqueue_layout();
virtual bool set_property(const rtl::OString rKey, const rtl::OString
rValue);
virtual sal_BoolClose();
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 6c94a17..13e1c12 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1233,7 +1233,7 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*,
EMPTYARG )
return 0;
}
-void Dialog::Resize()
+void Dialog::queue_layout()
{
if (hasPendingLayout())
return;
@@ -1244,6 +1244,11 @@ void Dialog::Resize()
maLayoutTimer.Start();
}
+void Dialog::Resize()
+{
+queue_layout();
+}
+
bool Dialog::set_property(const rtl::OString rKey, const rtl::OString rValue)
{
if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM(border-width)))
[Libreoffice-commits] .: Branch 'feature/svg-export' - 3 commits - filter/source
filter/source/svg/presentation_engine.js | 222 ++-
filter/source/svg/svgexport.cxx | 23 +--
2 files changed, 176 insertions(+), 69 deletions(-)
New commits:
commit 896ec40ea7543041e23ce2204e08adc1d950cd20
Author: Marco Cecchetti mrcek...@gmail.com
Date: Sun Aug 26 18:48:01 2012 +0200
Bug Fix: background objects on master pages were not stacked in the correct
order
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index a525744..63e8a4c 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -1606,6 +1606,34 @@ function getClassAttribute( aElem )
return '';
}
+function createElementGroup( aParentElement, aElementList, nFrom, nCount,
sGroupClass, sGroupId )
+{
+var nTo = nFrom + nCount;
+if( nCount 1 || aElementList.length nTo )
+{
+log( 'createElementGroup: not enough elements available.' );
+return;
+}
+var firstElement = aElementList[nFrom];
+if( !firstElement )
+{
+log( 'createElementGroup: element not found.' );
+return;
+}
+var aGroupElement = document.createElementNS( NSS['svg'], 'g' );
+if( sGroupId )
+aGroupElement.setAttribute( 'id', sGroupId );
+if( sGroupClass )
+aGroupElement.setAttribute( 'class', sGroupClass );
+aParentElement.insertBefore( aGroupElement, firstElement );
+var i = nFrom;
+for( ; i nTo; ++i )
+{
+aParentElement.removeChild( aElementList[i] );
+aGroupElement.appendChild( aElementList[i] );
+}
+}
+
function initVisibilityProperty( aElement )
{
var nVisibility = VISIBLE;
@@ -2213,6 +2241,47 @@ function MasterPage( sMasterPageId )
{
this.backgroundObjectsId = this.backgroundObjects.getAttribute( 'id' );
this.backgroundObjectsVisibility = initVisibilityProperty(
this.backgroundObjects );
+
+if( this.backgroundObjectsVisibility != HIDDEN )
+{
+var aBackgroundObjectList = getElementChildren(
this.backgroundObjects );
+var nFrom = 0;
+var nCount = 0;
+var nSubGroupId = 1;
+var sClass;
+var sId = '';
+this.aBackgroundObjectSubGroupIdList = new Array();
+var i = 0;
+for( ; i aBackgroundObjectList.length; ++i )
+{
+sClass = aBackgroundObjectList[i].getAttribute( 'class' );
+if( !sClass || ( ( sClass !== aDateTimeClassName ) ( sClass
!== aFooterClassName )
+ ( sClass !== aHeaderClassName ) (
sClass !== aSlideNumberClassName ) ) )
+{
+if( nCount === 0 )
+{
+nFrom = i;
+sId = this.backgroundObjectsId + '.' + nSubGroupId;
+++nSubGroupId;
+this.aBackgroundObjectSubGroupIdList.push( sId );
+}
+++nCount;
+}
+else
+{
+this.aBackgroundObjectSubGroupIdList.push( sClass );
+if( nCount !== 0 )
+{
+createElementGroup( this.backgroundObjects,
aBackgroundObjectList, nFrom, nCount, 'BackgroundObjectSubgroup', sId );
+nCount = 0;
+}
+}
+}
+if( nCount !== 0 )
+{
+createElementGroup( this.backgroundObjects,
aBackgroundObjectList, nFrom, nCount, 'BackgroundObjectSubgroup', sId );
+}
+}
}
else
{
@@ -2355,15 +2424,14 @@ PlaceholderShape.prototype.init = function()
* g class='MasterPageView'
* use class='Background' // reference to master page
background element
* g class='BackgroundObjects'
- * g class='BackgroundFields'
- * g class='Slide_Number' // a cloned element
+ * use class='BackgroundObjectSubGroup' // reference to the
group of shapes on the master page that are below text fields
+ * g class='Slide_Number' // a cloned element
* ...
- * /g
- * use class='Date/Time'// reference to a clone
- * use class='Footer'
- * use class='Header'
* /g
- * use class='BackgroundShapes' // reference to the group of
shapes on the master page
+ * use class='Date/Time'// reference to a clone
+ * use class='Footer'
+ * use class='Header'
+ * use class='BackgroundObjectSubGroup' // reference to the
group of shapes on the master page that are above text fields
* /g
* /g
*
@@ -2458,11 +2526,9 @@ MasterPageView.prototype.createElement = function()
[Libreoffice-commits] .: sc/source
sc/source/ui/view/tabview3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9e6d1f061c4c61bde3035270ddc76dace0fbdf96
Author: Noel Power noel.po...@suse.com
Date: Wed Aug 29 12:41:25 2012 +0100
don't cover cell with hint window fix for fdo#47595
Change-Id: Iedbe5238deb7ed011423ef211e7fb1e498d27387
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 307f048..ba93fea 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -545,7 +545,7 @@ Point calcHintWindowPosition(
{
// Right margin is good enough.
Point aPos = rCellPos;
-aPos.X() += nMargin;
+aPos.X() += nMargin + rCellSize.Width();
aPos.Y() = 0;
return aPos;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxmlsec/makefile.mk
libxmlsec/makefile.mk | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) New commits: commit 7df30efe8130d9dc583c077d7ec9793ba26b7cbf Author: Tor Lillqvist t...@iki.fi Date: Wed Aug 29 17:00:22 2012 +0300 Fix libxmlsec build on MacOSX, no idea if it works at run-time Change-Id: I1c8c978d62072cdb08bd64e6f38fe11983091375 diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 38ce013..459a84d 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -166,6 +166,14 @@ LDFLAGS:=$(xmlsec_LDFLAGS) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=autoreconf ; .$/configure ADDCFLAGS=$(xmlsec_CFLAGS) CPPFLAGS=$(xmlsec_CPPFLAGS) + +.IF $(OS) == MACOSX +.IF $(ACLOCAL) == +ACLOCAL=aclocal +.ENDIF +CONFIGURE_ACTION:=ACLOCAL=$(ACLOCAL) -I$(SRCDIR)/m4/mac $(CONFIGURE_ACTION) +.ENDIF + CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-gnutls=no LIBXML2LIB=$(LIBXML2LIB) .IF $(CROSS_COMPILING)==YES @@ -192,7 +200,7 @@ CONFIGURE_FLAGS += \ # --with-nss or parse -pkg-config --libs / cflags mozilla-nss since # the lib may a) be in /usr/lib (Debian) and be not in $with_nss/include # $with_nss/lib. -.IF $(SYSTEM_NSS) != YES +.IF $(SYSTEM_NSS) != YES || $(OS) == MACOSX CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - cui/uiconfig solenv/bin sw/uiconfig vcl/source
cui/uiconfig/ui/1.ui| 18 ++ solenv/bin/uilangfilter.xslt|4 ++-- sw/uiconfig/sw/ui/20872.ui | 18 ++ sw/uiconfig/swriter/ui/linenumbering.ui |3 +-- vcl/source/window/builder.cxx | 21 - 5 files changed, 43 insertions(+), 21 deletions(-) New commits: commit db7d5e00ab9d5e86180c10afa377c40b5006a274 Author: Caolán McNamara caol...@redhat.com Date: Wed Aug 29 15:06:48 2012 +0100 We need to distinguish NumericFields from MetricFields In the future I'm hoping we can get some gtk3-side support for patterns for GtkSpinButtons or such such. In the meamtime overload that info into the name Change-Id: I20464e3ddafb710dd7330fc038bb9330b852410a diff --git a/cui/uiconfig/ui/1.ui b/cui/uiconfig/ui/1.ui index a14db03..fe84aea 100644 --- a/cui/uiconfig/ui/1.ui +++ b/cui/uiconfig/ui/1.ui @@ -17,6 +17,7 @@ child object class=GtkButton id=28 property name=labelgtk-ok/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -32,6 +33,7 @@ child object class=GtkButton id=29 property name=labelgtk-cancel/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -47,6 +49,7 @@ child object class=GtkButton id=30 property name=labelgtk-help/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -91,6 +94,7 @@ child object class=GtkRadioButton id=15 property name=label translatable=yesOptimal/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -108,6 +112,7 @@ child object class=GtkRadioButton id=16 property name=label translatable=yesFit width and height/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -126,6 +131,7 @@ child object class=GtkRadioButton id=17 property name=label translatable=yesFit width/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -144,6 +150,7 @@ child object class=GtkRadioButton id=18 property name=label translatable=yes100%/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -166,6 +173,7 @@ child object class=GtkRadioButton id=19 property name=label translatable=yesVariable/property +property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -182,11 +190,10 @@ /packing /child child - object class=GtkSpinButton id=20 + object class=GtkSpinButton id=20:0% property name=visibleTrue/property property name=can_focusTrue/property property name=invisible_charâ/property -
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 51034, which changed state. Bug 51034 Summary: FILESAVE: # in hyperlink corrupts .docx (MSO2007) document https://bugs.freedesktop.org/show_bug.cgi?id=51034 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||54214 --- Comment #360 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-08-29 14:45:23 UTC --- Add Bug 54214 - FILESAVE: # in hyperlink corrupts .docx (OOXML) document, destroys documents, dataloss, similar to also listed Bug 51034 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/xml/xmlimprt.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 390a18bfdccfa9b2334ff0e76800358177f1c661
Author: Noel Power noel.po...@suse.com
Date: Fri Aug 24 10:31:45 2012 +0100
fix for fdo#49255
This patch disables row height calculations ( and uses the hard heights read
from the xml instead ) The bug here partially exisits because the height
calculation doesn't work correctly because the factor from
ScDocShell::GetOutputFactor() has not been calculated yet ( and has a
default
value of 1 ) This number is used in setting up the correct nPPTX and
because it
isn't setup correctly the height calculated for the text is incorrect. We
use
EnableAdjustHeight to inhibit auto height calculations that result from
various
changes ( like style changes etc. ) from the start of the load and
re-enabled
it at the end.
Change-Id: Ib6715c39b7cb5793458f15b1f0b3c9ecd16412f9
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index bf7c18b..d0234b2 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2811,6 +2811,7 @@ throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::R
uno::Referencedocument::XActionLockable xActionLockable(xDoc,
uno::UNO_QUERY);
if (xActionLockable.is())
xActionLockable-addActionLock();
+pDoc-EnableAdjustHeight(false);
}
// XServiceInfo
@@ -3105,7 +3106,6 @@ throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeE
pDoc-SetStreamValid( nTab, true );
}
-aTables.UpdateRowHeights();
aTables.FixupOLEs();
}
if (GetModel().is())
@@ -3120,6 +3120,7 @@ throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeE
{
ScModelObj::getImplementation(GetModel())-AfterXMLLoading(true);
}
+pDoc-EnableAdjustHeight( true );
}
// XEventListener
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3-6][PUSHED 3-6] fix for fdo#49255 FORMATTING: row height not preserved after FILESAVE and reopen
On 08/28/2012 12:06 PM, Noel Power wrote: I never did attach the patch in question :-/ cherry-pickers welcome Pushed to 3-6 with my sign-off. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[feature/killsdf]: Some cleanup
From Zolnai Tamás zolnaitamas2...@gmail.com: Zolnai Tamás has uploaded a new change for review. Change subject: Some cleanup .. Some cleanup Use normal integer types when it's unecessary to use sal_int types. Delete some hack from code. Change-Id: I93f0b1f260578d3aa9609b7e9d8a79053693971b --- M l10ntools/source/localize.cxx M l10ntools/source/po.cxx M l10ntools/source/renewpo.cxx 3 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/510/1 -- To view, visit https://gerrit.libreoffice.org/510 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93f0b1f260578d3aa9609b7e9d8a79053693971b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 38840 - Adding coverage analysis to unit tests
Hi. So now that we have a coverage report, does that mean that this bug/issue can be closed ? Regards, John Smith. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source
i18npool/source/localedata/data/hr_HR.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 9019bbf37b0460407823d98134f87f355af54123 Author: Eike Rathke er...@redhat.com Date: Tue Aug 28 13:35:53 2012 +0200 fdo#52240 added D.M date acceptance pattern to [hr-HR] Change-Id: I682bd186b571973acbe98a00af7f6a83ce83e9d4 Reviewed-on: https://gerrit.libreoffice.org/498 Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com Tested-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index a6fa91a..e5a0542 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -35,6 +35,7 @@ MeasurementSystemMetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$kn-41A] +DateAcceptancePatternD.M/DateAcceptancePattern FormatElement msgid=DateFormatskey1 default=false type=medium usage=DATE formatindex=34 FormatCodeMM.YY/FormatCode /FormatElement ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#52240 added D.M date acceptance pattern to [hr-HR]
From Kohei Yoshida kohei.yosh...@gmail.com: Kohei Yoshida has submitted this change and it was merged. Change subject: fdo#52240 added D.M date acceptance pattern to [hr-HR] .. fdo#52240 added D.M date acceptance pattern to [hr-HR] Change-Id: I682bd186b571973acbe98a00af7f6a83ce83e9d4 --- M i18npool/source/localedata/data/hr_HR.xml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/498 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I682bd186b571973acbe98a00af7f6a83ce83e9d4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig
sw/uiconfig/swriter/ui/wordcount.ui | 345 1 file changed, 345 insertions(+) New commits: commit 027816942203bbe1e4f0c0d2b8fa680b244ac802 Author: Gokul gokul.c...@gmail.com Date: Wed Aug 29 16:36:50 2012 +0100 add a wordcount .ui Change-Id: I3eb959c27fa99d0a088472de3f95bf3c659114ee diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui new file mode 100644 index 000..486e574 --- /dev/null +++ b/sw/uiconfig/swriter/ui/wordcount.ui @@ -0,0 +1,345 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=dialog1 +property name=can_focusFalse/property +property name=border_width5/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +child + object class=GtkButton id=101 +property name=labelgtk-help/property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property +property name=yalign0.4900953674316/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=102 +property name=labelgtk-close/property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing10/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=top_padding7/property +property name=bottom_padding5/property +property name=left_padding5/property +property name=right_padding5/property +child + object class=GtkGrid id=grid1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=row_spacing2/property +property name=column_spacing100/property +child + object class=GtkLabel id=3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=xpad10/property +property name=label translatable=yesWords:/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +
Build error
Tried to build from today's sources and I get the following error (already did 'make clean') [ build CXX ] writerfilter/source/rtftok/rtfdocumentimpl.cxx [ build CXX ] writerfilter/source/rtftok/rtfvalue.cxx libo/writerfilter/source/rtftok/rtfdocumentimpl.cxx: In Elementfunktion »int writerfilter::rtftok::RTFDocumentImpl::dispatchToggle(writerfilter::rtftok::RTFKeyword, bool, int)«: libo/writerfilter/source/rtftok/rtfdocumentimpl.cxx:3190:83: Fehler: »OOXML_del« ist kein Element von »writerfilter::ooxml« libo/writerfilter/source/rtftok/rtfdocumentimpl.cxx:3190:102: Fehler: »OOXML_ins« ist kein Element von »writerfilter::ooxml« make[2]: *** [libo/workdir/unxlngi6.pro/CxxObject/writerfilter/source/rtftok/rtfdocumentimpl.o] Fehler 1 Any ideas? Samuel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
factorise common code
From Lionel Elie Mamane lio...@mamane.lu: Lionel Elie Mamane has abandoned this change. Change subject: factorise common code .. Patch Set 1: Abandoned As described by Michael Stahl -- To view, visit https://gerrit.libreoffice.org/465 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2d86714a0d951930de2389d920ea2cd04474e432 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #13
Marco Cecchetti wrote: There was an old, unused filter dialog IIRC for the export, but that seems gone - at any rate, this fixed position thing is really dodgy, I wouldn't mind if you clean that up. For the easy fix, just add the new property at index 6. Ok, I fixed it in the easy way. I also fixed another couple of bugs. See: http://cgit.freedesktop.org/libreoffice/core/log/?h=feature%2Fsvg-export Neat - that should get us to a mergeable state, what do you think? Cheers, -- Thorsten pgpYujngWgAQZ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libxmlsec/makefile.mk
libxmlsec/makefile.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e1d56d509bf52eb83b461f4e291d348caa6c119d Author: Jan Holesovsky ke...@suse.cz Date: Wed Aug 29 19:21:33 2012 +0200 MinGW: Use the right objdump. Change-Id: Id891e048d1914d8e274f3f540c4038a299e57ae8 diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 459a84d..22d280b 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -106,15 +106,15 @@ CONFIGURE_DIR= CONFIGURE_ACTION=autoreconf ; .$/configure .IF $(CROSS_COMPILING)==YES -BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) MINGW_SYSROOT=$(MINGW_SYSROOT) +BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) MINGW_SYSROOT=$(MINGW_SYSROOT) OBJDUMP=$(OBJDUMP) .ELSE -BUILD_AND_HOST=--build=i586-pc-mingw32 --host=i586-pc-mingw32 --with-mozilla_ver=1.7.5 --enable-mscrypto +BUILD_AND_HOST=--build=i586-pc-mingw32 --host=i586-pc-mingw32 --with-mozilla_ver=1.7.5 --enable-mscrypto OBJDUMP=$(WRAPCMD) objdump .ENDIF # Note that this is obsolete crack for building *locally* on Windows with MinGW, # something we don't see the point in here in LibreOffice -CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --disable-crypto-dl $(BUILD_AND_HOST) CC=$(xmlsec_CC) LDFLAGS=-Wl,--no-undefined $(CONF_ILIB) LIBS=$(xmlsec_LIBS) LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP=$(WRAPCMD) objdump +CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --disable-crypto-dl $(BUILD_AND_HOST) CC=$(xmlsec_CC) LDFLAGS=-Wl,--no-undefined $(CONF_ILIB) LIBS=$(xmlsec_LIBS) LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) .IF $(SYSTEM_NSS) != YES CONFIGURE_FLAGS+=--enable-pkgconfig=no ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx|2 -
sc/inc/table.hxx |4 +--
sc/qa/unit/ucalc.cxx | 45 +
sc/source/core/data/documen3.cxx |4 +--
sc/source/core/data/table3.cxx | 19 ---
sc/source/ui/docshell/dbdocfun.cxx |5 +++-
6 files changed, 64 insertions(+), 15 deletions(-)
New commits:
commit 332451bea5ebe08136de2d51e0e29cac88f89e8c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Aug 29 19:42:02 2012 +0200
add unit test for basic sorting with cell note
Change-Id: I997f96e0a9f6aa4c2ed7f2d3811a84fdfda05683
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 63b3b00..a6d5115 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -224,6 +224,7 @@ public:
void testFindAreaPosRowDown();
void testFindAreaPosColRight();
+void testSort();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testCollator);
@@ -271,6 +272,7 @@ public:
CPPUNIT_TEST(testCopyPasteFormulasExternalDoc);
CPPUNIT_TEST(testFindAreaPosRowDown);
CPPUNIT_TEST(testFindAreaPosColRight);
+CPPUNIT_TEST(testSort);
CPPUNIT_TEST_SUITE_END();
private:
@@ -4881,6 +4883,49 @@ void Test::testFindAreaPosColRight()
pDoc-DeleteTab(0);
}
+void Test::testSort()
+{
+ScDocument* pDoc = m_xDocShRef-GetDocument();
+rtl::OUString aTabName1(test1);
+pDoc-InsertTab(0, aTabName1);
+
+const char* aData[][2] = {
+{ 2, 4 },
+{ 4, 1 },
+{ 1, 2 }
+};
+
+clearRange( pDoc, ScRange(0, 0, 0, 1, SAL_N_ELEMENTS(aData), 0));
+ScAddress aPos(0,0,0);
+ScRange aDataRange = insertRangeData( pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE(failed to insert range data at correct position,
aDataRange.aStart == aPos);
+
+rtl::OUString aHello(Hello);
+rtl::OUString aJimBob(Jim Bob);
+ScAddress rAddr(1, 1, 0);
+ScPostIt* pNote = m_pDoc-GetNotes(rAddr.Tab())-GetOrCreateNote(rAddr);
+pNote-SetText(rAddr, aHello);
+pNote-SetAuthor(aJimBob);
+
+ScSortParam aSortData;
+aSortData.nCol1 = 1;
+aSortData.nCol2 = 1;
+aSortData.nRow1 = 0;
+aSortData.nRow2 = 2;
+aSortData.maKeyState[0].bDoSort = true;
+aSortData.maKeyState[0].nField = 1;
+
+pDoc-Sort(0, aSortData, false, NULL);
+double nVal = pDoc-GetValue(1,0,0);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(nVal, 1.0, 1e-8);
+
+// check that note is also moved
+pNote = m_pDoc-GetNotes(0)-findByAddress( 1, 0 );
+CPPUNIT_ASSERT(pNote);
+
+pDoc-DeleteTab(0);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
commit b705c6b4bd080dd0f7713286a1b19ce95850eb49
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Aug 29 19:35:06 2012 +0200
move ScProgress construction out of ScTable::Sort
Change-Id: I8e523fbb53b9c40075b62ee32d79eee0b408168e
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a2db35f..efe8814 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1471,7 +1471,7 @@ public:
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
-voidSort( SCTAB nTab, const ScSortParam rSortParam, bool
bKeepQuery );
+voidSort( SCTAB nTab, const ScSortParam rSortParam, bool
bKeepQuery, ScProgress* pProgress );
SCSIZE Query( SCTAB nTab, const ScQueryParam rQueryParam, bool
bKeepSub );
SC_DLLPUBLIC bool CreateQueryParam( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2,
SCTAB nTab, ScQueryParam rQueryParam
);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 223d38c..2b205e5 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -753,7 +753,7 @@ public:
voidStripHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
voidExtendHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
-voidSort(const ScSortParam rSortParam, bool bKeepQuery);
+voidSort(const ScSortParam rSortParam, bool bKeepQuery,
ScProgress* pProgress);
boolValidQuery(
SCROW nRow, const ScQueryParam rQueryParam, ScBaseCell* pCell = NULL,
bool* pbTestEqualCondition = NULL);
@@ -863,7 +863,7 @@ private:
short Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2)
const;
ScSortInfoArray*CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 );
voidQuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
-voidSortReorder( ScSortInfoArray*, ScProgress );
+voidSortReorder( ScSortInfoArray*, ScProgress* );
boolCreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScQueryParam rQueryParam);
boolCreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScQueryParam rQueryParam);
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 20a6127..209ba19 100644
---
fdo#51695 retrieve index from respective entry fields
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has abandoned this change. Change subject: fdo#51695 retrieve index from respective entry fields .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/326 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I98ab1029848d47a94ee98b21b5534efaea67a201 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joseph Brown 1st...@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remove ugly statics in comphelper
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has abandoned this change. Change subject: Remove ugly statics in comphelper .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/269 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib241ea7d3766817e85977b4cd0ca27d5780c2616 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Christophe JAILLET christophe.jail...@wanadoo.fr Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source
l10ntools/source/localize.cxx | 14 +++---
l10ntools/source/po.cxx | 22 +++---
l10ntools/source/renewpo.cxx |8
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit ecfa813595cb577781668219d9e17a0494f92bea
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Wed Aug 29 12:58:29 2012 +0200
Some cleanup
Use normal integer types when it's unecessary to use
sal_int types.
Delete some hack from code.
Change-Id: I93f0b1f260578d3aa9609b7e9d8a79053693971b
Reviewed-on: https://gerrit.libreoffice.org/510
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index bef2444..598eccf 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -194,13 +194,13 @@ void handleCommand(
throw false; //TODO
}
rtl::OUStringBuffer buf(
-//getEnvironment(
-//rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SOLARVER;
-//buf.append('/');
-//buf.append(
-//getEnvironment(
-rtl::OUString(/home/zolnai/git/libo/solver/unxlngi6.pro));
- // RTL_CONSTASCII_USTRINGPARAM(INPATH_FOR_BUILD;
+getEnvironment(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SOLARVER;
+buf.append('/');
+buf.append(
+getEnvironment(
+rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM(INPATH_FOR_BUILD;
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(/bin/));
buf.append(executable);
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM( -e -p ));
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index c488c87..472e876 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -45,7 +45,7 @@ OString ImplGenKeyId(const OString rGenerator)
OString sKeyId = ;
while ( sKeyId.getLength() 4 )
{
-//Concat a char from the [33,126] intervallum of ASCII
+//Concat a char from the [33,126] interval of ASCII
sKeyId += OString(char(int(double(nCRC 255)/255*93)+33));
nCRC = 8;
}
@@ -59,10 +59,10 @@ OString ImplEscapeText(const OString rText,
{
if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw;
OString sResult = rText;
-sal_Int32 nCount = 0;
-for(sal_Int32 nIndex=0; nIndexrText.getLength(); ++nIndex)
+int nCount = 0;
+for(int nIndex=0; nIndexrText.getLength(); ++nIndex)
{
-sal_Int32 nActChar = rUnEscaped.indexOf(rText[nIndex]);
+int nActChar = rUnEscaped.indexOf(rText[nIndex]);
if(nActChar!=-1)
sResult = sResult.replaceAt((nIndex)+(nCount++),1,
rEscaped.copy(2*nActChar,2));
@@ -77,10 +77,10 @@ OString ImplUnEscapeText(const OString rText,
{
if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw;
OString sResult = rText;
-sal_Int32 nCount = 0;
-for(sal_Int32 nIndex=0; nIndexrText.getLength()-1; ++nIndex)
+int nCount = 0;
+for(int nIndex=0; nIndexrText.getLength()-1; ++nIndex)
{
-sal_Int32 nActChar = rEscaped.indexOf(rText.copy(nIndex,2));
+int nActChar = rEscaped.indexOf(rText.copy(nIndex,2));
if(nActChar % 2 == 0)
sResult = sResult.replaceAt((nIndex++)-(nCount++),2,
rUnEscaped.copy(nActChar/2,1));
@@ -95,7 +95,7 @@ OString ImplGenMsgString(const OString rSource)
return \\;
OString sResult = \ + rSource + \;
-sal_Int32 nIndex = 0;
+int nIndex = 0;
while((nIndex=sResult.indexOf(\\n,nIndex))!=-1)
{
if( sResult.copy(nIndex-1,3) != n )
@@ -160,12 +160,12 @@ void GenPoEntry::writeToFile(std::ofstream io_rOFStream)
//Class PoEntry
//Split string at the delimiter char
-void ImplSplitAt(const OString rSource, const sal_Int32 nDelimiter,
+void ImplSplitAt(const OString rSource, const char nDelimiter,
std::vectorOString o_vParts)
{
o_vParts.resize( 0 );
-sal_Int32 nActIndex( 0 );
-sal_Int32 nLastSplit( 0 );
+int nActIndex( 0 );
+int nLastSplit( 0 );
while( nActIndex rSource.getLength() )
{
if ( rSource[nActIndex] == nDelimiter )
diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
index f68250e..20738b1 100644
--- a/l10ntools/source/renewpo.cxx
+++ b/l10ntools/source/renewpo.cxx
@@ -61,8 +61,8 @@ OString GetPath(const OString rPath, const OString rLine)
OString DelLocalId(const OString rLine)
{
-sal_uInt16 nTabIndex = 0;
-for(sal_uInt16 nComponent=0; nComponentPoEntry::LOCALID; ++nComponent)
+unsigned nTabIndex = 0;
+for(unsigned nComponent=0; nComponentPoEntry::LOCALID; ++nComponent)
{
nTabIndex = rLine.indexOf('\t',nTabIndex);
++nTabIndex;
@@ -138,8 +138,8 @@
[PUSHED] Change in core[feature/killsdf]: Some cleanup
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has submitted this change and it was merged. Change subject: Some cleanup .. Some cleanup Use normal integer types when it's unecessary to use sal_int types. Delete some hack from code. Change-Id: I93f0b1f260578d3aa9609b7e9d8a79053693971b --- M l10ntools/source/localize.cxx M l10ntools/source/po.cxx M l10ntools/source/renewpo.cxx 3 files changed, 22 insertions(+), 22 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved Björn Michaelsen: -- To view, visit https://gerrit.libreoffice.org/510 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93f0b1f260578d3aa9609b7e9d8a79053693971b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/docvw/PageBreakWin.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2dc3f70b13ed861de6cb1b37b90edaa4fd0aa510 Author: Ivan Timofeev timofeev@gmail.com Date: Fri Aug 24 14:30:56 2012 +0400 SwPageBreakWin: memory leak Change-Id: Ibb543b8da8c89c7fa3799fada03c787dabe2b3cb (cherry picked from commit a251863970e0512a1dc2bd857913a3adf7148bb3) Reviewed-on: https://gerrit.libreoffice.org/473 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index f92101c..cd1184f 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -215,6 +215,7 @@ void SwPageBreakWin::Paint( const Rectangle ) *this, aNewViewInfos ); pProcessor-process( aGhostedSeq ); +delete pProcessor; } void SwPageBreakWin::Select( ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-5]: SwPageBreakWin: memory leak
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: SwPageBreakWin: memory leak .. SwPageBreakWin: memory leak Change-Id: Ibb543b8da8c89c7fa3799fada03c787dabe2b3cb (cherry picked from commit a251863970e0512a1dc2bd857913a3adf7148bb3) --- M sw/source/ui/docvw/PageBreakWin.cxx 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/473 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb543b8da8c89c7fa3799fada03c787dabe2b3cb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/ui/docvw/PageBreakWin.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit e8ddde302cdea785e6588be6175e15c7fa2bc809 Author: Ivan Timofeev timofeev@gmail.com Date: Fri Aug 24 14:30:56 2012 +0400 SwPageBreakWin: memory leak Change-Id: Ibb543b8da8c89c7fa3799fada03c787dabe2b3cb (cherry picked from commit a251863970e0512a1dc2bd857913a3adf7148bb3) Reviewed-on: https://gerrit.libreoffice.org/472 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index 02a3dcb..b8a3553 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -215,6 +215,7 @@ void SwPageBreakWin::Paint( const Rectangle ) *this, aNewViewInfos ); pProcessor-process( aGhostedSeq ); +delete pProcessor; } void SwPageBreakWin::Select( ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/docvw/HeaderFooterWin.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f565dc51a7e6d8eccca38b2bf3383577d67dcaa1 Author: Ivan Timofeev timofeev@gmail.com Date: Thu Aug 23 20:15:51 2012 +0400 SwHeaderFooterWin: memory leak Change-Id: Ie8322b93745c48970766c2033a23cca2c710a516 (cherry picked from commit 442d0766eb9575a45572e29f2018bed2831c177f) Reviewed-on: https://gerrit.libreoffice.org/467 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 32e8767..7005f83 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -390,6 +390,7 @@ void SwHeaderFooterWin::Paint( const Rectangle ) aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) ); pProcessor-process( aGhostedSeq ); +delete pProcessor; } bool SwHeaderFooterWin::IsEmptyHeaderFooter( ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source officecfg/registry svl/inc svl/source unotools/inc unotools/source
cui/source/options/optgdlg.cxx | 128 -
cui/source/options/optgdlg.hrc |3
cui/source/options/optgdlg.hxx |4
cui/source/options/optgdlg.src | 52 +---
officecfg/registry/schema/org/openoffice/Setup.xcs |8 +
svl/inc/svl/zforlist.hxx |4
svl/source/numbers/zforfind.cxx| 55 +++--
svl/source/numbers/zforfind.hxx|2
svl/source/numbers/zforlist.cxx| 37 +++---
unotools/inc/unotools/localedatawrapper.hxx|6
unotools/inc/unotools/syslocaleoptions.hxx | 18 ++
unotools/source/config/syslocaleoptions.cxx| 68 ++-
unotools/source/i18n/localedatawrapper.cxx | 59 +
unotools/source/misc/syslocale.cxx | 31 +
14 files changed, 429 insertions(+), 46 deletions(-)
New commits:
commit cda156257003df673fa853a0a5ffcd1cb4848d43
Author: Eike Rathke er...@redhat.com
Date: Wed Aug 29 20:49:01 2012 +0200
resolved fdo#52240 fdo#52137 fdo#52288 user editable date patterns
Implemented user editable date acceptance patterns.
The introduction of strict date parsing using locale dependent date
acceptance patterns in 3.6.0 wasn't always welcomed. Besides that not
every locale had patterns for incomplete (only day and month) date
input, users also complained about not being able to key in dates on
numeric keypads if the locale's date separator wasn't '/' or '-'
This commit implements a Date acceptance patterns edit field under
Tools-Options-LanguageSettings-Languages that follows the selected
locale and enables the user to add patterns.
Example de-DE locale:
* default patterns: D.M.Y;D.M.
* to enable additional input on numeric keypad: D.M.Y;D.M.;D-M-Y;D-M
* if 3-4 shall not result in a date, D-M- could be used instead of D-M
* note that to enter an ISO 8601 Y-M-D date with a D-M-Y pattern
active one needs to enter a year 31 or with at least 3 digits, e.g.
011
Change-Id: I9e20fcb168578b02d0f0248a0e209942e0f27113
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4f83368..5f7015b 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1206,6 +1206,22 @@ static OUString
sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Offi
static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM(UILocale));
static Sequence OUString seqInstalledLanguages;
+static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper
rLocaleWrapper )
+{
+Sequence OUString aDateAcceptancePatterns =
rLocaleWrapper.getDateAcceptancePatterns();
+sal_Int32 nPatterns = aDateAcceptancePatterns.getLength();
+OUStringBuffer aBuf( nPatterns * 6 ); // 6 := length of Y-M-D;
+SAL_WARN_IF( !nPatterns, cui.options, No date acceptance pattern);
+if (nPatterns)
+{
+const OUString* pPatterns = aDateAcceptancePatterns.getConstArray();
+aBuf.append( pPatterns[0]);
+for (sal_Int32 i=1; i nPatterns; ++i)
+aBuf.append(';').append( pPatterns[i]);
+}
+return aBuf.makeStringAndClear();
+}
+
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet
rSet ) :
SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ),
aUILanguageGB(this, CUI_RES(FL_UI_LANG )),
@@ -1219,6 +1235,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)),
aCurrencyFT( this, CUI_RES(FT_CURRENCY )),
aCurrencyLB( this, CUI_RES(LB_CURRENCY )),
+aDatePatternsFI( this, CUI_RES(FI_DATEPATTERNS )),
+aDatePatternsFT( this, CUI_RES(FT_DATEPATTERNS )),
+aDatePatternsED( this, CUI_RES(ED_DATEPATTERNS )),
aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )),
aWesternLanguageFI(this,CUI_RES(FI_WEST_LANG )),
aWesternLanguageFT(this,CUI_RES(FT_WEST_LANG )),
@@ -1341,6 +1360,8 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
delete pLanguageTable;
aLocaleSettingLB.SetSelectHdl( LINK( this, OfaLanguagesTabPage,
LocaleSettingHdl ) );
+aDatePatternsED.SetModifyHdl( LINK( this, OfaLanguagesTabPage,
DatePatternsHdl ) );
+
Link aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
aAsianSupportCB.SetClickHdl( aLink );
aCTLSupportCB.SetClickHdl( aLink );
@@ -1537,6 +1558,11 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet
rSet )
if ( sOldCurr != sNewCurr )
pLangConfig-aSysLocaleOptions.SetCurrencyConfigString( sNewCurr );
+// Configured date acceptance patterns, for example Y-M-D;M-D or empty for
+// locale default.
+if
[PUSHED] Change in core[libreoffice-3-6]: SwPageBreakWin: memory leak
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: SwPageBreakWin: memory leak .. SwPageBreakWin: memory leak Change-Id: Ibb543b8da8c89c7fa3799fada03c787dabe2b3cb (cherry picked from commit a251863970e0512a1dc2bd857913a3adf7148bb3) --- M sw/source/ui/docvw/PageBreakWin.cxx 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/472 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb543b8da8c89c7fa3799fada03c787dabe2b3cb Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-5]: SwHeaderFooterWin: memory leak
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: SwHeaderFooterWin: memory leak .. SwHeaderFooterWin: memory leak Change-Id: Ie8322b93745c48970766c2033a23cca2c710a516 (cherry picked from commit 442d0766eb9575a45572e29f2018bed2831c177f) --- M sw/source/ui/docvw/HeaderFooterWin.cxx 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved Bosdonnat Cedric: Verified; Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/467 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8322b93745c48970766c2033a23cca2c710a516 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/index/cnttab.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit c53bb3f1ec305eff1eb1da1542574eeffeb29d96
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 22 21:45:27 2012 +0200
SwTokenWindow::InsertAtSelection: fix STL assertion:
error: attempt to copy-construct an iterator from a singular iterator.
(regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cde)
Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
(cherry picked from commit c47505a4525c342694ba4196544715467c2bdb8e)
Reviewed-on: https://gerrit.libreoffice.org/460
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index cb07f71..e41f027 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3153,13 +3153,11 @@ voidSwTokenWindow::InsertAtSelection(
ctrl_iterator iterActive = std::find(aControlList.begin(),
aControlList.end(), pActiveCtrl);
-ctrl_iterator iterInsert = iterActive;
-
Size aControlSize(GetOutputSizePixel());
if( WINDOW_EDIT == pActiveCtrl-GetType())
{
-++iterInsert;
+++iterActive;
Selection aSel = ((SwTOXEdit*)pActiveCtrl)-GetSelection();
aSel.Justify();
@@ -3175,7 +3173,7 @@ voidSwTokenWindow::InsertAtSelection(
SwFormToken aTmpToken(TOKEN_TEXT);
SwTOXEdit* pEdit = new SwTOXEdit(aCtrlParentWin, this, aTmpToken);
-iterInsert = aControlList.insert(iterInsert, pEdit);
+iterActive = aControlList.insert(iterActive, pEdit);
pEdit-SetText(sRight);
pEdit-SetSizePixel(aControlSize);
@@ -3187,7 +3185,7 @@ voidSwTokenWindow::InsertAtSelection(
}
else
{
-aControlList.erase(iterActive);
+iterActive = aControlList.erase(iterActive);
pActiveCtrl-Hide();
delete pActiveCtrl;
}
@@ -3195,7 +3193,7 @@ voidSwTokenWindow::InsertAtSelection(
//now the new button
SwTOXButton* pButton = new SwTOXButton(aCtrlParentWin, this,
aToInsertToken);
-aControlList.insert(iterInsert, pButton);
+aControlList.insert(iterActive, pButton);
pButton-SetPrevNextLink(LINK(this, SwTokenWindow, NextItemBtnHdl));
pButton-SetGetFocusHdl(LINK(this, SwTokenWindow, TbxFocusBtnHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-5]: SwTokenWindow::InsertAtSelection: fix STL assertion:
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: SwTokenWindow::InsertAtSelection: fix STL assertion: .. SwTokenWindow::InsertAtSelection: fix STL assertion: error: attempt to copy-construct an iterator from a singular iterator. (regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cde) Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3 (cherry picked from commit c47505a4525c342694ba4196544715467c2bdb8e) --- M sw/source/ui/index/cnttab.cxx 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/460 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/bin
solenv/bin/modules/installer/simplepackage.pm | 18 +
solenv/bin/modules/installer/systemactions.pm | 47 ++
2 files changed, 65 insertions(+)
New commits:
commit 872d81eabe8712256c4ff3466a126cdade6d1b2a
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 23 14:25:38 2012 +0200
installer: remove empty directories again:
An archive installer contains one empty share/extensions/dict-XY/
directory for every dictionary (except the 3 default ones), causing
numerous assertions about missing META-INF/manifest.xml and an extension
manager cluttered; this is due to overzealous removal of extension
prereg code. (regression from
6dcb3d4ef46312729bb6f16c473b433474863f68, partially revert that)
(cherry picked from commit 8098a03d025a0c8fee90322e3835079edb45ade3)
Conflicts:
solenv/bin/modules/installer/simplepackage.pm
...plus cherry-pick of follow-up 7b4394f35b3557ffe61c8e9b0f0b630b31ca0977
...but remove obsolete prereg-specific code again.
Change-Id: I3a063ebfed1012aeb27ec3076cdd5ca545f918a2
Reviewed-on: https://gerrit.libreoffice.org/464
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index d15ad28..a7d1b23 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -60,6 +60,21 @@ sub check_simple_packager_project
}
}
+
+# Detecting the directory with extensions
+
+
+sub get_extensions_dir
+{
+my ( $subfolderdir ) = @_;
+
+my $extensiondir = $subfolderdir . $installer::globals::separator;
+if ( $installer::globals::officedirhostname ne ) { $extensiondir =
$extensiondir . $installer::globals::officedirhostname .
$installer::globals::separator; }
+my $extensionsdir = $extensiondir . share .
$installer::globals::separator . extensions;
+
+return $extensionsdir;
+}
+
# Getting the translation file for the Mac Language Pack installer
@@ -671,6 +686,9 @@ sub create_simple_package
installer::logger::print_message( ... removing superfluous directories
...\n );
installer::logger::include_header_into_logfile(Removing superfluous
directories:);
+my $extensionfolder = get_extensions_dir($subfolderdir);
+installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
+
if ( $installer::globals::compiler =~ /^unxmacx/ )
{
installer::worker::put_scpactions_into_installset($installdir/$packagename);
diff --git a/solenv/bin/modules/installer/systemactions.pm
b/solenv/bin/modules/installer/systemactions.pm
index c83d9b6..899ad24 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -1578,4 +1578,51 @@ sub read_full_directory {
return
}
+##
+# Removing all empty directories below a specified directory
+##
+
+sub remove_empty_dirs_in_folder
+{
+my ( $dir ) = @_;
+
+my @content = ();
+my $infoline = ;
+
+$dir =~ s/\Q$installer::globals::separator\E\s*$//;
+
+if ( -d $dir )
+{
+opendir(DIR, $dir);
+@content = readdir(DIR);
+closedir(DIR);
+
+my $oneitem;
+
+foreach $oneitem (@content)
+{
+if ((!($oneitem eq .)) (!($oneitem eq ..)))
+{
+my $item = $dir . $installer::globals::separator . $oneitem;
+
+if ( -d $item ) # recursive
+{
+remove_empty_dirs_in_folder($item);
+}
+}
+}
+
+# try to remove empty directory
+my $returnvalue = rmdir $dir;
+
+if ( $returnvalue )
+{
+$infoline = Successfully removed empty dir $dir\n;
+push(@installer::globals::logfileinfo, $infoline);
+}
+
+}
+
+}
+
1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: installer: remove empty directories again:
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: installer: remove empty directories again: .. installer: remove empty directories again: An archive installer contains one empty share/extensions/dict-XY/ directory for every dictionary (except the 3 default ones), causing numerous assertions about missing META-INF/manifest.xml and an extension manager cluttered; this is due to overzealous removal of extension prereg code. (regression from 6dcb3d4ef46312729bb6f16c473b433474863f68, partially revert that) (cherry picked from commit 8098a03d025a0c8fee90322e3835079edb45ade3) Conflicts: solenv/bin/modules/installer/simplepackage.pm ...plus cherry-pick of follow-up 7b4394f35b3557ffe61c8e9b0f0b630b31ca0977 ...but remove obsolete prereg-specific code again. Change-Id: I3a063ebfed1012aeb27ec3076cdd5ca545f918a2 --- M solenv/bin/modules/installer/simplepackage.pm M solenv/bin/modules/installer/systemactions.pm 2 files changed, 65 insertions(+), 0 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/464 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a063ebfed1012aeb27ec3076cdd5ca545f918a2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#53888: svx: do not link against dbtools
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: fdo#53888: svx: do not link against dbtools .. fdo#53888: svx: do not link against dbtools dbtools were added in 01089138cc76f5717244bd04f25a868602aeaab6 only to create dependency and fix the build. This creates circular dependency for libmerged, dbtools is not that common library. It's better to create real dependency in connectivity_inc package. To avoid another circular dependency gb_YaccTarget_get_header_target must not depend on external headers target. Change-Id: I431513d0b7a895b471eeec854b3b3f1fd69503af --- M connectivity/Library_dbtools.mk M connectivity/Package_inc.mk M solenv/gbuild/LinkTarget.mk M svx/Library_svx.mk 4 files changed, 4 insertions(+), 6 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/470 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I431513d0b7a895b471eeec854b3b3f1fd69503af Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/Library_dbtools.mk connectivity/Package_inc.mk solenv/gbuild svx/Library_svx.mk
connectivity/Library_dbtools.mk |4 connectivity/Package_inc.mk |3 +++ solenv/gbuild/LinkTarget.mk |2 +- svx/Library_svx.mk |1 - 4 files changed, 4 insertions(+), 6 deletions(-) New commits: commit fecf5af339506df7003a2e8f1742b1f958b6186b Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Aug 24 01:12:45 2012 +0200 fdo#53888: svx: do not link against dbtools dbtools were added in 01089138cc76f5717244bd04f25a868602aeaab6 only to create dependency and fix the build. This creates circular dependency for libmerged, dbtools is not that common library. It's better to create real dependency in connectivity_inc package. To avoid another circular dependency gb_YaccTarget_get_header_target must not depend on external headers target. Change-Id: I431513d0b7a895b471eeec854b3b3f1fd69503af Reviewed-on: https://gerrit.libreoffice.org/470 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 7688ef4..b845884 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Library_Library,dbtools)) -# connectivity_generated causes cyclic dependency here, so set include path -# for that instead $(eval $(call gb_Library_use_packages,dbtools,\ connectivity_inc \ )) @@ -42,9 +40,7 @@ $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/d $(eval $(call gb_Library_set_include,dbtools,\ $$(INCLUDE) \ - -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ - -I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \ )) $(eval $(call gb_Library_use_api,dbtools,\ diff --git a/connectivity/Package_inc.mk b/connectivity/Package_inc.mk index 3325e60..2ce920c 100644 --- a/connectivity/Package_inc.mk +++ b/connectivity/Package_inc.mk @@ -27,6 +27,9 @@ $(eval $(call gb_Package_Package,connectivity_inc,$(SRCDIR)/connectivity/inc/connectivity)) +# sqlbison.hxx is generated and thus in another package +$(call gb_Package_get_target,connectivity_inc) : $(call gb_Package_get_target,connectivity_generated) + $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/BlobHelper.hxx,BlobHelper.hxx)) $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/CommonTools.hxx,CommonTools.hxx)) $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,conncleanup.hxx)) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 0ffc3df..ccdfe49 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -880,7 +880,7 @@ define gb_LinkTarget_add_grammar $(call gb_YaccTarget_YaccTarget,$(2)) $(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2),$(3)) $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccTarget_get_clean_target,$(2)) -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccTarget_get_header_target,$(2))) +$(call gb_LinkTarget_get_headers_target,$(1)) : $(call gb_YaccTarget_get_header_target,$(2)) $(call gb_LinkTarget__add_include,$(1),$(dir $(call gb_YaccTarget_get_header_target,$(2 endef diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index f2bb177..ba8ffa1 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,svx,\ comphelper \ cppuhelper \ cppu \ -dbtools \ drawinglayer \ editeng \ i18nisolang1 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx | 26 +++---
1 file changed, 15 insertions(+), 11 deletions(-)
New commits:
commit b4f8acb41165a28b2db47acd3c6b624a4c507c54
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 24 16:06:15 2012 +0200
Fix removeRdbFiles (caused extension update to fail)
removeRdbFiles suffered from a confusion that ImplementationInfo.uri
denotes the
corresponding component (.so, .jar, etc.), but not the .rdb file. So
removing
an .rdb file silently failed to remove the corresponding implementations,
so re-
installing a similar enough .rdb (as typically happens during extension
update)
would fail due to duplicate implementation names.
Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe
Reviewed-on: https://gerrit.libreoffice.org/476
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index c3bdba3..7fd1e4a 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -130,9 +130,10 @@ struct ImplementationInfo: private boost::noncopyable {
rtl::OUString const theName, rtl::OUString const theLoader,
rtl::OUString const theUri, rtl::OUString const thePrefix,
css::uno::Reference css::uno::XComponentContext const
-theAlienContext):
+theAlienContext,
+rtl::OUString const theRdbFile):
name(theName), loader(theLoader), uri(theUri), prefix(thePrefix),
-alienContext(theAlienContext)
+alienContext(theAlienContext), rdbFile(theRdbFile)
{}
explicit ImplementationInfo(rtl::OUString const theName): name(theName)
{}
@@ -142,6 +143,7 @@ struct ImplementationInfo: private boost::noncopyable {
rtl::OUString const uri;
rtl::OUString const prefix;
css::uno::Reference css::uno::XComponentContext const alienContext;
+rtl::OUString const rdbFile;
std::vector rtl::OUString services;
std::vector rtl::OUString singletons;
};
@@ -149,12 +151,12 @@ struct ImplementationInfo: private boost::noncopyable {
struct Implementation: private boost::noncopyable {
Implementation(
rtl::OUString const name, rtl::OUString const loader,
-rtl::OUString const uri,
-rtl::OUString const prefix = rtl::OUString(),
-css::uno::Reference css::uno::XComponentContext const
-alienContext
-= css::uno::Reference css::uno::XComponentContext ()):
-info(new ImplementationInfo(name, loader, uri, prefix, alienContext)),
+rtl::OUString const uri, rtl::OUString const prefix,
+css::uno::Reference css::uno::XComponentContext const
alienContext,
+rtl::OUString const rdbFile):
+info(
+new ImplementationInfo(
+name, loader, uri, prefix, alienContext, rdbFile)),
loaded(false)
{}
@@ -466,7 +468,7 @@ void Parser::handleImplementation() {
implementation_.reset(
new Implementation(
attrImplementation_, attrLoader_, attrUri_, attrPrefix_,
-alienContext_));
+alienContext_, reader_.getUrl()));
if (!data_-namedImplementations.insert(
NamedImplementations::value_type(
attrImplementation_, implementation_)).
@@ -1502,7 +1504,9 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString
const uri) {
boost::shared_ptr Implementation impl(
new Implementation(
name, readLegacyRdbString(uri, implKey, UNO/ACTIVATOR),
-readLegacyRdbString(uri, implKey, UNO/LOCATION)));
+readLegacyRdbString(uri, implKey, UNO/LOCATION),
+rtl::OUString(),
+css::uno::Reference css::uno::XComponentContext (), uri));
if (!data_.namedImplementations.insert(
NamedImplementations::value_type(name, impl)).
second)
@@ -1744,7 +1748,7 @@ void ServiceManager::removeRdbFiles(std::vector
rtl::OUString const uris) {
j != data_.namedImplementations.end();)
{
assert(j-second.get() != 0);
-if (j-second-info-uri == *i) {
+if (j-second-info-rdbFile == *i) {
clear.push_back(j-second);
//TODO: The below leaves data_ in an inconsistent state
upon
// exceptions:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: Fix removeRdbFiles (caused extension update to fail)
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: Fix removeRdbFiles (caused extension update to fail) .. Fix removeRdbFiles (caused extension update to fail) removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the corresponding component (.so, .jar, etc.), but not the .rdb file. So removing an .rdb file silently failed to remove the corresponding implementations, so re- installing a similar enough .rdb (as typically happens during extension update) would fail due to duplicate implementation names. Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe --- M cppuhelper/source/defaultbootstrap.cxx 1 file changed, 15 insertions(+), 11 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/476 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: resolved fdo#52240 fdo#52137 fdo#52288 user editable date pa...
From Eike Rathke er...@redhat.com: Eike Rathke has uploaded a new change for review. Change subject: resolved fdo#52240 fdo#52137 fdo#52288 user editable date patterns .. resolved fdo#52240 fdo#52137 fdo#52288 user editable date patterns Implemented user editable date acceptance patterns. The introduction of strict date parsing using locale dependent date acceptance patterns in 3.6.0 wasn't always welcomed. Besides that not every locale had patterns for incomplete (only day and month) date input, users also complained about not being able to key in dates on numeric keypads if the locale's date separator wasn't '/' or '-' This commit implements a Date acceptance patterns edit field under Tools-Options-LanguageSettings-Languages that follows the selected locale and enables the user to add patterns. Example de-DE locale: * default patterns: D.M.Y;D.M. * to enable additional input on numeric keypad: D.M.Y;D.M.;D-M-Y;D-M * if 3-4 shall not result in a date, D-M- could be used instead of D-M * note that to enter an ISO 8601 Y-M-D date with a D-M-Y pattern active one needs to enter a year 31 or with at least 3 digits, e.g. 011 (cherry picked from commit bf10f4d62a5fe308ea47f9a0aac4f6f7e264ae3e) Conflicts: cui/source/options/optgdlg.hrc svl/source/numbers/zforfind.cxx unotools/source/config/syslocaleoptions.cxx Change-Id: Ic1ce91b1f9d29f1837d56b45ba0ae16f6d9cb17c --- M cui/source/options/optgdlg.cxx M cui/source/options/optgdlg.hrc M cui/source/options/optgdlg.hxx M cui/source/options/optgdlg.src M officecfg/registry/schema/org/openoffice/Setup.xcs M svl/inc/svl/zforlist.hxx M svl/source/numbers/zforfind.cxx M svl/source/numbers/zforfind.hxx M svl/source/numbers/zforlist.cxx M unotools/inc/unotools/localedatawrapper.hxx M unotools/inc/unotools/syslocaleoptions.hxx M unotools/source/config/syslocaleoptions.cxx M unotools/source/i18n/localedatawrapper.cxx M unotools/source/misc/syslocale.cxx 14 files changed, 429 insertions(+), 46 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/511/1 -- To view, visit https://gerrit.libreoffice.org/511 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1ce91b1f9d29f1837d56b45ba0ae16f6d9cb17c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/inc desktop/source offapi/com
desktop/inc/app.hxx|1
desktop/source/app/app.cxx | 219 +++--
desktop/source/app/check_ext_deps.cxx | 38 +-
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |2
desktop/source/deployment/inc/dp_misc.h|6
desktop/source/deployment/manager/dp_extensionmanager.cxx | 10
desktop/source/deployment/manager/dp_extensionmanager.hxx |2
desktop/source/deployment/manager/dp_manager.cxx |4
desktop/source/deployment/manager/dp_manager.h |1
desktop/source/deployment/misc/dp_misc.cxx |5
desktop/source/pkgchk/unopkg/unopkg_app.cxx|4
offapi/com/sun/star/deployment/XExtensionManager.idl |4
offapi/com/sun/star/deployment/XPackageManager.idl |4
13 files changed, 179 insertions(+), 121 deletions(-)
New commits:
commit 6d261e7aac12a876acb6496085e5329632595d39
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 24 16:45:20 2012 +0200
fdo#53968 etc.: Fix more doesn't start after upgrade problems
* fdo#53968 revealed that multiple soffice.bin instances can run removeTree
in
parallel. Therefore, demoted failures from exceptions to SAL_WARNs. (And
keeping fingers crossed.)
* a8cdce148c76c93c5d41820610d6e6ac175e03a7 fdo#53655: Ignore failure to
remove
directories (as happens on Windows XP) was due to a forgotten
osl::Directory::close before calling osl::Directory::remove after all.
* UserInstallations have been seen in the wild where no extensions were
installed per-user (any longer), but user/uno_packages/cache/registry/
com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
contained data nevertheless. To reliably clean out any old junk,
refreshBundledExtensionsDir has been extended to cleanExtensionsCache
which in
tandem with an extended Desktop::SynchronizeExtensionRepositories now
cleanly
re-installs all bundled, shared, and per-user extensions after a LO
upgrade.
Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0
Reviewed-on: https://gerrit.libreoffice.org/477
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 25b6352..c830b02 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -203,6 +203,7 @@ class Desktop : public Application
sal_Boolm_bMinimized;
sal_Boolm_bInvisible;
+boolm_bCleanedExtensionCache;
boolm_bServicesRegistered;
sal_uInt16 m_nAppEvents;
BootstrapError m_aBootstrapError;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 55ebaca..5fb653b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -147,77 +147,81 @@ namespace {
void removeTree(OUString const url) {
osl::Directory dir(url);
-switch (dir.open()) {
+osl::FileBase::RC rc = dir.open();
+switch (rc) {
case osl::FileBase::E_None:
break;
case osl::FileBase::E_NOENT:
return; //TODO: SAL_WARN if recursive
default:
-throw css::uno::RuntimeException(
-cannot open directory + url,
-css::uno::Reference css::uno::XInterface ());
+SAL_WARN(desktop, cannot open directory url : +rc);
+return;
}
for (;;) {
osl::DirectoryItem i;
-osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+rc = dir.getNextItem(i, SAL_MAX_UINT32);
if (rc == osl::FileBase::E_NOENT) {
break;
}
if (rc != osl::FileBase::E_None) {
-throw css::uno::RuntimeException(
-(cannot iterate directory + url + :
- + OUString::valueOf(static_cast sal_Int32 (rc))),
-css::uno::Reference css::uno::XInterface ());
+SAL_WARN(
+desktop,cannot iterate directory url : +rc);
+break;
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
rc = i.getFileStatus(stat);
if (rc != osl::FileBase::E_None) {
-throw css::uno::RuntimeException(
-(cannot stat in directory + url + :
- + OUString::valueOf(static_cast sal_Int32 (rc))),
-css::uno::Reference css::uno::XInterface ());
+SAL_WARN(
+desktop, cannot stat in directory url : +rc);
+continue;
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO:
symlinks
[PUSHED] Change in core[libreoffice-3-6]: fdo#53968 etc.: Fix more doesn't start after upgrade probl...
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: fdo#53968 etc.: Fix more doesn't start after upgrade problems .. fdo#53968 etc.: Fix more doesn't start after upgrade problems * fdo#53968 revealed that multiple soffice.bin instances can run removeTree in parallel. Therefore, demoted failures from exceptions to SAL_WARNs. (And keeping fingers crossed.) * a8cdce148c76c93c5d41820610d6e6ac175e03a7 fdo#53655: Ignore failure to remove directories (as happens on Windows XP) was due to a forgotten osl::Directory::close before calling osl::Directory::remove after all. * UserInstallations have been seen in the wild where no extensions were installed per-user (any longer), but user/uno_packages/cache/registry/ com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files contained data nevertheless. To reliably clean out any old junk, refreshBundledExtensionsDir has been extended to cleanExtensionsCache which in tandem with an extended Desktop::SynchronizeExtensionRepositories now cleanly re-installs all bundled, shared, and per-user extensions after a LO upgrade. Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0 --- M desktop/inc/app.hxx M desktop/source/app/app.cxx M desktop/source/app/check_ext_deps.cxx M desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx M desktop/source/deployment/inc/dp_misc.h M desktop/source/deployment/manager/dp_extensionmanager.cxx M desktop/source/deployment/manager/dp_extensionmanager.hxx M desktop/source/deployment/manager/dp_manager.cxx M desktop/source/deployment/manager/dp_manager.h M desktop/source/deployment/misc/dp_misc.cxx M desktop/source/pkgchk/unopkg/unopkg_app.cxx M offapi/com/sun/star/deployment/XExtensionManager.idl M offapi/com/sun/star/deployment/XPackageManager.idl 13 files changed, 179 insertions(+), 121 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/477 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 51 ++---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 +
2 files changed, 48 insertions(+), 6 deletions(-)
New commits:
commit 8c32e8758a2244174a533e045ff9e8113581ee7d
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 28 11:21:50 2012 +0200
fdo#52052 fix RTF import of page breaks on landscape pages
The problem was that we tried to insert a page break before reaching the
first section break, where section properties are sent.
Additionally, the continuous section break at the end of the doc caused
trouble, so ignore it explicitly.
(cherry picked from commit 1efa576ef88141c4deb5da9818537e053dc6517b)
Change-Id: I22bc355994991beeadb41d26b44ce3e2beedbdb2
Reviewed-on: https://gerrit.libreoffice.org/497
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c814b91..fb18553 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -277,7 +277,8 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_bFormField(false),
m_bIsInFrame(false),
m_aUnicodeBuffer(),
-m_aHexBuffer()
+m_aHexBuffer(),
+m_bDeferredContSectBreak(false)
{
OSL_ASSERT(xInputStream.is());
m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream,
sal_True));
@@ -1077,6 +1078,7 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t rBuffer)
int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
{
checkUnicode();
+checkDeferredContSectBreak();
RTFSkipDestination aSkip(*this);
switch (nKeyword)
{
@@ -1406,6 +1408,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
{
if (nKeyword != RTF_HEXCHAR)
checkUnicode();
+checkDeferredContSectBreak();
RTFSkipDestination aSkip(*this);
sal_uInt8 cCh = 0;
@@ -1462,7 +1465,17 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
}
break;
case RTF_SECT:
-sectBreak();
+{
+RTFValue::Pointer_t pBreak =
m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc);
+if (pBreak.get() !pBreak-getInt())
+{
+// This is a continous section break, don't send it yet.
+// It's possible that we'll have nothing after this token,
and then we should ignore it.
+m_bDeferredContSectBreak = true;
+}
+else
+sectBreak();
+}
break;
case RTF_NOBREAK:
{
@@ -1583,10 +1596,21 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
break;
case RTF_PAGE:
{
-sal_uInt8 sBreak[] = { 0xc };
-Mapper().text(sBreak, 1);
-if (!m_bNeedPap)
-parBreak();
+// If we're inside a continous section, we should send a
section break, not a page one.
+RTFValue::Pointer_t pBreak =
m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc);
+if (pBreak.get() !pBreak-getInt())
+{
+dispatchFlag(RTF_SBKPAGE);
+sectBreak();
+dispatchFlag(RTF_SBKNONE);
+}
+else
+{
+sal_uInt8 sBreak[] = { 0xc };
+Mapper().text(sBreak, 1);
+if (!m_bNeedPap)
+parBreak();
+}
}
break;
case RTF_CHPGN:
@@ -1609,6 +1633,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
{
checkUnicode();
+checkDeferredContSectBreak();
RTFSkipDestination aSkip(*this);
int nParam = -1;
int nSprm = -1;
@@ -2224,6 +2249,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
checkUnicode(nKeyword != RTF_U, true);
+checkDeferredContSectBreak();
RTFSkipDestination aSkip(*this);
int nSprm = 0;
RTFValue::Pointer_t pIntValue(new RTFValue(nParam));
@@ -2923,6 +2949,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int
nParam)
{
checkUnicode();
+checkDeferredContSectBreak();
RTFSkipDestination aSkip(*this);
int nSprm = -1;
RTFValue::Pointer_t pBoolValue(new RTFValue(!bParam || nParam != 0));
@@ -3455,7 +3482,10 @@ int RTFDocumentImpl::popState()
// This is the end of the doc, see if we need to close the last section.
if (m_nGroup == 1
[PUSHED] Change in core[libreoffice-3-6]: fdo#52052 fix RTF import of page breaks on landscape pages
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: fdo#52052 fix RTF import of page breaks on landscape pages .. fdo#52052 fix RTF import of page breaks on landscape pages The problem was that we tried to insert a page break before reaching the first section break, where section properties are sent. Additionally, the continuous section break at the end of the doc caused trouble, so ignore it explicitly. (cherry picked from commit 1efa576ef88141c4deb5da9818537e053dc6517b) Change-Id: I22bc355994991beeadb41d26b44ce3e2beedbdb2 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx M writerfilter/source/rtftok/rtfdocumentimpl.hxx 2 files changed, 48 insertions(+), 6 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/497 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22bc355994991beeadb41d26b44ce3e2beedbdb2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||54225 --- Comment #4 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-08-29 20:45:34 UTC --- Add Bug 54225 - MAILMERGEe-mail as PDF sends damaged documents, what makes Mailmerge assistant unusable for e-mail as PDF -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[PUSHED] Basic IDE: namespace basctl
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: Basic IDE: namespace basctl .. Basic IDE: namespace basctl Now all names in basctl are in namespace 'basctl'. There were lots of names that included the word 'Basic' or 'BasicIDE' in it, e.g. BasicIDEData, BasicDocumentEntry, BasicTreeListBox, BasicIDEModule, IDEBaseWindow etc. This information is now stored in the namespace name, so the names could be shortened: basctl::DocumentEntry, basctl::TreeListBox, basctl::Module, basctl::BaseWindow etc. Some other minor changes: * LibInfos, LibInfoItem, LibInfoKey - LibInfos, LibInfos::Item, LibInfos::Key * The header guards are now uniformly BASCTL_FILENAME_HXX, instead of e.g. _FILENAME_HXX, which is undefined behaviour because of the '_'. * namespace BasicIDE, BasicIDEGlobals, basicide - namespace basctl * BASICIDE_TYPE_MODULE, ... - basctl::TYPE_MODULE, ... Change-Id: I2a9b493562d0d8a2510d569798fbe9e1161b7c9b --- M basctl/inc/iderdll.hxx M basctl/sdi/baside.sdi M basctl/source/accessibility/accessibledialogcontrolshape.cxx M basctl/source/accessibility/accessibledialogwindow.cxx M basctl/source/basicide/basdoc.cxx M basctl/source/basicide/basdoc.hxx M basctl/source/basicide/basicbox.cxx M basctl/source/basicide/basicbox.hxx M basctl/source/basicide/basicmod.hxx M basctl/source/basicide/basicrenderable.cxx M basctl/source/basicide/basicrenderable.hxx M basctl/source/basicide/baside2.cxx M basctl/source/basicide/baside2.hrc M basctl/source/basicide/baside2.hxx M basctl/source/basicide/baside2b.cxx M basctl/source/basicide/baside3.cxx M basctl/source/basicide/basidectrlr.cxx M basctl/source/basicide/basides1.cxx M basctl/source/basicide/basides2.cxx M basctl/source/basicide/basides3.cxx M basctl/source/basicide/basidesh.cxx M basctl/source/basicide/basobj2.cxx M basctl/source/basicide/basobj3.cxx M basctl/source/basicide/bastype2.cxx M basctl/source/basicide/bastype2.hxx M basctl/source/basicide/bastype3.cxx M basctl/source/basicide/bastype3.hxx M basctl/source/basicide/bastypes.cxx M basctl/source/basicide/breakpoint.cxx M basctl/source/basicide/breakpoint.hxx M basctl/source/basicide/brkdlg.cxx M basctl/source/basicide/brkdlg.hrc M basctl/source/basicide/brkdlg.hxx M basctl/source/basicide/iderdll.cxx M basctl/source/basicide/iderdll2.hxx M basctl/source/basicide/idetemp.hxx M basctl/source/basicide/layout.cxx M basctl/source/basicide/layout.hxx M basctl/source/basicide/linenumberwindow.cxx M basctl/source/basicide/linenumberwindow.hxx M basctl/source/basicide/localizationmgr.cxx M basctl/source/basicide/macrodlg.cxx M basctl/source/basicide/macrodlg.hrc M basctl/source/basicide/macrodlg.hxx M basctl/source/basicide/moduldl2.cxx M basctl/source/basicide/moduldlg.cxx M basctl/source/basicide/moduldlg.hrc M basctl/source/basicide/moduldlg.hxx M basctl/source/basicide/moptions.hrc M basctl/source/basicide/objdlg.cxx M basctl/source/basicide/objdlg.hxx M basctl/source/basicide/register.cxx M basctl/source/basicide/sbxitem.cxx M basctl/source/basicide/scriptdocument.cxx M basctl/source/basicide/tbxctl.cxx M basctl/source/basicide/tbxctl.hxx M basctl/source/basicide/unomodel.cxx M basctl/source/basicide/unomodel.hxx M basctl/source/dlged/dlged.cxx M basctl/source/dlged/dlgedclip.cxx M basctl/source/dlged/dlgedfac.cxx M basctl/source/dlged/dlgedfunc.cxx M basctl/source/dlged/dlgedlist.cxx M basctl/source/dlged/dlgedmod.cxx M basctl/source/dlged/dlgedobj.cxx M basctl/source/dlged/dlgedpage.cxx M basctl/source/dlged/dlgedview.cxx M basctl/source/dlged/managelang.cxx M basctl/source/dlged/managelang.hrc M basctl/source/dlged/propbrw.cxx M basctl/source/inc/accessibledialogcontrolshape.hxx M basctl/source/inc/accessibledialogwindow.hxx M basctl/source/inc/baside3.hxx M basctl/source/inc/basidectrlr.hxx M basctl/source/inc/basidesh.hxx M basctl/source/inc/basobj.hxx M basctl/source/inc/bastypes.hxx M basctl/source/inc/dlged.hxx M basctl/source/inc/dlgedclip.hxx M basctl/source/inc/dlgeddef.hxx M basctl/source/inc/dlgedfac.hxx M basctl/source/inc/dlgedfunc.hxx M basctl/source/inc/dlgedlist.hxx M basctl/source/inc/dlgedmod.hxx M basctl/source/inc/dlgedobj.hxx M basctl/source/inc/dlgedpage.hxx M basctl/source/inc/dlgedview.hxx M basctl/source/inc/dlgresid.hrc M basctl/source/inc/iderid.hxx M basctl/source/inc/localizationmgr.hxx M basctl/source/inc/managelang.hxx M basctl/source/inc/propbrw.hxx M basctl/source/inc/sbxitem.hxx M basctl/source/inc/scriptdocument.hxx M basctl/source/inc/svheader.hxx 95 files changed, 2,308 insertions(+), 2,211 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/501 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a9b493562d0d8a2510d569798fbe9e1161b7c9b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master
[PUSHED] Cleanup in Tools Options User Data
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: Cleanup in Tools Options User Data .. Cleanup in Tools Options User Data Change-Id: I4f0a0304d7dd23ed8ce011e6f8f90e170bfbe5df Cleanup in Tools Options User Data Change-Id: If89f19e22b6efeb0fdd811ff8afe2cb6c0b0bf4e --- M cui/source/inc/cuioptgenrl.hxx M cui/source/options/optgenrl.cxx M cui/source/options/optgenrl.hrc M cui/source/options/optgenrl.src M unotools/inc/unotools/useroptions.hxx M unotools/source/config/useroptions.cxx 6 files changed, 669 insertions(+), 1,733 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/500 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If89f19e22b6efeb0fdd811ff8afe2cb6c0b0bf4e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: János Uray uray.ja...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - libxmlsec/makefile.mk libxmlsec/xmlsec1-1.2.14-ansi.patch solenv/gbuild
libxmlsec/makefile.mk |6 +-
libxmlsec/xmlsec1-1.2.14-ansi.patch | 13 +
solenv/gbuild/Output.mk | 10 +-
3 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit 0e3f66c5f68dfeee1e29198f1f17938e78087660
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 29 23:00:18 2012 +0200
No space inside brackets
Change-Id: I6f6222d7c4c928b29ac092d3afef125f2e552b8e
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 9bb3168..8d50e09 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -29,7 +29,7 @@
# user notifications and formatting
define gb_Output__format_type
-[ $(word 2,$(1) build clean) $(2) ]
+[$(word 2,$(1) build clean) $(2)]
endef
define gb_Output__format_target
@@ -47,11 +47,11 @@ define gb_Output_announce_bell
endef
define gb_Output_info
-$(info [ info $(2) ] $(1))
+$(info [info $(2)] $(1))
endef
define gb_Output_warn
-$(warning $(NEWLINE)[ WARN $(2) ] !!!$(NEWLINE)[ WARN $(2) ] !!!
$(1)$(NEWLINE)[ WARN $(2) ] !!!)
+$(warning $(NEWLINE)[WARN $(2)] !!!$(NEWLINE)[WARN $(2)] !!!
$(1)$(NEWLINE)[WARN $(2)] !!!)
endef
gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf %c, 27 }' -)
@@ -107,11 +107,11 @@ $(subst :, ,$(word 2,$(1) \
endef
define gb_Output_info
-$(info $(gb_Output_COLOR_OUTBUILD_LEVEL6)[
$(gb_Output_COLOR_INBUILD_LEVEL6)info $(2)$(gb_Output_COLOR_OUTBUILD_LEVEL6)
]$(gb_Output_COLOR_RESET) $(1))
+$(info
$(gb_Output_COLOR_OUTBUILD_LEVEL6)[$(gb_Output_COLOR_INBUILD_LEVEL6)info
$(2)$(gb_Output_COLOR_OUTBUILD_LEVEL6)]$(gb_Output_COLOR_RESET) $(1))
endef
define gb_Output_warn
-$(warning $(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[
$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)
]$(gb_Output_COLOR_RESET) !!!$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[
$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)
]$(gb_Output_COLOR_RESET) !!! $(1)$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[
$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)
]$(gb_Output_COLOR_RESET) !!!)
+$(warning
$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN
$(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)]$(gb_Output_COLOR_RESET)
!!!$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN
$(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)]$(gb_Output_COLOR_RESET) !!!
$(1)$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN
$(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)]$(gb_Output_COLOR_RESET) !!!)
endef
define gb_Output_error
commit 7947da50b3457b7ca10d75db85e3317eaed032d1
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 29 22:59:22 2012 +0200
Work around autoreconf de-ANSI-fication support error
Change-Id: I990167289fe39bbfdb3b40abf8fc522dabb7cc20
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 22d280b..1e68085 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -57,6 +57,9 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
#xmlsec1-mingw32.patch: Mingw32 support.
#xmlsec1-mingw-customkeymanage-addmscrypto.patch: builds the custom keymanager
on mingw
#xmlsec1-vc.path: support for Visual C++ 10
+#xmlsec1-1.2.14-ansi.patch: otherwise, at least MacPorts autoreconf (GNU
+# Autoconf) 2.69 fails with configure.in:50: error: automatic de-ANSI-fication
+# support has been removed
PATCH_FILES=\
xmlsec1-configure.patch \
xmlsec1-configure-libxml-libxslt.patch \
@@ -69,7 +72,8 @@ PATCH_FILES=\
xmlsec1-mingw-keymgr-mscrypto.patch \
xmlsec1-vc10.patch \
xmlsec1-1.2.14_fix_extern_c.patch \
- xmlsec1-android.patch
+ xmlsec1-android.patch \
+ xmlsec1-1.2.14-ansi.patch
ADDITIONAL_FILES= \
include$/xmlsec$/mscrypto$/akmngr.h \
diff --git a/libxmlsec/xmlsec1-1.2.14-ansi.patch
b/libxmlsec/xmlsec1-1.2.14-ansi.patch
new file mode 100644
index 000..24a9584
--- /dev/null
+++ b/libxmlsec/xmlsec1-1.2.14-ansi.patch
@@ -0,0 +1,13 @@
+--- misc/xmlsec1-1.2.14/configure.in 2012-08-29 22:44:51.0 +0200
misc/build/xmlsec1-1.2.14/configure.in 2012-08-29 22:46:23.0
+0200
+@@ -46,10 +46,6 @@
+ AC_PATH_PROG(HELP2MAN, help2man)
+ AC_PATH_PROG(MAN2HTML, man2html)
+
+-dnl Make sure we have an ANSI compiler
+-AM_C_PROTOTYPES
+-test z$U != z AC_MSG_ERROR(Compiler not ANSI compliant)
+-
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/options/optgenrl.hrc |3 ---
cui/source/options/optgenrl.src |6 --
2 files changed, 9 deletions(-)
New commits:
commit 11fb0c14477e8510d9b359f1188f1ce119dbe8c2
Author: Andras Timar ati...@suse.com
Date: Wed Aug 29 23:06:31 2012 +0200
remove unused resources
Change-Id: I07c3a456b36a4f032f5e158632eccd4370ce0085
diff --git a/cui/source/options/optgenrl.hrc b/cui/source/options/optgenrl.hrc
index 8b52a08..c35acc1 100644
--- a/cui/source/options/optgenrl.hrc
+++ b/cui/source/options/optgenrl.hrc
@@ -54,9 +54,6 @@
#define FT_NAME_EASTERN 41
#define FT_CITY_US 42
-#define STR_US_STATE10
-#define STR_QUERY_REG 11
-
#endif // #ifndef SVX_OPTGENRL_HRC
// *** EOF
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index 3eaabc0..863398c 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -210,12 +210,6 @@ TabPage RID_SFXPAGE_GENERAL
Hide = TRUE;
Text [ en-US ] = Use data for document properties;
};
-
-// extra resource for US addresses
-String STR_QUERY_REG
-{
-Text [ en-US ] = Note that street, Zip code and city are used to
generate the registration key. You will not be able to change the user data
again until the registration has been carried out. Do you want to modify the
user data now?;
-};
};
// RID_SVXQB_CHANGEDATA ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #13
On Wed, 29 Aug 2012 19:11:19 +0200, Thorsten Behrens t...@documentfoundation.org wrote: Marco Cecchetti wrote: There was an old, unused filter dialog IIRC for the export, but that seems gone - at any rate, this fixed position thing is really dodgy, I wouldn't mind if you clean that up. For the easy fix, just add the new property at index 6. Ok, I fixed it in the easy way. I also fixed another couple of bugs. See: http://cgit.freedesktop.org/libreoffice/core/log/?h=feature%2Fsvg-export Neat - that should get us to a mergeable state, what do you think? Indeed, I'd prefer to perform more tests, I'm not yet too confident that text animations are stable. Anyway, I leave the last word to you. -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libxmlsec/makefile.mk
libxmlsec/makefile.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 3a0889b9a930a6b8312024440b06de6e708930db Author: Stephan Bergmann sberg...@redhat.com Date: Wed Aug 29 23:31:21 2012 +0200 Add upstream link Change-Id: I8711d5476664d37ffdbf025b8e07a9bc21530908 diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 1e68085..5847fc0 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -59,7 +59,9 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f #xmlsec1-vc.path: support for Visual C++ 10 #xmlsec1-1.2.14-ansi.patch: otherwise, at least MacPorts autoreconf (GNU # Autoconf) 2.69 fails with configure.in:50: error: automatic de-ANSI-fication -# support has been removed +# support has been removed (cf. upstream http://git.gnome.org/browse/xmlsec/ +# commit/?id=6a4968bc33f83aaf61efc0a8050ce9c372f5 error in macro +# AM_C_PROTOTYPES (Roumen)) PATCH_FILES=\ xmlsec1-configure.patch \ xmlsec1-configure-libxml-libxslt.patch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - 6 commits - sfx2/inc sfx2/source sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk vcl/source
sfx2/inc/sfx2/basedlgs.hxx |4
sfx2/source/dialog/basedlgs.cxx | 26 +++--
sw/AllLangResTarget_sw.mk|1
sw/UI_swriter.mk |1
sw/inc/dialog.hrc|2
sw/inc/helpid.h |1
sw/inc/swabstdlg.hxx |7 -
sw/source/ui/dialog/swdlgfact.cxx| 18 ---
sw/source/ui/dialog/swdlgfact.hxx|7 -
sw/source/ui/dialog/wordcountdialog.cxx | 147 -
sw/source/ui/dialog/wordcountdialog.hrc | 41
sw/source/ui/dialog/wordcountdialog.src | 156 ---
sw/source/ui/dialog/wordcountwrapper.cxx |3
sw/source/ui/inc/wordcountdialog.hxx | 65 ++--
sw/uiconfig/swriter/ui/wordcount.ui | 107 +++--
vcl/source/window/builder.cxx| 16 ++-
16 files changed, 156 insertions(+), 446 deletions(-)
New commits:
commit bfbb24013514e6ab22354d6d6bb83126ce1bb99b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 23:39:25 2012 +0100
set a preferential width on the char/word count widgets
Change-Id: Icb0fa6e358fa3bc8281b8acdc7214b5cd8204c70
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index fec7055..e3af18c 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -34,12 +34,13 @@
#include docstat.hxx
#include dialog.hrc
#include cmdid.h
-#include vcl/msgbox.hxx // RET_CANCEL
#include swmodule.hxx
#include wview.hxx
-#include sfx2/viewfrm.hxx
#include swwait.hxx
#include wrtsh.hxx
+#include comphelper/string.hxx
+#include sfx2/viewfrm.hxx
+#include vcl/msgbox.hxx
IMPL_LINK_NOARG(SwWordCountFloatDlg, CloseHdl)
{
@@ -56,14 +57,23 @@ SwWordCountFloatDlg::~SwWordCountFloatDlg()
ViewShell::SetCareWin( 0 );
}
+namespace
+{
+void setValue(FixedText *pWidget, sal_uLong nValue)
+{
+rtl::OUString
sValue(rtl::OUString::valueOf(static_castsal_Int64(nValue)));
+pWidget-SetText(sValue);
+}
+}
+
void SwWordCountFloatDlg::SetValues(const SwDocStat rCurrent, const
SwDocStat rDoc)
{
-
m_pCurrentWordFT-SetText(rtl::OUString::valueOf(static_castsal_Int64(rCurrent.nWord)));
-
m_pCurrentCharacterFT-SetText(rtl::OUString::valueOf(static_castsal_Int64(rCurrent.nChar)));
-
m_pCurrentCharacterExcludingSpacesFT-SetText(rtl::OUString::valueOf(static_castsal_Int64(rCurrent.nCharExcludingSpaces)));
-
m_pDocWordFT-SetText(rtl::OUString::valueOf(static_castsal_Int64(rDoc.nWord)));
-
m_pDocCharacterFT-SetText(rtl::OUString::valueOf(static_castsal_Int64(rDoc.nChar)));
-
m_pDocCharacterExcludingSpacesFT-SetText(rtl::OUString::valueOf(static_castsal_Int64(rDoc.nCharExcludingSpaces)));
+setValue(m_pCurrentWordFT, rCurrent.nWord);
+setValue(m_pCurrentCharacterFT, rCurrent.nChar);
+setValue(m_pCurrentCharacterExcludingSpacesFT,
rCurrent.nCharExcludingSpaces);
+setValue(m_pDocWordFT, rDoc.nWord);
+setValue(m_pDocCharacterFT, rDoc.nChar);
+setValue(m_pDocCharacterExcludingSpacesFT, rDoc.nCharExcludingSpaces);
}
//TODO, add asian/non-asian word count to UI when CJK mode is enabled.
@@ -81,6 +91,15 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings*
_pBindings,
m_pUIBuilder-get(m_pDocCharacterExcludingSpacesFT, doccharsnospaces);
m_pUIBuilder-get(m_pClosePB, close);
+long nPrefWidth = m_pCurrentWordFT-get_preferred_size().Width();
+
+m_pCurrentWordFT-set_width_request(nPrefWidth);
+m_pCurrentCharacterFT-set_width_request(nPrefWidth);
+m_pCurrentCharacterExcludingSpacesFT-set_width_request(nPrefWidth);
+m_pDocWordFT-set_width_request(nPrefWidth);
+m_pDocCharacterFT-set_width_request(nPrefWidth);
+m_pDocCharacterExcludingSpacesFT-set_width_request(nPrefWidth);
+
Initialize(pInfo);
m_pClosePB-SetClickHdl(LINK(this, SwWordCountFloatDlg, CloseHdl));
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui
b/sw/uiconfig/swriter/ui/wordcount.ui
index ef9617f..88fd52d 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -133,7 +133,7 @@
property name=halignend/property
property name=hexpandTrue/property
property name=xalign1/property
-property name=label0/property
+property name=label
0/property
property name=justifyright/property
/object
packing
@@ -150,7 +150,7 @@
property name=halignend/property
property name=hexpandTrue/property
property name=xalign1/property
-property name=label0/property
+
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - helpcontent2/source
helpcontent2/source/text/swriter/01/0604.xhp |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 2a086454ed330c52286f406eb3ce73b353ab925a Author: Caolán McNamara caol...@redhat.com Date: Wed Aug 29 22:54:39 2012 +0100 update wordcount help id for .ui conversion Change-Id: I65b852b8b95deac78221a0f05ee5c9aeea48 diff --git a/helpcontent2/source/text/swriter/01/0604.xhp b/helpcontent2/source/text/swriter/01/0604.xhp index 39bb873..f6991ba 100644 --- a/helpcontent2/source/text/swriter/01/0604.xhp +++ b/helpcontent2/source/text/swriter/01/0604.xhp @@ -38,8 +38,7 @@ /topic /meta body -bookmark xml-lang=en-US branch=hid/.uno:WordCountDialog id=bm_id3698232 localize=false/ -bookmark xml-lang=en-US branch=hid/SW_HID_DLG_WORDCOUNT id=bm_id6469313 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/wordcount/WordCountDialog id=bm_id6469313 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:WordCountDialog id=bm_id1483504 localize=false/ section id=wordcount paragraph xml-lang=en-US id=par_idN10542 role=heading level=1 l10n=NEWlink href=text/swriter/01/0604.xhpWord Count/link/paragraph @@ -53,4 +52,4 @@ paragraph xml-lang=en-US id=par_idN1062D role=paragraph l10n=CHGlink href=text/shared/01/01100400.xhp name=File - Properties - StatisticsFile - Properties - Statistics/link/paragraph /section /body -/helpdocument \ No newline at end of file +/helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/useroptions.cxx | 38 -
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit f59733d45f900bf3e1427f69d7172cde5d877399
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 23:55:45 2012 +0100
fix build
Change-Id: I3616e62689246a091d9f26d69105a27f64553d48
diff --git a/unotools/source/config/useroptions.cxx
b/unotools/source/config/useroptions.cxx
index adb5db0..3e81f7e 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -56,26 +56,26 @@ OUString const sData = org.openoffice.UserProfile/Data;
// vOptionNames[] -- names of the user option entries
// The order corresponds to the #define USER_OPT_* list in useroptions.hxx.
OUString const vOptionNames[] = {
-l, // USER_OPT_CITY
-o, // USER_OPT_COMPANY
-c, // USER_OPT_COUNTRY
-mail, // USER_OPT_EMAIL
-facsimiletelephonenumber, // USER_OPT_FAX
-givenname, // USER_OPT_FIRSTNAME
-sn,// USER_OPT_LASTNAME
-position, // USER_OPT_POSITION
-st,// USER_OPT_STATE
-street,// USER_OPT_STREET
-homephone, // USER_OPT_TELEPHONEHOME
-telephonenumber, // USER_OPT_TELEPHONEWORK
-title, // USER_OPT_TITLE
-initials, // USER_OPT_ID
-postalcode,// USER_OPT_ZIP
-fathersname, // USER_OPT_FATHERSNAME
-apartment, // USER_OPT_APARTMENT
-customernumber,// USER_OPT_CUSTOMERNUMBER
+OUString(l), // USER_OPT_CITY
+OUString(o), // USER_OPT_COMPANY
+OUString(c), // USER_OPT_COUNTRY
+OUString(mail), // USER_OPT_EMAIL
+OUString(facsimiletelephonenumber), // USER_OPT_FAX
+OUString(givenname), // USER_OPT_FIRSTNAME
+OUString(sn),// USER_OPT_LASTNAME
+OUString(position), // USER_OPT_POSITION
+OUString(st),// USER_OPT_STATE
+OUString(street),// USER_OPT_STREET
+OUString(homephone), // USER_OPT_TELEPHONEHOME
+OUString(telephonenumber), // USER_OPT_TELEPHONEWORK
+OUString(title), // USER_OPT_TITLE
+OUString(initials), // USER_OPT_ID
+OUString(postalcode),// USER_OPT_ZIP
+OUString(fathersname), // USER_OPT_FATHERSNAME
+OUString(apartment), // USER_OPT_APARTMENT
+OUString(customernumber) // USER_OPT_CUSTOMERNUMBER
};
-unsigned const nOptionNameCount = sizeof vOptionNames / sizeof vOptionNames[0];
+const sal_uInt16 nOptionNameCount = SAL_N_ELEMENTS(vOptionNames);
} // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source
cui/source/options/optgenrl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 341acca82250f4e1e7f73212628b2fa451cf51bc
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 30 00:13:35 2012 +0100
some more build failures
Change-Id: I2c2eac4fd848925fada754ced03328fa5320f901
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index fdca005..366ddda 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -380,7 +380,7 @@ void SvxGeneralTabPage::SetAccessibleNames ()
for (unsigned iField = rRow.nFirstField; iField != rRow.nLastField;
++iField)
{
// the token
-rtl::OUString sPart = sList.getToken(0, '/', nIndex).trim();
+rtl::OUString sPart = sList.getToken(0,
static_castsal_Unicode('/'), nIndex).trim();
Edit rEdit = vFields[iField]-aEdit;
// creating the accessible name
if (iBracket != -1)
commit 716c0233cfa58d898012b23ec64fd7a598b8fe78
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 23:59:56 2012 +0100
use SAL_N_ELEMENTS
Change-Id: Ia55c8696657c459423d745e298630d549e4125df
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index e8d031d..fdca005 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -271,7 +271,7 @@ void SvxGeneralTabPage::CreateControls ()
));
Row rRow = *vRows.back();
// fields in the row
-static unsigned const nFieldCount = sizeof vFieldInfo / sizeof
vFieldInfo[0];
+static unsigned const nFieldCount = SAL_N_ELEMENTS(vFieldInfo);
// skipping other (invisible) rows
while (iField != nFieldCount vFieldInfo[iField].eRow != eRow)
++iField;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/options/optgenrl.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 3c1345bdde10a3bbf179530576053578c810b7f6
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 30 00:33:14 2012 +0100
try a stab at remote fix for no matching function for call to make_shared
Change-Id: I029df0a94158acc5ca9705f53070d39d297b7b17
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 366ddda..0284902 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -45,6 +45,7 @@
#include svx/dlgutil.hxx
#include svx/svxids.hrc // SID_FIELD_GRABFOCUS
+#include boost/ref.hpp
#include boost/make_shared.hpp
namespace
@@ -267,7 +268,7 @@ void SvxGeneralTabPage::CreateControls ()
continue;
// creating row
vRows.push_back(boost::make_sharedRow(
-*this, vRowInfo[iRow].nTextId, eRow
+boost::ref(*this), vRowInfo[iRow].nTextId, eRow
));
Row rRow = *vRows.back();
// fields in the row
@@ -281,7 +282,7 @@ void SvxGeneralTabPage::CreateControls ()
{
// creating edit field
vFields.push_back(boost::make_sharedField(
-*this, vFieldInfo[iField].nEditId, iField
+boost::ref(*this), vFieldInfo[iField].nEditId, iField
));
// short name field?
if (vFieldInfo[iField].nEditId == ED_SHORTNAME)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
