[Libreoffice-commits] .: sw/inc sw/source

[Miklos Vajna]

 sw/inc/format.hxx|1 +
 sw/inc/frmfmt.hxx|1 +
 sw/inc/node.hxx  |   12 +++-
 sw/source/core/inc/frame.hxx |7 +++
 4 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 06fa03d6ca0e27468129bfffaacecfd491738309
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Feb 17 10:47:49 2012 +0100

sw: second round of doxygen comments

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 660a7fe..28b4fac 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -42,6 +42,7 @@ class IDocumentFieldsAccess;
 class IDocumentChartDataProviderAccess;
 class SwDoc;
 
+/// Base class for various Writer styles.
 class SW_DLLPUBLIC SwFmt : public SwModify
 {
 String aFmtName;
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index e06dea9..d0be16d 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -44,6 +44,7 @@ class SwRect;
 class SwContact;
 class SdrObject;
 
+/// Style of a layout element.
 class SW_DLLPUBLIC SwFrmFmt: public SwFmt
 {
 friend class SwDoc;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index f75091a..fa2736c 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -85,9 +85,7 @@ class IDocumentContentOperations;
 class IDocumentListItems;
 class SwOLENodes;
 
-// 
-// class SwNode
-// 
+/// Base class of the Writer document model elements.
 class SW_DLLPUBLIC SwNode
 : private BigPtrEntry
 {
@@ -304,9 +302,7 @@ private:
 SwNode  operator= ( const SwNode  rNodes );
 };
 
-// 
-// class SwStartNode
-// 
+/// Starts a section of nodes in the document model.
 class SwStartNode: public SwNode
 {
 friend class SwNode;
@@ -340,9 +336,7 @@ private:
 };
 
 
-// 
-// class SwEndNode
-// 
+/// Ends a section of nodes in the document model.
 class SwEndNode : public SwNode
 {
 friend class SwNodes;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 7e4a389..e61ee3f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -250,6 +250,13 @@ enum MakePageType
 };
 
 
+/**
+ * Base class of the Writer layout elements.
+ *
+ * This includes not only fly frames, but everything down to the paragraph
+ * level: pages, headers, footers, etc. (Inside a paragraph SwLinePortion
+ * instances are used.)
+ */
 class SwFrm: public SwClient, public SfxBroadcaster
 {
 //Der verkappte Frm
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/gbuild soltools/prj

[Stephan Bergmann]

 solenv/gbuild/JunitTest.mk |8 ++--
 soltools/prj/build.lst |2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 77d120691d0bf8636f86e34a8d4926c260d73f68
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 17 11:07:29 2012 +0100

Pass JunitTest jar deps to underlying JavaClassSet

...and make underlying JavaClassSet implicitly depend on OOO_JUNI_JAR
...and remove unused gb_JunitTest_set_classpath

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8d3656a..5cef3a4 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -74,6 +74,7 @@ $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(call gb_JunitTest_JunitTest_platform,$(1))
 
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
+$(call gb_JavaClassSet_add_system_jar,$(call 
gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR))
 $(call gb_JunitTest_get_target,$(1)) : $(call 
gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
 $(eval $(call gb_Module_register_target,$(call 
gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1
 endef
@@ -104,12 +105,8 @@ $(foreach sourcefile,$(2),$(call 
gb_JunitTest_add_sourcefile,$(1),$(sourcefile))
 
 endef
 
-define gb_JunitTest_set_classpath
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(2)
-
-endef
-
 define gb_JunitTest_add_jar
+$(call gb_JavaClassSet_add_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
 $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2)
 $(call gb_JunitTest_get_target,$(1)) : $(2)
 $(2) :| $(gb_Helper_PHONY)
@@ -147,7 +144,6 @@ gb_JunitTest_add_classes :=
 gb_JunitTest_add_class :=
 gb_JunitTest_add_sourcefile :=
 gb_JunitTest_add_sourcefiles :=
-gb_JunitTest_set_classpath :=
 gb_JunitTest_add_jar :=
 gb_JunitTest_add_jars :=
 gb_JunitTest_add_package_dependency :=
commit 98f60e460ea64f061ca6948691a29d4cf29eb0a4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 17 11:05:45 2012 +0100

No SUN dependencies anymore

diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 78eb3fc..9ee36a7 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -1,4 +1,4 @@
-so  soltools :   solenv SUN:so_prereq NULL
+so  soltools : solenv NULL
 so soltools
usr1-   all so_usr1 NULL
 so soltools\incget 
-   all so_inc NULL
 so soltools\ldump  nmake   
-   w   so_ldump so_mkdep NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk

[Jan Holesovsky]

 desktop/Executable_soffice.bin.mk |2 +-
 desktop/Executable_unopkg.bin.mk  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a9c91748166a54520c82fd2d155e41081a400af4
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Tue Jan 10 22:28:24 2012 -0600

OS_FOR_BUILD is not right do decide Host module name

Signed-off-by: Jan Holesovsky ke...@suse.cz

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index 7e168aa..99b894f 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
+ifeq ($(OS),WNT)
 sofficebin := soffice_bin
 else
 sofficebin := soffice.bin
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 759a4e9..0b5d057 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
+ifeq ($(OS),WNT)
 unopkgbin := unopkg_bin
 else
 unopkgbin := unopkg.bin
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bridges/source

[René Engelhard]

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3dfae9e2e6416ce2605b1db75e139f1185841a43
Author: Rene Engelhard r...@debian.org
Date:   Fri Feb 17 11:23:37 2012 +0100

fix armel/armv4t build

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 97eff51..8e69ebe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -279,7 +279,11 @@ void callVirtualMethod(
 #endif
 //Make the call
 ldr r5, %[pmethod]\n\t
+#ifndef __ARM_ARCH_4T__
 blx r5\n\t
+#else
+mov lr, pc ; bx r5\n\t
+#endif
 
 //Fill in return values
 mov %[r0], r0\n\t
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

[Matus Kukan]

 Makefile |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5b773eb58222109843814e48ace35fe9740a7d72
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Feb 17 11:26:15 2012 +0100

update Makefile

diff --git a/Makefile b/Makefile
index 7ef0842..d4dd3d9 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,10 @@ hwpfilter\
 i18npool\
 i18nutil\
 idl\
+javaunohelper\
+jurt\
+jvmaccess\
+jvmfwk\
 lingucomponent\
 linguistic\
 lotuswordpro\
@@ -78,6 +82,7 @@ psprint_config\
 qadevOOo\
 regexp\
 reportdesign\
+ridljar\
 rsc\
 sal\
 salhelper\
@@ -106,6 +111,7 @@ ucb\
 ucbhelper\
 udkapi\
 unixODBC\
+unoil\
 unotest\
 unotools\
 unoxml\
@@ -164,12 +170,8 @@ icu\
 idlc\
 instsetoo_native\
 io\
-javaunohelper\
 jfreereport\
 jpeg\
-jurt\
-jvmaccess\
-jvmfwk\
 l10ntools\
 languagetool\
 libcdr\
@@ -212,7 +214,6 @@ registry\
 remotebridges\
 reportbuilder\
 rhino\
-ridljar\
 saxon\
 scp2\
 sdext\
@@ -232,7 +233,6 @@ tomcat\
 translations\
 udm\
 unodevtools\
-unoil\
 vigra\
 x11_extensions\
 xmlhelp\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Andras Timar]

 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   24 ++---
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 2786c354ce4f7ff215fffe83ef242ee3b411fb13
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 17 12:58:37 2012 +0100

fdo#46167 fix path of shell extension dll in registry

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp 
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index c7def3e..32a5ef8 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -35,8 +35,8 @@ RegistryItem 
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -58,8 +58,8 @@ RegistryItem 
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -90,8 +90,8 @@ RegistryItem 
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -122,8 +122,8 @@ RegistryItem 
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
 ModuleID = gid_Module_Root;
 Subkey = CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32;
 Styles = (X64); // Values: X64 / X64_ONLY
-Value = [INSTALLLOCATION]shlxthdl\ooofilt.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\ooofilt_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\ooofilt.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -163,8 +163,8 @@ RegistryItem 
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -197,8 +197,8 @@ RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
 ComponentCondition = VersionNT = 600;
 Styles = (X64);
 Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\propertyhdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\propertyhdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\propertyhdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 6 commits - clucene/configs clucene/Library_clucene.mk clucene/Makefile clucene/Module_clucene.mk clucene/Package_inc.mk clucene/prj extensions/Library_log.mk lotuswordpro/sou

[Caolán McNamara]

 Repository.mk |1 
 RepositoryModule_ooo.mk   |1 
 clucene/Library_clucene.mk|  267 ++
 clucene/Makefile  |   11 
 clucene/Module_clucene.mk |   35 ++
 clucene/Package_inc.mk|   97 ++
 clucene/configs/_clucene-config-generic.h |  112 +++
 clucene/configs/clucene-config-generic.h  |  148 +
 clucene/prj/build.lst |3 
 clucene/prj/makefile.mk   |1 
 extensions/Library_log.mk |7 
 lotuswordpro/source/filter/lwprowlayout.cxx   |2 
 ooo.lst.in|1 
 sdext/source/presenter/PresenterAccessibility.cxx |   11 
 testtools/com/sun/star/comp/bridge/TestComponent.java |4 
 testtools/source/bridgetest/bridgetest.cxx|5 
 testtools/source/bridgetest/cli/cli_cs_testobj.cs |5 
 testtools/source/bridgetest/cppobj.cxx|3 
 testtools/source/bridgetest/idl/bridgetest.idl|5 
 unotools/source/i18n/numberformatcodewrapper.cxx  |8 
 20 files changed, 707 insertions(+), 20 deletions(-)

New commits:
commit b688a3dcbe962774fff97156296593df1e4b92f0
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Feb 17 12:21:14 2012 +

first cut at building an internal clucene

diff --git a/Repository.mk b/Repository.mk
index 6462d3a..b87dc61 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -345,6 +345,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 avmediagst \
 avmediawin \
 cached1 \
+clucene \
 collator_data \
 deployment \
 deploymentgui \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 9cd684b..8859503 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 binaryurp \
 canvas \
 chart2 \
+clucene \
 comphelper \
 configmgr \
 cppcanvas \
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
new file mode 100644
index 000..7c8f0d5
--- /dev/null
+++ b/clucene/Library_clucene.mk
@@ -0,0 +1,267 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara caol...@redhat.com
+#  (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.
+
+# FIXME, need a way to suppress -Werror
+
+$(eval $(call gb_Library_Library,clucene))
+
+$(eval $(call gb_Library_use_external,clucene,zlib))
+
+$(eval $(call gb_Library_add_package_headers,clucene,clucene_inc))
+
+$(eval $(call gb_Library_set_include,clucene,\
+-I$(WORKDIR)/clucene/src/core \
+-I$(WORKDIR)/clucene/src/shared \
+-I$(WORKDIR)/clucene/src/contribs-lib \
+-I$(WORKDIR)/clucene/inc/internal \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,clucene,\
+-Dclucene_shared_EXPORTS\
+-Dclucene_core_EXPORTS\
+-Dclucene_contribs_lib_EXPORTS\
+))
+
+$(eval $(call gb_Library_add_linked_libs,clucene,\
+$(gb_STDLIBS) \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,clucene,\
+dl \
+m \
+pthread \
+))
+endif
+
+$(eval $(call gb_Library_add_generated_exception_objects,clucene,\
+clucene/src/shared/CLucene/SharedHeader \
+clucene/src/shared/CLucene/config/gunichartables \
+clucene/src/shared/CLucene/config/repl_tcslwr \
+clucene/src/shared/CLucene/config/repl_tcstoll \
+clucene/src/shared/CLucene/config/repl_tcscasecmp \
+clucene/src/shared/CLucene/config/repl_tprintf \
+clucene/src/shared/CLucene/config/repl_lltot \
+clucene/src/shared/CLucene/config/repl_tcstod \
+clucene/src/shared/CLucene/config/utf8 \
+clucene/src/shared/CLucene/config/threads \
+clucene/src/shared/CLucene/debug/condition \
+

[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f8e3ec289216fcf68b4083497a7e0ac04f07ce23
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Feb 17 14:40:53 2012 +0200

Bin obsolete comment

diff --git a/configure.in b/configure.in
index 18adc1b..5f6a4f2 100644
--- a/configure.in
+++ b/configure.in
@@ -110,7 +110,6 @@ if test -n $with_android_ndk; then
 
ANDROIDCFLAGS=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a
 
-   # Note that letting this set CC and CXX means ccache won't be used
test -z $CC  CC=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
$ANDROIDCFLAGS
test -z $CXX  CXX=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include 
-fexceptions -frtti
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/qa i18npool/source

[Eike Rathke]

 i18npool/qa/cppunit/test_breakiterator.cxx  |   35 +++-
 i18npool/source/breakiterator/breakiterator_unicode.cxx |7 ++-
 2 files changed, 39 insertions(+), 3 deletions(-)

New commits:
commit dab92ff8a19533db8633ae0a8c146f06c0e26932
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Feb 14 16:07:10 2012 +

use icu's breakiterator for Thai, not our customized generic rules

(cherry picked from commit 475d0c59c66fb7752d230f76130b17145aad0c12)

Conflicts:

i18npool/qa/cppunit/test_breakiterator.cxx
i18npool/source/breakiterator/breakiterator_unicode.cxx

Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 661e46a..820e57b 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -41,7 +41,8 @@
 #include cppunit/plugin/TestPlugIn.h
 #include com/sun/star/i18n/XBreakIterator.hpp
 #include com/sun/star/i18n/CharacterIteratorMode.hpp
-#include com/sun/star/i18n/ScriptType.hdl
+#include com/sun/star/i18n/ScriptType.hpp
+#include com/sun/star/i18n/WordType.hpp
 
 #include rtl/strbuf.hxx
 
@@ -62,12 +63,14 @@ public:
 void testGraphemeIteration();
 void testWeak();
 void testAsian();
+void testThai();
 
 CPPUNIT_TEST_SUITE(TestBreakIterator);
 CPPUNIT_TEST(testLineBreaking);
 CPPUNIT_TEST(testGraphemeIteration);
 CPPUNIT_TEST(testWeak);
 CPPUNIT_TEST(testAsian);
+CPPUNIT_TEST(testThai);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -249,6 +252,36 @@ void TestBreakIterator::testAsian()
 }
 }
 
+//A test to ensure that our thai word boundary detection is useful
+//http://lists.freedesktop.org/archives/libreoffice/2012-February/025959.html
+void TestBreakIterator::testThai()
+{
+lang::Locale aLocale;
+aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(th));
+aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TH));
+
+i18n::Boundary aBounds;
+{
+const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 
0x0E1A };
+::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
+aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT_MESSAGE(Should skip full word,
+aBounds.startPos == 0  aBounds.endPos == aTest.getLength());
+}
+
+#ifdef TODO
+{
+const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 
0x0E25, 0x0E32, 0x0E1A };
+::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
+aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT_MESSAGE(Should skip full word,
+aBounds.startPos == 0  aBounds.endPos == aTest.getLength());
+}
+#endif
+}
+
 TestBreakIterator::TestBreakIterator()
 {
 m_xContext = cppu::defaultBootstrap_InitialComponentContext();
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 78ba7a6..aa5e1d8 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -129,10 +129,13 @@ void SAL_CALL 
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
 
 OOoRuleBasedBreakIterator *rbi = NULL;
 
-if (breakRules.getLength()  breakType  
breakRules[breakType].getLength()  0) {
+if (breakRules.getLength()  breakType  
!breakRules[breakType].isEmpty())
+{
 rbi = new OOoRuleBasedBreakIterator(udata_open(OpenOffice, 
brk,
 OUStringToOString(breakRules[breakType], 
RTL_TEXTENCODING_ASCII_US).getStr(), status), status);
-} else {
+}
+else if 
(!rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(th))) //use icu's 
breakiterator for Thai
+{
 status = U_ZERO_ERROR;
 OStringBuffer aUDName(64);
 aUDName.append(rule);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - clucene/Library_clucene.mk clucene/Module_clucene.mk clucene/Package_inc.mk clucene/Package_source.mk clucene/source slideshow/source

[David Tardon]

 clucene/Library_clucene.mk |  397 
--
 clucene/Module_clucene.mk  |2 
 clucene/Package_inc.mk |   97 --
 clucene/Package_source.mk  |  110 ++
 clucene/source/Makefile|   49 +
 slideshow/source/engine/transitions/shapetransitionfactory.cxx |4 
 6 files changed, 352 insertions(+), 307 deletions(-)

New commits:
commit 314c2d3e0cab5f5e72fbd09585f344368125e1d1
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 14:34:34 2012 +0100

use custom target for preparing sources

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 7c8f0d5..53da705 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -31,14 +31,14 @@ $(eval $(call gb_Library_Library,clucene))
 
 $(eval $(call gb_Library_use_external,clucene,zlib))
 
-$(eval $(call gb_Library_add_package_headers,clucene,clucene_inc))
+$(eval $(call gb_Library_add_package_headers,clucene,clucene_source))
 
 $(eval $(call gb_Library_set_include,clucene,\
--I$(WORKDIR)/clucene/src/core \
--I$(WORKDIR)/clucene/src/shared \
--I$(WORKDIR)/clucene/src/contribs-lib \
--I$(WORKDIR)/clucene/inc/internal \
-$$(INCLUDE) \
+   -I$(WORKDIR)/CustomTarget/clucene/source/inc/internal \
+   -I$(WORKDIR)/CustomTarget/clucene/source/src/core \
+   -I$(WORKDIR)/CustomTarget/clucene/source/src/contribs-lib \
+   -I$(WORKDIR)/CustomTarget/clucene/source/src/shared \
+   $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,clucene,\
@@ -60,208 +60,195 @@ $(eval $(call gb_Library_add_linked_libs,clucene,\
 endif
 
 $(eval $(call gb_Library_add_generated_exception_objects,clucene,\
-clucene/src/shared/CLucene/SharedHeader \
-clucene/src/shared/CLucene/config/gunichartables \
-clucene/src/shared/CLucene/config/repl_tcslwr \
-clucene/src/shared/CLucene/config/repl_tcstoll \
-clucene/src/shared/CLucene/config/repl_tcscasecmp \
-clucene/src/shared/CLucene/config/repl_tprintf \
-clucene/src/shared/CLucene/config/repl_lltot \
-clucene/src/shared/CLucene/config/repl_tcstod \
-clucene/src/shared/CLucene/config/utf8 \
-clucene/src/shared/CLucene/config/threads \
-clucene/src/shared/CLucene/debug/condition \
-clucene/src/shared/CLucene/util/StringBuffer \
-clucene/src/shared/CLucene/util/Misc \
-clucene/src/shared/CLucene/util/dirent \
-   clucene/src/core/CLucene/StdHeader \
-   clucene/src/core/CLucene/debug/error \
-   clucene/src/core/CLucene/util/ThreadLocal \
-   clucene/src/core/CLucene/util/Reader \
-   clucene/src/core/CLucene/util/Equators \
-   clucene/src/core/CLucene/util/FastCharStream \
-   clucene/src/core/CLucene/util/MD5Digester \
-   clucene/src/core/CLucene/util/StringIntern \
-   clucene/src/core/CLucene/util/BitSet \
-   clucene/src/core/CLucene/queryParser/FastCharStream \
-   clucene/src/core/CLucene/queryParser/MultiFieldQueryParser \
-   clucene/src/core/CLucene/queryParser/QueryParser \
-   clucene/src/core/CLucene/queryParser/QueryParserTokenManager \
-   clucene/src/core/CLucene/queryParser/QueryToken \
-   clucene/src/core/CLucene/queryParser/legacy/Lexer \
-   clucene/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser \
-   clucene/src/core/CLucene/queryParser/legacy/QueryParser \
-   clucene/src/core/CLucene/queryParser/legacy/QueryParserBase \
-   clucene/src/core/CLucene/queryParser/legacy/QueryToken \
-   clucene/src/core/CLucene/queryParser/legacy/TokenList \
-   clucene/src/core/CLucene/analysis/standard/StandardAnalyzer \
-   clucene/src/core/CLucene/analysis/standard/StandardFilter \
-   clucene/src/core/CLucene/analysis/standard/StandardTokenizer \
-   clucene/src/core/CLucene/analysis/Analyzers \
-   clucene/src/core/CLucene/analysis/AnalysisHeader \
-   clucene/src/core/CLucene/store/MMapInput \
-   clucene/src/core/CLucene/store/IndexInput \
-   clucene/src/core/CLucene/store/Lock \
-   clucene/src/core/CLucene/store/LockFactory \
-   clucene/src/core/CLucene/store/IndexOutput \
-   clucene/src/core/CLucene/store/Directory \
-clucene/src/core/CLucene/store/FSDirectory \
-clucene/src/core/CLucene/store/RAMDirectory \
-clucene/src/core/CLucene/document/Document \
-clucene/src/core/CLucene/document/DateField \
-clucene/src/core/CLucene/document/DateTools \
-clucene/src/core/CLucene/document/Field \
-clucene/src/core/CLucene/document/FieldSelector \
-clucene/src/core/CLucene/document/NumberTools \
-clucene/src/core/CLucene/index/IndexFileNames \
-clucene/src/core/CLucene/index/IndexFileNameFilter \
-clucene/src/core/CLucene/index/IndexDeletionPolicy \
-clucene/src/core/CLucene/index/SegmentMergeInfo \
-

[Libreoffice-commits] .: solenv/bin

[Michael Meeks]

 solenv/bin/make_installer.pl|7 +---
 solenv/bin/modules/installer/sorter.pm  |   53 
 solenv/bin/modules/t/installer-sorter.t |   48 
 3 files changed, 3 insertions(+), 105 deletions(-)

New commits:
commit d6adf7c7b38d72328bd0c8867c472be677cd91ef
Author: Tim Retout t...@retout.co.uk
Date:   Thu Feb 16 18:58:20 2012 +

Inline and remove installer::sorter

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 45dede0..08c118b 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -57,7 +57,6 @@ use installer::scpzipfiles;
 use installer::scriptitems;
 use installer::setupscript;
 use installer::simplepackage;
-use installer::sorter qw(sorting_array_of_hashes);
 use installer::strip;
 use installer::substfilenamefiles;
 use installer::systemactions;
@@ -1101,7 +1100,7 @@ for ( my $n = 0; $n = 
$#installer::globals::languageproducts; $n++ )
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist3alangpack.log, $directoriesforepmarrayref); }
 ($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist3blangpack.log, $directoriesforepmarrayref); }
-sorting_array_of_hashes($directoriesforepmarrayref, HostName);
+@$directoriesforepmarrayref = sort { $a-{HostName} cmp 
$b-{HostName} } @$directoriesforepmarrayref;
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist3clangpack.log, $directoriesforepmarrayref); }
 
 if ( $installer::globals::iswindowsbuild )
@@ -1130,7 +1129,7 @@ for ( my $n = 0; $n = 
$#installer::globals::languageproducts; $n++ )
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist3ahelppack.log, $directoriesforepmarrayref); }
 ($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist3bhelppack.log, $directoriesforepmarrayref); }
-sorting_array_of_hashes($directoriesforepmarrayref, HostName);
+@$directoriesforepmarrayref = sort { $a-{HostName} cmp 
$b-{HostName} } @$directoriesforepmarrayref;
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist3chelppack.log, $directoriesforepmarrayref); }
 
 if ( $installer::globals::iswindowsbuild )
@@ -1171,7 +1170,7 @@ for ( my $n = 0; $n = 
$#installer::globals::languageproducts; $n++ )
 ($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist4_patch.log, $directoriesforepmarrayref); }
 
-sorting_array_of_hashes($directoriesforepmarrayref, HostName);
+@$directoriesforepmarrayref = sort { $a-{HostName} cmp 
$b-{HostName} } @$directoriesforepmarrayref;
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . 
directoriesforepmlist5_patch.log, $directoriesforepmarrayref); }
 }
 }
diff --git a/solenv/bin/modules/installer/sorter.pm 
b/solenv/bin/modules/installer/sorter.pm
deleted file mode 100644
index b08dd80..000
--- a/solenv/bin/modules/installer/sorter.pm
+++ /dev/null
@@ -1,53 +0,0 @@
-#*
-#
-# 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 useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 

[Libreoffice-commits] .: 5 commits - solenv/bin

[Michael Meeks]

 solenv/bin/modules/installer/globals.pm |2 
 solenv/bin/modules/installer/logger.pm  |  110 +++-
 solenv/bin/modules/installer/setupscript.pm |6 -
 3 files changed, 33 insertions(+), 85 deletions(-)

New commits:
commit 76ffd9e6bfc763f45c12758f149b6dbbf299
Author: Tim Retout t...@retout.co.uk
Date:   Thu Feb 16 22:33:46 2012 +

Replace installer::logger::include_header_into_globallogfile.

diff --git a/solenv/bin/modules/installer/logger.pm 
b/solenv/bin/modules/installer/logger.pm
index f98d34c..dba0ea0 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -37,7 +37,6 @@ use installer::globals;
 
 our @EXPORT_OK = qw(
 include_header_into_logfile
-include_header_into_globallogfile
 include_timestamp_into_logfile
 log_hashref
 globallog
@@ -78,30 +77,6 @@ sub include_header_into_logfile
 }
 
 
-# Including header files into the logfile
-
-
-sub include_header_into_globallogfile
-{
-my ($message) = @_;
-
-my $infoline;
-
-$infoline = \n . _get_time_string();
-push( @installer::globals::globallogfileinfo, $infoline);
-
-$infoline = ##\n;
-push( @installer::globals::globallogfileinfo, $infoline);
-
-$infoline = $message\n;
-push( @installer::globals::globallogfileinfo, $infoline);
-
-
-$infoline = ##\n;
-push( @installer::globals::globallogfileinfo, $infoline);
-}
-
-
 # Write timestamp into log file
 
 
@@ -154,13 +129,13 @@ sub globallog
 $infoline = \n . _get_time_string();
 push( @installer::globals::globallogfileinfo, $infoline);
 
-$infoline = 
\n;
+$infoline = ##\n;
 push( @installer::globals::globallogfileinfo, $infoline);
 
 $infoline = $message\n;
 push( @installer::globals::globallogfileinfo, $infoline);
 
-$infoline = 
\n;
+$infoline = ##\n;
 push( @installer::globals::globallogfileinfo, $infoline);
 
 }
diff --git a/solenv/bin/modules/installer/setupscript.pm 
b/solenv/bin/modules/installer/setupscript.pm
index 3018bb3..7d590c5 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -30,7 +30,7 @@ package installer::setupscript;
 use installer::existence;
 use installer::exiter;
 use installer::globals;
-use installer::logger;
+use installer::logger qw(globallog);
 use installer::remover;
 use installer::scriptitems;
 use installer::ziplist;
@@ -241,7 +241,7 @@ sub replace_all_setupscriptvariables_in_script
 {
 my ( $scriptref, $variablesref ) = @_;
 
-installer::logger::include_header_into_globallogfile(Replacing variables 
in setup script (start));
+globallog(Replacing variables in setup script (start));
 
 # make hash of variables to be substituted if they appear in the script
 my %subs;
@@ -282,7 +282,7 @@ sub replace_all_setupscriptvariables_in_script
 }
 }
 
-installer::logger::include_header_into_globallogfile(Replacing variables 
in setup script (end));
+globallog(Replacing variables in setup script (end));
 
 return $scriptref;
 }
commit c2ece9e23d8dc792833506010c69e4ec1835b257
Author: Tim Retout t...@retout.co.uk
Date:   Thu Feb 16 20:54:19 2012 +

Move global starttime into installer::logger

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 33d6e0a..f066c34 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -431,8 +431,6 @@ BEGIN
 $postprocess_standardepm = 0;
 $mergemodules_analyzed = 0;
 
-$starttime = ;
-
 @solarispatchscripts = (checkinstall, copyright, patch_checkinstall, 
patch_postinstall, postinstall, preinstall, i.none);
 @solarispatchscriptsforextensions = (checkinstall, copyright, 
patch_checkinstall, patch_postinstall_extensions, postinstall_extensions, 
preinstall, i.none);
 @solarispatchfiles = (.diPatch, patchinfo);
diff --git a/solenv/bin/modules/installer/logger.pm 
b/solenv/bin/modules/installer/logger.pm
index 681c3d1..f98d34c 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -51,6 +51,8 @@ our @EXPORT_OK = qw(
 print_error
 );
 
+my $starttime;
+
 
 # Including header files into the logfile
 
@@ -207,7 +209,7 @@ sub savedebug
 
 sub starttime
 {
-

[Libreoffice-commits] .: 6 commits - solenv/bin

[Michael Meeks]

 solenv/bin/make_installer.pl |4 
 solenv/bin/modules/installer/download.pm |   64 --
 solenv/bin/modules/installer/worker.pm   |  322 ---
 3 files changed, 390 deletions(-)

New commits:
commit 04e1010fd74a8e61d43e83afb81c4f6315a201c8
Author: Tim Retout t...@retout.co.uk
Date:   Thu Feb 16 23:03:05 2012 +

Remove unused save_logfile_after_linking from installer::worker

diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index 702e366..6f6801a 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -277,21 +277,6 @@ sub analyze_and_save_logfile
 }
 
 ###
-# Analyzing and creating the log file
-###
-
-sub save_logfile_after_linking
-{
-my ($loggingdir, $installlogdir, $current_install_number) = @_;
-
-# Saving the logfile in the log file directory and additionally in a log 
directory in the install directory
-my $numberedlogfilename = $installer::globals::logfilename;
-installer::logger::print_message( ... creating log file 
$numberedlogfilename \n );
-installer::files::save_file($loggingdir . $numberedlogfilename, 
\@installer::globals::logfileinfo);
-installer::files::save_file($installlogdir . 
$installer::globals::separator . $numberedlogfilename, 
\@installer::globals::logfileinfo);
-}
-
-###
 # Removing all directories that are saved in the
 # global directory @installer::globals::removedirs
 ###
commit 2492b26bb705a5c85b87386cd18aa57b3ed3c68d
Author: Tim Retout t...@retout.co.uk
Date:   Thu Feb 16 23:02:22 2012 +

Remove unused unpack_all_targzfiles_in_directory from installer::worker

diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index 7dbe0d4..702e366 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -45,44 +45,6 @@ use installer::scriptitems;
 use installer::systemactions;
 use installer::windows::language;
 
-#
-# Unpacking all files ending with tar.gz in a specified directory
-#
-
-sub unpack_all_targzfiles_in_directory
-{
-my ( $directory ) = @_;
-
-installer::logger::include_header_into_logfile(Unpacking tar.gz files:);
-
-installer::logger::print_message( ... unpacking tar.gz files ... \n );
-
-my $localdirectory = $directory . $installer::globals::separator . 
packages;
-my $alltargzfiles = 
installer::systemactions::find_file_with_file_extension(tar.gz, 
$localdirectory);
-
-for ( my $i = 0; $i = $#{$alltargzfiles}; $i++ )
-{
-my $onefile = $localdirectory . $installer::globals::separator . 
${$alltargzfiles}[$i];
-
-my $systemcall = cd $localdirectory; cat ${$alltargzfiles}[$i] \| 
gunzip \| tar -xf -;
-$returnvalue = system($systemcall);
-
-my $infoline = Systemcall: $systemcall\n;
-push( @installer::globals::logfileinfo, $infoline);
-
-if ($returnvalue)
-{
-$infoline = ERROR: Could not execute \$systemcall\!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-else
-{
-$infoline = Success: Executed \$systemcall\ successfully!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-}
-}
-
 #
 # Writing some global information into
 # the list of files without flag PATCH
commit 8b389383dcc56048605cef7c430ee58687b12986
Author: Tim Retout t...@retout.co.uk
Date:   Thu Feb 16 22:59:51 2012 +

Remove unused checksum subs from installer::worker

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 08c118b..47d137c 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -815,10 +815,6 @@ for ( my $n = 0; $n = 
$#installer::globals::languageproducts; $n++ )
 
installer::scriptitems::make_filename_language_specific($filesinproductlanguageresolvedarrayref);
 if ( $installer::globals::globallogging ) { 
installer::files::save_array_of_hashes($loggingdir . productfiles10f.log, 
$filesinproductlanguageresolvedarrayref); }
 
-# print ... calculating checksums ...\n;
-# my $checksumfile = 
installer::worker::make_checksum_file($filesinproductlanguageresolvedarrayref, 
$includepatharrayref);
-# if ( $installer::globals::globallogging ) { 
installer::files::save_file($loggingdir . 
$installer::globals::checksumfilename, $checksumfile); }
-
 
##
 # Unzipping files with flag 

[Libreoffice-commits] .: 3 commits - clucene/Library_clucene.mk solenv/gbuild vcl/Library_vclplug_gtk3.mk

[David Tardon]

 clucene/Library_clucene.mk  |4 ++--
 solenv/gbuild/Executable.mk |1 +
 solenv/gbuild/Library.mk|1 +
 solenv/gbuild/LinkTarget.mk |9 +
 solenv/gbuild/StaticLibrary.mk  |1 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |8 +---
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |5 +++--
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 --
 solenv/gbuild/platform/com_GCC_class.mk |2 ++
 solenv/gbuild/platform/macosx.mk|   10 ++
 solenv/gbuild/platform/solaris.mk   |6 --
 solenv/gbuild/platform/unxgcc.mk|4 ++--
 vcl/Library_vclplug_gtk3.mk |2 ++
 13 files changed, 42 insertions(+), 17 deletions(-)

New commits:
commit a3aa7ada194c33a9bedd2b5ce0506b1c5f3604a6
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 15:46:07 2012 +0100

suppress -Werror for vclplug_gtk3

diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 0be8ef9..0b85964 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -28,6 +28,8 @@
 
 $(eval $(call gb_Library_Library,vclplug_gtk3))
 
+$(eval $(call gb_Library_set_warnings_not_errors,vclplug_gtk3))
+
 $(eval $(call gb_Library_set_include,vclplug_gtk3,\
 $$(INCLUDE) \
 -I$(SRCDIR)/vcl/inc \
commit 512fcc354d02715e4e11df5c37f11d130365a139
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 15:43:10 2012 +0100

suppress -Werror for clucene

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 53da705..74e7dbc 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -25,14 +25,14 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-# FIXME, need a way to suppress -Werror
-
 $(eval $(call gb_Library_Library,clucene))
 
 $(eval $(call gb_Library_use_external,clucene,zlib))
 
 $(eval $(call gb_Library_add_package_headers,clucene,clucene_source))
 
+$(eval $(call gb_Library_set_warnings_not_errors,clucene))
+
 $(eval $(call gb_Library_set_include,clucene,\
-I$(WORKDIR)/CustomTarget/clucene/source/inc/internal \
-I$(WORKDIR)/CustomTarget/clucene/source/src/core \
commit a6e47f72dc08669c1600f10e624bb19421cee04b
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 15:40:20 2012 +0100

allow to suppress -Werror per link target

It is implemented for Executable, Library and StaticLibrary and works
for C, C++, Objective C and Objective C++ sources.

Please, do not misuse! Better fix your code!

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 2c5d9ea..2d148a6 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -111,6 +111,7 @@ $(eval $(foreach method,\
add_package_headers \
add_sdi_headers \
add_nativeres \
+   set_warnings_not_errors \
 ,\
$(call gb_Executable_forward_to_Linktarget,$(method))\
 ))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 72599c6..1b7a2aa 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -181,6 +181,7 @@ $(eval $(foreach method,\
add_sdi_headers \
export_objects_list \
add_nativeres \
+   set_warnings_not_errors \
 ,\
$(call gb_Library__forward_to_Linktarget,$(method))\
 ))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 227fe96..3edc66f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -472,6 +472,7 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
 $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS :=
 $(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
+$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS :=
 
 ifeq ($(gb_FULLDEPS),$(true))
 -include $(call gb_LinkTarget_get_dep_target,$(1))
@@ -494,6 +495,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := 
$$(gb_LinkTarget_INCL
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS :=
 endif
 
 endef
@@ -949,5 +951,12 @@ endef
 gb_LinkTarget_use_externals = \
  $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
 
+define gb_LinkTarget_set_warnings_not_errors
+$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS := $(true)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS := $(true)
+endif
+
+endef
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 23ceef4..888918c 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -113,6 +113,7 @@ $(eval $(foreach method,\
use_externals \
add_package_headers 

[Libreoffice-commits] .: 12 commits - autogen.sh configure.in external/mingw-dlls m4/mingw.m4 redland/raptor

[David Tardon]

 autogen.sh  |6 +++
 configure.in|   52 +-
 external/mingw-dlls/makefile.mk |4 +-
 m4/mingw.m4 |   61 
 redland/raptor/makefile.mk  |2 -
 5 files changed, 114 insertions(+), 11 deletions(-)

New commits:
commit 80b94e54d8861d32c608d8831037b48d6418f57b
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 13:55:56 2012 +0100

do not hardcode mingw path

diff --git a/configure.in b/configure.in
index afce205..2459b76 100644
--- a/configure.in
+++ b/configure.in
@@ -7231,7 +7231,7 @@ if test $with_system_icu = yes; then
 
 ICUPATH=$PATH
 if test $WITH_MINGW = yes ; then
-ICUPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$ICUPATH
+ICUPATH=`$CC -print-sysroot`/mingw/bin:$ICUPATH
 fi
 AC_PATH_PROG(ICUCONFIG,icu-config,,[$ICUPATH])
 
commit 41522fc7752acd25829a9d3b5ec9e89898777106
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 13:54:10 2012 +0100

avoid hardcoded dll names

diff --git a/configure.in b/configure.in
index 1b7bce3..afce205 100644
--- a/configure.in
+++ b/configure.in
@@ -5631,7 +5631,7 @@ if test $with_system_expat = yes; then
 [AC_MSG_ERROR(expat.h not found. install expat)], [])
 AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
 [AC_MSG_RESULT(expat library not found or functional.)], [])
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libexpat-1.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_EXPAT=NO
@@ -5823,7 +5823,7 @@ if test $with_system_libxml = yes; then
 AC_MSG_ERROR([xsltproc is required])
 fi
 
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libxslt-1.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXSLT=NO
@@ -5873,7 +5873,7 @@ if test $with_system_libxml = yes; then
 AC_MSG_ERROR([xmllint is required])
 fi
 
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXML=NO
@@ -6674,7 +6674,7 @@ if test $with_system_curl = yes; then
 ;;
 esac
 
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libintl-8.dll libidn-11.dll 
libnspr4.dll nssutil3.dll libplc4.dll libplds4.dll nss3.dll ssl3.dll 
libgpg-error-0.dll libgcrypt-11.dll libssh2-1.dll libcurl-4.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_CURL=NO
@@ -7572,7 +7572,7 @@ if test $with_system_hunspell = yes; then
 HUNSPELL_LIBS=-lhunspell
 fi
 AC_LANG_POP([C++])
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libhunspell-1.3-0.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_HUNSPELL=NO
@@ -9759,7 +9759,7 @@ if test $with_system_cairo = yes; then
 AC_LANG_POP([C])
 fi
 fi
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libfontconfig-1.dll 
libfreetype-6.dll libpixman-1-0.dll libpng15-15.dll libcairo-2.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([no])
 
commit 12c35f511e7d2ff74113f307212b6b422898b0f2
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 13:10:14 2012 +0100

add macro for extracting mingw dll names from libtool files

Hardcoding dll names from SuSE Linux in configure.in is not good,
because they might be slightly different on other systems (notably
Fedora :-), or the libraries might be compiled with different
dependencies.

diff --git a/autogen.sh b/autogen.sh
index f423fe1..d41ccdd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -125,7 +125,11 @@ sanity_checks ($system) unless($system eq 'Darwin');
 
 my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
 
-$aclocal_flags = -I ./m4/mac if (($aclocal_flags eq )  ($system eq 
'Darwin'));
+if ($aclocal_flags eq )
+{
+$aclocal_flags = -I ./m4;
+$aclocal_flags .=  -I ./m4/mac if ($system eq 'Darwin');
+}
 
 $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 
'Darwin'));
 
diff --git a/m4/mingw.m4 b/m4/mingw.m4
new file mode 100644
index 000..cd0f38f
--- /dev/null
+++ b/m4/mingw.m4
@@ -0,0 +1,61 @@
+# libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude])
+# uses: CC, WITH_MINGW
+# 
+AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS],
+[AC_REQUIRE([AC_PROG_SED])dnl
+if test $WITH_MINGW = yes -a -n $CC; then
+_libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib
+for _libo_mingw_lib in $1; do
+_libo_mingw_lib=$_libo_mingw_libdir/$_libo_mingw_lib.la
+_libo_mingw_find_dll([$_libo_mingw_lib],[$3],[_libo_mingw_new_dll])
+if test -n $_libo_mingw_new_dll; then
+

[Libreoffice-commits] .: 3 commits - avmedia/source filter/source l10ntools/source

[Thorsten Behrens]

 avmedia/source/gstreamer/gstplayer.cxx |   14 +++---
 filter/source/svg/svgreader.cxx|7 ---
 l10ntools/source/helpmerge.cxx |5 +++--
 3 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit 5d14f80c1e12508659fc337b5e6208e5bc018001
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Feb 17 15:05:19 2012 +0100

Make avmedia module buildable with dbglevel=3 again.

diff --git a/avmedia/source/gstreamer/gstplayer.cxx 
b/avmedia/source/gstreamer/gstplayer.cxx
index a8d2642..fa1dcbd 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -230,22 +230,14 @@ GstBusSyncReply Player::processSyncMessage( GstMessage 
*message )
 }
 }
 
-#if OSL_DEBUG_LEVEL  2
-sal_Bool aSuccess =
-#endif
-  maSizeCondition.set();
-DBG( %p set condition result: %d, this, aSuccess );
+maSizeCondition.set();
 }
 }
 }
 } else if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) {
 if( mnWidth == 0 ) {
 // an error occurred, set condition so that OOo thread doesn't 
wait for us
-#if OSL_DEBUG_LEVEL  2
-sal_Bool aSuccess =
-#endif
-maSizeCondition.set();
-DBG( %p set condition result: %d, this, aSuccess );
+maSizeCondition.set();
 }
 }
 
@@ -537,7 +529,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
 
 TimeValue aTimeout = { 10, 0 };
 #if OSL_DEBUG_LEVEL  2
-oslConditionResult aResult =
+osl::Condition::Result aResult =
 #endif
  maSizeCondition.wait( aTimeout );
 
commit 1984e0b41e0449b6c5b1a94411a4e7559d2ca746
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Feb 17 13:42:12 2012 +0100

Make l10ntools module buildable with dbglevel=3 again.

diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index ceb0f1e..4cbf8d5 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -32,6 +32,7 @@
 #include functional
 
 #include osl/file.hxx
+#include sal/log.hxx
 // local includes
 #include stdio.h
 #include stdlib.h
@@ -70,7 +71,7 @@ void HelpParser::Dump(LangHashMap* rElem_in,const 
rtl::OString  sKey_in)
 {
 x=posn-first;
 y=posn-second-ToOString();
-fprintf(stdout,key=%s value=%s\n,x.GetBuffer(),y.getStr());
+fprintf(stdout,key=%s value=%s\n,x.getStr(),y.getStr());
 }
 fprintf(stdout,+--+\n);
 }
@@ -291,7 +292,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , 
MergeDataFile aMergeDataFile
 #if OSL_DEBUG_LEVEL  2
 printf(*DUMPING 
HASHMAP***);
 Dump(aXMLStrHM);
-printf(DBG: sHelpFile = %s\n,sHelpFile.GetBuffer() );
+printf(DBG: sHelpFile = %s\n,sHelpFile.getStr() );
 #endif
 
 pResData.sGId  =  pos-first;
commit 49b54b37e86df2c66fdcdafa08e8f9275ca44fb1
Author: Thorsten Behrens tbehr...@suse.com
Date:   Thu Feb 16 18:08:34 2012 +0100

Make filters module buildable with dbglevel=3 again.

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index f941cba..5d46c7c 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1771,6 +1771,9 @@ static void writeShapes( StatePool   
 rStat
 visitElements(aVisitor, xElem);
 }
 
+} // namespace
+
+
 #if OSL_DEBUG_LEVEL  2
 struct DumpingVisitor
 {
@@ -1813,8 +1816,6 @@ static void dumpTree( const 
uno::Referencexml::dom::XElement xElem )
 }
 #endif
 
-} // namespace
-
 
 SVGReader::SVGReader(const uno::Referencelang::XMultiServiceFactory 
xServiceFactory,
  const uno::Referenceio::XInputStream   
xInputStream,
@@ -2768,7 +2769,7 @@ bool importSvg(SvStream  rStream, Graphic  rGraphic )
 svgi::visitElements(aVisitor, xDocElem);
 
 #if OSL_DEBUG_LEVEL  2
-dumpTree(xDocElem);
+svgi::dumpTree(xDocElem);
 #endif
 
 // render all shapes to mtf
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: jurt/Module_jurt.mk

[Stephan Bergmann]

 jurt/Module_jurt.mk |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit e14700edc0ebb194392b53e19d02be9f5c7e3e6f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 17 16:14:51 2012 +0100

Move all jurt JunitTests back to subsequentcheck for now

...as they have further dependencies on modules higher up in the hierarchy.

diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index e81f90a..50339cd 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -47,23 +47,18 @@ $(eval $(call gb_Module_add_targets,jurt,\
 ))
 endif
 
-$(eval $(call gb_Module_add_check_targets,jurt,\
+$(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\
 JunitTest_bridgefactory \
 JunitTest_connections \
 JunitTest_java \
+JunitTest_java_remote \
 JunitTest_remote \
+JunitTest_uno \
 JunitTest_urp \
 JunitTest_util \
 Package_test_urp \
 ))
 
-#TOOD: The following depend on OOoRunnerLight.jar from qadevOOo (but only for
-# WaitUnreachable, which should be moved elsewhere):
-$(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\
-JunitTest_java_remote \
-JunitTest_uno \
-))
-
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: fpicker/source

[Michael Meeks]

 fpicker/source/win32/filepicker/asynceventnotifier.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7a0b9e51918fb0de2ec290f90178d36e4761f67
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date:   Fri Feb 17 15:15:44 2012 +

Possible inefficient checking for 'm_EventList' emptiness.

diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx 
b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index a155f8b..748e5ac 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -240,7 +240,7 @@ size_t SAL_CALL CAsyncEventNotifier::getEventListSize()
 void SAL_CALL CAsyncEventNotifier::resetNotifyEvent()
 {
 osl::MutexGuard aGuard(m_Mutex);
-if (0 == m_EventList.size())
+if ( m_EventList.empty() )
 ResetEvent(m_NotifyEvent);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - cli_ure/source dtrans/source editeng/source extensions/test io/test sfx2/source writerperfect/source

[Michael Meeks]

 cli_ure/source/uno_bridge/cli_bridge.h   |2 +-
 dtrans/source/win32/dtobj/FetcList.cxx   |2 +-
 dtrans/source/win32/dtobj/FmtFilter.cxx  |2 +-
 editeng/source/items/borderline.cxx  |   21 ++---
 extensions/test/ole/cpnt/cpnt.cxx|2 +-
 extensions/test/stm/datatest.cxx |4 ++--
 io/test/stm/datatest.cxx |4 ++--
 sfx2/source/doc/printhelper.cxx  |2 +-
 writerperfect/source/filter/FontStyle.hxx|2 +-
 writerperfect/source/filter/TextRunStyle.hxx |4 ++--
 10 files changed, 18 insertions(+), 27 deletions(-)

New commits:
commit 51b3eb3a391cc5329d358a2d4159861537feab26
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date:   Fri Feb 17 15:25:28 2012 +

clean up logic

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index b617ff4..1677141 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -492,29 +492,20 @@ bool SvxBorderLine::HasPriority( const SvxBorderLine 
rOtherLine ) const
 const sal_uInt16 nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
 const sal_uInt16 nOtherSize = rOtherLine.GetOutWidth() + 
rOtherLine.GetDistance() + rOtherLine.GetInWidth();
 
-if (nThisSize  nOtherSize)
+if ( nThisSize  nOtherSize )
 {
 return true;
 }
-else if (nThisSize  nOtherSize)
+else if ( nThisSize  nOtherSize )
 {
 return false;
 }
-else
+else if ( rOtherLine.GetInWidth()  !GetInWidth() )
 {
-if ( rOtherLine.GetInWidth()  !GetInWidth() )
-{
-return true;
-}
-else if ( GetInWidth()  !rOtherLine.GetInWidth() )
-{
-return false;
-}
-else
-{
-return false;
-}
+return true;
 }
+
+return false;
 }
 
 } // namespace editeng
commit b8f007d05250258a8d8b5113298867f142af6e09
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date:   Fri Feb 17 15:22:46 2012 +

remove extraneous qualifiers that break some compilers

diff --git a/cli_ure/source/uno_bridge/cli_bridge.h 
b/cli_ure/source/uno_bridge/cli_bridge.h
index 0306e4d..b9297d0 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -96,7 +96,7 @@ struct Bridge
 
 System::Object* map_uno2cli(uno_Interface * pUnoI, 
typelib_InterfaceTypeDescription* pTD) const;
 
-System::Object* Bridge::call_uno(uno_Interface * pUnoI,
+System::Object* call_uno(uno_Interface * pUnoI,
   typelib_TypeDescription* member_td,
   typelib_TypeDescriptionReference * return_type,
   sal_Int32 nParams, typelib_MethodParameter const * 
pParams,
diff --git a/extensions/test/ole/cpnt/cpnt.cxx 
b/extensions/test/ole/cpnt/cpnt.cxx
index 0435ced..b20795e 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -315,7 +315,7 @@ public: // XTestSequence
 class EventListener: public WeakImplHelper1XEventListener
 {
 public:
-EventListener::EventListener(): bCalled( sal_False)
+EventListener(): bCalled( sal_False)
 {}
 virtual void SAL_CALL disposing( const 
::com::sun::star::lang::EventObject Source ) throw (RuntimeException);
 
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index b084ac2..2bdc349 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -662,8 +662,8 @@ public:
 
 
 private:
-void OObjectStreamTest::testObject( const XObjectOutputStreamRef rOut,
-const XObjectInputStreamRef rIn );
+void testObject( const XObjectOutputStreamRef rOut,
+ const XObjectInputStreamRef rIn );
 
 private:
 };
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 47b7769..4504403 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -668,8 +668,8 @@ public:
 
 
 private:
-void OObjectStreamTest::testObject( const Reference 
XObjectOutputStream  rOut,
-const Reference 
XObjectInputStream rIn );
+void testObject( const Reference XObjectOutputStream  rOut,
+ const Reference XObjectInputStream rIn );
 
 private:
 };
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 9206d3a..33b33a6 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -511,7 +511,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread
 
 // lock for further using of our member isn't neccessary - because
 // we truns alone by defenition. Nobody join for us nor use us ...
-ImplUCBPrintWatcher::moveAndDeleteTemp(m_pTempFile,m_sTargetURL);
+moveAndDeleteTemp(m_pTempFile,m_sTargetURL);
 
 // 

[Libreoffice-commits] .: distro-configs/LibreOfficeMacOSX.conf

[Thorsten Behrens]

 distro-configs/LibreOfficeMacOSX.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fdfeb21102e85f94a1ecb22fb376e1875319765e
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Feb 17 16:18:43 2012 +0100

Fix fdo#45584 - disable cairocanvas on Mac.

We never used cairocanvas on Mac, this got accidentally enabled
due to configure.in cleanups. Not that we shouldn't, but it needs
some more fixing.

diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 108ef81..9366a04 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,6 +1,7 @@
 --with-vendor=The Document Foundation
 --enable-epm
 --enable-binfilter
+--disable-cairo-canvas
 --with-java-target-version=1.5
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - extensions/source icu/arm-assembler.patch icu/makefile.mk np_sdk/inc Repository.mk scp2/source svx/Executable_gengal.bin.mk svx/Module_svx.mk svx/Package_gengal.mk

[René Engelhard]

 Repository.mk |1 
 extensions/source/nsplugin/source/npshell.cxx |2 
 icu/arm-assembler.patch   |   24 ++
 icu/makefile.mk   |3 
 np_sdk/inc/npapi.h|2 
 scp2/source/ooo/file_ooo.scp  |   22 +
 svx/Executable_gengal.bin.mk  |   80 
 svx/Module_svx.mk |2 
 svx/Package_gengal.mk |   31 +++
 svx/source/gengal/gengal.cxx  |8 +-
 svx/source/gengal/gengal.sh   |  103 ++
 11 files changed, 271 insertions(+), 7 deletions(-)

New commits:
commit d40a7f18a859f01678008c05cb1baf9cc272a9fb
Author: Rene Engelhard r...@debian.org
Date:   Fri Feb 17 15:45:05 2012 +0100

make gengal work again

diff --git a/Repository.mk b/Repository.mk
index b87dc61..5584744 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -84,6 +84,7 @@ else
 $(eval $(call gb_Helper_register_executables,OOO,\
 soffice.bin \
 unopkg.bin \
+gengal.bin \
 ))
 
 ifeq ($(OS),MACOSX)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4d5d771..33432aa 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -124,6 +124,28 @@ End
 #endif
 #endif
 
+File gid_File_Bin_Gengal
+BIN_FILE_BODY;
+Dir = gid_Brand_Dir_Program;
+Styles = (PACKED);
+  #ifdef UNX
+Name = gengal.bin;
+  #else
+Name = gengal.exe;
+  #endif
+End
+
+#ifdef UNX
+
+File gid_File_Script_Gengal
+BIN_FILE_BODY;
+Dir = gid_Brand_Dir_Program;
+Styles = (PACKED);
+Name = gengal;
+End
+
+#endif
+
 #if !defined(WITHOUT_MOZILLA)  defined(UNX)  !defined(QUARTZ)
 
 File gid_File_Bin_Pluginapp
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
new file mode 100644
index 000..36f7752
--- /dev/null
+++ b/svx/Executable_gengal.bin.mk
@@ -0,0 +1,80 @@
+#*
+#
+# 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 useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# http://www.openoffice.org/license.html
+# for a copy of the LGPLv3 License.
+#
+#*
+
+$(eval $(call gb_Executable_Executable,gengal.bin))
+
+$(eval $(call gb_Executable_set_include,gengal.bin,\
+$$(INCLUDE) \
+-I$(SRCDIR)/svx/inc/ \
+-I$(SRCDIR)/svx/inc/pch \
+-I$(OUTDIR)/inc/offuh \
+-I$(OUTDIR)/inc/udkapi \
+-I$(OUTDIR)/inc/offapi \
+))
+
+$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
+$$(CXXFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+sal \
+tl \
+svl \
+comphelper \
+cppu \
+cppuhelper \
+vcl \
+ucbhelper \
+svxcore \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
+svx/source/gengal/gengal \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
+vclmain \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+kernel32 \
+msvcrt \
+oldnames \
+user32 \
+uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+dl \
+pthread \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index ab1b595..fad 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -39,6 +39,8 @@ $(eval $(call gb_Module_add_targets,svx,\
 Package_globlmn_hrc \
 Package_inc \
 Package_sdi \
+Package_gengal \
+Executable_gengal.bin \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
diff --git a/svx/Package_gengal.mk b/svx/Package_gengal.mk
new file mode 100644
index 000..c47fc85
--- /dev/null
+++ b/svx/Package_gengal.mk
@@ -0,0 +1,31 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - extensions/source np_sdk/inc Repository.mk scp2/source svx/Executable_gengal.bin.mk svx/Module_svx.mk svx/Package_gengal.mk svx/source

[René Engelhard]

 Repository.mk |1 
 extensions/source/nsplugin/source/npshell.cxx |2 
 np_sdk/inc/npapi.h|2 
 scp2/source/ooo/file_ooo.scp  |   22 +
 svx/Executable_gengal.bin.mk  |   80 
 svx/Module_svx.mk |2 
 svx/Package_gengal.mk |   31 +++
 svx/source/gengal/gengal.cxx  |8 +-
 svx/source/gengal/gengal.sh   |  103 ++
 9 files changed, 245 insertions(+), 6 deletions(-)

New commits:
commit e46472ae2e4eea0e201565fb8dd7bdcb59ef9c28
Author: Rene Engelhard r...@debian.org
Date:   Fri Feb 17 15:40:37 2012 +0100

char* - const char* for npapis getMIMEDescription to fix build with newer 
mozs

diff --git a/extensions/source/nsplugin/source/npshell.cxx 
b/extensions/source/nsplugin/source/npshell.cxx
index 134ee36..e25326f 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -361,7 +361,7 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII 
:odp:OpenDocument Presentation;
 MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII :otp:OpenDocument 
Presentation Template;
 MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII :odf:OpenDocument Formula; );
 
-char*
+const char*
 NPP_GetMIMEDescription(void)
 {
 debug_fprintf(NSP_LOG_APPEND, print by Netscape Plugin,  
NPP_GetMIMEDescription:%s.\n, pMimeTypes);
diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h
index d67dcd3..4a7f7ce 100644
--- a/np_sdk/inc/npapi.h
+++ b/np_sdk/inc/npapi.h
@@ -784,7 +784,7 @@ extern C {
 
 /* NPP_* functions are provided by the plugin and called by the navigator. */
 
-char* NPP_GetMIMEDescription(void);
+const char* NPP_GetMIMEDescription(void);
 NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
   uint16_t mode, int16_t argc, char* argn[],
   char* argv[], NPSavedData* saved);
commit b948b1ec30e2001fe2386f70510c64ed9f19270c
Author: Rene Engelhard r...@debian.org
Date:   Fri Feb 17 15:45:05 2012 +0100

make gengal work again

diff --git a/Repository.mk b/Repository.mk
index 251405b..5df6c87 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -78,6 +78,7 @@ else
 $(eval $(call gb_Helper_register_executables,OOO,\
soffice.bin \
unopkg.bin \
+   gengal.bin \
 ))
 
 ifeq ($(OS),MACOSX)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7f1cc64..e3b9abe 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -121,6 +121,28 @@ File gid_File_Exe_Nsplugin
 End
 #endif
 
+File gid_File_Bin_Gengal
+BIN_FILE_BODY;
+Dir = gid_Brand_Dir_Program;
+Styles = (PACKED);
+  #ifdef UNX
+Name = gengal.bin;
+  #else
+Name = gengal.exe;
+  #endif
+End
+
+#ifdef UNX
+
+File gid_File_Script_Gengal
+BIN_FILE_BODY;
+Dir = gid_Brand_Dir_Program;
+Styles = (PACKED);
+Name = gengal;
+End
+
+#endif
+
 #if !defined(WITHOUT_MOZILLA)  defined(UNX)  !defined(QUARTZ)
 
 File gid_File_Bin_Pluginapp
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
new file mode 100644
index 000..36f7752
--- /dev/null
+++ b/svx/Executable_gengal.bin.mk
@@ -0,0 +1,80 @@
+#*
+#
+# 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 useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# http://www.openoffice.org/license.html
+# for a copy of the LGPLv3 License.
+#
+#*
+
+$(eval $(call gb_Executable_Executable,gengal.bin))
+
+$(eval $(call gb_Executable_set_include,gengal.bin,\
+$$(INCLUDE) \
+-I$(SRCDIR)/svx/inc/ \
+-I$(SRCDIR)/svx/inc/pch \
+-I$(OUTDIR)/inc/offuh \
+-I$(OUTDIR)/inc/udkapi \
+-I$(OUTDIR)/inc/offapi \
+))
+
+$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
+$$(CXXFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+sal \
+tl \
+svl \
+comphelper \
+cppu \
+cppuhelper \
+vcl \
+

[Libreoffice-commits] .: drawinglayer/inc drawinglayer/source unusedcode.easy

[Michael Meeks]

 drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx|1 
 drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx  |3 -
 drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx |1 
 drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx|1 
 drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx |1 
 drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx   |4 -
 drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx   |1 
 drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx|1 
 drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx   |3 -
 drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx   |7 
---
 drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx   |   15 
--
 drawinglayer/inc/drawinglayer/primitive2d/rendergraphicprimitive2d.hxx |2 
 drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx   |5 
--
 drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx  |1 
 drawinglayer/source/attribute/fillbitmapattribute.cxx  |6 
--
 drawinglayer/source/attribute/sdrallattribute3d.cxx|9 
---
 drawinglayer/source/attribute/sdrfillbitmapattribute.cxx   |5 
--
 drawinglayer/source/attribute/sdrlightattribute3d.cxx  |6 
--
 drawinglayer/source/attribute/sdrlightingattribute3d.cxx   |5 
--
 drawinglayer/source/attribute/sdrlineattribute.cxx |   11 

 drawinglayer/source/attribute/sdrobjectattribute3d.cxx |6 
--
 drawinglayer/source/attribute/sdrsceneattribute3d.cxx  |5 
--
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx |   10 

 drawinglayer/source/primitive2d/polygonprimitive2d.cxx |   11 

 drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx |   23 
--
 drawinglayer/source/primitive2d/rendergraphicprimitive2d.cxx   |   10 

 drawinglayer/source/primitive3d/polygonprimitive3d.cxx |   10 

 drawinglayer/source/processor3d/baseprocessor3d.cxx|6 
--
 unusedcode.easy|   17 
---
 29 files changed, 186 deletions(-)

New commits:
commit bb61f56d71b699dfbe422bac37a3151767e6a40f
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Fri Feb 17 13:18:17 2012 +0100

Removed unused code from drawinlayer

diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx 
b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
index 96b181d..285bf79 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
@@ -65,7 +65,6 @@ namespace drawinglayer
 const basegfx::B2DPoint rTopLeft,
 const basegfx::B2DVector rSize,
 bool bTiling);
-FillBitmapAttribute();
 FillBitmapAttribute(const FillBitmapAttribute rCandidate);
 FillBitmapAttribute operator=(const FillBitmapAttribute 
rCandidate);
 ~FillBitmapAttribute();
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx 
b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
index 1831b78..f92ccc6 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
@@ -66,9 +66,6 @@ namespace drawinglayer
 const FillGradientAttribute rFillFloatTransGradient);
 SdrLineFillShadowAttribute3D();
 
-// checks if the incarnation is default constructed
-bool isDefault() const;
-
 // compare operator
 bool operator==(const SdrLineFillShadowAttribute3D rCandidate) 
const;
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx 
b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
index ab7f003..fc33bf9 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
@@ -89,7 +89,6 @@ namespace drawinglayer
 const basegfx::B2DVector getRectPoint() const;
 bool getTiling() const;
 bool getStretch() const;
-bool getLogSize() const;
 
 // FillBitmapAttribute generator
 FillBitmapAttribute getFillBitmapAttribute(const 
basegfx::B2DRange rRange) const;
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx 
b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
index 03a731c..d4f5499 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
+++ 

[Libreoffice-commits] .: cppcanvas/inc cppcanvas/source unusedcode.easy

[Michael Meeks]

 cppcanvas/inc/cppcanvas/basegfxfactory.hxx   |6 -
 cppcanvas/inc/cppcanvas/vclfactory.hxx   |1 
 cppcanvas/source/inc/implrenderer.hxx|5 -
 cppcanvas/source/mtfrenderer/emfplus.cxx |   28 --
 cppcanvas/source/mtfrenderer/implrenderer.cxx|   48 ---
 cppcanvas/source/mtfrenderer/mtftools.cxx|   62 ---
 cppcanvas/source/mtfrenderer/mtftools.hxx|   56 -
 cppcanvas/source/mtfrenderer/transparencygroupaction.cxx |   19 
 cppcanvas/source/mtfrenderer/transparencygroupaction.hxx |   28 --
 cppcanvas/source/wrapper/basegfxfactory.cxx  |   31 ---
 cppcanvas/source/wrapper/implsprite.cxx  |5 -
 cppcanvas/source/wrapper/implsprite.hxx  |4 
 cppcanvas/source/wrapper/implspritecanvas.cxx|9 --
 cppcanvas/source/wrapper/implspritecanvas.hxx|6 -
 cppcanvas/source/wrapper/vclfactory.cxx  |4 
 unusedcode.easy  |   12 --
 16 files changed, 324 deletions(-)

New commits:
commit eed2695cd5d63bdaf8b02c5cbf3a7e4017e18173
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Fri Feb 17 14:06:34 2012 +0100

Removed unused code from cppcanvas

diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx 
b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index 5cb87aa..0aecf80 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -75,7 +75,6 @@ namespace cppcanvas
 coordinate space as the source polygon
  */
 PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr, 
const ::basegfx::B2DPolygon rPoly ) const;
-PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr, 
const ::basegfx::B2DPolyPolygon rPoly ) const;
 
 /** Create an uninitialized bitmap with the given size
  */
@@ -85,16 +84,11 @@ namespace cppcanvas
  */
 BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr, 
const ::basegfx::B2ISize rSize ) const;
 
-/** Create a text portion with the given content string
- */
-TextSharedPtr   createText( const CanvasSharedPtr, const 
::rtl::OUString ) const;
-
 private:
 friend struct InitInstance2;
 
 // singleton
 BaseGfxFactory();
-~BaseGfxFactory();
 
 // default: disabled copy/assignment
 BaseGfxFactory(const BaseGfxFactory);
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx 
b/cppcanvas/inc/cppcanvas/vclfactory.hxx
index ab84534..14f4c51 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/vclfactory.hxx
@@ -102,7 +102,6 @@ namespace cppcanvas
 
 // singleton
 VCLFactory();
-~VCLFactory();
 
 // default: disabled copy/assignment
 VCLFactory(const VCLFactory);
diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index 9c270e8..c93c83c 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -184,9 +184,6 @@ static float GetSwapFloat( SvStream rSt )
 ImplRenderer( const CanvasSharedPtrrCanvas,
   const GDIMetaFilerMtf,
   const Parameters rParms );
-ImplRenderer( const CanvasSharedPtrrCanvas,
-  const BitmapEx   rBmpEx,
-  const Parameters rParms );
 
 virtual ~ImplRenderer();
 
@@ -220,10 +217,8 @@ static float GetSwapFloat( SvStream rSt )
 void ReadRectangle (SvStream s, float x, float y, float width, 
float height, sal_uInt32 flags = 0);
 void ReadPoint (SvStream s, float x, float y, sal_uInt32 flags 
= 0);
 void MapToDevice (double x, double y);
-::basegfx::B2DPoint Map (::basegfx::B2DPoint p);
 ::basegfx::B2DPoint Map (double ix, double iy);
 ::basegfx::B2DSize MapSize (double iwidth, double iheight);
-::basegfx::B2DRange MapRectangle (double ix, double iy, double 
iwidth, double iheight);
 
 private:
 // default: disabled copy/assignment
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 91c9560..8ccb75b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -825,11 +825,6 @@ namespace cppcanvas
 y = 100*nMmY*y/nPixY;
 }
 
-::basegfx::B2DPoint ImplRenderer::Map (::basegfx::B2DPoint p)
-{
-return Map (p.getX (), p.getY ());
-}
-
 ::basegfx::B2DPoint ImplRenderer::Map (double ix, double iy)
 {
 double x, y;
@@ -863,29 +858,6 @@ namespace cppcanvas
 return ::basegfx::B2DSize (w, 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source

[Michael Meeks]

 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   24 ++---
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 02f57086c2d35b68b35c2f62926ef9597eb7a85f
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 17 12:58:37 2012 +0100

fdo#46167 fix path of shell extension dll in registry

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp 
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 78de789..47465ff 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -35,8 +35,8 @@ RegistryItem 
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -58,8 +58,8 @@ RegistryItem 
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -90,8 +90,8 @@ RegistryItem 
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -124,8 +124,8 @@ RegistryItem 
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
 ModuleID = gid_Module_Root;
 Subkey = CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32;
 Styles = (X64); // Values: X64 / X64_ONLY
-Value = [INSTALLLOCATION]shlxthdl\ooofilt.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\ooofilt_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\ooofilt.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -167,8 +167,8 @@ RegistryItem 
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -201,8 +201,8 @@ RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
 ComponentCondition = VersionNT = 600;
 Styles = (X64);
 Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\propertyhdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\propertyhdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\propertyhdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in jvmaccess/Library_jvmaccess.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk README.cross unotest/Library_unoexceptionprotector.mk unotest/

[Tor Lillqvist]

 README.cross |4 ++--
 configure.in |2 +-
 jvmaccess/Library_jvmaccess.mk   |7 +--
 jvmfwk/Library_jvmfwk.mk |1 +
 jvmfwk/Library_sunjavaplugin.mk  |1 +
 unotest/Library_unoexceptionprotector.mk |1 +
 unotest/Library_unotest.mk   |1 +
 7 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 33b6af02195144875e9fa1a0663d55441aa3f5f4
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Feb 17 17:41:33 2012 +0200

We want gb_STDLIBS here surely?

diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index 98bfb46..c7bddf2 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -45,14 +45,9 @@ $(eval $(call gb_Library_add_linked_libs,jvmaccess,\
 cppu \
 sal \
 salhelper \
+   $(gb_STDLIBS) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,jvmaccess,\
-advapi32 \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,jvmaccess,\
 jvmaccess/source/classpath \
 jvmaccess/source/unovirtualmachine \
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index e58dade..5b424d0 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_api,jvmfwk,\
 $(eval $(call gb_Library_add_linked_libs,jvmfwk,\
 cppuhelper \
 sal \
+   $(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 734e564..d1d2af4 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
 cppuhelper \
 sal \
 salhelper \
+   $(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),ANDROID)
diff --git a/unotest/Library_unoexceptionprotector.mk 
b/unotest/Library_unoexceptionprotector.mk
index 079574b..3324f3e 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -38,6 +38,7 @@ $(eval $(call 
gb_Library_add_linked_libs,unoexceptionprotector,\
cppu \
cppuhelper \
sal \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,unoexceptionprotector,\
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index 9cfd371..aad6abd 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,unotest,\
cppu \
cppuhelper \
sal \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,unotest,\
commit 18f4ff23179620e834aa3ebd83a2e15c2f77cbe1
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Feb 17 13:54:25 2012 +0200

Recommend to use NDK r7b

Drop compiler options -fexceptions -frtti for Android, I hope they are
taken care of by the makefilery where needed. At least either
-fexceptions or -fno-exceptions is used for each C++ compilation as
far as I know. Not so sure about RTTI, let's see.

diff --git a/README.cross b/README.cross
index 2acd497..d2a8b14 100644
--- a/README.cross
+++ b/README.cross
@@ -322,7 +322,7 @@ Here is an autogen.lastrun for Android, when 
cross-compiling from Mac OS X:
 
 CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
---with-android-ndk=/Users/tml/android-ndk-r7
+--with-android-ndk=/Users/tml/android-ndk-r7b
 --with-android-sdk=/Users/tml/android-sdk-macosx
 --build=x86_64-apple-darwin11
 --disable-zenity
@@ -338,7 +338,7 @@ And here is an autogen.lastrun for Android when 
cross-compiling from Linux:
 
 CC_FOR_BUILD=ccache gcc
 CXX_FOR_BUILD=ccache g++
---with-android-ndk=/home/tml/android-ndk-r7
+--with-android-ndk=/home/tml/android-ndk-r7b
 --with-android-sdk=/home/tml/android-sdk-linux_x86
 --with-ant-home=/opt/apache-ant-1.8.2
 --build=x86_64-unknown-linux-gnu
diff --git a/configure.in b/configure.in
index 2459b76..486d061 100644
--- a/configure.in
+++ b/configure.in
@@ -111,7 +111,7 @@ if test -n $with_android_ndk; then
ANDROIDCFLAGS=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a
 
test -z $CC  CC=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
$ANDROIDCFLAGS
-   test -z $CXX  CXX=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include 
-fexceptions -frtti
+   test -z $CXX  CXX=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 fi
 AC_SUBST(ANDROID_NDK_HOME)
 

[Libreoffice-commits] .: 4 commits - clucene/Library_clucene.mk clucene/Package_source.mk clucene/patches clucene/source connectivity/source package/source

[Caolán McNamara]

 clucene/Library_clucene.mk |6 ++
 clucene/Package_source.mk  |8 +++-
 clucene/patches/clucene-internal-zlib.patch|   15 +++
 clucene/source/Makefile|   16 +++-
 connectivity/source/commontools/makefile.mk|4 ++--
 connectivity/source/drivers/file/makefile.mk   |6 +++---
 package/source/zipapi/Deflater.cxx |2 --
 package/source/zipapi/Inflater.cxx |2 --
 package/source/zippackage/ZipPackageStream.cxx |1 +
 9 files changed, 49 insertions(+), 11 deletions(-)

New commits:
commit a818fa05c34bb2e969e2fe1972d9a52774538beb
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Feb 17 16:35:04 2012 +

get clucene building under windows-msvc

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 74e7dbc..bda5917 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -47,6 +47,12 @@ $(eval $(call gb_Library_add_defs,clucene,\
 -Dclucene_contribs_lib_EXPORTS\
 ))
 
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_add_defs,clucene,\
+-DSYSTEM_ZLIB \
+))
+endif
+
 $(eval $(call gb_Library_add_linked_libs,clucene,\
 $(gb_STDLIBS) \
 ))
diff --git a/clucene/Package_source.mk b/clucene/Package_source.mk
index b8a774e..c51dbce 100644
--- a/clucene/Package_source.mk
+++ b/clucene/Package_source.mk
@@ -35,9 +35,15 @@ $(eval $(call 
gb_CustomTarget_add_dependencies,clucene/source,\
clucene/configs/clucene-config-generic.h \
 ))
 
+ifeq ($(OS),WNT)
+FIXED_TARFILE_LOCATION=$(shell cygpath -u $(TARFILE_LOCATION))
+else
+FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
+endif
+
 # FIXME: do not hardcode the path here
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,clucene/source,\
-   
$(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 \
+   
$(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 \
 ))
 
 $(eval $(call 
gb_Package_add_file,clucene_source,inc/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h))
diff --git a/clucene/patches/clucene-internal-zlib.patch 
b/clucene/patches/clucene-internal-zlib.patch
new file mode 100644
index 000..6667926
--- /dev/null
+++ b/clucene/patches/clucene-internal-zlib.patch
@@ -0,0 +1,15 @@
+--- src/shared/CLucene/util/Misc.cpp   2012-02-17 15:33:09.217891100 +
 src/shared/CLucene/util/Misc.cpp   2012-02-17 15:38:10.836597500 +
+@@ -34,7 +34,11 @@
+ #include CLucene/util/dirent.h //if we have dirent, then the native one 
will be used
+ 
+ //for zlib...
+-#include zlib.h
++#ifdef SYSTEM_ZLIB
++#include zlib.h
++#else
++#include external/zlib/zlib.h
++#endif
+ #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+ #  include fcntl.h
+ #  include io.h
diff --git a/clucene/source/Makefile b/clucene/source/Makefile
index 9a274c1..aa5bcfd 100644
--- a/clucene/source/Makefile
+++ b/clucene/source/Makefile
@@ -29,18 +29,32 @@
 gb_PARTIALBUILD := T
 include $(GBUILDDIR)/gbuild_simple.mk
 
+ifeq ($(OS),WNT)
+FIXED_TARFILE_LOCATION=$(shell cygpath -u $(TARFILE_LOCATION))
+else
+FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
+endif
+
 done :
mkdir -p $(dir $@)
# FIXME: do not hardcode the path here
-   $(GNUTAR) -x --strip-component=1 -f 
$(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+   $(GNUTAR) -x --strip-component=1 -f 
$(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+   $(GNUPATCH) -p0  $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch
#FIXME ?, our rules expect .cxx
for i in `find . -name *.cpp`; do mv $$i $${i%%cpp}cxx; done
+ifneq ($(OS),WNT)
#dirent.h is a problem, move it around
mkdir -p inc/internal/CLucene/util
mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util
+endif
#To generate these, run cmake for each sufficiently different platform, 
customize and stick into configs
+ifeq ($(COM),MSC)
+   cp $(SRCDIR)/clucene/configs/_clucene-config-MSVC.h 
src/shared/CLucene/_clucene-config.h
+   cp $(SRCDIR)/clucene/configs/clucene-config-MSVC.h 
src/shared/CLucene/clucene-config.h
+else
cp $(SRCDIR)/clucene/configs/_clucene-config-generic.h 
src/shared/CLucene/_clucene-config.h
cp $(SRCDIR)/clucene/configs/clucene-config-generic.h 
src/shared/CLucene/clucene-config.h
+endif
 
 .DEFAULT_GOAL := all
 .PHONY : all
commit ecb1599ad00e71dfe05f3ae9a71bdce5f7540a40
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Feb 17 16:32:02 2012 +

WaE: unused variable

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 5cb6720..b5c0731 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -542,6 +542,7 @@ uno::Reference io::XInputStream  SAL_CALL 

[Libreoffice-commits] .: 2 commits - configure.in desktop/Executable_oosplash.mk desktop/Module_desktop.mk postprocess/packcomponents postprocess/packregistry scp2/source toolkit/Library_tk.mk vcl/hea

[Michael Meeks]

 configure.in   |   53 +++-
 desktop/Executable_oosplash.mk |2 
 desktop/Module_desktop.mk  |7 +
 postprocess/packcomponents/makefile.mk |   11 +-
 postprocess/packregistry/makefile.mk   |2 
 scp2/source/ooo/common_brand.scp   |2 
 scp2/source/ooo/file_library_ooo.scp   |   14 ++-
 scp2/source/ooo/file_ooo.scp   |2 
 scp2/source/ooo/file_resource_ooo.scp  |2 
 scp2/source/ooo/module_hidden_ooo.scp  |2 
 toolkit/Library_tk.mk  |2 
 vcl/Library_vcl.mk |   95 +--
 vcl/Module_vcl.mk  |6 +
 vcl/headless/headlessinst.cxx  |  135 +
 vcl/inc/generic/gendata.hxx|3 
 vcl/inc/svsys.h|1 
 vcl/null/printerinfomanager.cxx|4 
 vcl/unx/generic/plugadapt/salplug.cxx  |4 
 vcl/unx/generic/printer/ppdparser.cxx  |2 
 vcl/vcl.headless.component |   40 +
 20 files changed, 330 insertions(+), 59 deletions(-)

New commits:
commit c04e865ff6b48d49d7ae73479710f255135d80a6
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 17 16:43:41 2012 +

vcl: simplify cut/paste shared module lists

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3ac253d..3420f7d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -396,13 +396,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
 ))
 endif
 
-ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_add_defs,vcl,\
--DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \
--DSAL_DLLPOSTFIX=\$(gb_Library_OOOEXT)\ \
--D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \
-))
-$(eval $(call gb_Library_add_exception_objects,vcl,\
+vcl_generic_code=\
 vcl/generic/app/gensys \
 vcl/generic/app/geninst \
 vcl/generic/app/gendisp \
@@ -423,7 +417,28 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/generic/fontmanager/fontconfig \
 vcl/generic/fontmanager/fontmanager \
 vcl/generic/fontmanager/helper \
-vcl/generic/fontmanager/parseAFM \
+vcl/generic/fontmanager/parseAFM
+
+vcl_headless_code=\
+vcl/headless/svpbmp \
+vcl/headless/svpdummies \
+vcl/headless/svpelement \
+vcl/headless/svpframe \
+vcl/headless/svpgdi \
+vcl/headless/svpinst \
+vcl/headless/svpdata \
+vcl/headless/svpprn \
+vcl/headless/svptext \
+vcl/headless/svpvd
+
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_add_defs,vcl,\
+-DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \
+-DSAL_DLLPOSTFIX=\$(gb_Library_OOOEXT)\ \
+-D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+   $(vcl_generic_code) \
 vcl/unx/generic/plugadapt/salplug \
 vcl/unx/generic/printer/cupsmgr \
 vcl/unx/generic/printer/jobdata \
@@ -447,41 +462,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
 -D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-vcl/generic/app/gensys \
-vcl/generic/app/geninst \
-vcl/generic/app/gendisp \
-vcl/generic/print/bitmap_gfx \
-vcl/generic/print/common_gfx \
-vcl/generic/print/glyphset \
-vcl/generic/print/printerjob \
-vcl/generic/print/psputil \
-vcl/generic/print/genpspgraphics \
-vcl/generic/print/genprnpsp \
-vcl/generic/print/text_gfx \
-vcl/generic/fontmanager/fontsubst \
-vcl/generic/glyphs/gcach_ftyp \
-vcl/generic/glyphs/gcach_layout \
-vcl/generic/glyphs/gcach_rbmp \
-vcl/generic/glyphs/glyphcache \
-vcl/generic/fontmanager/fontcache \
-vcl/generic/fontmanager/fontconfig \
-vcl/generic/fontmanager/fontmanager \
-vcl/generic/fontmanager/helper \
-vcl/generic/fontmanager/parseAFM \
+   $(vcl_generic_code) \
 vcl/unx/generic/printer/jobdata \
 vcl/unx/generic/printer/ppdparser \
 vcl/null/printerinfomanager \
 vcl/headless/headlessinst \
-vcl/headless/svpbmp \
-vcl/headless/svpdummies \
-vcl/headless/svpelement \
-vcl/headless/svpframe \
-vcl/headless/svpgdi \
-vcl/headless/svpinst \
-vcl/headless/svpdata \
-vcl/headless/svpprn \
-vcl/headless/svptext \
-vcl/headless/svpvd \
+   $(vcl_headless_code) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vcl,\
@@ -507,41 +493,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
 -D_XSALSET_LIBNAME=\$(call gb_Library_get_runtime_filename,spa)\ \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-vcl/generic/app/gensys \
-vcl/generic/app/geninst \
-vcl/generic/app/gendisp \
-vcl/generic/print/bitmap_gfx \
-vcl/generic/print/common_gfx \
-vcl/generic/print/glyphset \
-vcl/generic/print/printerjob \
-vcl/generic/print/psputil \
-vcl/generic/print/genpspgraphics \
-vcl/generic/print/genprnpsp \
-vcl/generic/print/text_gfx \
- 

[Libreoffice-commits] .: extensions/source l10ntools/inc l10ntools/source linguistic/source unusedcode.easy vcl/inc vcl/source

[Michael Meeks]

 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |3 --
 extensions/source/plugin/unx/plugcon.cxx|   17 --
 l10ntools/inc/export.hxx|2 -
 l10ntools/source/export.cxx |   23 
 linguistic/source/spelldsp.cxx  |   15 -
 unusedcode.easy |5 
 vcl/inc/vcl/button.hxx  |1 
 vcl/source/control/button.cxx   |6 -
 8 files changed, 72 deletions(-)

New commits:
commit 69eede0409987c0e34a3ff1000520bdf249fb150
Author: Petr Vorel petr.vo...@gmail.com
Date:   Fri Feb 17 18:07:24 2012 +0100

Remove unused code.

diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 
b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 86c0e70..8c7175f 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -184,9 +184,6 @@ public:
 LINK( this, PluginConnector, WorkOnNewMessageHdl ).
 Call( (Mediator*)this );
 }
-
-ConnectorInstance* getInstance( NPP );
-ConnectorInstance* getInstanceById( sal_uInt32 );
 };
 
 enum CommandAtoms
diff --git a/extensions/source/plugin/unx/plugcon.cxx 
b/extensions/source/plugin/unx/plugcon.cxx
index c178c47..1a44624 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -59,23 +59,6 @@ sal_uInt32 PluginConnector::GetNPPID( NPP instance )
 return UnknownNPPID;
 }
 
-ConnectorInstance* PluginConnector::getInstance( NPP instance )
-{
-size_t nLen = m_aInstances.size();
-for( size_t i=0; i nLen; i++ )
-{
-ConnectorInstance* pInst = m_aInstances[i];
-if( pInst-instance == instance )
-return pInst;
-}
-return NULL;
-}
-
-ConnectorInstance* PluginConnector::getInstanceById( sal_uInt32 nInstanceID )
-{
-return nInstanceID  static_castsal_uInt32(m_aInstances.size()) ? 
m_aInstances[ nInstanceID ] : NULL;
-}
-
 struct PtrStruct
 {
 char* pData;
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index c669a3b..97c5bf1 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -166,8 +166,6 @@ public:
 
 rtl::OString sPForm;
 
-void Dump();
-
 ResData(const rtl::OString rPF, const rtl::OString rGId)
 :
 nWidth( 0 ),
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 6a43da8..3c0bff9 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -201,29 +201,6 @@ int GetError()
 // class ResData
 //
 
-void ResData::Dump(){
-printf(**\nResData\n);
-printf(sPForm = %s , sResTyp = %s , sId = %s , sGId = %s , sHelpId = 
%s\n,
-sPForm.getStr(), sResTyp.getStr(), sId.getStr(),
-sGId.getStr(), sHelpId.getStr());
-
-rtl::OString a(*pStringList);
-rtl::OString b(*pUIEntries);
-rtl::OString c(*pFilterList);
-rtl::OString d(*pItemList);
-rtl::OString e(*pPairedList);
-rtl::OString f(sText);
-
-Export::DumpMap( f , sText );
-
-if( pStringList )   Export::DumpExportList( a , *pStringList );
-if( pUIEntries )Export::DumpExportList( b , *pUIEntries );
-if( pFilterList )   Export::DumpExportList( c , *pFilterList );
-if( pItemList ) Export::DumpExportList( d , *pItemList );
-if( pPairedList )   Export::DumpExportList( e , *pPairedList );
-printf(\n);
-}
-
 /*/
 sal_Bool ResData::SetId( const rtl::OString rId, sal_uInt16 nLevel )
 /*/
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index d809e9e..cf5a854 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -81,7 +81,6 @@ public:
 voidAppend( const OUString rNew );
 voidAppend( const std::vector OUString  rNew );
 voidAppend( const Sequence OUString  rNew );
-voidRemove( const OUString rText );
 Sequence OUString GetSequence() const;
 };
 
@@ -164,20 +163,6 @@ Sequence OUString  ProposalList::GetSequence() const
 return aRes;
 }
 
-void ProposalList::Remove( const OUString rText )
-{
-size_t nLen = aVec.size();
-for (size_t i = 0;  i  nLen;  ++i)
-{
-OUString rEntry = aVec[i];
-if (rEntry == rText)
-{
-rEntry = OUString();
-break;  // there should be only one matching entry
-}
-}
-}
-
 sal_Bool SvcListHasLanguage(
 const LangSvcEntries_Spell rEntry,
 LanguageType nLanguage )
diff --git a/unusedcode.easy b/unusedcode.easy
index 90d0de7..43a51a8 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -54,13 +54,8 @@ ORegKey::acquireKey(void*)
 OutputDevice::LogicToPixel(PolyPolygon const, 

[Libreoffice-commits] .: 2 commits - canvas/source

[David Tardon]

 canvas/source/vcl/spritecanvashelper.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 48453f3d5d8ba0429d814552c7d9c48a595d539e
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 8 15:46:17 2012 +0100

mark parameter as unused

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index ba4248e..1e3d2dd 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -486,11 +486,9 @@ namespace vclcanvas
 _1 ) );
 }
 
-void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange  
rTotalArea,
+void SpriteCanvasHelper::opaqueUpdate( SAL_UNUSED_PARAMETER const 
::basegfx::B2DRange rTotalArea ,
const ::std::vector 
::canvas::Sprite::Reference  rSortedUpdateSprites )
 {
-(void)rTotalArea;
-
 ENSURE_OR_THROW( mpOwningSpriteCanvas 
  mpOwningSpriteCanvas-getBackBuffer() 
  mpOwningSpriteCanvas-getFrontBuffer(),
commit b24c4e7461fbd3452bc98ce1e945d15b33795c73
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 8 15:42:15 2012 +0100

remove unused variable

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 5f0b75f..ba4248e 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -454,8 +454,6 @@ namespace vclcanvas
 
 const 
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
 aFirst( rUpdateArea.maComponentList.begin() );
-
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
-  aSecond( aFirst ); ++aSecond;
 
 ENSURE_OR_THROW( aFirst-second.getSprite().is(),
   VCLCanvas::scrollUpdate(): no sprite );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: jvmfwk/Module_jvmfwk.mk

[David Tardon]

 jvmfwk/Module_jvmfwk.mk |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit b73e3c50757665653c28c6938746eb0257f40ed4
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 19:32:48 2012 +0100

libjvmfwk is needed even when building without java

diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index a6131da..84399db 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -27,15 +27,18 @@
 
 $(eval $(call gb_Module_Module,jvmfwk))
 
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+Library_jvmfwk \
+Package_inc \
+Package_rcfiles \
+))
+
 ifneq ($(SOLAR_JAVA),)
 
 $(eval $(call gb_Module_add_targets,jvmfwk,\
-Library_jvmfwk \
 Library_sunjavaplugin \
-Package_inc \
 Package_javavendors \
 Package_jreproperties \
-Package_rcfiles \
 ))
 
 ifneq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in icon-themes/README Makefile packimages/Makefile packimages/Module_packimages.mk packimages/pack packimages/Package_images.mk packima

[Matus Kukan]

 Makefile|2 -
 config_host.mk.in   |1 
 configure.in|   11 --
 icon-themes/README  |2 -
 packimages/Makefile |7 
 packimages/Module_packimages.mk |   34 +++
 packimages/Package_images.mk|   43 
 packimages/pack/Makefile|   70 
 packimages/pack/makefile.mk |   68 --
 packimages/prj/build.lst|3 -
 packimages/prj/d.lst|2 -
 packimages/prj/makefile.mk  |1 
 12 files changed, 158 insertions(+), 86 deletions(-)

New commits:
commit 7f267db9b30fb90fe53844f659d4efa599034b5c
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Feb 17 14:40:04 2012 +0100

SOLAREXTRALIB unused

diff --git a/config_host.mk.in b/config_host.mk.in
index 8d38959..1abf218 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -367,7 +367,6 @@ export SIZEOF_LONGLONG=@SIZEOF_LONGLONG@
 export SIZEOF_POINTER=@SIZEOF_POINTER@
 export SIZEOF_SHORT=@SIZEOF_SHORT@
 export SOLARENV=@SRC_ROOT@/solenv
-export SOLAREXTRALIB=@SOLAREXTRALIB@
 export SOLARINC=@SOLARINC@
 export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
 export SOLARLIB=@SOLARLIB@
diff --git a/configure.in b/configure.in
index 0f45e09..e424560 100644
--- a/configure.in
+++ b/configure.in
@@ -2721,7 +2721,6 @@ aix*)
 OS=AIX
 OUTPATH=unxaigppc
 P_SEP=:
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2810,7 +2809,6 @@ dragonfly*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2838,7 +2836,6 @@ freebsd*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2867,7 +2864,6 @@ kfreebsd*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -2975,7 +2971,6 @@ linux-gnu*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -3061,7 +3056,6 @@ mingw*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
@@ -3088,7 +3082,6 @@ openbsd*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB64
 SOLARINC=$SOLARINC -I/usr/local/include
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
@@ -3120,9 +3113,6 @@ solaris*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLAREXTRALIB=-L../$LIB -L$SRC_ROOT/solenv/$OUTPATH/lib.solaris.2.6
-SOLAREXTRALIB=$SOLAREXTRALIB -L/lib -L/usr/lib
-SOLAREXTRALIB=$SOLAREXTRALIB -L/usr/local/bin -L/usr/dt/lib 
-L/usr/openwin/lib
 SOLARINC=$SOLARINC -I/usr/local/include
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
@@ -3155,7 +3145,6 @@ AC_SUBST(OS)
 AC_SUBST(OUTDIR)
 AC_SUBST(OUTPATH)
 AC_SUBST(P_SEP)
-AC_SUBST(SOLAREXTRALIB)
 AC_SUBST(WORKDIR)
 
 dnl ===
commit 5a4e4d5543edd47f4b411c0f2fa43d1a0e6a1ff7
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Feb 16 20:18:13 2012 +0100

packimages: convert to gbuild

diff --git a/Makefile b/Makefile
index d4dd3d9..cb99243 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ officecfg\
 oovbaapi\
 oox\
 package\
+packimages\
 padmin\
 psprint_config\
 qadevOOo\
@@ -201,7 +202,6 @@ neon\
 nss\
 odk\
 openssl\
-packimages\
 pango\
 postgresql\
 postprocess\
diff --git a/icon-themes/README b/icon-themes/README
index 7655710..120c3ab 100644
--- 

[Libreoffice-commits] .: configure.in

[Caolán McNamara]

 configure.in |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit af75ceb873e55fc2f252c4b02ea3d536470cfb87
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Feb 17 20:11:34 2012 +

fix build, WANT_X11 is a variable

diff --git a/configure.in b/configure.in
index e424560..413dec0 100644
--- a/configure.in
+++ b/configure.in
@@ -7345,7 +7345,7 @@ fi
 dnl ===
 dnl Check for nsplugin
 dnl ===
-AC_MSG_CHECKING([wether to build nsplugin extension])
+AC_MSG_CHECKING([whether to build nsplugin extension])
 ENABLE_NSPLUGIN=NO
 if test $enable_nsplugin != no; then
 if test $enable_gtk != no; then
@@ -7359,6 +7359,7 @@ else
 fi
 AC_SUBST(ENABLE_NSPLUGIN)
 
+AC_MSG_CHECKING([whether to use X11])
 dnl ***
 dnl testing for X libraries and includes...
 dnl ***
@@ -7366,8 +7367,9 @@ WANT_X11=no
 if test $_os != Darwin -a $_os != WINNT -a $_os != Android -a $_os != iOS -a 
$enable_headless != yes; then
 WANT_X11=yes
 fi
+AC_MSG_RESULT([$WANT_X11])
 
-if test WANT_X11 = yes; then
+if test $WANT_X11 = yes; then
 AC_PATH_X
 AC_PATH_XTRA
 CPPFLAGS=$CPPFLAGS $X_CFLAGS
@@ -7420,7 +7422,7 @@ if test $XINC != no_x_includes -a $XINC != 
/usr/include ; then
 fi
 AC_SUBST(XLIB)
 
-if test WANT_X11 = yes; then
+if test $WANT_X11 = yes; then
 dnl ===
 dnl Check for Composite.h for Mozilla plugin
 dnl ===
@@ -7440,7 +7442,7 @@ dnl 
===
 dnl Check for system Xrender
 dnl ===
 AC_MSG_CHECKING([whether to use Xrender])
-if test WANT_X11 = yes -a  $test_xrender = yes; then
+if test $WANT_X11 = yes -a  $test_xrender = yes; then
 AC_MSG_RESULT([yes])
 AC_CHECK_LIB([Xrender], [XRenderQueryVersion], [:],
   [AC_MSG_ERROR(libXrender not found or functional)], [])
@@ -7458,7 +7460,7 @@ dnl 
===
 dnl Check for XRandr
 dnl ===
 AC_MSG_CHECKING([whether to enable RandR support])
-if test WANT_X11 = yes -a $test_randr = yes -a \( $enable_randr = 
yes -o $enable_randr = TRUE \) ; then
+if test $WANT_X11 = yes -a $test_randr = yes -a \( $enable_randr = 
yes -o $enable_randr = TRUE \) ; then
 if test -z $enable_randr_link -o $enable_randr_link = no; then
 XRANDR_DLOPEN=TRUE
 AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source xmlhelp/source

[Andras Timar]

 l10ntools/source/help/HelpIndexerTool.java   |5 -
 xmlhelp/source/com/sun/star/help/HelpSearch.java |5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7636d37f8f9c53d694c4fe38581f3b495d53670e
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 17 21:43:31 2012 +0100

fdo#40665 use CJKAnalyzer for ko, zh-CN, and zh-TW, too

diff --git a/l10ntools/source/help/HelpIndexerTool.java 
b/l10ntools/source/help/HelpIndexerTool.java
index d1d0873..8e42d55 100644
--- a/l10ntools/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.java
@@ -185,7 +185,10 @@ public class HelpIndexerTool
 
 try
 {
-Analyzer analyzer = aLanguageStr.equals(ja) ? (Analyzer)new 
CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
+Analyzer analyzer = ( aLanguageStr.equals(ja)
+|| aLanguageStr.equals(ko)
+|| aLanguageStr.equals(zh-CN)
+|| aLanguageStr.equals(zh-TW) ) ? 
(Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
 IndexWriter writer = new IndexWriter( aIndexDir, analyzer, true );
 int nRet = indexDocs( writer, aModule, bExtensionMode, 
aCaptionFilesDir, aContentFilesDir );
 if( nRet != -1 )
diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java 
b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index dc31514..03aadea 100755
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java
@@ -255,7 +255,10 @@ public class HelpSearch
 {
 IndexReader reader = IndexReader.open( aIndexStr );
 Searcher searcher = new IndexSearcher( reader );
-Analyzer analyzer = aLanguageStr.equals(ja) ? (Analyzer)new 
CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
+Analyzer analyzer = ( aLanguageStr.equals(ja)
+|| aLanguageStr.equals(ko)
+|| aLanguageStr.equals(zh-CN)
+|| aLanguageStr.equals(zh-TW) ) ? 
(Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
 
 String aField;
 if( bCaptionOnly )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: np_sdk/mozsrc

[Michael Meeks]

 np_sdk/mozsrc/npunix.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0825e49bcaf8d956ae5721235b5c33e6ac4d6e3c
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Feb 17 20:45:42 2012 +

WaE: add horror cast to calm Stephan's tinderbox

diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
index 19ae47a..b99a545 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -368,7 +368,7 @@ Private_GetJavaClass(void)
 char *
 NP_GetMIMEDescription(void)
 {
-return NPP_GetMIMEDescription();
+return (char *)NPP_GetMIMEDescription();
 }
 
 /*
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - l10ntools/source xmlhelp/source

[Michael Meeks]

 l10ntools/source/help/HelpIndexerTool.java   |5 -
 xmlhelp/source/com/sun/star/help/HelpSearch.java |5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit c3f76c548c6131543e4ccfafe4e72e8d12804234
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 17 21:14:37 2012 +

fdo#40665 use CJKAnalyzer for ko, zh-CN, and zh-TW, too

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/l10ntools/source/help/HelpIndexerTool.java 
b/l10ntools/source/help/HelpIndexerTool.java
index c20d9f1..e58f14b 100644
--- a/l10ntools/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.java
@@ -186,7 +186,10 @@ public class HelpIndexerTool
 try
 {
 Date start = new Date();
-Analyzer analyzer = aLanguageStr.equals(ja) ? (Analyzer)new 
CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
+Analyzer analyzer = ( aLanguageStr.equals(ja)
+|| aLanguageStr.equals(ko)
+|| aLanguageStr.equals(zh-CN)
+|| aLanguageStr.equals(zh-TW) ) ? 
(Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
 IndexWriter writer = new IndexWriter( aIndexDir, analyzer, true );
 if( !bExtensionMode )
 System.out.println( Lucene: Indexing to directory ' + 
aIndexDir + '... );
diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java 
b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index dc31514..03aadea 100755
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java
@@ -255,7 +255,10 @@ public class HelpSearch
 {
 IndexReader reader = IndexReader.open( aIndexStr );
 Searcher searcher = new IndexSearcher( reader );
-Analyzer analyzer = aLanguageStr.equals(ja) ? (Analyzer)new 
CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
+Analyzer analyzer = ( aLanguageStr.equals(ja)
+|| aLanguageStr.equals(ko)
+|| aLanguageStr.equals(zh-CN)
+|| aLanguageStr.equals(zh-TW) ) ? 
(Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
 
 String aField;
 if( bCaptionOnly )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svl/inc sw/inc sw/source

[Michael Meeks]

 svl/inc/svl/svarray.hxx |6 +++---
 sw/inc/index.hxx|2 +-
 sw/source/core/bastyp/index.cxx |2 +-
 sw/source/core/undo/rolbck.cxx  |4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 26bd18dfc2516aab507dfb478cfc31e4bf57442f
Author: Laurent Balland-Poirier jumbo4...@yahoo.fr
Date:   Tue Feb 14 22:39:47 2012 +0100

EasyHack 42790: get rid of PRODUCT

Preprocessor constant PRODUCT is replaced by !DBG_UTIL

diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index d500ca6..2a2c6a8 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -112,7 +112,7 @@ inline void* operator new( size_t, DummyType* pPtr )
 }
 inline void operator delete( void*, DummyType* ) {}
 
-#if defined(PRODUCT)
+#ifndef DBG_UTIL
 
 #define _SVVARARR_DEF_GET_OP_INLINE( nm, ArrElem ) \
 ArrElem operator[](sal_uInt16 nP) const { return *(pData+nP); }\
@@ -128,7 +128,7 @@ void Insert( const nm * pI, sal_uInt16 nP,\
 
 #define _SVVARARR_IMPL_GET_OP_INLINE( nm, ArrElem )
 
-#else
+#else // DBG_UTIL
 
 #define _SVVARARR_DEF_GET_OP_INLINE( nm,ArrElem )\
 ArrElem operator[](sal_uInt16 nP) const;\
@@ -150,7 +150,7 @@ void nm::Insert( const nm *pI, sal_uInt16 nP, sal_uInt16 
nStt, sal_uInt16 nE)\
 Insert( (const ArrElem*)pI-pData+nStt, (sal_uInt16)nE-nStt, nP );\
 }
 
-#endif
+#endif // DBG_UTIL
 
 #define _SV_DECL_VARARR_GEN(nm, AE, IS, AERef, vis )\
 typedef sal_Bool (*FnForEach_##nm)( const AERef, void* );\
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 8d183db..a47bbaf 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -211,7 +211,7 @@ inline SwIndex SwIndex::operator= ( xub_StrLen const nVal )
 return *this;
 }
 
-#endif // PRODUCT
+#endif // ifndef DBG_UTIL
 
 #endif
 
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 88ee1d3..37a6c60 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -406,7 +406,7 @@ SwIndex SwIndex::operator= ( xub_StrLen const nVal )
 return *this;
 }
 
-#endif // ifndef PRODUCT
+#endif // ifdef DBG_UTIL
 
 void SwIndexReg::MoveTo( SwIndexReg rArr )
 {
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index cdb85b9..8e00a53 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -829,7 +829,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const 
SfxItemSet rSet,
 {
 const sal_uInt16 nWhich = aIter.GetCurItem()-Which();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 switch (nWhich)
 {
 case RES_TXTATR_REFMARK:
@@ -845,7 +845,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const 
SfxItemSet rSet,
 \nnot such a good idea);
 break;
 }
-#endif
+#endif // DBG_UTIL
 
 // Character attribute cannot be inserted into the hints array
 // anymore. Therefore we have to treat them as one RES_TXTATR_AUTOFMT:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy

[Michael Meeks]

 svx/inc/svx/srchdlg.hxx   |4 
 svx/source/dialog/srchdlg.cxx |   42 --
 unusedcode.easy   |3 ---
 3 files changed, 49 deletions(-)

New commits:
commit 57c8929c6bf037a767e7016d28b7656cd8fddfb7
Author: Santiago Martinez smvar...@gmail.com
Date:   Thu Feb 16 21:34:44 2012 +0100

Remove unused code in SvxSearchDialog

diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index e5d2844..852c681 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -127,7 +127,6 @@ friend class SvxSearchDialogWrapper;
 friend class SvxJSearchOptionsDialog;
 
 public:
-SvxSearchDialog( Window* pParent, SfxBindings rBind );
 SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings 
rBind );
 ~SvxSearchDialog();
 
@@ -136,9 +135,6 @@ public:
 // Window
 virtual voidActivate();
 
-voidGetSearchItems( SfxItemSet rSet );
-voidGetReplaceItems( SfxItemSet rSet );
-
 const SearchAttrItemList*   GetSearchItemList() const
 { return pSearchList; }
 const SearchAttrItemList*   GetReplaceItemList() const
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 305436b..d090ff6 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -336,18 +336,6 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, 
sal_uInt16 nLen )
 
 // class SvxSearchDialog -
 
-SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxBindings rBind ) :
-
-SfxModelessDialog( rBind, NULL, pParent, SVX_RES( RID_SVXDLG_SEARCH ) ),
-
-INI_LIST()
-
-{
-Construct_Impl();
-}
-
-// ---
-
 SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, 
SfxBindings rBind ) :
 
 SfxModelessDialog( rBind, pChildWin, pParent, SVX_RES( RID_SVXDLG_SEARCH 
) ),
@@ -2241,36 +2229,6 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, 
pTimer )
 
 // ---
 
-void SvxSearchDialog::GetSearchItems( SfxItemSet rSet )
-{
-xub_StrLen nLen;
-
-if ( !pImpl-bMultiLineEdit )
-nLen = aSearchAttrText.GetText().Len();
-else
-nLen = pImpl-aSearchFormats.GetText().Len();
-
-if ( nLen  pSearchList )
-pSearchList-Get( rSet );
-}
-
-// ---
-
-void SvxSearchDialog::GetReplaceItems( SfxItemSet rSet )
-{
-xub_StrLen nLen;
-
-if ( !pImpl-bMultiLineEdit )
-nLen = aReplaceAttrText.GetText().Len();
-else
-nLen = pImpl-aReplaceFormats.GetText().Len();
-
-if ( nLen  pReplaceList )
-pReplaceList-Get( rSet );
-}
-
-// ---
-
 String SvxSearchDialog::BuildAttrText_Impl( String rStr,
  sal_Bool bSrchFlag ) const
 {
diff --git a/unusedcode.easy b/unusedcode.easy
index 43a51a8..d1331fe 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -337,9 +337,6 @@ SvxRelativeField::SvxRelativeField(Window*, long)
 SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
 SvxRubyChildWindow::GetChildWindowId()
 SvxRuler::GetDefTabDist() const
-SvxSearchDialog::GetReplaceItems(SfxItemSet)
-SvxSearchDialog::GetSearchItems(SfxItemSet)
-SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings)
 SvxSelectionModeControl::GetDefItemWidth(StatusBar const)
 SvxShapeText::SvxShapeText()
 SvxTabStopArr::Insert(SvxTabStop const, unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source svl/inc svl/source svtools/inc svtools/source unusedcode.easy

[Michael Meeks]

 sfx2/inc/sfx2/app.hxx|1 
 sfx2/inc/sfx2/childwin.hxx   |2 -
 sfx2/inc/sfx2/hintpost.hxx   |1 
 sfx2/inc/sfx2/mnuitem.hxx|1 
 sfx2/inc/sfx2/progress.hxx   |1 
 sfx2/source/appl/appmain.cxx |4 --
 sfx2/source/bastyp/progress.cxx  |   39 
 sfx2/source/menu/mnuitem.cxx |8 -
 sfx2/source/notify/hintpost.cxx  |6 ---
 svl/inc/svl/nranges.hxx  |2 -
 svl/inc/svl/rngitem.hxx  |1 
 svl/source/items/nranges.cxx |   61 ---
 svl/source/items/rngitem_inc.cxx |   10 --
 svtools/inc/svtools/wallitem.hxx |2 -
 svtools/source/misc/wallitem.cxx |4 +-
 unusedcode.easy  |8 -
 16 files changed, 4 insertions(+), 147 deletions(-)

New commits:
commit ada6350a7cdf4984eb3ead31d938004bf9177ae8
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Fri Feb 17 21:47:49 2012 +

Removed unused code from svl and sfx2

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index c255035..ea9dbc2 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -147,7 +147,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
 voidInit();
 voidExit();
 voidSettingsChange( sal_uInt16, const AppSettings 
 );
-voidMain( );
 voidPreInit( );
 voidQuit();
 voidDeinitialize();
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index fc7cf83..c96d1a6 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -307,7 +307,7 @@ public:
 return pWin; \
 } \
 sal_uInt16 Class::GetChildWindowId () \
-{ return MyID; } \
+   { return MyID; } \
 voidClass::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, 
sal_uInt16 nFlags)   \
 {   \
 SfxChildWinFactory *pFact = new SfxChildWinFactory( \
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index f455d84..0f8eae2 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -56,7 +56,6 @@ class SfxHintPoster: public SvRefBase
 GenLink aLink;
 
 private:
-voidRegisterEvent();
 DECL_LINK( DoEvent_Impl, SfxHint * );
 
 protected:
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 62ebce6..08acfa6 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -56,7 +56,6 @@ public:
 SfxMenuControl( sal_uInt16, SfxBindings);
 
 static SfxMenuControl*  CreateImpl( sal_uInt16 nId, Menu rMenu, 
SfxBindings rBindings );
-static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL );
 
 ~SfxMenuControl();
 
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 6dbdcfa..2f397c3 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -66,7 +66,6 @@ public:
 voidSuspend();
 sal_BoolIsSuspended() const { return bSuspended; }
 
-voidLock();
 voidUnLock();
 voidReschedule();
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 3a16624..fbc6c77 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -118,10 +118,6 @@ void SfxApplication::PreInit( )
 {
 }
 
-void SfxApplication::Main( )
-{
-}
-
 //-
 
 SfxFilterMatcher SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index d6fb779..22025a6 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -461,45 +461,6 @@ void SfxProgress::Suspend()
 
 // ---
 
-void SfxProgress::Lock()
-{
-if( pImp-pActiveProgress ) return;
-// No Reschedule for Embedded-Objects,
-// because we are defenseless against the OLE protocol
-if ( !pImp-xObjSh.Is() )
-{
-for ( SfxObjectShell *pDocSh = SfxObjectShell::GetFirst();
-  pDocSh;
-  pDocSh = SfxObjectShell::GetNext(*pDocSh) )
-{
-SfxObjectCreateMode eMode = pDocSh-GetCreateMode();
-if ( ( eMode == SFX_CREATE_MODE_EMBEDDED ) ||
- ( eMode == SFX_CREATE_MODE_PREVIEW ) )
-{
-DBG( DbgOutf( SfxProgress: not locked because 
EMBEDDED/PREVIEW found ) );
-pImp-bAllowRescheduling = sal_False;
-}
-}
-}
-else
-{
-SfxObjectCreateMode eMode = pImp-xObjSh-GetCreateMode();
-if 

[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source

[Michael Meeks]

 unusedcode.easy |7 
 vcl/inc/vcl/pdfextoutdevdata.hxx|   62 
 vcl/source/gdi/pdfextoutdevdata.cxx |   35 
 vcl/source/helper/lazydelete.cxx|8 
 4 files changed, 112 deletions(-)

New commits:
commit b4d4751ec0ff0c34f8cf0f1c8770badef81c007c
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Thu Feb 16 17:02:13 2012 +0100

Removed unused code from vcl module

diff --git a/unusedcode.easy b/unusedcode.easy
index bcd3d7c..78c00f0 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1357,11 +1357,4 @@ 
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun:
 ucbhelper::SimpleCertificateValidationRequest::getResponse() const
 utl::OConfigurationNode::appendNode(rtl::OUString const, 
utl::OConfigurationNode const) const
 utl::TransliterationWrapper::compareSubstring(String const, int, int, String 
const, int, int) const
-vcl::LazyDeletorMenu::is_less(Menu*, Menu*)
-vcl::PDFExtOutDevData::EndGroup()
-vcl::PDFExtOutDevData::GetFormsFormat() const
-vcl::PDFExtOutDevData::SetAutoAdvanceTime(unsigned int, int)
-vcl::PDFExtOutDevData::SetOutlineItemDest(int, int)
-vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
-vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const)
 vcl::PDFWriter::DrawPixel(Polygon const, Color const*)
diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx
index c1be576..665303b 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/vcl/inc/vcl/pdfextoutdevdata.hxx
@@ -131,7 +131,6 @@ public :
 sal_BoolGetIsExportFormFields() const;
 voidSetIsExportFormFields( const sal_Bool bExportFormFields );
 
-sal_Int32   GetFormsFormat() const;
 voidSetFormsFormat( const sal_Int32 nFormsFormat );
 
 sal_BoolGetIsExportBookmarks() const;
@@ -166,13 +165,6 @@ public :
 
 /** End render output
 
-This method ends grouped render output without
-further actions.
- */
-voidEndGroup();
-
-/** End render output
-
 This method ends grouped render output, that can be
 represented by a GfxLink. This is typically used for
 external graphic files, such as JPEGs, EPS files etc.
@@ -321,49 +313,6 @@ public :
 */
 sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString 
rText = rtl::OUString(), sal_Int32 nDestID = -1 );
 
-/** Set an outline item's parent
-
-@param nItem
-specififies which item should be reparented.
-
-@param nNewParent
-specifies which outline item will be the item's new parent.
-Use 0 for reparenting to top level.
-
-@returns
--1 if the item does not exist
--2 if the new parent does not exist, item will be reparented to top level.
-*/
-sal_Int32 SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent );
-
-/** Set an outline item's title text
-
-@param nItem
-specififies which item should get a new text
-
-@param rText
-sets the title text of the item
-
-@returns
-0 if the item exists and the text was changed
--1 if the item does not exist
-*/
-sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString rText 
);
-
-/** Set an outline item's destination
-
-@param nItem
-specififies which item should get a new dest
-
-@param nDestID
-specifies the item's new destination
-
-@returns
--1 if the item does not exist
--2 if the new dest does not exist, dest will remain unchanged
-*/
-sal_Int32 SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID );
-
 /** Create a new note on a page
 
 @param rRect
@@ -518,17 +467,6 @@ public :
 */
 void SetAlternateText( const String rText );
 
-/** Sets the time in seconds a page will appear before the next
-page is shown automatically
-
-@param nSeconds
-time in seconds the current page will be shown; pass 0 for manual 
advancement
-
-@param nPageNr
-the page number to apply the autoadvance time to; -1 denotes the 
current page
-*/
-void SetAutoAdvanceTime( sal_uInt32 nSeconds, sal_Int32 nPageNr = -1 );
-
 /** Sets the transitional effect to be applied when the current page gets 
shown.
 
 @param eType
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx 
b/vcl/source/gdi/pdfextoutdevdata.cxx
index 23d81a4..b917a0a 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -599,10 +599,6 @@ void PDFExtOutDevData::SetIsExportFormFields( const 
sal_Bool bExportFomtFields )
 {
 mbExportFormFields = bExportFomtFields;
 }
-sal_Int32 PDFExtOutDevData::GetFormsFormat() const
-{
-return mnFormsFormat;
-}
 void PDFExtOutDevData::SetFormsFormat( const sal_Int32 nFormsFormat )
 {
 mnFormsFormat = nFormsFormat;
@@ -721,27 +717,6 @@ sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 
nParent, const rtl::OUS
 

[Libreoffice-commits] .: vbahelper/source

[Julien Nabet]

 vbahelper/source/vbahelper/vbapagesetupbase.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit b8629e45c3451c40777934b2cdc110d25be75faf
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Feb 17 23:02:06 2012 +0100

Fix never read reported by clang

diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx 
b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
index 1cdca49..14deb67 100644
--- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx
+++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
@@ -310,11 +310,6 @@ void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 
orientation ) throw (c
 mxPageProps-setPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM(Width)),  aHeight );
 mxPageProps-setPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM(Height)), aWidth );
 }
-
-if( isLandscape )
-{
-orientation = mnOrientLandscape;
-}
 }
 catch( uno::Exception )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sd/source

[Jan Holesovsky]

 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx |6 
 sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx|6 
 sd/source/ui/slidesorter/view/SlideSorterView.cxx |   14 +
 sd/source/ui/slidesorter/view/SlsButtonBar.cxx|  129 +++---
 4 files changed, 71 insertions(+), 84 deletions(-)

New commits:
commit 4866b20ec6205b04cd21077fd00d68c4d4bb2c1b
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri Feb 17 23:32:52 2012 +0100

Slidesorter: Show the buttons on the opposite side...

...compared to where the mouse entered the slide thumbnail.  This
seems to prevent a user annoyance when you very often used to hide
the slide, instead of just selecting it.

diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx 
b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 4229665..d65bb90 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -226,13 +226,15 @@ public:
 const bool bAnimate = true);
 void SetPageUnderMouse (
 const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate = true);
+const bool bAnimate = true,
+const Point rMousePosition = Point());
 
 bool SetState (
 const model::SharedPageDescriptor rpDescriptor,
 const model::PageDescriptor::State eState,
 const bool bStateValue,
-const bool bAnimate = true);
+const bool bAnimate = true,
+const Point rMousePosition = Point());
 
 void UpdateOrientation (void);
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index 13b49f0..c6faee3 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -69,6 +69,11 @@ public:
 const Point aMouseModelLocation,
 const bool bIsMouseButtonDown);
 
+/// Decide whether the button should be drawn at the top, or the bottom.
+void UpdateButtonPosition(
+const model::SharedPageDescriptor rpDescriptor,
+const Point rMousePosition);
+
 void ResetPage (void);
 
 bool IsMouseOverBar (void) const;
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx 
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 4d63677..935f191 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -958,7 +958,7 @@ void SlideSorterView::UpdatePageUnderMouse (
 const bool bAnimate)
 {
 // Update the page under the mouse.
-SetPageUnderMouse(rpDescriptor, bAnimate);
+SetPageUnderMouse(rpDescriptor, bAnimate, rMousePosition);
 
 // Tell the button bar about the new mouse position.
 SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
@@ -986,7 +986,8 @@ void SlideSorterView::UpdatePageUnderMouse (
 
 void SlideSorterView::SetPageUnderMouse (
 const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate)
+const bool bAnimate,
+const Point rMousePosition)
 {
 if (mpPageUnderMouse != rpDescriptor)
 {
@@ -996,7 +997,7 @@ void SlideSorterView::SetPageUnderMouse (
 mpPageUnderMouse = rpDescriptor;
 
 if (mpPageUnderMouse)
-SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true, 
bAnimate);
+SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true, 
bAnimate, rMousePosition);
 
 // Change the quick help text to display the name of the page under
 // the mouse.
@@ -1011,7 +1012,8 @@ bool SlideSorterView::SetState (
 const model::SharedPageDescriptor rpDescriptor,
 const PageDescriptor::State eState,
 const bool bStateValue,
-const bool bAnimate)
+const bool bAnimate,
+const Point rMousePosition)
 {
 model::SharedPageDescriptor pDescriptor (rpDescriptor);
 if ( ! pDescriptor)
@@ -1039,7 +1041,11 @@ bool SlideSorterView::SetState (
 if (eState == PageDescriptor::ST_MouseOver)
 {
 if (bStateValue)
+{
+if (bAnimate)
+GetButtonBar().UpdateButtonPosition(rpDescriptor, 
rMousePosition);
 GetButtonBar().RequestFadeIn(rpDescriptor, bAnimate);
+}
 else
 GetButtonBar().RequestFadeOut(rpDescriptor, bAnimate);
 }
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 06a2074..fc4d05b 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -68,19 +68,25 @@ namespace sd { namespace slidesorter { namespace view {
 class ButtonBar::BackgroundTheme
 {
 public:
+enum ButtonPosition { TOP, BOTTOM };
+public:
 BackgroundTheme(
 const ::boost::shared_ptrTheme rpTheme,
 const ::std::vectorSharedButton rButtons);
-virtual 

[Libreoffice-commits] .: 5 commits - pyuno/source sd/source sw/source xmlsecurity/source

[Michael Stahl]

 pyuno/source/module/pyuno_gc.cxx  |5 +
 sd/source/ui/accessibility/AccessibleTreeNode.cxx |6 +
 sd/source/ui/toolpanel/ScrollPanel.cxx|2 
 sw/source/core/layout/ftnfrm.cxx  |2 
 sw/source/core/layout/newfrm.cxx  |2 
 xmlsecurity/source/helper/xsecverify.cxx  |   86 ++
 6 files changed, 87 insertions(+), 16 deletions(-)

New commits:
commit e72e8dcd332474321439eb266528eb7e5fc8809f
Author: Michael Stahl mst...@redhat.com
Date:   Sat Feb 18 00:06:42 2012 +0100

AccessibleTreeNode: fix headless crash

On closing a document in headless mode, the
accessibility::AccessibleTreeNode::WindowEventListener will access a deleted
mrTreeNode member and crash; don't do anything in the listener if the
AccessibleTreeNode has been disposed.

#0  0x in ?? ()
#1  0x7f99842d6887 in accessibility::AccessibleTreeNode::UpdateStateSet 
(this=0x27a99f80) at sd/source/ui/accessibility/AccessibleTreeNode.cxx:285
#2  0x7f99842d803e in 
accessibility::AccessibleTreeNode::WindowEventListener (this=0x27a99f80, 
pEvent=0x7f997fd64f40) at sd/source/ui/accessibility/AccessibleTreeNode.cxx:694
#3  0x7f99842d7f3d in 
accessibility::AccessibleTreeNode::LinkStubWindowEventListener 
(pThis=0x27a99f80, pCaller=0x7f997fd64f40) at 
sd/source/ui/accessibility/AccessibleTreeNode.cxx:670
#4  0x7f99b88a1442 in Link::Call (this=0x279f94e0, 
pCaller=0x7f997fd64f40) at solver/unxlngx6/inc/tools/link.hxx:140
#5  0x7f99b88cdecf in VclEventListeners::Call (this=0x27a946f0, 
pEvent=0x7f997fd64f40) at vcl/source/app/vclevent.cxx:72
#6  0x7f99b8d2e76e in Window::CallEventListeners (this=0x27a98280, 
nEvent=1009, pData=0x0) at vcl/source/window/window.cxx:5188
#7  0x7f99b8d2e6cf in Window::ImplCallEventListeners (this=0x27a98280, 
nEvent=1009, pData=0x0) at vcl/source/window/window.cxx:5171
#8  0x7f99b8d2df63 in Window::PreNotify (this=0x27a98280, rNEvt=...) at 
vcl/source/window/window.cxx:5037
#9  0x7f99b8d4aa0c in ImplCallPreNotify (rEvt=...) at 
vcl/source/window/winproc.cxx:86
#10 0x7f99b8d2910e in Window::ImplGrabFocus (this=0x2703d230, nFlags=0) 
at vcl/source/window/window.cxx:4033
#11 0x7f99b8d3749f in Window::GrabFocus (this=0x2703d230) at 
vcl/source/window/window.cxx:7493
#12 0x7f99b8d2b624 in Window::~Window (this=0x27a98280, 
__in_chrg=optimized out) at vcl/source/window/window.cxx:4493
#13 0x7f99b88fa514 in Control::~Control (this=0x27a98280, 
__in_chrg=optimized out) at vcl/source/control/ctrl.cxx:88
#14 0x7f99845521e4 in sd::toolpanel::ScrollPanel::~ScrollPanel 
(this=0x27a98280, __in_chrg=optimized out) at 
sd/source/ui/toolpanel/ScrollPanel.cxx:91
#15 0x7f99845522e8 in sd::toolpanel::ScrollPanel::~ScrollPanel 
(this=0x27a98280, __in_chrg=optimized out) at 
sd/source/ui/toolpanel/ScrollPanel.cxx:112
#16 0x7f9984565d76 in std::auto_ptrsd::toolpanel::TreeNode::reset 
(this=0x27a94970, __p=0x0)

diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx 
b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 554c73d..2831895 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -637,6 +637,9 @@ sal_Bool AccessibleTreeNode::IsDisposed (void)
 
 IMPL_LINK(AccessibleTreeNode, StateChangeListener, TreeNodeStateChangeEvent*, 
pEvent)
 {
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+return 1; // mrTreeNode is probably dead
+
 OSL_ASSERT(pEvent!=NULL);
 OSL_ASSERT(pEvent-mrSource==mrTreeNode);
 
@@ -669,6 +672,9 @@ IMPL_LINK(AccessibleTreeNode, StateChangeListener, 
TreeNodeStateChangeEvent*, pE
 
 IMPL_LINK(AccessibleTreeNode, WindowEventListener, VclWindowEvent*, pEvent)
 {
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+return 1; // mrTreeNode is probably dead
+
 switch (pEvent-GetId())
 {
 case VCLEVENT_WINDOW_HIDE:
commit cdfa3bd5e4c62dc88158a4c6c4908404baf1f529
Author: Michael Stahl mst...@redhat.com
Date:   Sat Feb 18 00:06:41 2012 +0100

sd::toolpanel::ScrollPanel::~ScrollPanel: bogus static_cast

diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx 
b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 0a84e75..7c43aa4 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -97,7 +97,7 @@ ScrollPanel::~ScrollPanel (void)
 TreeNode* pControl = pNode;
 // When the node has been created as TitledControl then use its
 // control instead of pNode directly.
-TitledControl* pTitledControl = static_castTitledControl*(pNode);
+TitledControl* pTitledControl = dynamic_castTitledControl*(pNode);
 if (pTitledControl != NULL)
 pControl = pTitledControl-GetControl();
 
commit 29177b1d04b845e8e6bf8edc8beb34b76a95d9c3
Author: Michael Stahl mst...@redhat.com

[Libreoffice-commits] .: hunspell/makefile.mk mythes/makefile.mk

[Tor Lillqvist]

 hunspell/makefile.mk |2 +-
 mythes/makefile.mk   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5cea39979f395b586ae1a52c8adfe4ff0176466
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Sat Feb 18 01:14:42 2012 +0200

Use STDLIBCUIMT so that the sample executables link for Android

Without using STDLIBCUIMT and the -lgnustl_shared it contains the
sample executables in hunspell and mythes won't link. Sure, they won't
be used for anything, but it's easier this way than to patch out
building them.

diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 8cf2e4e..a1c035a 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -69,7 +69,7 @@ CONFIGURE_FLAGS+=CPPFLAGS=$(EXTRA_CDEFS)
 .ENDIF
 
 .IF $(CROSS_COMPILING)==YES
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) 
LIBS=$(STDLIBCUIMT)
 .ENDIF
 
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index f10d0a0..46520fc 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -81,7 +81,7 @@ CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
 .ENDIF
 
 .IF $(CROSS_COMPILING)==YES
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) 
gio_can_sniff=no
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) 
gio_can_sniff=no LIBS=$(STDLIBCUIMT)
 .ENDIF
 
 BUILD_ACTION=make
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

[Thorsten Behrens]

 svx/source/dialog/_contdlg.cxx |   65 -
 1 file changed, 65 deletions(-)

New commits:
commit 600c27470380f80445fecb4b5691e0d11060494d
Author: Björgvin Ragnarsson nifgr...@gmail.com
Date:   Fri Feb 17 23:19:28 2012 +

Remove unused code in core/svx/source/dialog/_contdlg.cxx

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 576d06e..c96bbf7 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -195,64 +195,9 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const 
Graphic rGraphic,
 return PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, 
pRect ) );
 }
 
-void SvxContourDlg::ScaleContour( PolyPolygon rContour, const Graphic 
rGraphic,
-  const MapUnit eUnit, const Size 
rDisplaySize )
-{
-DBG_ASSERT( rGraphic.GetType() != GRAPHIC_NONE, Graphic is not valid! );
-
-OutputDevice*   pOutDev = Application::GetDefaultDevice();
-const MapMode   aDispMap( eUnit );
-const MapMode   aGrfMap( rGraphic.GetPrefMapMode() );
-const Size  aGrfSize( rGraphic.GetPrefSize() );
-SizeaOrgSize;
-Point   aNewPoint;
-sal_BoolbPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
-
-if ( bPixelMap )
-aOrgSize = pOutDev-PixelToLogic( aGrfSize, aDispMap );
-else
-aOrgSize = pOutDev-LogicToLogic( aGrfSize, aGrfMap, aDispMap );
-
-if ( aOrgSize.Width()  aOrgSize.Height() )
-{
-double fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width();
-double fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height();
-
-for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j  nPolyCount; 
j++ )
-{
-Polygon rPoly = rContour[ j ];
-
-for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i  nCount; i++ )
-{
-if ( bPixelMap )
-aNewPoint = pOutDev-PixelToLogic( rPoly[ i ], aDispMap  );
-else
-aNewPoint = pOutDev-LogicToLogic( rPoly[ i ], aGrfMap, 
aDispMap  );
-
-rPoly[ i ] = Point( FRound( aNewPoint.X() * fScaleX ), FRound( 
aNewPoint.Y() * fScaleY ) );
-}
-}
-}
-}
-
 // Loop through to super class, no virtual Methods to not become incompatible
 // due to IF changes
 
-void SvxContourDlg::SetExecState( sal_Bool bEnable )
-{
-pSuperClass-SetExecState( bEnable );
-}
-
-void SvxContourDlg::SetGraphic( const Graphic rGraphic )
-{
-pSuperClass-SetGraphic( rGraphic );
-}
-
-void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked )
-{
-pSuperClass-SetGraphicLinked( bGraphicLinked );
-}
-
 const Graphic SvxContourDlg::GetGraphic() const
 {
 return pSuperClass-GetGraphic();
@@ -263,21 +208,11 @@ sal_Bool SvxContourDlg::IsGraphicChanged() const
 return pSuperClass-IsGraphicChanged();
 }
 
-void SvxContourDlg::SetPolyPolygon( const PolyPolygon rPolyPoly )
-{
-pSuperClass-SetPolyPolygon( rPolyPoly );
-}
-
 PolyPolygon SvxContourDlg::GetPolyPolygon()
 {
 return pSuperClass-GetPolyPolygon( sal_True );
 }
 
-void SvxContourDlg::SetEditingObject( void* pObj )
-{
-pSuperClass-SetEditingObject( pObj );
-}
-
 const void* SvxContourDlg::GetEditingObject() const
 {
 return pSuperClass-GetEditingObject();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmlsecurity/source

[Julien Nabet]

 xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 140c90f4302303faf146c4a509acfb1d21c26164
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Feb 18 08:03:35 2012 +0100

Fix pEncryptedData not initialized

diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 30a8e11..5134008 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -149,6 +149,8 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
 
 //remember the position of the element to be signed
 sal_Bool isParentRef = sal_True;
+pEncryptedData = pTemplate-getNativeElement();
+
 xmlNodePtr pParent = pEncryptedData-parent;
 xmlNodePtr referenceNode;
 
@@ -179,8 +181,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
 return aTemplate;
 }
 
-pEncryptedData = pTemplate-getNativeElement() ;
-
 //Find the element to be encrypted.
 
 //Encrypt the template
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source vcl/source

[Michael Meeks]

 sfx2/inc/sfx2/mnuitem.hxx|1 +
 sfx2/source/menu/mnuitem.cxx |8 
 vcl/source/helper/lazydelete.cxx |   10 ++
 3 files changed, 19 insertions(+)

New commits:
commit 019458b151f402c1f8bbabc90e94987bfe2c32f2
Author: Michael Meeks michael.me...@suse.com
Date:   Sat Feb 18 07:57:01 2012 +

partial revert of unused code removal, and add LINUX guards

diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 08acfa6..62ebce6 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -56,6 +56,7 @@ public:
 SfxMenuControl( sal_uInt16, SfxBindings);
 
 static SfxMenuControl*  CreateImpl( sal_uInt16 nId, Menu rMenu, 
SfxBindings rBindings );
+static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL );
 
 ~SfxMenuControl();
 
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 32b173e..8b05360 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -246,6 +246,14 @@ SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 
/*nId*/, Menu /*rMenu*/,
 return new SfxMenuControl( sal_True );
 }
 
+#ifndef LINUX
+void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
+{
+RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
+SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
+}
+#endif
+
 //
 void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* 
pFact)
 {
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index d63466e..b160bb8 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -70,6 +70,16 @@ template bool LazyDeletorWindow::is_less( Window* left, 
Window* right )
 return (left != right  right-IsChild( left, sal_True )) ? true : false;
 }
 
+#ifndef LINUX
+// specialized is_less function for Menu
+template bool LazyDeletorMenu::is_less( Menu* left, Menu* right )
+{
+while( left  left != right )
+left = left-ImplGetStartedFrom();
+return left != NULL;
+}
+#endif
+
 DeleteOnDeinitBase::~DeleteOnDeinitBase()
 {
 ImplSVData* pSVData = ImplGetSVData();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits