[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sd/source

[Matúš Kukan]

 sd/source/filter/eppt/pptx-epptooxml.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit bc3b23f9c07aa2916c648abf1ca8c2af297250d4
Author: Matúš Kukan 
Date:   Sat Feb 11 16:24:37 2017 +0100

tdf#104222: Put expensive debug code behind #if again

dump_pset calls very expensive SdGenericDrawPage::getPropertyValue
doing something with GDIMetaFiles.

(regression from 5c7ce42dfc35d9cceef5f05a96e813b4e3913d38)

(cherry picked from commit 9cbe69f1950115e47af693bd78fc78f96f9b508e)

Change-Id: If39e9a451c87754343d77c8a1f840153c6b9de80
Reviewed-on: https://gerrit.libreoffice.org/34643
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 8069c7a..03ddcd0 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -93,7 +93,10 @@ using ::com::sun::star::container::XIndexAccess;
 using ::sax_fastparser::FSHelperPtr;
 
 
+#if OSL_DEBUG_LEVEL > 1
 void dump_pset(Reference< XPropertySet > const & rXPropSet);
+#endif
+
 #define IDS(x) OString(OStringLiteral(#x " ") + OString::number( 
mnShapeIdMax++ )).getStr()
 
 namespace oox {
@@ -1788,7 +1791,9 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 
nOffset, sal_uInt32 nMaste
 
 Reference< beans::XPropertySet > xPropSet( xSlide, uno::UNO_QUERY );
 xPropSet->setPropertyValue( "Layout", makeAny( short( aLayoutInfo[ nOffset 
].nType ) ) );
+#if OSL_DEBUG_LEVEL > 1
 dump_pset(xPropSet);
+#endif
 mXPagePropSet.set( xSlide, UNO_QUERY );
 mXShapes.set( xSlide, UNO_QUERY );
 
@@ -2329,6 +2334,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
sdfilt_component_getFactory( const sal_Char*
 
 }
 
+#if OSL_DEBUG_LEVEL > 1
 void dump_pset(Reference< XPropertySet > const & rXPropSet)
 {
 Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
@@ -2356,5 +2362,6 @@ void dump_pset(Reference< XPropertySet > const & 
rXPropSet)
 SAL_INFO("sd.eppt", "???  ");
 }
 }
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

[Matúš Kukan]

 sd/source/filter/eppt/pptx-epptooxml.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ed22f8b84ed0b5286af406c87c674f34fe8439c1
Author: Matúš Kukan 
Date:   Sat Feb 11 16:24:37 2017 +0100

tdf#104222: Put expensive debug code behind #if again

dump_pset calls very expensive SdGenericDrawPage::getPropertyValue
doing something with GDIMetaFiles.

(regression from 5c7ce42dfc35d9cceef5f05a96e813b4e3913d38)

(cherry picked from commit 9cbe69f1950115e47af693bd78fc78f96f9b508e)

Change-Id: If39e9a451c87754343d77c8a1f840153c6b9de80
Reviewed-on: https://gerrit.libreoffice.org/34651
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 32f7171..fb98a6e 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -92,7 +92,10 @@ using ::com::sun::star::container::XIndexAccess;
 using ::sax_fastparser::FSHelperPtr;
 
 
-void dump_pset(Reference< XPropertySet > rXPropSet);
+#if OSL_DEBUG_LEVEL > 1
+void dump_pset(Reference< XPropertySet > const & rXPropSet);
+#endif
+
 #define IDS(x) OString(OStringLiteral(#x " ") + OString::number( 
mnShapeIdMax++ )).getStr()
 
 namespace oox {
@@ -1789,7 +1792,9 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 
nOffset, sal_uInt32 nMaste
 
 Reference< beans::XPropertySet > xPropSet( xSlide, uno::UNO_QUERY );
 xPropSet->setPropertyValue( "Layout", makeAny( short( aLayoutInfo[ nOffset 
].nType ) ) );
+#if OSL_DEBUG_LEVEL > 1
 dump_pset(xPropSet);
+#endif
 mXPagePropSet.set( xSlide, UNO_QUERY );
 mXShapes.set( xSlide, UNO_QUERY );
 
@@ -2334,7 +2339,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
sdfilt_component_getFactory( const sal_Char*
 }
 #endif
 
-void dump_pset(Reference< XPropertySet > rXPropSet)
+#if OSL_DEBUG_LEVEL > 1
+void dump_pset(Reference< XPropertySet > const & rXPropSet)
 {
 Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
 Sequence< beans::Property > props = info->getProperties ();
@@ -2361,5 +2367,6 @@ void dump_pset(Reference< XPropertySet > rXPropSet)
 SAL_WARN("sd.eppt", "???  ");
 }
 }
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Matúš Kukan]

 sd/source/filter/eppt/pptx-epptooxml.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 9cbe69f1950115e47af693bd78fc78f96f9b508e
Author: Matúš Kukan 
Date:   Sat Feb 11 16:24:37 2017 +0100

tdf#104222: Put expensive debug code behind #if again

dump_pset calls very expensive SdGenericDrawPage::getPropertyValue
doing something with GDIMetaFiles.

(regression from 5c7ce42dfc35d9cceef5f05a96e813b4e3913d38)

Change-Id: If39e9a451c87754343d77c8a1f840153c6b9de80

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index a20ead1..76e00b4 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -94,7 +94,9 @@ using ::com::sun::star::container::XIndexAccess;
 using ::sax_fastparser::FSHelperPtr;
 
 
+#if OSL_DEBUG_LEVEL > 1
 void dump_pset(Reference< XPropertySet > const & rXPropSet);
+#endif
 
 namespace oox {
 using namespace drawingml;
@@ -1785,7 +1787,9 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 
nOffset, sal_uInt32 nMaste
 
 Reference< beans::XPropertySet > xPropSet( xSlide, uno::UNO_QUERY );
 xPropSet->setPropertyValue( "Layout", makeAny( short( aLayoutInfo[ nOffset 
].nType ) ) );
+#if OSL_DEBUG_LEVEL > 1
 dump_pset(xPropSet);
+#endif
 mXPagePropSet.set( xSlide, UNO_QUERY );
 mXShapes.set( xSlide, UNO_QUERY );
 
@@ -2328,6 +2332,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
sdfilt_component_getFactory( const sal_Char*
 
 }
 
+#if OSL_DEBUG_LEVEL > 1
 void dump_pset(Reference< XPropertySet > const & rXPropSet)
 {
 Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
@@ -2355,5 +2360,6 @@ void dump_pset(Reference< XPropertySet > const & 
rXPropSet)
 SAL_INFO("sd.eppt", "???  ");
 }
 }
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-file-lists Repository.mk scp2/InstallModule_ooo.mk scp2/source setup_native/source

[Matúš Kukan]

 Repository.mk|4 -
 bin/distro-install-file-lists|2 
 scp2/InstallModule_ooo.mk|1 
 scp2/source/ooo/module_filter.scp|   51 ---
 setup_native/source/packinfo/packinfo_office.txt |   15 --
 5 files changed, 2 insertions(+), 71 deletions(-)

New commits:
commit dc2d33dd903590ca37246376acea7cab5befc06b
Author: Matúš Kukan 
Date:   Sun Feb 12 08:07:00 2017 +0100

AutoInstall oox filter data packages to ooo module

Change-Id: Ib7b0773ee2b347d81d3f8894ea3063c6d6f18d90
Reviewed-on: https://gerrit.libreoffice.org/34168
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 8b4205d..988a218 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -799,8 +799,6 @@ $(eval $(call gb_Helper_register_packages, \
instsetoo_native_setup \
$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
odk_headers_generated \
-   oox_customshapes \
-   oox_generated \
postprocess_images \
postprocess_registry \
readlicense_oo_readmes \
@@ -896,6 +894,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_tplwizstyles \
framework_dtd \
$(if $(filter $(OS),MACOSX),infoplist) \
+   oox_customshapes \
+   oox_generated \
package_dtd \
sd_web \
sfx2_emojiconfig \
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 2960f5f..eece72d 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -78,7 +78,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 rm -f common_list.txt
 for module in gid_Module_Root gid_Module_Root_Brand \
 gid_Module_Root_Files_[0-9] \
-gid_Module_Filter \
 gid_Module_Root_Hack \
 gid_Module_Oo_Linguistic \
 gid_Module_Root_Extension_Dictionary_* \
@@ -394,7 +393,6 @@ else
 create_package_directory gid_Module_Root_Files_Images   
pkg/libreoffice-common
 create_package_directory gid_Module_Oo_Linguistic   
pkg/libreoffice-common
 create_package_directory gid_Module_Optional_Xsltfiltersamples  
pkg/libreoffice-common
-create_package_directory gid_Module_Filter  
pkg/libreoffice-common
 create_package_directory gid_Module_Optional_Grfflt 
pkg/libreoffice-draw
 create_package_directory gid_Module_Prg_Calc_Bin
pkg/libreoffice-calc
 create_package_directory gid_Module_Prg_Math_Bin
pkg/libreoffice-math
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ba85431..51c2a62 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 scp2/source/ooo/module_lang_template \
 scp2/source/ooo/profileitem_ooo \
 scp2/source/ooo/scpaction_ooo \
-scp2/source/ooo/module_filter \
 $(if $(filter-out MACOSX WNT,$(OS)), \
scp2/source/ooo/module_libreofficekit \
) \
diff --git a/scp2/source/ooo/module_filter.scp 
b/scp2/source/ooo/module_filter.scp
deleted file mode 100644
index bc19b91..000
--- a/scp2/source/ooo/module_filter.scp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "macros.inc"
-
-Module gid_Module_Filter
-Name = "Filter Data";
-Description = "Filter Data";
-PackageInfo = "packinfo_office.txt";
-ParentID = gid_Module_Root_Brand;
-Styles = (HIDDEN_ROOT);
-Dirs = (gid_Dir_Share_Filter);
-Files = (
-gid_File_Dat_OoxDrawingmlAdjNames,
-gid_File_Dat_OoxDrawingmlCsPresets,
-gid_File_Dat_VmlShapeTypes);
-End
-
-Directory gid_Dir_Share_Filter
-ParentID = gid_Brand_Dir_Share;
-DosName = "filter";
-End
-
-File gid_File_Dat_OoxDrawingmlAdjNames
-TXT_FILE_BODY;
-Dir = gid_Dir_Share_Filter;
-Name = "oox-drawingml-adj-names";
-Styles = (PACKED);
-End
-
-File gid_File_Dat_OoxDrawingmlCsPresets
-TXT_FILE_BODY;
-Dir = gid_Dir_Share_Filter;
-Name = "oox-drawingml-cs-presets";
-Styles = (PACKED);
-End
-
-File gid_File_Dat_OoxVmlShapeTypes
-TXT_FILE_BODY;
-Dir = gid_Dir_Share_Filter;
-Name = "vml-shape-types";
-Styles = (PACKED);
-End
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index a8f8491..b6cace4 100644
--- 

[Libreoffice-commits] core.git: Repository.mk

[Matúš Kukan]

 Repository.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 252ae4f540f2a6bdf1a52139c1ff8a266bd4713c
Author: Matúš Kukan 
Date:   Fri Feb 10 20:46:42 2017 +0100

python_zipcore package is no more

..since 8646ab97dc37c0606b19057686bf3d610f9c15ee

Change-Id: I14644a85023fe66e86d9eef50ebd9eddabe73f60

diff --git a/Repository.mk b/Repository.mk
index c7f054a..8b4205d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -803,7 +803,6 @@ $(eval $(call gb_Helper_register_packages, \
oox_generated \
postprocess_images \
postprocess_registry \
-   python_zipcore \
readlicense_oo_readmes \
setup_native_misc \
share \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/msc-externals Makefile.fetch Repository.mk

[Matúš Kukan]

 Makefile.fetch |1 -
 Repository.mk  |1 -
 configure.ac   |7 ---
 download.lst   |1 -
 external/msc-externals/Module_msc-externals.mk |1 -
 external/msc-externals/Package_dbghelp.mk  |   14 --
 6 files changed, 25 deletions(-)

New commits:
commit 35bc9668567a8c61763715f0854a42324dc5a4f4
Author: Matúš Kukan 
Date:   Fri Dec 23 23:22:25 2016 +0100

Remove package with dbghelp.dll

ENABLE_CRASHDUMP is always empty.
dbghelp.dll was removed from scp2 in
8ab4d2f29fdd2c058db23f6ee7b2200655d4c6f6

Change-Id: I5c47ce4b4cafb2f24185ddd9a31eb1a3176fa176
Reviewed-on: https://gerrit.libreoffice.org/32395
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Makefile.fetch b/Makefile.fetch
index cf31e5b..db62719 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -214,7 +214,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,ZMF,ZMF_TARBALL) \
,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
-   $(call fetch_Optional,DBGHELP,DBGHELP_DLL) \
$(call fetch_Optional,ODK,UNOWINREG_DLL) \
$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
diff --git a/Repository.mk b/Repository.mk
index 8e296ec..8305c97 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -774,7 +774,6 @@ endif
 $(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
-   $(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
extras_fonts \
diff --git a/configure.ac b/configure.ac
index 6fc1487..79e643b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3653,13 +3653,6 @@ AC_SUBST(DISABLE_ACTIVEX)
 AC_SUBST(DISABLE_ATL)
 
 #
-# dbghelp.dll
-#
-if test "$_os" = "WINNT"; then
-BUILD_TYPE="$BUILD_TYPE DBGHELP"
-fi
-
-#
 # unowinreg.dll
 #
 UNOWINREG_DLL="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
diff --git a/download.lst b/download.lst
index 31ec1ce..da57096 100644
--- a/download.lst
+++ b/download.lst
@@ -26,7 +26,6 @@ export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
 export CURL_MD5SUM := 490e19a8ccd1f4a244b50338a0eb9456
 export CURL_TARBALL := curl-7.51.0.tar.gz
-export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
 export EPOXY_MD5SUM := 96f6620a9b005a503e7b44b0b528287d
diff --git a/external/msc-externals/Module_msc-externals.mk 
b/external/msc-externals/Module_msc-externals.mk
index 002dcf5..789c7bd 100644
--- a/external/msc-externals/Module_msc-externals.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Module_Module,msc-externals))
 
 $(eval $(call gb_Module_add_targets,msc-externals,\
-   $(if $(ENABLE_CRASHDUMP),Package_dbghelp) \
Package_msvc_dlls \
 ))
 
diff --git a/external/msc-externals/Package_dbghelp.mk 
b/external/msc-externals/Package_dbghelp.mk
deleted file mode 100644
index d039b07..000
--- a/external/msc-externals/Package_dbghelp.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,dbghelp,$(TARFILE_LOCATION)))
-
-$(eval $(call 
gb_Package_add_file,dbghelp,$(LIBO_LIB_FOLDER)/dbghelp.dll,$(DBGHELP_DLL)))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide sw/CppunitTest_sw_ooxmlexport2.mk sw/CppunitTest_sw_ooxmlexport3.mk sw/CppunitTest_sw_ooxmlexport4.mk sw/CppunitTest_sw_ooxmlexport5.mk sw/CppunitTest

[Matúš Kukan]

 bin/gbuild-to-ide |   10 +-
 sw/CppunitTest_sw_ooxmlexport.mk  |2 --
 sw/CppunitTest_sw_ooxmlexport2.mk |2 --
 sw/CppunitTest_sw_ooxmlexport3.mk |2 --
 sw/CppunitTest_sw_ooxmlexport4.mk |2 --
 sw/CppunitTest_sw_ooxmlexport5.mk |2 --
 sw/CppunitTest_sw_ooxmlexport6.mk |2 --
 sw/CppunitTest_sw_ooxmlexport7.mk |2 --
 sw/CppunitTest_sw_ooxmlexport9.mk |2 --
 sw/CppunitTest_sw_ooxmlfieldexport.mk |2 --
 sw/CppunitTest_sw_ooxmlw14export.mk   |2 --
 sw/Module_sw.mk   |2 ++
 12 files changed, 3 insertions(+), 29 deletions(-)

New commits:
commit d8a9d483898d94868bc502d52f0fcd166d18959f
Author: Matúš Kukan 
Date:   Thu Dec 29 23:42:23 2016 +0100

Workaround strange sw test makefiles

Include ooxmlexport_setup.mk only once in Module_sw.mk,
so that gbuildtojson can properly set last included
makefile for test jsons.

Change-Id: Ie8ed3296ae97cf4a33d652599673f389b224993e
Reviewed-on: https://gerrit.libreoffice.org/32502
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 3b84394..451f6b5 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -149,16 +149,8 @@ class GbuildParser:
 @staticmethod
 def __test_from_json(json):
 (foundincludes, foundisystem) = 
GbuildParser.__split_includes(json['INCLUDE'])
-testname_match = 
GbuildParser.testpattern.match(os.path.basename(json['MAKEFILE']))
-
-# Workaround strange writer test makefile setup
-if testname_match is None:
-testname = "StrangeWriterMakefiles"
-else:
-testname = testname_match.group(1)
-
 return GbuildTest(
-testname,
+
GbuildParser.testpattern.match(os.path.basename(json['MAKEFILE'])).group(1),
 os.path.dirname(json['MAKEFILE']),
 foundincludes,
 foundisystem,
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index d3e7ac1..dec6978 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -9,8 +9,6 @@
 #
 #*
 
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
 # empty second argument (i.e. no 1)
 $(eval $(call sw_ooxmlexport_test,))
 
diff --git a/sw/CppunitTest_sw_ooxmlexport2.mk 
b/sw/CppunitTest_sw_ooxmlexport2.mk
index 2be67c0..18a3456 100644
--- a/sw/CppunitTest_sw_ooxmlexport2.mk
+++ b/sw/CppunitTest_sw_ooxmlexport2.mk
@@ -9,8 +9,6 @@
 #
 #*
 
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
 $(eval $(call sw_ooxmlexport_test,2))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport3.mk 
b/sw/CppunitTest_sw_ooxmlexport3.mk
index cdb9ab1..5969aea 100644
--- a/sw/CppunitTest_sw_ooxmlexport3.mk
+++ b/sw/CppunitTest_sw_ooxmlexport3.mk
@@ -9,8 +9,6 @@
 #
 #*
 
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
 $(eval $(call sw_ooxmlexport_test,3))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport4.mk 
b/sw/CppunitTest_sw_ooxmlexport4.mk
index 1a92a48..e328593 100644
--- a/sw/CppunitTest_sw_ooxmlexport4.mk
+++ b/sw/CppunitTest_sw_ooxmlexport4.mk
@@ -9,8 +9,6 @@
 #
 #*
 
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
 $(eval $(call sw_ooxmlexport_test,4))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport5.mk 
b/sw/CppunitTest_sw_ooxmlexport5.mk
index 42b873e..674fcee 100644
--- a/sw/CppunitTest_sw_ooxmlexport5.mk
+++ b/sw/CppunitTest_sw_ooxmlexport5.mk
@@ -9,8 +9,6 @@
 #
 #*
 
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
 $(eval $(call sw_ooxmlexport_test,5))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport6.mk 
b/sw/CppunitTest_sw_ooxmlexport6.mk
index f619ada..9b3ebe18 100644
--- a/sw/CppunitTest_sw_ooxmlexport6.mk
+++ b/sw/CppunitTest_sw_ooxmlexport6.mk
@@ -9,8 +9,6 @@
 #
 #*
 
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
 $(eval $(call sw_ooxmlexport_test,6))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport7.mk 
b/sw/CppunitTest_sw_ooxmlexport7.mk
index 8a8f53e..2145a94 100644
--- a/sw/CppunitTest_sw_ooxmlexport7.mk
+++ b/sw/CppunitTest_sw_ooxmlexport7.mk
@@ -9,8 +9,6 @@
 #
 #*
 
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
 $(eval $(call sw_ooxmlexport_test,7))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport9.mk 
b/sw/CppunitTest_sw_ooxmlexport9.mk
index 

[Libreoffice-commits] core.git: solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/extensions/post_GbuildToJson.mk |   42 ++
 1 file changed, 24 insertions(+), 18 deletions(-)

New commits:
commit d019c7ffa84104fe2583174a6c0a34e68bb4a1d4
Author: Matúš Kukan 
Date:   Fri Dec 30 00:41:55 2016 +0100

Fix GbuildToJson for tests: Set source files correctly

Need newline in gb_LinkTarget_add_foo_object.
With that we can avoid direct gb_Executable_foo and gb_Library_foo.

Change-Id: I1e2b1ef2f2a3e15f4bb81170f23265186ef47733
Reviewed-on: https://gerrit.libreoffice.org/32503
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk 
b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 856e2f7..7a24869 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -72,10 +72,30 @@ gb_LinkTarget_use_static_libraries =
 gb_UnoApiHeadersTarget_get_target = $(gb_Helper_MISCDUMMY)
 gb_UnpackedTarball_get_final_target = $(gb_Helper_MISCDUMMY)
 gb_LinkTarget__get_headers_check =
-gb_LinkTarget_add_cobject = $(call gb_LinkTarget_get_target,$(1)) : COBJECTS 
+= $(2)
-gb_LinkTarget_add_cxxobject = $(call gb_LinkTarget_get_target,$(1)) : 
CXXOBJECTS += $(2)
-gb_LinkTarget_add_generated_c_object = $(call gb_LinkTarget_get_target,$(1)) : 
GENCOBJECTS += $(2)
-gb_LinkTarget_add_generated_cxx_object = $(call gb_LinkTarget_get_target,$(1)) 
: GENCXXOBJECTS += $(2)
+define gb_LinkTarget_add_cobject
+$(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
+
+endef
+define gb_LinkTarget_add_cxxobject
+$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)
+
+endef
+define gb_LinkTarget_add_generated_c_object
+$(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2)
+
+endef
+define gb_LinkTarget_add_generated_cxx_object
+$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2)
+
+endef
+define gb_LinkTarget_add_objcobject
+$(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS += $(2)
+
+endef
+define gb_LinkTarget_add_objcxxobject
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2)
+
+endef
 gb_LinkTarget_use_package =
 gb_LinkTarget_add_sdi_headers =
 gb_LinkTarget_use_external_project =
@@ -90,20 +110,6 @@ gb_LinkTarget_set_nativeres =
 gb_LinkTarget_add_nativeres =
 gb_Library_set_componentfile =
 gb_LinkTarget_use_restarget =
-# TODO: curious these are needed in addition
-gb_Executable_add_cxxobject = $(call gb_Executable_get_target,$(1)): 
CXXOBJECTS += $(2)
-gb_Executable_add_cxxobjects = $(call gb_Executable_get_target,$(1)): 
CXXOBJECTS += $(2)
-gb_Executable_add_exception_object = $(call gb_Executable_get_target,$(1)): 
CXXOBJECTS += $(2)
-gb_Executable_add_exception_objects = $(call gb_Executable_get_target,$(1)): 
CXXOBJECTS += $(2)
-gb_Library_add_cxxobject = $(call gb_Library_get_target,$(1)): CXXOBJECTS += 
$(2)
-gb_Library_add_cxxobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += 
$(2)
-gb_Library_add_exception_object = $(call gb_Library_get_target,$(1)): 
CXXOBJECTS += $(2)
-gb_Library_add_exception_objects = $(call gb_Library_get_target,$(1)): 
CXXOBJECTS += $(2)
-
-# Objective C++ macros
-gb_Library_add_objcxxobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS 
+= $(2)
-gb_Library_add_objcobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += 
$(2)
-
 
 #$(call gb_Library_get_exports_target,%):
 $(WORKDIR)/LinkTarget/Library/%.exports:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/AutoInstall.mk scp2/InstallModule_gnome.mk scp2/InstallModule_ooo.mk scp2/source

[Matúš Kukan]

 Repository.mk |5 -
 scp2/AutoInstall.mk   |1 +
 scp2/InstallModule_gnome.mk   |4 
 scp2/InstallModule_ooo.mk |6 ++
 scp2/source/ooo/module_libreofficekit.scp |   30 +++---
 5 files changed, 10 insertions(+), 36 deletions(-)

New commits:
commit 98c0a80a1c1522a74a8b82d2e876d0d30de2dcb7
Author: Matúš Kukan 
Date:   Sat Dec 24 14:48:33 2016 +0100

scp2: Bin not used defines

Change-Id: I4d2fe64fb8635bb87c9eb3b3f5b98227811cea03

diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index ac3a1fd..c33f4f5 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
 
-$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
-ENABLE_GTK \
-))
-
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
 scp2/source/gnome/file_gnome \
 ))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 5831304..3a1f2a4 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,11 +19,9 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
-   ENABLE_GTK \
ENABLE_SYSTRAY_GTK \
ENABLE_MACOSX_SANDBOX \
ENABLE_ONLINE_UPDATE \
-   ENABLE_TDE \
SYSTEM_CURL \
SYSTEM_HSQLDB \
SYSTEM_LIBXSLT \
commit 7b340f0d88e32408c4dd797aba826c73caccc01d
Author: Matúš Kukan 
Date:   Sat Dec 24 14:42:54 2016 +0100

tdf#90753: AutoInstall libreofficekit_selectionhandles package

Change-Id: I9998f3dcd6725a49aa2c083eac0de1f970b167e0

diff --git a/Repository.mk b/Repository.mk
index 939b91d..dbc3c2b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -786,7 +786,6 @@ $(eval $(call gb_Helper_register_packages, \
more_fonts_conf \
instsetoo_native_setup \
$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
-   libreofficekit_selectionhandles \
odk_headers_generated \
oox_customshapes \
oox_generated \
@@ -807,6 +806,10 @@ $(eval $(call 
gb_Helper_register_packages_for_install,calc,\
sc_res_xml \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,libreofficekit,\
+   $(if $(filter LINUX %BSD SOLARIS, $(OS)),$(if 
$(ENABLE_GTK3),libreofficekit_selectionhandles)) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,ure,\
instsetoo_native_setup_ure \
ure_install \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index cba489f..43c53ab 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -27,6 +27,7 @@ $(eval $(call 
gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call 
gb_AutoInstall_add_module,libreofficekit,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ade0cbd..5831304 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -11,16 +11,16 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
brand \
+   libreofficekit \
ooo \
ooobinarytable \
-   reportbuilder \
pdfimport \
+   reportbuilder \
 ))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
ENABLE_SYSTRAY_GTK \
-   ENABLE_GTK3 \
ENABLE_MACOSX_SANDBOX \
ENABLE_ONLINE_UPDATE \
ENABLE_TDE \
diff --git a/scp2/source/ooo/module_libreofficekit.scp 
b/scp2/source/ooo/module_libreofficekit.scp
index 4a31923..80af179 100644
--- a/scp2/source/ooo/module_libreofficekit.scp
+++ b/scp2/source/ooo/module_libreofficekit.scp
@@ -9,6 +9,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/libreofficekit"
+
 Module gid_Module_Libreofficekit
 Name = "Libreofficekit Data";
 Description = "Libreofficekit Data";
@@ -16,10 +18,7 @@ Module gid_Module_Libreofficekit
 ParentID = gid_Module_Root_Brand;
 Styles = (HIDDEN_ROOT);
 Dirs = (gid_Dir_Share_Libreofficekit);
-Files = (
-gid_File_Dat_HandleImageStart,
-gid_File_Dat_HandleImageMiddle,
-gid_File_Dat_HandleImageEnd);
+Files = (auto_libreofficekit_ALL);
 End
 
 Directory gid_Dir_Share_Libreofficekit
@@ -27,27 +26,4 @@ Directory gid_Dir_Share_Libreofficekit
 DosName = 

[Libreoffice-commits] core.git: Repository.mk scp2/source shell/Module_shell.mk

[Matúš Kukan]

 Repository.mk  |3 ++-
 scp2/source/ooo/file_ooo.scp   |9 -
 scp2/source/ooo/module_ooo.scp |3 +--
 shell/Module_shell.mk  |   11 ++-
 4 files changed, 5 insertions(+), 21 deletions(-)

New commits:
commit b09035675465b156d773e60d6c6650fa12d17766
Author: Matúš Kukan 
Date:   Sat Dec 24 06:07:05 2016 +0100

tdf#90753: AutoInstall shell_senddoc package

Change-Id: I6cc638c460a8baa2cd9d29c3b82418b6ecfb630d
Reviewed-on: https://gerrit.libreoffice.org/32397
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index 884a309..939b91d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -796,7 +796,6 @@ $(eval $(call gb_Helper_register_packages, \
readlicense_oo_readmes \
setup_native_misc \
share \
-   shell_senddoc \
vcl_fontunxpsprint \
 ))
 
@@ -886,6 +885,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
package_dtd \
sd_web \
sfx2_emojiconfig \
+   $(call gb_Helper_optional,DESKTOP,\
+   $(if $(filter-out WNT,$(OS)),$(if 
$(ENABLE_MACOSX_SANDBOX),,shell_senddoc))) \
$(call gb_Helper_optional,DESKTOP,$(if $(filter-out MACOSX 
WNT,$(OS)),svx_gengal)) \
$(if $(USING_X11),vcl_fontunxppds) \
$(if $(filter $(OS),MACOSX),vcl_osxres) \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3e5a67..6d962d0 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -27,15 +27,6 @@
 
 #include "macros.inc"
 
-#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
-File gid_File_Bin_Senddoc
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "shell_senddoc.filelist";
-Styles = (FILELIST, PACKED);
-End
-#endif
-
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
 #if defined WITH_HELP
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 210f4e5..7f1fa99 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -23,8 +23,7 @@ Module gid_Module_Root
 PackageInfo = "packinfo_office.txt";
 InstallOrder = "20";
 MOD_NAME_DESC(MODULE_ROOT_OSL);
-Files = (gid_File_Bin_Senddoc,
- gid_File_Txt_Pagein_Common,
+Files = (gid_File_Txt_Pagein_Common,
  gid_File_Txt_Pagein_Calc,
  gid_File_Txt_Pagein_Draw,
  gid_File_Txt_Pagein_Impress,
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 17661e9..53fda24 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -94,14 +94,6 @@ $(eval $(call gb_Module_add_targets,shell,\
Library_syssh \
 ))
 
-ifneq ($(OS),WNT)
-
-$(eval $(call gb_Module_add_targets,shell,\
-   StaticLibrary_xmlparser \
-))
-
-endif
-
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
Library_recentfile \
@@ -111,9 +103,10 @@ endif
 ifneq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,shell,\
+   StaticLibrary_xmlparser \
Executable_uri_encode \
Library_cmdmail \
-   Package_senddoc \
+   $(if $(ENABLE_MACOSX_SANDBOX),,Package_senddoc) \
 ))
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

[Matúš Kukan]

 Repository.mk|7 ++-
 scp2/source/ooo/module_pdfimport.scp |8 
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 120a87a36e04b01c99c3544aca57faf66934d9c7
Author: Matúš Kukan 
Date:   Sat Dec 24 00:03:01 2016 +0100

tdf#90753: AutoInstall xpdfimport_err.pdf as filelist

Change-Id: Icfebcbf3cb738cb376a5ee97cd21a27a25c0bf35
Reviewed-on: https://gerrit.libreoffice.org/32396
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index 6423202..884a309 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -794,7 +794,6 @@ $(eval $(call gb_Helper_register_packages, \
postprocess_registry \
python_zipcore \
readlicense_oo_readmes \
-   sdext_pdfimport_pdf \
setup_native_misc \
share \
shell_senddoc \
@@ -937,6 +936,12 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ogltrans,\
slideshow_opengl_shader \
 ))
 
+ifneq ($(ENABLE_PDFIMPORT),)
+$(eval $(call gb_Helper_register_packages_for_install,pdfimport, \
+   sdext_pdfimport_pdf \
+))
+endif
+
 $(eval $(call gb_Helper_register_packages_for_install,reportbuilder,\
reportbuilder-templates \
 ))
diff --git a/scp2/source/ooo/module_pdfimport.scp 
b/scp2/source/ooo/module_pdfimport.scp
index 5159b19..548ea58 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -34,7 +34,6 @@ Module gid_Module_Pdfimport
 Styles = (HIDDEN_ROOT);
 Dirs = (gid_Dir_Share_Xpdfimport);
 Files = (auto_pdfimport_ALL,
-gid_File_Dat_XpdfimportErrPdf,
 gid_File_Xcd_Pdfimport);
 End
 
@@ -43,13 +42,6 @@ Directory gid_Dir_Share_Xpdfimport
 DosName = "xpdfimport";
 End
 
-File gid_File_Dat_XpdfimportErrPdf
-TXT_FILE_BODY;
-Dir = gid_Dir_Share_Xpdfimport;
-Name = "xpdfimport_err.pdf";
-Styles = (PACKED);
-End
-
 File gid_File_Xcd_Pdfimport
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Registry;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

[Matúš Kukan]

 Repository.mk   |5 -
 scp2/source/base/postgresqlsdbc.scp |8 
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 5662817149e3eed0a592c389042d9c3755629614
Author: Matúš Kukan 
Date:   Fri Dec 23 21:31:18 2016 +0100

tdf#90753: AutoInstall postgresql-sdbc.ini as filelist

Change-Id: I908b549a14c702ce2c33de704b06d016036ccecb
Reviewed-on: https://gerrit.libreoffice.org/32394
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index dcfa393..6423202 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -773,7 +773,6 @@ endif
 $(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
-   $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
$(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
@@ -821,6 +820,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+   $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,sdk,\
odk_share_readme \
odk_share_readme_generated \
diff --git a/scp2/source/base/postgresqlsdbc.scp 
b/scp2/source/base/postgresqlsdbc.scp
index 23bbd44..94e6936 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -18,20 +18,12 @@ Module gid_Module_Optional_PostgresqlSdbc
 MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
 ParentID = gid_Module_Prg_Base_Bin;
 Files = (auto_postgresqlsdbc_ALL,
- gid_File_PostgresqlSdbc_Ini,
  gid_File_PostgresqlSdbc_Rdb,
  gid_File_PostgresqlSdbc_Xcd);
 Default = YES;
 Styles = ();
 End
 
-File gid_File_PostgresqlSdbc_Ini
-TXT_FILE_BODY;
-Dir = GID_BRAND_DIR_ETC;
-Name = "postgresql-sdbc.ini";
-Styles = (PACKED);
-End
-
 File gid_File_PostgresqlSdbc_Rdb
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Program_Services;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/CppunitTest_sal_bytesequence.mk sal/CppunitTest_sal_rtl_alloc.mk sal/CppunitTest_sal_rtl_bootstrap.mk sal/CppunitTest_sal_rtl_cipher.mk sal/CppunitTest_sal_rtl_crc3

[Matúš Kukan]

 sal/CppunitTest_sal_bytesequence.mk|   22 ---
 sal/CppunitTest_sal_rtl.mk |   67 
++
 sal/CppunitTest_sal_rtl_alloc.mk   |   22 ---
 sal/CppunitTest_sal_rtl_bootstrap.mk   |   21 ---
 sal/CppunitTest_sal_rtl_cipher.mk  |   22 ---
 sal/CppunitTest_sal_rtl_crc32.mk   |   22 ---
 sal/CppunitTest_sal_rtl_digest.mk  |   24 ---
 sal/CppunitTest_sal_rtl_doublelock.mk  |   22 ---
 sal/CppunitTest_sal_rtl_locale.mk  |   22 ---
 sal/CppunitTest_sal_rtl_math.mk|   21 ---
 sal/CppunitTest_sal_rtl_ostringbuffer.mk   |   22 ---
 sal/CppunitTest_sal_rtl_oustring.mk|   30 
 sal/CppunitTest_sal_rtl_oustringbuffer.mk  |   26 ---
 sal/CppunitTest_sal_rtl_process.mk |   22 ---
 sal/CppunitTest_sal_rtl_random.mk  |   21 ---
 sal/CppunitTest_sal_rtl_ref.mk |   21 ---
 sal/CppunitTest_sal_rtl_strings.mk |   38 -
 sal/CppunitTest_sal_rtl_textenc.mk |   26 ---
 sal/CppunitTest_sal_rtl_uri.mk |   32 
 sal/CppunitTest_sal_rtl_uuid.mk|   27 
 sal/Module_sal.mk  |   20 --
 sal/qa/ByteSequence/ByteSequence.cxx   |2 
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx |2 
 sal/qa/rtl/bootstrap/expand.cxx|2 
 sal/qa/rtl/cipher/rtl_cipher.cxx   |4 
 sal/qa/rtl/crc32/rtl_crc32.cxx |4 
 sal/qa/rtl/digest/rtl_digest.cxx   |2 
 sal/qa/rtl/doublelock/rtl_doublelocking.cxx|4 
 sal/qa/rtl/locale/rtl_locale.cxx   |6 
 sal/qa/rtl/math/test-rtl-math.cxx  |2 
 sal/qa/rtl/oustring/rtl_OUString2.cxx  |4 
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx |   25 ---
 sal/qa/rtl/process/rtl_Process.cxx |4 
 sal/qa/rtl/random/rtl_random.cxx   |2 
 sal/qa/rtl/ref/rtl_ref.cxx |1 
 sal/qa/rtl/strings/test_oustring_noadditional.cxx  |   25 ---
 sal/qa/rtl/textenc/rtl_tencinfo.cxx|3 
 sal/qa/rtl/uri/rtl_Uri.cxx |4 
 sal/qa/rtl/uri/rtl_testuri.cxx |1 
 sal/qa/rtl/uuid/rtl_Uuid.cxx   |4 
 40 files changed, 68 insertions(+), 583 deletions(-)

New commits:
commit 597d178c2b516ab0cff4e4f86246d47ce9700f18
Author: Matúš Kukan 
Date:   Sat Dec 17 10:30:36 2016 +0100

tdf#97283: Merge sal rtl tests to one makefile

Change-Id: I1b78276e08feef9b6f49e5abe002391c50a8d2cc
Reviewed-on: https://gerrit.libreoffice.org/32143
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/sal/CppunitTest_sal_bytesequence.mk 
b/sal/CppunitTest_sal_bytesequence.mk
deleted file mode 100644
index ca22ebb..000
--- a/sal/CppunitTest_sal_bytesequence.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,sal_bytesequence))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\
-sal/qa/ByteSequence/ByteSequence \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\
-sal \
-   $(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk
new file mode 100644
index 000..b69e330
--- /dev/null
+++ b/sal/CppunitTest_sal_rtl.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl,\
+   sal/qa/ByteSequence/ByteSequence \
+   sal/qa/OStringBuffer/rtl_OStringBuffer \

[Libreoffice-commits] core.git: sal/CppunitTest_sal_osl_condition.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk sal/CppunitTest_sal_osl.mk sal/CppunitTest_sal_

[Matúš Kukan]

 sal/CppunitTest_sal_osl.mk|   44 
++
 sal/CppunitTest_sal_osl_condition.mk  |   22 
-
 sal/CppunitTest_sal_osl_file.mk   |   24 
-
 sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk   |   22 
-
 sal/CppunitTest_sal_osl_module.mk |   26 
-
 sal/CppunitTest_sal_osl_mutex.mk  |   21 

 sal/CppunitTest_sal_osl_old_test_file.mk  |   22 
-
 sal/CppunitTest_sal_osl_pipe.mk   |   21 

 sal/CppunitTest_sal_osl_process.mk|   28 
--
 sal/CppunitTest_sal_osl_profile.mk|   21 

 sal/CppunitTest_sal_osl_setthreadname.mk  |   23 
-
 sal/CppunitTest_sal_osl_thread.mk |   22 
-
 sal/CppunitTest_sal_tcwf.mk   |   23 
-
 sal/Module_sal.mk |   15 
---
 sal/qa/osl/file/osl_File.cxx  |2 
 sal/qa/osl/file/osl_old_test_file.cxx |2 
 sal/qa/osl/file/test_cpy_wrt_file.cxx |6 -
 sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx |2 
 sal/qa/osl/module/osl_Module.cxx  |4 
 sal/qa/osl/mutex/osl_Mutex.cxx|2 
 sal/qa/osl/pipe/osl_Pipe.cxx  |2 
 sal/qa/osl/process/osl_Thread.cxx |4 
 sal/qa/osl/process/osl_process.cxx|2 
 sal/qa/osl/profile/osl_old_testprofile.cxx|2 
 sal/qa/osl/setthreadname/test-setthreadname.cxx   |2 
 25 files changed, 46 insertions(+), 318 deletions(-)

New commits:
commit 8e743e46781b252f41227d809dec43d3c4c1d01f
Author: Matúš Kukan 
Date:   Sat Dec 17 08:58:42 2016 +0100

tdf#97283: Merge sal osl tests to one makefile

Leave sal_osl_security alone because
it does not use CPPUNIT_PLUGIN_IMPLEMENT.

Change-Id: Iced8bb80c3ae661d371c087d7178a373ffd802e0
Reviewed-on: https://gerrit.libreoffice.org/32142
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk
new file mode 100644
index 000..7432ff9
--- /dev/null
+++ b/sal/CppunitTest_sal_osl.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\
+   sal/qa/osl/condition/osl_Condition \
+   $(if $(filter $(OS),WNT),,sal/qa/osl/file/osl_File) \
+   sal/qa/osl/file/osl_old_test_file \
+   sal/qa/osl/file/test_cpy_wrt_file \
+   sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl \
+   $(if $(DISABLE_DYNLOADING),,sal/qa/osl/module/osl_Module) \
+   sal/qa/osl/mutex/osl_Mutex \
+   sal/qa/osl/pipe/osl_Pipe \
+   sal/qa/osl/process/osl_process \
+   sal/qa/osl/process/osl_Thread \
+   sal/qa/osl/profile/osl_old_testprofile \
+   sal/qa/osl/setthreadname/test-setthreadname \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sal_osl,\
+   sal \
+   $(gb_UWINAPI) \
+))
+
+# the test uses the library created by Module_DLL
+$(call gb_CppunitTest_get_target,sal_osl) : \
+   $(call gb_CppunitTest_get_target,Module_DLL)
+
+$(eval $(call gb_CppunitTest_use_executable,sal_osl,osl_process_child))
+
+$(eval $(call gb_CppunitTest_use_externals,sal_osl,\
+   boost_headers \
+   valgrind \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_condition.mk 
b/sal/CppunitTest_sal_osl_condition.mk
deleted file mode 100644
index 4b9f4aa..000
--- a/sal/CppunitTest_sal_osl_condition.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_condition))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\
-

Re: MSVC 2015's broken static initializer_list causing build failure

[Matúš Kukan]

On 19 December 2016 at 11:23, Stephan Bergmann  wrote:
> On 12/16/2016 10:53 PM, Luke Benes wrote:
>>
>> When I try to build with MSVC 2015 I get the following error:
>> checking whether C:/PROGRA~2/MICROS~1.0/VC/bin/amd64/cl.exe has broken
>> static initializer_list support... yes
>> configure: error: working support for static initializer_list needed
>> Error running configure at ./autogen.sh line 281.
>
>
> 
> "Make check for broken static initialize_list work with MSVC 2015" fixes
> that for me

I need this change in the 'else' branch of 'if test "$BITNESS_OVERRIDE" = 64;'
With that it works for me too.
But I can't push now.

Thanks,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: make gbuildtojson and make xx-ide-integration problems.

[Matúš Kukan]

On 14 December 2016 at 13:32, Jan Iversen  wrote:
> I ran it in my debugger and the file in question is
> '/workdir/GbuildToJson/Library/libscqahelper.dylib’ which has ‘“MAKEFILE":
> "'/Volumes/LIBREOFFICE/play/core/sc/CppunitTest_sc_ucalc.mk’”’ (see
> attachment GbuildToJson.tgz).

/me wonders why I don't have any workdir/GbuildToJson/Library/*scqahelper*

Anyway, I've also touched xcode generation in
https://gerrit.libreoffice.org/#/c/32027/
I think there was the same problem as with different visual studio
project files having the same name.
..just to know

HTH,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Matúš Kukan]

 bin/gbuild-to-ide |   39 +--
 1 file changed, 13 insertions(+), 26 deletions(-)

New commits:
commit ee3f793a2d4e2977a3e952e1439708d8936953d7
Author: Matúš Kukan 
Date:   Wed Dec 14 22:25:12 2016 +0100

tdf#70414: Fix VisualStudio ide integration

'LINKTARGET' is not really helpful as target name.
Use name based on makefile's name and hope something like
b81ac16e65b311d6e43c05c22c65d2040c9d7e04 is not needed anymore.
And if there are still some inconsistencies, we should fix makefile's name.

Also, don't use target.name because it's not unique.
There can be e.g. both Library_smoketest and CppunitTest_smoketest.

Change-Id: I541a1e41f80446e875e1bb2bfa89786e356e0e74
Reviewed-on: https://gerrit.libreoffice.org/32027
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 7de2fb4..8ee2d13 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -39,47 +39,40 @@ class GbuildLinkTarget:
 
 
 class GbuildLib(GbuildLinkTarget):
-def __init__(self, name, library, location, include, include_sys, defs, 
cxxobjects, cxxflags, linked_libs):
+def __init__(self, name, location, include, include_sys, defs, cxxobjects, 
cxxflags, linked_libs):
 GbuildLinkTarget.__init__(self, name, location, include, include_sys, 
defs, cxxobjects, cxxflags, linked_libs)
-self.library = library
 
 def short_name(self):
 """Return the short name of target based on the Library_* makefile 
name"""
 return 'Library %s' % self.name
 
 def target_name(self):
-return 'Library_%s' % self.library
+return 'Library_%s' % self.name
 
 def library_name(self):
-return self.library
+return self.name
 
 class GbuildTest(GbuildLinkTarget):
-def __init__(self, name, test, location, include, include_sys, defs, 
cxxobjects, cxxflags, linked_libs):
+def __init__(self, name, location, include, include_sys, defs, cxxobjects, 
cxxflags, linked_libs):
 GbuildLinkTarget.__init__(self, name, location, include, include_sys, 
defs, cxxobjects, cxxflags, linked_libs)
-self.test = test
 
 def short_name(self):
 """Return the short name of target based n the CppunitTest_* makefile 
names"""
 return 'CppunitTest %s' % self.name
 
 def target_name(self):
-return 'CppunitTest_%s' % self.test
-
-def test_name(self):
-return self.test
-
+return 'CppunitTest_%s' % self.name
 
 class GbuildExe(GbuildLinkTarget):
-def __init__(self, name, executable, location, include, include_sys, defs, 
cxxobjects, cxxflags, linked_libs):
+def __init__(self, name, location, include, include_sys, defs, cxxobjects, 
cxxflags, linked_libs):
 GbuildLinkTarget.__init__(self, name, location, include, include_sys, 
defs, cxxobjects, cxxflags, linked_libs)
-self.executable = executable
 
 def short_name(self):
 """Return the short name of target based on the Executable_* makefile 
name"""
 return 'Executable %s' % self.name
 
 def target_name(self):
-return 'Executable_%s' % self.executable
+return 'Executable_%s' % self.name
 
 
 class GbuildParser:
@@ -88,7 +81,7 @@ class GbuildParser:
 self.binpath = os.path.dirname(os.environ['GPERF']) # woha, this is 
quite a hack
 (self.srcdir, self.builddir, self.instdir, self.workdir) = 
(os.environ['SRCDIR'], os.environ['BUILDDIR'], os.environ['INSTDIR'], 
os.environ['WORKDIR'])
 (self.libs, self.exes, self.tests, self.modulenamelist) = ([], [], [], 
[])
-(self.libnames, self.exenames, self.testnames, self.target_by_path, 
self.target_by_location) = ({}, {}, {}, {}, {})
+(self.target_by_path, self.target_by_location) = ({}, {})
 
 includepattern = re.compile('-I(\S+)')
 isystempattern = re.compile('-isystem\s*(\S+)')
@@ -129,7 +122,6 @@ class GbuildParser:
 (foundincludes, foundisystem) = 
GbuildParser.__split_includes(json['INCLUDE'])
 return GbuildLib(
 
GbuildParser.libpattern.match(os.path.basename(json['MAKEFILE'])).group(1),
-json['LINKTARGET'],
 os.path.dirname(json['MAKEFILE']),
 foundincludes,
 foundisystem,
@@ -151,7 +143,6 @@ class GbuildParser:
 
 return GbuildTest(
 testname,
-json['LINKTARGET'],
 os.path.dirname(json['MAKEFILE']),
 foundincludes,
 foundisystem,
@@ -165,7 +156,6 @@ class GbuildParser:
 (foundincludes, foundisystem) = 
GbuildParser.__split_includes(json['INCLUDE'])
 return GbuildExe(
 
GbuildParser.exepattern.match(os.path.basename(json['MAKEFILE'])).group(1),
-json['LINKTARGET'],
 os.path.dirname(json['MAKEFILE']),
 foundincludes,
   

[Libreoffice-commits] core.git: 2 commits - configure.ac scp2/source solenv/gbuild

[Matúš Kukan]

 configure.ac |5 -
 scp2/source/gnome/module_gnome.scp   |5 ++---
 solenv/gbuild/InstallModuleTarget.mk |2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 7740e945e0c74d057c424cced079adc766cc5604
Author: Matúš Kukan 
Date:   Sun Dec 11 00:09:01 2016 +0100

gid_File_Bin_Gnome_Open_Url was removed

..in eaa7f30102df4df01171e5daf83cdddae1bb0cda

Change-Id: I149ee4087dffe54fd63bacd3bb5aba67159fac72

diff --git a/scp2/source/gnome/module_gnome.scp 
b/scp2/source/gnome/module_gnome.scp
index e1c5862..200c300 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -27,11 +27,10 @@ Module gid_Module_Optional_Gnome
 PackageInfo = "packinfo_office.txt";
 MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
 Styles = ();
-Files = (auto_gnome_ALL,
+Files = (auto_gnome_ALL
 #if ENABLE_GIO
-  gid_File_Share_Registry_Gnome_Xcd,
+  ,gid_File_Share_Registry_Gnome_Xcd
 #endif
-  gid_File_Bin_Gnome_Open_Url
 );
 End
 
commit 1e074a455ed9c7136868f10bce3e173b22c1564b
Author: Matúš Kukan 
Date:   Sat Dec 10 23:53:29 2016 +0100

Remove some not used SCPDEFS

Change-Id: Ib85895c21cef9baeccc468b476cbd8170ee4c9ce

diff --git a/configure.ac b/configure.ac
index 6607ffa..2cf3ebf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2477,8 +2477,6 @@ fi
 if test "$enable_avmedia" = yes; then
 BUILD_TYPE="$BUILD_TYPE AVMEDIA"
 AC_DEFINE(HAVE_FEATURE_AVMEDIA)
-else
-SCPDEFS="$SCPDEFS -DDISABLE_AVMEDIA"
 fi
 
 # Decide whether to build database connectivity stuff (including
@@ -2539,7 +2537,6 @@ if test "$enable_dynamic_loading" = yes; then
 BUILD_TYPE="$BUILD_TYPE DYNLOADING"
 else
 DISABLE_DYNLOADING='TRUE'
-SCPDEFS="$SCPDEFS -DDISABLE_DYNLOADING"
 fi
 AC_SUBST(DISABLE_DYNLOADING)
 
@@ -3169,7 +3166,6 @@ fi
 
 if test "$cross_compiling" = "yes"; then
 export CROSS_COMPILING=TRUE
-SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
 else
 CROSS_COMPILING=
 BUILD_TYPE="$BUILD_TYPE NATIVE"
@@ -7560,7 +7556,6 @@ fi
 ENABLE_LWP=
 if test "$enable_lotuswordpro" = "yes"; then
 ENABLE_LWP="TRUE"
-SCPDEFS="$SCPDEFS -DDISABLE_LWP"
 fi
 AC_SUBST(ENABLE_LWP)
 
diff --git a/solenv/gbuild/InstallModuleTarget.mk 
b/solenv/gbuild/InstallModuleTarget.mk
index 54848b0..d24b201 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -68,7 +68,7 @@ $(call gb_Output_announce,$(2),$(true),SPP,2)
 $(call gb_Helper_abbreviate_dirs,\
$(gb_ScpPreprocessTarget_COMMAND) \
-+ -P \
-   $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
+   $(SCPDEFS) $(SCP_DEFS) \
$(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \
$(if $(ENABLE_JAVA),-DENABLE_JAVA) \
$(SCP_SOURCE) > $(1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk solenv/gbuild

[Matúš Kukan]

 Repository.mk|   35 +++
 solenv/gbuild/Helper.mk  |   18 ++
 solenv/gbuild/Package.mk |4 
 3 files changed, 57 insertions(+)

New commits:
commit 4d5e5908b41308152698cfd769173c69cb3569d4
Author: Matúš Kukan 
Date:   Wed Nov 30 09:15:53 2016 +0100

tdf#97803: gbuild: Check that every package is registered

Change-Id: Idedad62ac28804f4725d6bda2f4633ed79c01535
Reviewed-on: https://gerrit.libreoffice.org/31571
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 77dad73..245befa 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -768,6 +768,41 @@ $(eval $(call gb_Helper_register_jars,NONE,\
 ))
 endif
 
+# 'test_unittest' is only package delivering to workdir.
+# Other packages could be potentially autoinstalled.
+$(eval $(call gb_Helper_register_packages, \
+   test_unittest \
+   cli_basetypes_copy \
+   $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
+   $(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
+   desktop_install \
+   $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
+   extras_fonts \
+   extras_wordbook \
+   $(if $(filter WNTGCC,$(OS)$(COM)), \
+   mingw_dlls \
+   mingw_gccdlls \
+   ) \
+   $(if $(filter MSC,$(COM)),msvc_dlls) \
+   more_fonts_conf \
+   instsetoo_native_setup \
+   $(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
+   libreofficekit_selectionhandles \
+   odk_headers_generated \
+   oox_customshapes \
+   oox_generated \
+   postprocess_images \
+   postprocess_registry \
+   python_zipcore \
+   readlicense_oo_readmes \
+   sc_res_xml \
+   sdext_pdfimport_pdf \
+   setup_native_misc \
+   share \
+   shell_senddoc \
+   vcl_fontunxpsprint \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,impress,\
sd_xml \
 ))
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index c3677c0..0693f13 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -231,9 +231,27 @@ gb_Jar_MODULE_$(2) += $(3)
 
 endef
 
+define gb_Helper__register_packages
+$(foreach target,$(1),\
+ $(if $(filter $(target),$(gb_Package_REGISTERED)),\
+  $(call gb_Output_error,gb_Helper_register_packages: already registered: 
$(target
+$(if $(filter-out $(words $(1)),$(words $(sort $(1,\
+ $(call gb_Output_error,gb_Helper_register_packages: contains duplicates: 
$(1)))
+
+gb_Package_REGISTERED += $(1)
+
+endef
+
+# $(call gb_Helper_register_packages,packages)
+define gb_Helper_register_packages
+$(call gb_Helper__register_packages,$(1))
+
+endef
+
 # $(call gb_Helper_register_packages_for_install,installmodule,packages)
 define gb_Helper_register_packages_for_install
 $(if $(2),,$(call gb_Output_error,gb_Helper_register_packages_for_install: no 
packages - need 2 parameters))
+$(call gb_Helper__register_packages,$(2))
 
 gb_Package_MODULE_$(1) += $(2)
 
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index a23728c..1ab45b6 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -100,6 +100,10 @@ define gb_Package_Package
 $$(if $$(gb_Package_SOURCEDIR_$(1)),$$(call gb_Output_error,gb_Package__check: 
Package $(1) has already been defined))
 $(if $(filter postprocess% instsetoo_native%,$(1)),,\
 $(call gb_Postprocess_register_target,AllPackages,Package,$(1)))
+ifeq (,$$(filter $(1),$$(gb_Package_REGISTERED)))
+$$(eval $$(call gb_Output_info,Currently known packages are: $(sort 
$(gb_Package_REGISTERED)),ALL))
+$$(eval $$(call gb_Output_error,Package $(1) must be registered in 
Repository.mk or RepositoryExternal.mk))
+endif
 $(call gb_Package_Package_internal,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call 
gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1
 $(call gb_Helper_make_userfriendly_targets,$(1),Package)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/gen-autoinstall.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e99aa445679f70f2e686255eac89b732fec5e7a
Author: Matúš Kukan 
Date:   Fri Dec 2 21:40:06 2016 +0100

No component condition for a package file list

This is to fix a build after 67398a8d9746dbed743beb702a8cff2eac2bbf99
No idea if packages should contain conditions too,
but at least gid_File_Bin_UnpackUpdate did not.

Change-Id: I56e1b23f6eeca9c62cdadd8d93de6ccda89b20c4

diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index 61ed81a..53690bf 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -82,6 +82,6 @@ for (gid, jarfile) in autojars:
 print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition 
+ ")")
 
 for (gid, pkgfilelist) in autopkgs:
-print("PACKAGE_FILELIST(" + gid + "," + pkgfilelist + 
scp2componentcondition + ")")
+print("PACKAGE_FILELIST(" + gid + "," + pkgfilelist + ")")
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - Repository.mk scp2/InstallModule_ooo.mk scp2/source setup_native/Module_setup_native.mk setup_native/Package_scripts.mk

[Matúš Kukan]

 Repository.mk|7 +
 scp2/InstallModule_ooo.mk|8 -
 scp2/source/onlineupdate/file_onlineupdate.scp   |9 --
 scp2/source/onlineupdate/module_onlineupdate.scp |1 
 scp2/source/ooo/common_brand.scp |   95 ++-
 scp2/source/ooo/common_brand_readme.scp  |   33 ---
 scp2/source/ooo/ure.scp  |   16 ---
 setup_native/Module_setup_native.mk  |   24 +
 setup_native/Package_scripts.mk  |4 
 9 files changed, 26 insertions(+), 171 deletions(-)

New commits:
commit f80d618cedafef73eb27fd994a1b5356ea693585
Author: Matúš Kukan 
Date:   Fri Dec 2 16:16:53 2016 +0100

scp2: Bin not defined gids and not used defines

And a little cleanup.

Change-Id: Id066b4d37e217b8ab21ea162c23a999566a9e190

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index a681f18..ade0cbd 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -38,16 +38,9 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-   $(if $(WINDOWS_SDK_HOME),\
-   -DHAVE_WINDOWS_SDK \
-   ) \
$(if $(SYSTEM_HSQLDB),\
-DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
) \
-   $(if $(MACOSX_SDK_VERSION),\
-   -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
-   ) \
-   $(if $(filter MSC,$(COM)),$(if 
$(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \
 ))
 
 ifeq ($(USING_X11),TRUE)
@@ -71,7 +64,6 @@ $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 scp2/source/ooo/common_brand \
-scp2/source/ooo/common_brand_readme \
 scp2/source/ooo/directory_ooo \
 scp2/source/ooo/directory_ooo_macosx \
 scp2/source/ooo/file_extra_ooo \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2bb6801..1f88ada 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -58,19 +58,10 @@ Module gid_Module_Root_Brand
  gid_Brand_File_Gdb_Trace,
  gid_Brand_File_Bin_Unoinfo,
 gid_Brand_File_Desktophelper_Txt,
- gid_Brand_File_Lib_Dbghelp,
- gid_Brand_File_Lib_Mingw_GccS,
- gid_Brand_File_Lib_Mingw_Stdcpp,
- gid_Brand_File_Lib_Msvcr80,
- gid_Brand_File_Lib_Msvcp80,
- gid_Brand_File_Lib_Msvcm80,
- gid_Brand_File_Msvcm80crt_Manifest,
- gid_Brand_File_Share_Registry_O5oo_Xcd,
  gid_Brand_File_Script_Unopkg,
  gid_Brand_File_Share_Xdg_Base,
  gid_Brand_File_Share_Xdg_Calc,
  gid_Brand_File_Share_Xdg_Draw,
- gid_Brand_File_Share_Xdg_Extension,
  gid_Brand_File_Share_Xdg_Impress,
  gid_Brand_File_Share_Xdg_Math,
  gid_Brand_File_Share_Xdg_QStart,
@@ -90,8 +81,7 @@ Module gid_Module_Langpack_Brand_Template
 Dirs = (gid_Brand_Dir_Program_Shell,
 gid_Brand_Dir_Readme);
 Files = (gid_Brand_File_Readme_Readme,
- gid_Brand_File_Share_Registry_Cjk_Xcd,
- gid_Brand_File_Txt_Readme);
+ gid_Brand_File_Share_Registry_Cjk_Xcd);
 End
 
 // Directories
@@ -503,6 +493,18 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
+File gid_Brand_File_Readme_Readme
+  TXT_FILE_BODY;
+  Dir = gid_Brand_Dir_Readme;
+  #ifdef UNX
+README_ALL_LANG(Name, README);
+  #endif
+  #ifdef WNT
+README_TXT_ALL_LANG(Name, readme, txt);
+  #endif
+Styles = (PACKED, SCPZIP_REPLACE);
+End
+
 File gid_Brand_File_Share_Registry_Cjk_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED,MAKE_LANG_SPECIFIC);
diff --git a/scp2/source/ooo/common_brand_readme.scp 
b/scp2/source/ooo/common_brand_readme.scp
deleted file mode 100644
index be3469d..000
--- a/scp2/source/ooo/common_brand_readme.scp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-// Files
-
-File 

[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/source solenv/gbuild

[Matúš Kukan]

 Repository.mk|1 +
 scp2/source/ooo/file_ooo.scp |   11 ---
 scp2/source/ooo/module_ooo.scp   |1 -
 solenv/gbuild/AllLangResTarget.mk|6 --
 solenv/gbuild/UIConfig.mk|4 
 solenv/gbuild/extensions/post_PackageInfo.mk |2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 0b66adec8f3a3e03499d5a3cb1db7008a391e61e
Author: Matúš Kukan 
Date:   Thu Dec 1 14:47:31 2016 +0100

tdf#90753: AutoInstall gengal with filelist feature

Change-Id: Ic72fb18eccb54b24f4205d997585cee753965b10

diff --git a/Repository.mk b/Repository.mk
index 33bf6d0..bcf63d4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -845,6 +845,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
package_dtd \
sd_web \
sfx2_emojiconfig \
+   $(call gb_Helper_optional,DESKTOP,$(if $(filter-out MACOSX 
WNT,$(OS)),svx_gengal)) \
$(if $(USING_X11),vcl_fontunxppds) \
$(if $(filter $(OS),MACOSX),vcl_osxres) \
xmloff_dtd \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index df88a71..a3e5a67 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -27,17 +27,6 @@
 
 #include "macros.inc"
 
-#if defined UNX && !defined MACOSX
-
-File gid_File_Script_Gengal
-BIN_FILE_BODY;
-Dir = gid_Brand_Dir_Program;
-Styles = (PACKED);
-Name = "gengal";
-End
-
-#endif
-
 #if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
 File gid_File_Bin_Senddoc
 BIN_FILE_BODY;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 4287904..210f4e5 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -24,7 +24,6 @@ Module gid_Module_Root
 InstallOrder = "20";
 MOD_NAME_DESC(MODULE_ROOT_OSL);
 Files = (gid_File_Bin_Senddoc,
- gid_File_Script_Gengal,
  gid_File_Txt_Pagein_Common,
  gid_File_Txt_Pagein_Calc,
  gid_File_Txt_Pagein_Draw,
commit 39a4ca4072059b707a5368d8d215249e06258032
Author: Matúš Kukan 
Date:   Wed Nov 30 20:16:12 2016 +0100

tdf#97803: gbuild: Check that resource targets are registered

And replace gb_AllLangResTarget_ALLTARGETS with
gb_AllLangResTarget_REGISTERED which should have
the same content and is already used.

This actually helped to find a problem, fixed in
52d409f0d657f314a53f945c9ffb5b8025bea034

Change-Id: Iae551d7be221c5655dee1bc9ad273c8822d45178

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 905fee4..3462a54 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -329,9 +329,11 @@ $(call gb_AllLangResTarget_get_target,%) :
 
 gb_ResTarget_get_install_target = 
$(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
 
-gb_AllLangResTarget_ALLTARGETS :=
 define gb_AllLangResTarget_AllLangResTarget
-gb_AllLangResTarget_ALLTARGETS += $(1)
+ifeq (,$$(filter $(1),$$(gb_AllLangResTarget_REGISTERED)))
+$$(eval $$(call gb_Output_info,Currently known AllLangResTargets are: $(sort 
$(gb_AllLangResTarget_REGISTERED)),ALL))
+$$(eval $$(call gb_Output_error,AllLangResTarget $(1) must be registered in 
Repository.mk))
+endif
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
 
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 7f81418..55446a3 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -200,6 +200,10 @@ gb_UIConfig_get_zipname_for_lang = UIConfig/$(1)/$(2)
 #
 # gb_UIConfig_UIConfig modulename
 define gb_UIConfig_UIConfig
+ifeq (,$$(filter $(1),$$(gb_UIConfig_REGISTERED)))
+$$(eval $$(call gb_Output_info,Currently known UI configs are: $(sort 
$(gb_UIConfig_REGISTERED)),ALL))
+$$(eval $$(call gb_Output_error,UIConfig $(1) must be registered in 
Repository.mk))
+endif
 $(call gb_UIConfig_get_imagelist_target,$(1)) : UI_IMAGELISTS :=
 
 $(call gb_PackageSet_PackageSet_internal,$(call 
gb_UIConfig_get_packagesetname,$(1)))
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index b3d3cfc..1b05e9c 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -72,7 +72,7 @@ endef
 define gb_PackageInfo_emit_l10n_for_one_lang
 @touch $(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf))
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst 
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call 
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1
-$(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach 
target,$(gb_AllLangResTarget_ALLTARGETS),$(call 
gb_PackageInfo_emit_l10n_for_one_resource,$(target),$(1
+$(if $(filter 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - external/Module_external.mk Repository.mk solenv/gbuild

[Matúš Kukan]

 Repository.mk  |2 +-
 external/Module_external.mk|7 ---
 solenv/gbuild/Helper.mk|4 +++-
 solenv/gbuild/Module.mk|2 ++
 solenv/gbuild/extensions/pre_BuildTools.mk |3 +++
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c3bec2919fda97f37127c3656314a1441f19ce5a
Author: Matúš Kukan 
Date:   Wed Nov 30 14:36:51 2016 +0100

gbuild: Prevent wrong use of gb_Helper_optional_for_host

It's empty, unless gb_Side=build.
This fixes commit 1193443b15b0e38cbfb41573b31acf9a8d90ce2c
which removed icons used in our open dialog from image zip files.

Also, include 985e93ecb44aef97995099d4fd5915afd3cab282
"fix cross-toolset: gb_Helper_optional_for_host can't contain 'newline'"

Reviewed-on: https://gerrit.libreoffice.org/31419
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 52d409f0d657f314a53f945c9ffb5b8025bea034)

Change-Id: I83efad36d8f40c460d09ee1bd1addd7fb26c177b
Reviewed-on: https://gerrit.libreoffice.org/31463
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 48ce934..8030cf5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -918,7 +918,7 @@ $(eval $(call gb_Helper_register_resources,\
eur \
for \
forui \
-   $(call gb_Helper_optional_for_host,DESKTOP,fps_office) \
+   $(call gb_Helper_optional,DESKTOP,fps_office) \
frm \
fwe \
gal \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 3b54b52..1dbf97b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -101,13 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
$(call gb_Helper_optional,ZMF,libzmf) \
-   $(call gb_Helper_optional_for_host,DESKTOP, \
-   $(if $(WITH_GALLERY_BUILD), \
-   $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
-   $(call gb_Helper_optional,LCMS2,lcms2) \
-   $(call gb_Helper_optional,NSS,nss) \
-   ) \
-   ) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 4e914d1..c3677c0 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -299,7 +299,9 @@ endef
 endif
 
 define gb_Helper_optional_for_host
-$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
+$(if $(filter build,$(gb_Side)), \
+   $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)), \
+   $(call gb_Output_error,gb_Helper_optional_for_host: Use only when 
gb_Side=build))
 endef
 
 define gb_Helper_print_on_error
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index eb558a8..6af2b5c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -144,10 +144,12 @@ $(call gb_Module_get_target,%) :
 
 all : build $(if $(CROSS_COMPILING),,unitcheck $(if 
$(gb_PARTIAL_BUILD),,slowcheck))
 
+ifeq ($(gb_Side),build)
 build-tools : $(gb_BUILD_TOOLS)
$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
$(call gb_Output_announce_title,build-tools done.)
$(call gb_Output_announce_bell)
+endif
 
 build :
$(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir 
$(module))),$(true),ALL,6)
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index f387df6..5daf671 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -8,6 +8,7 @@
 #
 
 # Tools we need to build for cross-compiling
+ifeq ($(gb_Side),build)
 gb_BUILD_TOOLS = \
$(foreach executable, \
bestreversemap \
@@ -44,4 +45,6 @@ gb_BUILD_TOOLS = \
,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/Helper.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 985e93ecb44aef97995099d4fd5915afd3cab282
Author: Matúš Kukan 
Date:   Thu Dec 1 07:35:26 2016 +0100

fix cross-toolset: gb_Helper_optional_for_host can't contain 'newline'

Otherwise, the 'newline' is passed as a second parameter to
gb_Module_add_moduledir which breaks build. :/

Change-Id: I02eba5ddef9f7a6dccbb7d135a7e8c68629da9c4

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 1464411..c3677c0 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -299,8 +299,9 @@ endef
 endif
 
 define gb_Helper_optional_for_host
-$(if $(filter build,$(gb_Side)),,$(call 
gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build))
-$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
+$(if $(filter build,$(gb_Side)), \
+   $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)), \
+   $(call gb_Output_error,gb_Helper_optional_for_host: Use only when 
gb_Side=build))
 endef
 
 define gb_Helper_print_on_error
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk Repository.mk solenv/gbuild

[Matúš Kukan]

 Repository.mk  |2 +-
 external/Module_external.mk|7 ---
 solenv/gbuild/Helper.mk|1 +
 solenv/gbuild/Module.mk|2 ++
 solenv/gbuild/extensions/pre_BuildTools.mk |3 +++
 5 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 52d409f0d657f314a53f945c9ffb5b8025bea034
Author: Matúš Kukan 
Date:   Wed Nov 30 14:36:51 2016 +0100

gbuild: Prevent wrong use of gb_Helper_optional_for_host

It's empty, unless gb_Side=build.
This fixes commit 1193443b15b0e38cbfb41573b31acf9a8d90ce2c

Change-Id: I83efad36d8f40c460d09ee1bd1addd7fb26c177b
Reviewed-on: https://gerrit.libreoffice.org/31419
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 6ed227c..33bf6d0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -992,7 +992,7 @@ $(eval $(call gb_Helper_register_resources,\
eur \
for \
forui \
-   $(call gb_Helper_optional_for_host,DESKTOP,fps_office) \
+   $(call gb_Helper_optional,DESKTOP,fps_office) \
frm \
fwe \
gal \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 3b54b52..1dbf97b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -101,13 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
$(call gb_Helper_optional,ZMF,libzmf) \
-   $(call gb_Helper_optional_for_host,DESKTOP, \
-   $(if $(WITH_GALLERY_BUILD), \
-   $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
-   $(call gb_Helper_optional,LCMS2,lcms2) \
-   $(call gb_Helper_optional,NSS,nss) \
-   ) \
-   ) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 4e914d1..1464411 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -299,6 +299,7 @@ endef
 endif
 
 define gb_Helper_optional_for_host
+$(if $(filter build,$(gb_Side)),,$(call 
gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build))
 $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
 endef
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index eb558a8..6af2b5c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -144,10 +144,12 @@ $(call gb_Module_get_target,%) :
 
 all : build $(if $(CROSS_COMPILING),,unitcheck $(if 
$(gb_PARTIAL_BUILD),,slowcheck))
 
+ifeq ($(gb_Side),build)
 build-tools : $(gb_BUILD_TOOLS)
$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
$(call gb_Output_announce_title,build-tools done.)
$(call gb_Output_announce_bell)
+endif
 
 build :
$(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir 
$(module))),$(true),ALL,6)
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index f387df6..5daf671 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -8,6 +8,7 @@
 #
 
 # Tools we need to build for cross-compiling
+ifeq ($(gb_Side),build)
 gb_BUILD_TOOLS = \
$(foreach executable, \
bestreversemap \
@@ -44,4 +45,6 @@ gb_BUILD_TOOLS = \
,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

[Matúš Kukan]

 Repository.mk   |   18 +
 scp2/source/impress/file_impress.scp|9 
 scp2/source/impress/module_impress.scp  |1 
 scp2/source/impress/module_ogltrans.scp |9 
 scp2/source/ooo/file_extra_ooo.scp  |   21 --
 scp2/source/ooo/file_ooo.scp|   64 
 scp2/source/ooo/module_ooo.scp  |6 ---
 7 files changed, 19 insertions(+), 109 deletions(-)

New commits:
commit 4430ace32a8dfd534d5e1c64ec7855edad11e5c4
Author: Matúš Kukan 
Date:   Mon Nov 28 16:42:09 2016 +0100

tdf#90753: AutoInstall more packages

Change-Id: If8a52f652f7ab890826372b6d081ee19c69fb5ec
Reviewed-on: https://gerrit.libreoffice.org/31371
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 898a112..6ed227c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -766,6 +766,10 @@ $(eval $(call gb_Helper_register_jars,NONE,\
 ))
 endif
 
+$(eval $(call gb_Helper_register_packages_for_install,impress,\
+   sd_xml \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,ure,\
instsetoo_native_setup_ure \
ure_install \
@@ -803,6 +807,10 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
officecfg_misc \
+   $(if $(filter $(OS),MACOSX), \
+   extensions_mdibundle \
+   extensions_OOoSpotlightImporter \
+   ) \
extras_autocorr \
extras_autotextuser \
extras_cfgsrvnolang \
@@ -833,7 +841,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_tplwizreport \
extras_tplwizstyles \
framework_dtd \
+   $(if $(filter $(OS),MACOSX),infoplist) \
package_dtd \
+   sd_web \
+   sfx2_emojiconfig \
+   $(if $(USING_X11),vcl_fontunxppds) \
+   $(if $(filter $(OS),MACOSX),vcl_osxres) \
xmloff_dtd \
xmlscript_dtd \
xmlhelp_helpxsl \
@@ -844,15 +857,19 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo,\
$(if 
$(ENABLE_SCRIPTING_JAVASCRIPT),scripting_ScriptsJavaScript) \
) \
$(if $(DISABLE_SCRIPTING),,scripting_scriptbindinglib) \
+   $(if $(filter $(OS),MACOSX),sysui_osxicons) \
+   wizards_basicshare \
wizards_basicsrvaccess2base \
wizards_basicsrvdepot \
wizards_basicsrveuro \
wizards_basicsrvgimmicks \
wizards_basicsrvimport \
wizards_basicsrvform \
+   wizards_basicsrvstandard \
wizards_basicsrvtemplate \
wizards_basicsrvtools \
wizards_basicsrvtutorials \
+   wizards_basicusr \
xmlsec \
chart2_opengl_shader \
vcl_opengl_shader \
@@ -873,6 +890,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
+   sd_opengl \
slideshow_opengl_shader \
 ))
 
diff --git a/scp2/source/impress/file_impress.scp 
b/scp2/source/impress/file_impress.scp
index 81ad53c..f689c62 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -32,12 +32,3 @@ File gid_File_Help_Simpress_Zip
 EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
 End
 #endif
-
-// configuration files for custom animation effects
-
-File gid_File_sd_xml
-TXT_FILE_BODY;
-Styles = (FILELIST, PACKED);
-Dir = FILELIST_DIR;
-Name = "sd_xml.filelist";
-End
diff --git a/scp2/source/impress/module_impress.scp 
b/scp2/source/impress/module_impress.scp
index 9d32917..ca335d6 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -38,7 +38,6 @@ Module gid_Module_Prg_Impress_Bin
 Files = (auto_impress_ALL,
 
gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
 gid_File_Share_Registry_Impress_Xcd,
-gid_File_sd_xml,
 gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
diff --git a/scp2/source/impress/module_ogltrans.scp 
b/scp2/source/impress/module_ogltrans.scp
index 14f586f..a549c34 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -23,18 +23,11 @@
 Module gid_Module_Optional_OGLTrans
 PackageInfo = "packinfo_office.txt";
 ParentID = gid_Module_Optional;
-Files = ( auto_ogltrans_ALL, 
gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, 
gid_File_Share_Registry_Ogltrans_Xcd );
+Files = ( auto_ogltrans_ALL, gid_File_Share_Registry_Ogltrans_Xcd );
 Default = YES;
 Styles = (HIDDEN_ROOT);
 End
 
-File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
-TXT_FILE_BODY;
-Styles = (FILELIST,PACKED);
-Dir = FILELIST_DIR;
-Name = 

[Libreoffice-commits] core.git: Repository.mk scp2/inc scp2/InstallModule_sdkoo.mk scp2/source

[Matúš Kukan]

 Repository.mk   |   23 +++
 scp2/InstallModule_sdkoo.mk |4 -
 scp2/inc/macros.inc |6 +
 scp2/source/sdkoo/sdkoo.scp |  138 
 4 files changed, 29 insertions(+), 142 deletions(-)

New commits:
commit fd7c94f0b201df7203410323fbabc9edcd2d69af
Author: Matúš Kukan 
Date:   Mon Nov 28 14:48:43 2016 +0100

tdf#90753: Autoinstall sdk packages

Change-Id: I54de722335d443813cb4526716c0101a049db03f
Reviewed-on: https://gerrit.libreoffice.org/31370
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 2015556..898a112 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -777,6 +777,29 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,sdk,\
+   odk_share_readme \
+   odk_share_readme_generated \
+   $(if $(filter WNT,$(OS)),odk_cli) \
+   odk_config \
+   $(if $(filter WNT,$(OS)),odk_config_win) \
+   odk_docs \
+   $(if $(DOXYGEN),odk_doxygen) \
+   odk_examples \
+   odk_headers \
+   odk_html \
+   odk_lib \
+   odk_settings \
+   odk_settings_generated \
+   offapi_idl \
+   udkapi_idl \
+   $(if $(ENABLE_JAVA), \
+   odk_javadoc \
+   odk_uno_loader_classes \
+   odk_unowinreg \
+   ) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
officecfg_misc \
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 0669195..7dfbcfa 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -11,11 +11,9 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/sdkoo,sdk))
 
-ifneq ($(DOXYGEN),)
 $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
-   -DDOXYGEN \
+   -DPACKAGE_FILELIST_DIR=FILELIST_SDK_DIR \
 ))
-endif
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
 scp2/source/sdkoo/sdkoo \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4de35db..a2e8daa 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -115,7 +115,7 @@
 
 #define PACKAGE_FILELIST(id,name) \
 File id \
-Dir = FILELIST_DIR; \
+Dir = PACKAGE_FILELIST_DIR; \
 Name = name; \
 Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
 End
@@ -469,6 +469,10 @@ End
 #endif
 #endif
 
+#if !defined PACKAGE_FILELIST_DIR
+#define PACKAGE_FILELIST_DIR FILELIST_DIR
+#endif
+
 #define UI_FILELIST(name, file) \
 File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \
 TXT_FILE_BODY; \
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f73e3e8..e4ff952 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -71,141 +71,3 @@ Module gid_Module_Root_SDK
 Files = (auto_sdk_ALL);
 End
 
-File gid_File_Package_odk_share_readme
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_share_readme.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Package_odk_share_readme_generated
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_share_readme_generated.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-
-#if defined(WNT)
-File gid_File_Package_odk_cli
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_cli.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Package_odk_config
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_config.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-#if defined(WNT)
-File gid_File_Package_odk_config_win
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_config_win.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Package_odk_docs
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_docs.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Package_odk_html
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_html.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-#if defined(ENABLE_JAVA)
-File gid_File_Package_odk_javadoc
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_javadoc.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Package_odk_lib
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_lib.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Package_odk_settings
-TXT_FILE_BODY;
-Dir = FILELIST_SDK_DIR;
-Name = "odk_settings.filelist";
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Package_odk_settings_generated
-TXT_FILE_BODY;
-Dir = 

[Libreoffice-commits] core.git: external/msc-externals

[Matúš Kukan]

 external/msc-externals/Package_msvc80_dlls.mk |   16 
 1 file changed, 16 deletions(-)

New commits:
commit 620e99bb9cf81ee9d269ea2c60e66f2be1a7523a
Author: Matúš Kukan 
Date:   Wed Nov 30 08:36:52 2016 +0100

Bin not used makefile

msvc80 dlls are gone since 4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f

Change-Id: Ifc43bc5ffdb404340967786628f360ebdb0e7fbc

diff --git a/external/msc-externals/Package_msvc80_dlls.mk 
b/external/msc-externals/Package_msvc80_dlls.mk
deleted file mode 100644
index c15e839..000
--- a/external/msc-externals/Package_msvc80_dlls.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,msvc80_dlls,$(MSVC80_DLL_PATH)))
-
-$(eval $(call gb_Package_add_files,msvc80_dlls,$(LIBO_LIB_FOLDER),\
-   $(MSVC80_DLLS) \
-))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

[Matúš Kukan]

 Repository.mk  |   27 +
 scp2/source/ooo/file_extra_ooo.scp |  182 -
 scp2/source/ooo/file_ooo.scp   |   11 --
 scp2/source/ooo/module_ooo.scp |   23 
 4 files changed, 27 insertions(+), 216 deletions(-)

New commits:
commit 42b959ff7241f955bfa68ee484d81c2d90be5434
Author: Matúš Kukan 
Date:   Fri Nov 25 22:42:42 2016 +0100

tdf#90753: Move extras packages to AutoInstall

Change-Id: I3e1504bb8a68a6142ab4035b2cb81c03d9af9227

diff --git a/Repository.mk b/Repository.mk
index 60c9fa0..2015556 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -780,8 +780,35 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
officecfg_misc \
+   extras_autocorr \
+   extras_autotextuser \
+   extras_cfgsrvnolang \
+   extras_cfgusr \
+   extras_database \
+   extras_databasebiblio \
+   extras_gallbullets \
+   extras_gallhtmlexpo \
+   extras_gallmytheme \
+   extras_gallroot \
+   extras_gallsystem \
+   extras_gallwwwback \
+   extras_gallwwwgraf \
extras_glade \
extras_labels \
+   $(if $(filter WNT,$(OS)),extras_newfiles) \
+   extras_palettes \
+   extras_tplofficorr \
+   extras_tploffimisc \
+   extras_tplpresnt \
+   extras_tpl_styles \
+   extras_tplpersonal \
+   extras_tplwizbitmap \
+   extras_tplwizdesktop \
+   extras_tplwizletter \
+   extras_tplwizfax \
+   extras_tplwizagenda \
+   extras_tplwizreport \
+   extras_tplwizstyles \
framework_dtd \
package_dtd \
xmloff_dtd \
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 59a408c..b1a66a9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -18,13 +18,6 @@
 
 #include "macros.inc"
 
-File gid_File_Extra_Autocorr
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_autocorr.filelist";
-End
-
 File gid_File_Extra_Autotextshare_Lang
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
@@ -32,27 +25,6 @@ File gid_File_Extra_Autotextshare_Lang
 EXTRA_ALL_LANG(autotextshare,filelist);
 End
 
-File gid_File_Extra_Autotextuser
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION, DOCLANG);
-Name = "extras_autotextuser.filelist";
-End
-
-File gid_File_Extra_Cfgusr
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_cfgusr.filelist";
-End
-
-File gid_File_Extra_Cfgsrv
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_cfgsrvnolang.filelist";
-End
-
 File gid_File_sd_web
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
@@ -60,20 +32,6 @@ File gid_File_sd_web
 Name = "sd_web.filelist";
 End
 
-File gid_File_Extra_Database
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_database.filelist";
-End
-
-File gid_File_Extra_Databasebiblio
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_databasebiblio.filelist";
-End
-
 File gid_File_Extra_Emojiconfig
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
@@ -99,27 +57,6 @@ End
 
 #endif
 
-File gid_File_Extra_Gallbullets
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallbullets.filelist";
-End
-
-File gid_File_Extra_Gallhtmlexpo
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallhtmlexpo.filelist";
-End
-
-File gid_File_Extra_Gallroot
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallroot.filelist";
-End
-
 #if defined (WITH_GALLERY_BUILD)
 
 GALLERY_FILELIST(arrows)
@@ -136,125 +73,6 @@ GALLERY_FILELIST(txtshapes)
 
 #endif
 
-File gid_File_Extra_Gallmytheme
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_gallmytheme.filelist";
-End
-
-File gid_File_Extra_Gallsystem
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallsystem.filelist";
-End
-
-File gid_File_Extra_Gallwwwback
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallwwwback.filelist";
-End
-
-File gid_File_Extra_Gallwwwgraf
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallwwwgraf.filelist";
-End
-
-File gid_File_Extra_Palettes
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_palettes.filelist";
-End
-
-File gid_File_Extra_Tplofficorr
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_tplofficorr.filelist";
-End
-
-File 

[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/InstallModule_ooo.mk scp2/source

[Matúš Kukan]

 Repository.mk|6 ++
 scp2/InstallModule_ooo.mk|5 -
 scp2/source/ooo/common_brand.scp |   31 ---
 3 files changed, 6 insertions(+), 36 deletions(-)

New commits:
commit aabc5aab5af27e929a81a6036d2f470ab1f5ac4d
Author: Matúš Kukan 
Date:   Sun Nov 20 10:35:38 2016 +0100

tdf#90753: Move brand packages to AutoInstall

gid_Brand_File_Bin_Soffice_Bin_Manifest was removed
in 26bddf3e80865d847f52e649ab60f97269177a3e

Change-Id: Iff5314e8c3c6191556c082bc30938dd177b254fc

diff --git a/Repository.mk b/Repository.mk
index 48ce934..60c9fa0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -836,6 +836,12 @@ $(eval $(call 
gb_Helper_register_packages_for_install,xsltfilter,\
filter_xslt \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,brand,\
+   desktop_branding \
+   $(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
+   $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter 
DESKTOP,$(BUILD_TYPE))),desktop_soffice_sh) \
+))
+
 ifeq ($(USING_X11), TRUE)
 $(eval $(call gb_Helper_register_packages_for_install,base_brand,\
desktop_sbase_sh \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 7a9bc37..a681f18 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-   $(if $(CUSTOM_BRAND_DIR),-DCUSTOM_BRANDING) \
$(if $(WINDOWS_SDK_HOME),\
-DHAVE_WINDOWS_SDK \
) \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6424960..8e90992 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -56,11 +56,7 @@ Module gid_Module_Root_Brand
 gid_Brand_Dir_Share_Xdg);
 Files = (auto_brand_ALL,
  gid_Brand_File_Gdb_Trace,
- gid_Brand_File_Bin_Soffice,
- gid_Brand_File_Bin_Soffice_Bin_Manifest,
  gid_Brand_File_Bin_Unoinfo,
- gid_Brand_File_Bmp_IntroAboutShell,
- gid_Brand_File_Bmp_IntroAboutShell_custom,
 gid_Brand_File_Desktophelper_Txt,
  gid_Brand_File_Html_Thirdpartylicensereadme,
  gid_Brand_File_Lib_Dbghelp,
@@ -496,17 +492,6 @@ End
 
 #endif
 
-#if !defined MACOSX && !defined WNT
-
-File gid_Brand_File_Bin_Soffice
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "desktop_soffice_sh.filelist";
-Styles = (FILELIST, PACKED);
-End
-
-#endif
-
 #ifdef WNT
 File gid_Brand_File_Desktophelper_Txt
 TXT_FILE_BODY;
@@ -535,22 +520,6 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-File gid_Brand_File_Bmp_IntroAboutShell
-TXT_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "desktop_branding.filelist";
-Styles = (FILELIST);
-End
-
-#if defined CUSTOM_BRANDING
-File gid_Brand_File_Bmp_IntroAboutShell_custom
-TXT_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "desktop_branding_custom.filelist";
-Styles = (FILELIST);
-End
-#endif
-
 File gid_Brand_File_Txt_Package
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Extensions;
commit c1b50e6d8c1f925aa09a5522d5f83f5204c62670
Author: Matúš Kukan 
Date:   Fri Nov 25 22:03:58 2016 +0100

scp2: ICU was moved to AutoInstall

..in e759269e373fa02d3e8566d1edc9fb9526de6640

Change-Id: I670cd35f64f1784b4150a8c3ab310bd1c88e6ed0

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 35db721..7a9bc37 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -63,10 +63,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 ))
 endif
 
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-   -DICU_MAJOR=$(ICU_MAJOR) \
-))
-
 $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
 scp2/source/templates/module_helppack \
 scp2/source/templates/module_helppack_root \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: uui/source uui/util

[Matúš Kukan]

 uui/source/requeststringresolver.cxx |   33 -
 uui/source/requeststringresolver.hxx |   16 ++--
 uui/source/services.cxx  |   22 +-
 uui/util/uui.component   |4 ++--
 4 files changed, 13 insertions(+), 62 deletions(-)

New commits:
commit 22b0c09f8463b9c6cceb9e2c3addcab79d42aa0b
Author: Matúš Kukan 
Date:   Wed Sep 7 20:10:26 2016 +0200

tdf#74608: Ctor function for 
css.comp.uui.UUIInteractionRequestStringResolver

Change-Id: I42c0c2cc8797647aa9dd676034137a1430e42fee

diff --git a/uui/source/requeststringresolver.cxx 
b/uui/source/requeststringresolver.cxx
index d2ed7dc..b63b035 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -19,7 +19,6 @@
 
 #include "requeststringresolver.hxx"
 #include "iahndl.hxx"
-#include 
 #include 
 
 using namespace css;
@@ -39,7 +38,7 @@ OUString SAL_CALL
 UUIInteractionRequestStringResolver::getImplementationName()
 throw (uno::RuntimeException, std::exception)
 {
-return OUString::createFromAscii(m_aImplementationName);
+return 
OUString("com.sun.star.comp.uui.UUIInteractionRequestStringResolver");
 }
 
 sal_Bool SAL_CALL
@@ -50,11 +49,12 @@ UUIInteractionRequestStringResolver::supportsService(
 return cppu::supportsService(this, rServiceName);
 }
 
+
 uno::Sequence< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getSupportedServiceNames()
 throw (uno::RuntimeException, std::exception)
 {
-return getSupportedServiceNames_static();
+return { "com.sun.star.task.InteractionRequestStringResolver" };
 }
 
 beans::Optional< OUString > SAL_CALL
@@ -73,29 +73,12 @@ 
UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
 }
 }
 
-char const UUIInteractionRequestStringResolver::m_aImplementationName[]
-= "com.sun.star.comp.uui.UUIInteractionRequestStringResolver";
-
-uno::Sequence< OUString >
-UUIInteractionRequestStringResolver::getSupportedServiceNames_static()
-{
-uno::Sequence< OUString > aNames { 
"com.sun.star.task.InteractionRequestStringResolver" };
-return aNames;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
-UUIInteractionRequestStringResolver::createInstance(
-uno::Reference< lang::XMultiServiceFactory > const &
-rServiceFactory)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
 {
-try
-{
-return *new 
UUIInteractionRequestStringResolver(comphelper::getComponentContext(rServiceFactory));
-}
-catch (std::bad_alloc const &)
-{
-throw uno::RuntimeException("out of memory", nullptr);
-}
+return cppu::acquire(new UUIInteractionRequestStringResolver(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/requeststringresolver.hxx 
b/uui/source/requeststringresolver.hxx
index 4ebbee0..e6dc745 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -35,16 +34,8 @@ class UUIInteractionRequestStringResolver:
 css::task::XInteractionRequestStringResolver >
 {
 public:
-static char const m_aImplementationName[];
-
-static css::uno::Sequence< OUString >
-getSupportedServiceNames_static();
-
-static css::uno::Reference< css::uno::XInterface >
-SAL_CALL
-createInstance(
-css::uno::Reference< css::lang::XMultiServiceFactory > const &
-rServiceFactory);
+explicit UUIInteractionRequestStringResolver(
+css::uno::Reference< css::uno::XComponentContext > const & rxContext);
 
 private:
 std::unique_ptr m_pImpl;
@@ -52,9 +43,6 @@ private:
 UUIInteractionRequestStringResolver(UUIInteractionRequestStringResolver &) 
= delete;
 void operator =(UUIInteractionRequestStringResolver&) = delete;
 
-explicit UUIInteractionRequestStringResolver(
-css::uno::Reference< css::uno::XComponentContext > const & rxContext);
-
 virtual ~UUIInteractionRequestStringResolver() override;
 
 virtual OUString SAL_CALL getImplementationName()
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index e914508..052658a 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-#include "requeststringresolver.hxx"
 #include "passwordcontainer.hxx"
 
 using namespace com::sun::star::uno;
@@ -45,28 +44,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
uui_component_getFactory(sal_Cha
 static_cast< XMultiServiceFactory * >( pServiceManager ) );
 Reference< XSingleServiceFactory > xFactory;
 
-
-// UUI Interaction Request String Resolver.
-
-
-if ( rtl_str_compare(pImplName,
-

Re: Myssing link to libcomphelper.so on 5.2.0alpha1

[Matúš Kukan]

On 19 May 2016 at 09:53, Tomáš Chvátal  wrote:
> Hi all,
>
> I am building libreoffice 5.2.0alpha1 and it fails to install properly the
> sax library.
> It links to libcomphelper.so instead of the libmerged as the libcomphelper
> was integrated by
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=8668e044b27ca70de2e5b47741d5ccb2d4418ac4

Why do you need to install sax library?
I don't have it in ./test-install - it's included in libmerged.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: comphelper/source compilerplugins/clang include/comphelper include/unotools

[Matúš Kukan]

 comphelper/source/inc/comphelper_module.hxx |   14 --
 compilerplugins/clang/refcounting.cxx   |3 --
 include/comphelper/componentmodule.hxx  |   38 
 include/unotools/componentresmodule.hxx |   13 -
 4 files changed, 68 deletions(-)

New commits:
commit 5a1cd2f30d9cc8b9a6ce5eaed06af199080055b7
Author: Matúš Kukan 
Date:   Mon Feb 29 19:46:58 2016 +0100

OSingletonRegistration is dead now

Change-Id: I64a5ffa8790496bd39ba26e0c789db9eedc51071
Reviewed-on: https://gerrit.libreoffice.org/22788
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/comphelper/source/inc/comphelper_module.hxx 
b/comphelper/source/inc/comphelper_module.hxx
index 2364adf..8c587f0 100644
--- a/comphelper/source/inc/comphelper_module.hxx
+++ b/comphelper/source/inc/comphelper_module.hxx
@@ -64,20 +64,6 @@ namespace comphelper { namespace module
 }
 };
 
-/*  */
-template < class TYPE >
-class OSingletonRegistration : public 
::comphelper::OSingletonRegistration< TYPE >
-{
-private:
-typedef ::comphelper::OSingletonRegistration< TYPE > BaseClass;
-
-public:
-OSingletonRegistration() : BaseClass( ComphelperModule::getInstance() )
-{
-}
-};
-
-
 } } // namespace comphelper::module
 
 
diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index 0e899f3..663fcb7 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -112,7 +112,6 @@ static std::vector PROBABLY_GOOD_TEMPLATES = {
 "com::sun::star::uno::Sequence",
 "accessibility::WeakCppRef",
 "dba::OAutoRegistration",
-"dba::OSingletonRegistration",
 "dbp::OMultiInstanceAutoRegistration",
 "dbaui::OMultiInstanceAutoRegistration",
 "dbaxml::OMultiInstanceAutoRegistration",
@@ -120,7 +119,6 @@ static std::vector PROBABLY_GOOD_TEMPLATES = {
 "io_acceptor::ReferenceHash",
 "comphelper::OAutoRegistration",
 "comphelper::OInterfaceCompare",
-"comphelper::module::OSingletonRegistration",
 "comphelper::WeakBag",
 "comphelper::service_decl::class_",
 "comphelper::service_decl::vba_service_class_",
@@ -131,7 +129,6 @@ static std::vector PROBABLY_GOOD_TEMPLATES = {
 "dbmm::OAutoRegistration",
 "pcr::OAutoRegistration",
 "logging::ComponentMethodGuard",
-"logging::OSingletonRegistration",
 "logging::OAutoRegistration",
 "rtl::Reference",
 "sdbtools::OAutoRegistration",
diff --git a/include/comphelper/componentmodule.hxx 
b/include/comphelper/componentmodule.hxx
index 9317916..b14148a 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -202,44 +202,6 @@ namespace comphelper
 );
 }
 
-
-//= OSingletonRegistration
-
-template 
-class OSingletonRegistration
-{
-public:
-/** automatically provides all component information to an OModule 
instance,
-for a singleton component
-
-Assumed that the template argument has the three methods
-
-static OUString 
getImplementationName_static()
-static css::uno::Sequence< OUString > 
getSupportedServiceNames_static()
-static OUString 
getSingletonName_static()
-static css::uno::Reference< css::uno::XInterface 
>
-Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&)
-
-
-the instantiation of this object will automatically register the 
class via OModule::registerImplementation.
-
-*/
-OSingletonRegistration( OModule& _rModule );
-};
-
-template 
-
-OSingletonRegistration::OSingletonRegistration( OModule& _rModule )
-{
-_rModule.registerImplementation( ComponentDescription(
-TYPE::getImplementationName_static(),
-TYPE::getSupportedServiceNames_static(),
-::Create,
-&::cppu::createSingleComponentFactory
-) );
-}
-
-
 } // namespace comphelper
 
 
diff --git a/include/unotools/componentresmodule.hxx 
b/include/unotools/componentresmodule.hxx
index bc35a6c..c63d10c 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
@@ -121,19 +121,6 @@ namespace utl
 OAutoRegistration() : BaseClass( ModuleClass::getInstance() ) \
 { \
 } \
-}; \
-\
-/*  */ 
\
-template < class TYPE > \
-class OSingletonRegistration : public 
::comphelper::OSingletonRegistration< TYPE > \
-{ \
-private: \
-typedef ::comphelper::OSingletonRegistration< TYPE >

[Libreoffice-commits] core.git: comphelper/source include/comphelper sax/Library_expwrap.mk sax/source

[Matúš Kukan]

 comphelper/source/xml/attributelist.cxx |   14 +-
 include/comphelper/attributelist.hxx|9 -
 sax/Library_expwrap.mk  |2 
 sax/source/expatwrap/attrlistimpl.cxx   |  162 
 sax/source/expatwrap/attrlistimpl.hxx   |   76 ---
 sax/source/expatwrap/sax_expat.cxx  |   10 -
 6 files changed, 18 insertions(+), 255 deletions(-)

New commits:
commit 8998768a34751d35403678a81464a26835b2230e
Author: Matúš Kukan 
Date:   Sat Feb 6 18:38:32 2016 +0100

sax: Use comphelper's AttributeList

Change-Id: I6eb0115dba8797025a513cf1e6cfbfbe0b6f7e50

diff --git a/comphelper/source/xml/attributelist.cxx 
b/comphelper/source/xml/attributelist.cxx
index 3342ef2..f196b48 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -106,18 +106,20 @@ AttributeList::AttributeList()
 m_pImpl = new AttributeList_Impl;
 }
 
-
-
 AttributeList::~AttributeList()
 {
 delete m_pImpl;
 }
 
-void AttributeList::AddAttribute(   const OUString  ,
-const OUString  ,
-const OUString  )
+void AttributeList::AddAttribute(const OUString ,
+const OUString , const OUString )
+{
+m_pImpl->vecAttribute.push_back( TagAttribute_Impl(sName, sType, sValue) );
+}
+
+void AttributeList::Clear()
 {
-m_pImpl->vecAttribute.push_back( TagAttribute_Impl( sName , sType , sValue 
) );
+m_pImpl->vecAttribute.clear();
 }
 
 } // namespace comphelper
diff --git a/include/comphelper/attributelist.hxx 
b/include/comphelper/attributelist.hxx
index 1337a3a..18aaa50 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -30,10 +30,8 @@ namespace comphelper
 
 struct AttributeList_Impl;
 
-class COMPHELPER_DLLPUBLIC AttributeList : public ::cppu::WeakImplHelper
-<
-css::xml::sax::XAttributeList
->
+class COMPHELPER_DLLPUBLIC AttributeList :
+public ::cppu::WeakImplHelper
 {
 AttributeList_Impl *m_pImpl;
 public:
@@ -41,7 +39,8 @@ public:
 virtual ~AttributeList();
 
 // methods that are not contained in any interface
-void AddAttribute( const OUString  , const OUString  , const 
OUString  );
+void AddAttribute(const OUString  , const OUString  , const 
OUString );
+void Clear();
 
 // css::xml::sax::XAttributeList
 virtual sal_Int16 SAL_CALL getLength()
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 0c44d30..e8e049a 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_externals,expwrap,\
 ))
 
 $(eval $(call gb_Library_use_libraries,expwrap,\
+   comphelper \
cppu \
cppuhelper \
sal \
@@ -39,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,expwrap,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,expwrap,\
-   sax/source/expatwrap/attrlistimpl \
sax/source/expatwrap/sax_expat \
sax/source/expatwrap/saxwriter \
sax/source/expatwrap/xml2utf \
diff --git a/sax/source/expatwrap/attrlistimpl.cxx 
b/sax/source/expatwrap/attrlistimpl.cxx
deleted file mode 100644
index 61bfe2b..000
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "attrlistimpl.hxx"
-
-#include 
-
-#include 
-
-using namespace ::std;
-using namespace ::cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::xml::sax;
-
-
-namespace sax_expatwrap {
-struct TagAttribute
-{
-TagAttribute( const OUString , const OUString  , const 
OUString  )
-{
-this->sName = aName;
-this->sType = aType;
-this->sValue= aValue;
-}
-
-OUString sName;
-OUString sType;
-OUString sValue;
-};
-
-struct AttributeList_impl
-{
-AttributeList_impl()
-{
-// performance improvement during adding
-vecAttribute.reserve(20);
-}
-vector vecAttribute;
-};
-
-
-
-sal_Int16 

[Libreoffice-commits] core.git: basic/CppunitTest_basic_coverage.mk basic/CppunitTest_basic_enable.mk basic/CppunitTest_basic_macros.mk basic/CppunitTest_basic_nested_struct.mk basic/CppunitTest_basic

[Matúš Kukan]

 basic/CppunitTest_basic_coverage.mk  |   64 ---
 basic/CppunitTest_basic_enable.mk|   60 --
 basic/CppunitTest_basic_macros.mk|   65 +++
 basic/CppunitTest_basic_nested_struct.mk |   63 ---
 basic/CppunitTest_basic_scanner.mk   |6 -
 basic/CppunitTest_basic_vba.mk   |   68 
 basic/Module_basic.mk|7 -
 basic/qa/cppunit/basic_coverage.cxx  |3 
 basic/qa/cppunit/basictest.cxx   |  126 +++
 basic/qa/cppunit/basictest.hxx   |  106 ++
 basic/qa/cppunit/test_append.cxx |3 
 basic/qa/cppunit/test_nested_struct.cxx  |3 
 basic/qa/cppunit/test_vba.cxx|   18 +---
 13 files changed, 217 insertions(+), 375 deletions(-)

New commits:
commit aa20acb87d48b4dcda337ab08c5d8a76a400bacb
Author: Matúš Kukan 
Date:   Sat Jan 30 22:12:35 2016 +0100

basic: Merge macro snippet tests

Change-Id: Ia2d8944227c6be8b5ae7b42f7d566ac150d522b9

diff --git a/basic/CppunitTest_basic_coverage.mk 
b/basic/CppunitTest_basic_coverage.mk
deleted file mode 100644
index 4031177..000
--- a/basic/CppunitTest_basic_coverage.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,basic_coverage))
-
-$(eval $(call gb_CppunitTest_use_external,basic_coverage,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,basic_coverage, \
-basic/qa/cppunit/basic_coverage \
-))
-
-#$(eval $(call gb_CppunitTest_use_library_objects,basic_coverage,sb))
-
-# add a list of all needed libraries here
-$(eval $(call gb_CppunitTest_use_libraries,basic_coverage, \
-comphelper \
-cppu \
-cppuhelper \
-sal \
-salhelper \
-sb \
-sot \
-svl \
-svt \
-test \
-tl \
-unotest \
-utl \
-vcl \
-xmlscript \
-i18nlangtag \
-$(gb_UWINAPI) \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_coverage, \
-oleaut32 \
-))
-endif
-
-$(eval $(call gb_CppunitTest_set_include,basic_coverage,\
--I$(SRCDIR)/basic/source/inc \
--I$(SRCDIR)/basic/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,basic_coverage,\
-offapi \
-udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,basic_coverage))
-$(eval $(call gb_CppunitTest_use_vcl,basic_coverage))
-
-$(eval $(call gb_CppunitTest_use_components,basic_coverage,\
-configmgr/source/configmgr \
-i18npool/util/i18npool \
-))
-$(eval $(call gb_CppunitTest_use_configuration,basic_coverage))
diff --git a/basic/CppunitTest_basic_enable.mk 
b/basic/CppunitTest_basic_enable.mk
deleted file mode 100644
index c9bdef7..000
--- a/basic/CppunitTest_basic_enable.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,basic_enable))
-
-$(eval $(call gb_CppunitTest_use_external,basic_enable,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,basic_enable, \
-basic/qa/cppunit/test_append \
-))
-
-# add a list of all needed libraries here
-$(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
-comphelper \
-cppu \
-cppuhelper \
-sal \
-salhelper \
-sb \
-sot \
-svl \
-svt \
-tl \
-utl \
-vcl \
-xmlscript \
-test \
-   $(gb_UWINAPI) \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \
-   oleaut32 \
-))
-endif
-
-$(eval $(call gb_CppunitTest_set_include,basic_enable,\
--I$(SRCDIR)/basic/source/inc \
--I$(SRCDIR)/basic/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,basic_enable,\
-offapi \
-udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,basic_enable))
-$(eval $(call gb_CppunitTest_use_vcl,basic_enable))
-
-$(eval $(call gb_CppunitTest_use_components,basic_enable,\
-configmgr/source/configmgr \
-i18npool/util/i18npool \
-))
-$(eval $(call gb_CppunitTest_use_configuration,basic_enable))
diff --git a/basic/CppunitTest_basic_macros.mk 
b/basic/CppunitTest_basic_macros.mk
new file mode 100644
index 000..13e9235
--- /dev/null
+++ b/basic/CppunitTest_basic_macros.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not 

[Libreoffice-commits] core.git: lotuswordpro/Library_lwpft.mk lotuswordpro/source

[Matúš Kukan]

 lotuswordpro/Library_lwpft.mk   |1 
 lotuswordpro/source/filter/LotusWordProImportFilter.cxx |   46 +---
 lotuswordpro/source/filter/genericfilter.cxx|   15 -
 3 files changed, 16 insertions(+), 46 deletions(-)

New commits:
commit c81eddbb20c84280aa64c712e34c829380b24527
Author: Matúš Kukan 
Date:   Thu Jan 21 18:48:57 2016 +0100

lotuswordpro: Clean after we use constructor feature

18f1eb7b0c3536817572eeb481591418a7eab3da was pushed sooner,
so just few more additions.

Change-Id: If8e8082959fc049947986ca6faf329ea9436062a

diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 1ed0483..f86e9de 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
 lotuswordpro/source/filter/benobj \
 lotuswordpro/source/filter/benval \
 lotuswordpro/source/filter/explode \
-lotuswordpro/source/filter/genericfilter \
 lotuswordpro/source/filter/localtime \
 lotuswordpro/source/filter/LotusWordProImportFilter \
 lotuswordpro/source/filter/lwp9reader \
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx 
b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 90017a5..ce78c60 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -18,15 +18,11 @@
  */
 
 #include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
-#include 
+#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -39,23 +35,15 @@
 
 using namespace com::sun::star;
 using com::sun::star::uno::Sequence;
-using com::sun::star::lang::XComponent;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Exception;
 using com::sun::star::uno::RuntimeException;
 using com::sun::star::io::XInputStream;
-using com::sun::star::lang::XMultiServiceFactory;
 using com::sun::star::beans::PropertyValue;
-using com::sun::star::document::XFilter;
-using com::sun::star::document::XExtendedFilterDetection;
 using com::sun::star::ucb::XCommandEnvironment;
-
 using com::sun::star::document::XImporter;
-using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
-using com::sun::star::xml::sax::XParser;
 
 // W o r d P r o
 static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
@@ -97,14 +85,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL 
TestImportLWP(const OUString 
 return ( ReadWordproFile(aFileStream, xHandler) == 0 );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-LotusWordProImportFilter_get_implementation(
-css::uno::XComponentContext *context,
-css::uno::Sequence const &)
- {
-return cppu::acquire(new LotusWordProImportFilter(context));
- }
-
 sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence< 
css::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException, std::exception)
 {
@@ -190,24 +170,30 @@ void SAL_CALL LotusWordProImportFilter::initialize( const 
Sequence< Any >& aArgu
 }
 
 // XServiceInfo
-OUString SAL_CALL LotusWordProImportFilter::getImplementationName(  )
+OUString SAL_CALL LotusWordProImportFilter::getImplementationName()
 throw (RuntimeException, std::exception)
 {
-return OUString ( "com.sun.star.comp.Writer.LotusWordProImportFilter" );
+return OUString("com.sun.star.comp.Writer.LotusWordProImportFilter");
 }
-sal_Bool SAL_CALL LotusWordProImportFilter::supportsService( const OUString& 
rServiceName )
+
+sal_Bool SAL_CALL LotusWordProImportFilter::supportsService(const OUString& 
rServiceName)
 throw (RuntimeException, std::exception)
 {
 return cppu::supportsService(this, rServiceName);
 }
-Sequence< OUString > SAL_CALL 
LotusWordProImportFilter::getSupportedServiceNames(  )
+
+Sequence SAL_CALL 
LotusWordProImportFilter::getSupportedServiceNames()
 throw (RuntimeException, std::exception)
 {
-Sequence < OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.document.ImportFilter";
-pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
-return aRet;
+return { "com.sun.star.document.ImportFilter", 
"com.sun.star.document.ExtendedTypeDetection" };
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+LotusWordProImportFilter_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new LotusWordProImportFilter(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/genericfilter.cxx 
b/lotuswordpro/source/filter/genericfilter.cxx
deleted file mode 100644
index 837ba1a..000
--- 

Re: Resuming downloads of external files

[Matúš Kukan]

On 18 January 2016 at 23:16, Chris Sherlock  wrote:
> I notice we use curl to download things like boost.

I think we use curl only if wget is not found.

> Would it be possible to use the -C (continue) command?

No idea, but you can easily do that locally as
make CURL="curl -C" fetch
Something like that should work I hope.

Best,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sax/qa

[Matúš Kukan]

 sax/qa/cppunit/attributes.cxx |   11 +--
 sax/qa/cppunit/parser.cxx |   11 +--
 2 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 15a43283b83dd3179347c255b42aba0d116cb71b
Author: Matúš Kukan 
Date:   Sun Jan 17 11:23:21 2016 +0100

sax: use CPPUNIT_ASSERT_THROW

Change-Id: I34b0b559a91e77cc497e14d8ffad7e2c80e43d79
Reviewed-on: https://gerrit.libreoffice.org/21531
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/sax/qa/cppunit/attributes.cxx b/sax/qa/cppunit/attributes.cxx
index 716b7b2..3697190 100644
--- a/sax/qa/cppunit/attributes.cxx
+++ b/sax/qa/cppunit/attributes.cxx
@@ -22,8 +22,6 @@ namespace {
 
 class AttributesTest: public CppUnit::TestFixture
 {
-bool mbException;
-
 public:
 void test();
 
@@ -51,14 +49,7 @@ void AttributesTest::test()
 CPPUNIT_ASSERT_EQUAL( xAttributeList->getOptionalValue(3), OUString() );
 
 CPPUNIT_ASSERT_EQUAL( xAttributeList->getValue(1), OUString("1") );
-mbException = false;
-
-try { xAttributeList->getValue(3); }
-catch (const sax::SAXException& )
-{
-mbException = true;
-}
-CPPUNIT_ASSERT( mbException );
+CPPUNIT_ASSERT_THROW( xAttributeList->getValue(3), xml::sax::SAXException 
);
 
 xAttributeList->addUnknown("a", "a");
 xAttributeList->addUnknown("b", "b", "b");
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index e17538f..5381f36 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -92,16 +92,7 @@ void ParserTest::parse()
 mxParser->parseStream( maInput );
 
 maInput.aInputStream = createStream("");
-bool bException = false;
-try
-{
-mxParser->parseStream( maInput );
-}
-catch (const SAXParseException &)
-{
-bException = true;
-}
-CPPUNIT_ASSERT_MESSAGE("No Exception!", bException);
+CPPUNIT_ASSERT_THROW( mxParser->parseStream( maInput ), 
css::xml::sax::SAXParseException );
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ParserTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Matúš Kukan]

 vcl/source/filter/jpeg/JpegWriter.cxx |   39 +++---
 1 file changed, 18 insertions(+), 21 deletions(-)

New commits:
commit 39f0277ba71c8f3834579003c046d12fa4650e8f
Author: Matúš Kukan 
Date:   Mon Jan 11 21:32:55 2016 +0100

tdf#94831: Check for null mpReadAccess before first use

There was erroneously added code before check in
45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36.

Change-Id: Ie2e84cfc061097c25e5d799e9c388abd9724bd93
(cherry picked from commit d5dcfe40ff3774d82a7b8f9f3d75b5b3cdac78ba)
Reviewed-on: https://gerrit.libreoffice.org/21373
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx 
b/vcl/source/filter/jpeg/JpegWriter.cxx
index fe03540..28143ac 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -200,32 +200,29 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
 }
 
 mpReadAccess = aGraphicBmp.AcquireReadAccess();
+if( mpReadAccess )
+{
+if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
+{// check if source is greyscale only
+bool bIsGrey = true;
 
-if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
-{// check if source is greyscale only
-
-bool bIsGrey = true;
-
-long nWidth = mpReadAccess->Width();
-for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ )
-{
-BitmapColor aColor;
-for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+long nWidth = mpReadAccess->Width();
+for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); 
nY++ )
 {
-aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
-: mpReadAccess->GetPixel( nY, nX );
-bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+BitmapColor aColor;
+for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+{
+aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
+: mpReadAccess->GetPixel( nY, 
nX );
+bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+}
 }
+if ( bIsGrey )
+mbGreys = true;
 }
-if ( bIsGrey )
-mbGreys = true;
-}
+if( mpExpWasGrey )
+*mpExpWasGrey = mbGreys;
 
-if( mpExpWasGrey )
-*mpExpWasGrey = mbGreys;
-
-if( mpReadAccess )
-{
 mbNative = ( mpReadAccess->GetScanlineFormat() == 
BMP_FORMAT_24BIT_TC_RGB );
 
 if( !mbNative )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[Matúš Kukan]

 vcl/source/filter/jpeg/JpegWriter.cxx |   39 +++---
 1 file changed, 18 insertions(+), 21 deletions(-)

New commits:
commit 4b2007997fd6b061702515e5d708ccbe5f03c161
Author: Matúš Kukan 
Date:   Mon Jan 11 21:32:55 2016 +0100

tdf#94831: Check for null mpReadAccess before first use

There was erroneously added code before check in
45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36.

Change-Id: Ie2e84cfc061097c25e5d799e9c388abd9724bd93
(cherry picked from commit d5dcfe40ff3774d82a7b8f9f3d75b5b3cdac78ba)
Reviewed-on: https://gerrit.libreoffice.org/21371
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx 
b/vcl/source/filter/jpeg/JpegWriter.cxx
index cb1a67f..38c65a5 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -199,32 +199,29 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
 }
 
 mpReadAccess = aGraphicBmp.AcquireReadAccess();
+if( mpReadAccess )
+{
+if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
+{// check if source is greyscale only
+bool bIsGrey = true;
 
-if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
-{// check if source is greyscale only
-
-bool bIsGrey = true;
-
-long nWidth = mpReadAccess->Width();
-for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ )
-{
-BitmapColor aColor;
-for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+long nWidth = mpReadAccess->Width();
+for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); 
nY++ )
 {
-aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
-: mpReadAccess->GetPixel( nY, nX );
-bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+BitmapColor aColor;
+for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+{
+aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
+: mpReadAccess->GetPixel( nY, 
nX );
+bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+}
 }
+if ( bIsGrey )
+mbGreys = true;
 }
-if ( bIsGrey )
-mbGreys = true;
-}
+if( mpExpWasGrey )
+*mpExpWasGrey = mbGreys;
 
-if( mpExpWasGrey )
-*mpExpWasGrey = mbGreys;
-
-if( mpReadAccess )
-{
 mbNative = ( mpReadAccess->GetScanlineFormat() == 
BMP_FORMAT_24BIT_TC_RGB );
 
 if( !mbNative )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - framework/source

[Matúš Kukan]

 framework/source/services/frame.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 013beaceb8c6daf2bf7f804631a3385e35144152
Author: Matúš Kukan 
Date:   Mon Nov 23 22:07:12 2015 +0100

Make this static WeakReference local to Frame::impl_checkMenuCloser()

..to avoid problem shown with comphelper added to libmerged. More info in
http://lists.freedesktop.org/archives/libreoffice/2015-November/071189.html

(cherry picked from commit c6122fe6143ff1efa9f449d46a848cf3071ac67e)

Apparently it was problem also without merged comphelper. Seen in
CppunitTest_libreofficekit_tiledrendering in libreoffice-5-1.

Change-Id: I2017d87f64f1ae3a1a1cf2e50bce24c05cff6321
Reviewed-on: https://gerrit.libreoffice.org/21243
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 754768e..bcd12d4 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -402,7 +402,6 @@ private:
 SvtCommandOptions   
m_aCommandOptions;   /// ref counted class to support disabling 
commands defined by configuration file
 bool
m_bSelfClose;/// in case of CloseVetoException on method 
close() was thrown by ourself - we must close ourself later if no internal 
processes are running
 bool
m_bIsHidden; /// indicates, if this frame is used in hidden 
mode or not
-static css::uno::WeakReference< css::frame::XFrame2 >   
m_xCloserFrame;  /// holds the only frame, which must show the 
special closer menu item (can be NULL!)
 css::uno::Reference< css::frame::XLayoutManager2 >  
m_xLayoutManager;/// is used to layout the child windows of the 
frame.
 css::uno::Reference< css::frame::XDispatchInformationProvider > 
m_xDispatchInfoHelper;
 css::uno::Reference< css::frame::XTitle >   
m_xTitleHelper;
@@ -414,8 +413,6 @@ protected:
 FrameContainer  
m_aChildFrameContainer;   /// array of child frames
 };
 
-css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame;
-
 //  XInterface, XTypeProvider, XServiceInfo
 
 DEFINE_XINTERFACE_22(   Frame  
 ,
@@ -3206,15 +3203,16 @@ void Frame::impl_checkMenuCloser()
 // Only if the closer state must be moved from one frame to another one
 // or must be enabled/disabled at all.
 SolarMutexGuard aGuard;
-
-css::uno::Reference< css::frame::XFrame2 > xCloserFrame 
(m_xCloserFrame.get(), css::uno::UNO_QUERY);
+// Holds the only frame, which must show the special closer menu item (can 
be NULL!)
+static css::uno::WeakReference< css::frame::XFrame2 > s_xCloserFrame;
+css::uno::Reference< css::frame::XFrame2 > xCloserFrame 
(s_xCloserFrame.get(), css::uno::UNO_QUERY);
 if (xCloserFrame!=xNewCloserFrame)
 {
 if (xCloserFrame.is())
 impl_setCloser(xCloserFrame, false);
 if (xNewCloserFrame.is())
 impl_setCloser(xNewCloserFrame, true);
-m_xCloserFrame = xNewCloserFrame;
+s_xCloserFrame = xNewCloserFrame;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Matúš Kukan]

 vcl/source/filter/jpeg/JpegWriter.cxx |   39 +++---
 1 file changed, 18 insertions(+), 21 deletions(-)

New commits:
commit d5dcfe40ff3774d82a7b8f9f3d75b5b3cdac78ba
Author: Matúš Kukan 
Date:   Mon Jan 11 21:32:55 2016 +0100

tdf#94831: Check for null mpReadAccess before first use

There was erroneously added code before check in
45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36.

Change-Id: Ie2e84cfc061097c25e5d799e9c388abd9724bd93

diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx 
b/vcl/source/filter/jpeg/JpegWriter.cxx
index cb1a67f..38c65a5 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -199,32 +199,29 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
 }
 
 mpReadAccess = aGraphicBmp.AcquireReadAccess();
+if( mpReadAccess )
+{
+if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
+{// check if source is greyscale only
+bool bIsGrey = true;
 
-if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
-{// check if source is greyscale only
-
-bool bIsGrey = true;
-
-long nWidth = mpReadAccess->Width();
-for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ )
-{
-BitmapColor aColor;
-for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+long nWidth = mpReadAccess->Width();
+for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); 
nY++ )
 {
-aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
-: mpReadAccess->GetPixel( nY, nX );
-bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+BitmapColor aColor;
+for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+{
+aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
+: mpReadAccess->GetPixel( nY, 
nX );
+bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+}
 }
+if ( bIsGrey )
+mbGreys = true;
 }
-if ( bIsGrey )
-mbGreys = true;
-}
+if( mpExpWasGrey )
+*mpExpWasGrey = mbGreys;
 
-if( mpExpWasGrey )
-*mpExpWasGrey = mbGreys;
-
-if( mpReadAccess )
-{
 mbNative = ( mpReadAccess->GetScanlineFormat() == 
BMP_FORMAT_24BIT_TC_RGB );
 
 if( !mbNative )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - package/source

[Matúš Kukan]

 package/source/zippackage/ZipPackageStream.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 57ee45cd6b7655bbd04972287802fcf300e1a933
Author: Matúš Kukan 
Date:   Thu Jan 7 21:34:50 2016 +0100

tdf#89236: Don't deflate encrypted document in parallel

I see "warn:legacy.osl:22439:1:package/source/zipapi/ZipFile.cxx:583:
Can't detect password correctness without digest!"
when opening file saved with password.

Obviously css::xml::crypto::XDigestContext used in ZipOutputEntry does not
work properly when encrypting files in parallel, so don't do that.

Change-Id: I4b354535240a4f31a6bc6855cf7f9af527634e7e
Reviewed-on: https://gerrit.libreoffice.org/21238
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 
(cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d)
Reviewed-on: https://gerrit.libreoffice.org/21241
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 0b4cf3f..2fbcfdb 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -816,7 +816,8 @@ bool ZipPackageStream::saveChild(
 }
 else
 {
-bParallelDeflate = true;
+// tdf#89236 Encrypting in parallel does not work
+bParallelDeflate = !bToBeEncrypted;
 // Do not deflate small streams in a thread
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - package/source

[Matúš Kukan]

 package/source/zippackage/ZipPackageStream.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fe7d69565866b4b02cde5aebdab4cbc11d00af2b
Author: Matúš Kukan 
Date:   Thu Jan 7 21:34:50 2016 +0100

tdf#89236: Don't deflate encrypted document in parallel

I see "warn:legacy.osl:22439:1:package/source/zipapi/ZipFile.cxx:583:
Can't detect password correctness without digest!"
when opening file saved with password.

Obviously css::xml::crypto::XDigestContext used in ZipOutputEntry does not
work properly when encrypting files in parallel, so don't do that.

Change-Id: I4b354535240a4f31a6bc6855cf7f9af527634e7e
Reviewed-on: https://gerrit.libreoffice.org/21238
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 
(cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d)
Reviewed-on: https://gerrit.libreoffice.org/21242
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 76d8efc..2ed7f57 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -816,7 +816,8 @@ bool ZipPackageStream::saveChild(
 }
 else
 {
-bParallelDeflate = true;
+// tdf#89236 Encrypting in parallel does not work
+bParallelDeflate = !bToBeEncrypted;
 // Do not deflate small streams in a thread
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 7 commits - filter/source include/toolkit lotuswordpro/source package/source reportdesign/inc reportdesign/source sc/source toolkit/s

[Matúš Kukan]

 filter/source/odfflatxml/OdfFlatXml.cxx   |4 +
 include/toolkit/awt/vclxaccessiblecomponent.hxx   |   15 ++--
 lotuswordpro/source/filter/lwplayout.cxx  |5 -
 lotuswordpro/source/filter/lwplayout.hxx  |   14 +++-
 package/source/zippackage/ZipPackageStream.cxx|3 
 reportdesign/inc/ReportDefinition.hxx |   15 +++-
 reportdesign/source/core/api/ReportDefinition.cxx |   42 -
 sc/source/ui/undo/undoblk3.cxx|6 +
 toolkit/source/awt/vclxaccessiblecomponent.cxx|   70 +++---
 xmlhelp/source/cxxhelp/provider/provider.cxx  |2 
 10 files changed, 122 insertions(+), 54 deletions(-)

New commits:
commit bd509c57fe66c69901ed24a46ae835f149d8dcfd
Author: Matúš Kukan 
Date:   Thu Jan 7 21:34:50 2016 +0100

tdf#89236: Don't deflate encrypted document in parallel

I see "warn:legacy.osl:22439:1:package/source/zipapi/ZipFile.cxx:583:
Can't detect password correctness without digest!"
when opening file saved with password.

Obviously css::xml::crypto::XDigestContext used in ZipOutputEntry does not
work properly when encrypting files in parallel, so don't do that.

Change-Id: I4b354535240a4f31a6bc6855cf7f9af527634e7e
Reviewed-on: https://gerrit.libreoffice.org/21238
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 
(cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d)
Reviewed-on: https://gerrit.libreoffice.org/21242
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit fe7d69565866b4b02cde5aebdab4cbc11d00af2b)

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 76d8efc..2ed7f57 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -816,7 +816,8 @@ bool ZipPackageStream::saveChild(
 }
 else
 {
-bParallelDeflate = true;
+// tdf#89236 Encrypting in parallel does not work
+bParallelDeflate = !bToBeEncrypted;
 // Do not deflate small streams in a thread
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
commit fb9888f172b7e41605a107c13420614fe53259e3
Author: Maxim Monastirsky 
Date:   Thu Dec 24 21:49:23 2015 +0200

tdf#96713 OdfFlatXml: Seek to 0 before reading

Similar to tdf#45418.

The problem is that sfx2 DocumentInserter code calls SfxMedium::IsStorage,
which reads the stream but doesn't correctly seek back to 0. Actually
SfxMedium_Impl has 2 members for the input stream, one of SvStream type
and another one as Reference. Turns out that reading with
SvStream::Read changes the position in the object referenced by
Reference, but SvStream::Seek doesn't, so Seek(0) doesn't
do the desired effect.

My current solution is to ensure that we're reading from 0 inside the
filter. I think it's a good thing to do anyway, and should be sufficient,
given that other filters doesn't seem to be affected by this bug.

Change-Id: I49b41077032d3e395c675e4f7824cc778c075473
(cherry picked from commit 5e4124396cafc2b0a435f17a66b33e36303ae4e4)
Reviewed-on: https://gerrit.libreoffice.org/20983
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 47f6e49e2a204a00ac631f9fa021d6320752d039)

diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx 
b/filter/source/odfflatxml/OdfFlatXml.cxx
index 6b75b83..e81eff7 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -147,6 +147,10 @@ OdfFlatXml::importer(
 saxParser->setDocumentHandler(docHandler);
 try
 {
+css::uno::Reference< css::io::XSeekable > xSeekable( inputStream, 
css::uno::UNO_QUERY );
+if ( xSeekable.is() )
+xSeekable->seek( 0 );
+
 saxParser->parseStream(inputSource);
 }
 catch (const Exception )
commit 4b08660542a647b1ab01ff7c55910f6b914fab0d
Author: Eike Rathke 
Date:   Thu Jan 7 12:11:30 2016 +0100

Resolves: tdf#94208 broadcast fill undo (for deleted cells)

Change-Id: I0fb54956bffc77dad4236b326eee3af836017623
(cherry picked from commit ece5cc21aa7814be79016e0d285981c6ced4d9ee)
Reviewed-on: https://gerrit.libreoffice.org/21207
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 
(cherry picked from commit 81dad223dbfac9352bbfd9333d1ba101d245a15a)

diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 764d717..b28f0bb 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ 

Re: about using test files in our unit tests

[Matúš Kukan]

On 8 January 2016 at 01:50, Markus Mohrhard
 wrote:
> Hey,
>
> a short update. I think most of our random test failures have been fixed.

This is awesome. Thanks a lot Markus. It was really annoying.

Best,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: package/source

[Matúš Kukan]

 package/source/zippackage/ZipPackageStream.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit eaed822c9cf6b3762f727f1281003dafd300df6d
Author: Matúš Kukan 
Date:   Thu Jan 7 21:34:50 2016 +0100

tdf#89236: Don't deflate encrypted document in parallel

I see "warn:legacy.osl:22439:1:package/source/zipapi/ZipFile.cxx:583:
Can't detect password correctness without digest!"
when opening file saved with password.

Obviously css::xml::crypto::XDigestContext used in ZipOutputEntry does not
work properly when encrypting files in parallel, so don't do that.

Change-Id: I4b354535240a4f31a6bc6855cf7f9af527634e7e
Reviewed-on: https://gerrit.libreoffice.org/21238
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 0b4cf3f..2fbcfdb 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -816,7 +816,8 @@ bool ZipPackageStream::saveChild(
 }
 else
 {
-bParallelDeflate = true;
+// tdf#89236 Encrypting in parallel does not work
+bParallelDeflate = !bToBeEncrypted;
 // Do not deflate small streams in a thread
 if (xSeek.is() && xSeek->getLength() < 10)
 bParallelDeflate = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - basctl/source chart2/source cui/source include/sot sc/source sd/source sfx2/source sot/Library_sot.mk sot/source sot/util starmath/source svx/source sw/inc

[Matúš Kukan]

 basctl/source/basicide/basdoc.cxx |1 
 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |1 
 cui/source/dialogs/pastedlg.cxx   |2 
 include/sot/factory.hxx   |   64 ---
 include/sot/object.hxx|   15 
 include/sot/sotdata.hxx   |   52 --
 include/sot/storage.hxx   |   27 -
 sc/source/ui/unoobj/chartuno.cxx  |1 
 sd/source/ui/func/fudraw.cxx  |5 
 sfx2/source/appl/imagemgr.cxx |1 
 sfx2/source/doc/docfac.cxx|1 
 sfx2/source/doc/frmdescr.cxx  |2 
 sfx2/source/doc/objitem.cxx   |2 
 sfx2/source/doc/objxtor.cxx   |1 
 sfx2/source/doc/ownsubfilterservice.cxx   |1 
 sfx2/source/doc/printhelper.cxx   |1 
 sfx2/source/menu/virtmenu.cxx |2 
 sfx2/source/statbar/stbitem.cxx   |1 
 sfx2/source/toolbox/tbxitem.cxx   |1 
 sfx2/source/view/frame.cxx|1 
 sot/Library_sot.mk|2 
 sot/source/base/exchange.cxx  |   34 +
 sot/source/base/factory.cxx   |  202 ---
 sot/source/base/object.cxx|   43 --
 sot/source/sdstor/storage.cxx |   72 ---
 sot/source/unoolestorage/register.cxx |   59 ---
 sot/source/unoolestorage/xolesimplestorage.cxx|  253 +-
 sot/source/unoolestorage/xolesimplestorage.hxx|   45 --
 sot/util/sot.component|5 
 starmath/source/smdll.cxx |3 
 svx/source/dialog/_contdlg.cxx|3 
 svx/source/unodraw/unopage.cxx|1 
 svx/source/xoutdev/_xoutbmp.cxx   |3 
 sw/inc/pch/precompiled_msword.hxx |1 
 sw/source/core/doc/DocumentContentOperationsManager.cxx   |1 
 sw/source/core/doc/docdesc.cxx|1 
 sw/source/core/doc/doctxm.cxx |1 
 sw/source/core/draw/dview.cxx |1 
 sw/source/core/frmedt/fefly1.cxx  |1 
 sw/source/core/frmedt/feshview.cxx|1 
 sw/source/core/ole/ndole.cxx  |1 
 sw/source/core/txtnode/thints.cxx |3 
 sw/source/core/unocore/unoframe.cxx   |1 
 sw/source/ui/frmdlg/frmpage.cxx   |2 
 sw/source/uibase/shells/basesh.cxx|3 
 sw/source/uibase/wrtsh/wrtsh1.cxx |3 
 vbahelper/inc/pch/precompiled_msforms.hxx |1 
 vcl/source/control/longcurr.cxx   |2 
 vcl/source/filter/wmf/winmtf.hxx  |3 
 49 files changed, 190 insertions(+), 743 deletions(-)

New commits:
commit 7f36d2e25572978ee6ee79a4089db81c191df260
Author: Matúš Kukan 
Date:   Tue Jan 5 18:04:14 2016 +0100

tdf#74608: Ctor function for css.embed.OLESimpleStorage

Change-Id: I20b91ad65514e27094ff702d1d94a48ef9a82fe6

diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 3c443e5..6c76555 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,sot,\
 
 $(eval $(call gb_Library_add_exception_objects,sot,\
 sot/source/unoolestorage/xolesimplestorage \
-sot/source/unoolestorage/register \
 sot/source/base/formats \
 sot/source/base/object \
 sot/source/base/exchange \
diff --git a/sot/source/unoolestorage/register.cxx 
b/sot/source/unoolestorage/register.cxx
deleted file mode 100644
index 1c65311..000
--- a/sot/source/unoolestorage/register.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the 

[Libreoffice-commits] core.git: solenv/bin

[Matúš Kukan]

 solenv/bin/native-code.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d929e3a6b478b0bc02aa90ba326aab79353a7799
Author: Matúš Kukan 
Date:   Tue Jan 5 22:29:27 2016 +0100

sot_component_getFactory is gone

Change-Id: I4c0360b088f7de8bbcd598fcf3f35c6de13b6c66

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 819f1bb..99a3a4c 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -39,7 +39,6 @@ core_factory_list = [
 ("libooxlo.a", "oox_component_getFactory"),
 ("libpackage2.a", "package2_component_getFactory"),
 ("libsmlo.a", "sm_component_getFactory"),
-("libsotlo.a", "sot_component_getFactory"),
 ("libsrtrs1.a", "srtrs1_component_getFactory"),
 ("libstoragefdlo.a", "storagefd_component_getFactory"),
 ("libucb1.a", "ucb_component_getFactory"),
@@ -175,6 +174,8 @@ core_constructor_list = [
 "com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation",
 "com_sun_star_comp_sfx2_DocumentTemplates_get_implementation",
 "com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
+# sot/util/sot.component
+"com_sun_star_comp_embed_OLESimpleStorage",
 # stoc/source/inspect/introspection.component
 "com_sun_star_comp_stoc_Introspection_get_implementation",
 # stoc/util/stocservices.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/Library_abp.mk extensions/source

[Matúš Kukan]

 extensions/Library_abp.mk  |1 
 extensions/source/abpilot/abp.component|5 +-
 extensions/source/abpilot/abpservices.cxx  |   59 -
 extensions/source/abpilot/unodialogabp.cxx |   54 ++
 extensions/source/abpilot/unodialogabp.hxx |   23 ++-
 5 files changed, 23 insertions(+), 119 deletions(-)

New commits:
commit d4bbf358eb19a8c96720595b9aa3fdf47d9e02f9
Author: Matúš Kukan 
Date:   Thu Dec 31 16:08:44 2015 +0100

tdf#74608: Ctor function for abp::OABSPilotUno

Change-Id: I15f64797340ae366e02c2b503767cd3d22a66eeb

diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 559b8d82..e12bd26 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_sdk_api,abp))
 
 $(eval $(call gb_Library_add_exception_objects,abp,\
extensions/source/abpilot/abpfinalpage \
-   extensions/source/abpilot/abpservices \
extensions/source/abpilot/abspage \
extensions/source/abpilot/abspilot \
extensions/source/abpilot/admininvokationimpl \
diff --git a/extensions/source/abpilot/abp.component 
b/extensions/source/abpilot/abp.component
index 6c1580a..91b9638 100644
--- a/extensions/source/abpilot/abp.component
+++ b/extensions/source/abpilot/abp.component
@@ -18,8 +18,9 @@
  -->
 
 http://openoffice.org/2010/uno-components;>
-  
+xmlns="http://openoffice.org/2010/uno-components;>
+  
 
   
 
diff --git a/extensions/source/abpilot/abpservices.cxx 
b/extensions/source/abpilot/abpservices.cxx
deleted file mode 100644
index 16be0a0..000
--- a/extensions/source/abpilot/abpservices.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "componentmodule.hxx"
-#include "unodialogabp.hxx"
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-extern "C" void SAL_CALL abp_initializeModule()
-{
-static bool s_bInit = false;
-if (!s_bInit)
-{
-createRegistryInfo_OABSPilotUno();
-::abp::OModule::setResourceFilePrefix("abp");
-s_bInit = true;
-}
-}
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory(
-const sal_Char* pImplementationName,
-void* pServiceManager,
-void* /*pRegistryKey*/)
-{
-abp_initializeModule();
-
-Reference< XInterface > xRet;
-if (pServiceManager && pImplementationName)
-{
-xRet = ::abp::OModule::getComponentFactory(
-OUString::createFromAscii(pImplementationName),
-static_cast< XMultiServiceFactory* >(pServiceManager));
-}
-
-if (xRet.is())
-xRet->acquire();
-return xRet.get();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/unodialogabp.cxx 
b/extensions/source/abpilot/unodialogabp.cxx
index 3f01533..af54ed9 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -24,17 +24,10 @@
 #include 
 #include 
 
-void SAL_CALL createRegistryInfo_OABSPilotUno()
-{
-static ::abp::OMultiInstanceAutoRegistration< ::abp::OABSPilotUno > 
aAutoRegistration;
-}
-
 #define PROPERTY_ID_DATASOURCENAME  3
 
 namespace abp
 {
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -48,72 +41,45 @@ namespace abp
 _sDataSourceName, 
cppu::UnoType::get() );
 }
 
-
 Any SAL_CALL OABSPilotUno::queryInterface( const Type& aType ) throw 
(RuntimeException, std::exception)
 {
-Any aReturn = OABSPilotUno_DBase::queryInterface( aType );
+Any aReturn = svt::OGenericUnoDialog::queryInterface( aType );
 return aReturn.hasValue() ? aReturn : 
OABSPilotUno_JBase::queryInterface( aType );
 }
 
-
 void SAL_CALL OABSPilotUno::acquire(  ) throw ()
 {
-OABSPilotUno_DBase::acquire();
+

[Libreoffice-commits] core.git: sc/source

[Matúš Kukan]

 sc/source/filter/xml/xmlwrap.cxx |   40 ---
 1 file changed, 5 insertions(+), 35 deletions(-)

New commits:
commit 6c2a9102eeb4d3de6a64780eb2b97415b15ce4a9
Author: Matúš Kukan 
Date:   Tue Dec 29 21:37:01 2015 +0100

Use SAL_WARN here

Change-Id: Ibfa0deed6c3a26ea90c9be327bc1d4b66be95bff

diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index b63e140..0df5913 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -209,12 +209,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const 
uno::Reference 0
-OStringBuffer aError("SAX parse exception caught while 
importing:\n");
-aError.append(OUStringToOString(r.Message, 
RTL_TEXTENCODING_ASCII_US));
-OSL_FAIL(aError.getStr());
-#endif
+SAL_WARN("sc.filter", "SAX parse exception caught while importing: 
" << r.Message);
 
 OUString sErr = OUString::number( r.LineNumber ) +
   "," +
@@ -245,51 +240,26 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const 
uno::Reference 0
-OStringBuffer aError("SAX exception caught while importing:\n");
-aError.append(OUStringToOString(r.Message,
-RTL_TEXTENCODING_ASCII_US));
-OSL_FAIL(aError.getStr());
-#endif
-(void)r;// avoid warning in product version
+SAL_WARN("sc.filter", "SAX exception caught while importing: " << 
r.Message);
 
 nReturn = SCERR_IMPORT_FORMAT;
 }
 }
 catch( const packages::zip::ZipIOException& r )
 {
-#if OSL_DEBUG_LEVEL > 0
-OStringBuffer aError("Zip exception caught while importing:\n");
-aError.append(OUStringToOString(r.Message,
-RTL_TEXTENCODING_ASCII_US));
-OSL_FAIL( aError.getStr() );
-#endif
-(void)r;// avoid warning in product version
+SAL_WARN("sc.filter", "Zip exception caught while importing: " << 
r.Message);
 
 nReturn = ERRCODE_IO_BROKENPACKAGE;
 }
 catch( const io::IOException& r )
 {
-#if OSL_DEBUG_LEVEL > 0
-OStringBuffer aError("IO exception caught while importing:\n");
-aError.append(OUStringToOString(r.Message,
-RTL_TEXTENCODING_ASCII_US));
-OSL_FAIL(aError.getStr());
-#endif
-(void)r;// avoid warning in product version
+SAL_WARN("sc.filter", "IO exception caught while importing: " << 
r.Message);
 
 nReturn = SCERR_IMPORT_OPEN;
 }
 catch( const uno::Exception& r )
 {
-#if OSL_DEBUG_LEVEL > 0
-OStringBuffer aError("uno exception caught while importing:\n");
-aError.append(OUStringToOString(r.Message,
-RTL_TEXTENCODING_ASCII_US));
-OSL_FAIL(aError.getStr());
-#endif
-(void)r;// avoid warning in product version
+SAL_WARN("sc.filter", "uno exception caught while importing: " << 
r.Message);
 
 nReturn = SCERR_IMPORT_UNKNOWN;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - extensions/Library_log.mk extensions/source

[Matúš Kukan]

 extensions/Library_log.mk|2 
 extensions/source/logging/consolehandler.cxx |  128 ++
 extensions/source/logging/csvformatter.cxx   |   69 ++-
 extensions/source/logging/filehandler.cxx|  133 +++
 extensions/source/logging/log.component  |   17 +-
 extensions/source/logging/log_module.cxx |   51 
 extensions/source/logging/log_module.hxx |   86 --
 extensions/source/logging/log_services.cxx   |   47 
 extensions/source/logging/log_services.hxx   |   37 --
 extensions/source/logging/logger.cxx |  114 ++-
 extensions/source/logging/plaintextformatter.cxx |   65 ++-
 11 files changed, 162 insertions(+), 587 deletions(-)

New commits:
commit ad7d76add51736bc035afb5c64acc35feea74c6c
Author: Matúš Kukan 
Date:   Mon Dec 28 20:30:36 2015 +0100

extensions: Remove recently unused logging::LogModule

Change-Id: I43d1306427e32dce4ed9ea621d0abc2155bd58df

diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 30d109e..99f8090 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Library_add_exception_objects,log,\
extensions/source/logging/consolehandler \
extensions/source/logging/csvformatter \
extensions/source/logging/filehandler \
-   extensions/source/logging/log_module \
extensions/source/logging/logger \
extensions/source/logging/loggerconfig \
extensions/source/logging/loghandler \
diff --git a/extensions/source/logging/log_module.cxx 
b/extensions/source/logging/log_module.cxx
deleted file mode 100644
index fac6e53..000
--- a/extensions/source/logging/log_module.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "log_module.hxx"
-#include 
-
-
-namespace logging
-{
-
-
-struct LogModuleCreator
-{
-LogModule m_aLogModule;
-};
-namespace
-{
-class theLogModuleInstance : public rtl::Static {};
-}
-
-LogModule::LogModule()
-:BaseClass()
-{
-}
-
-LogModule& LogModule::getInstance()
-{
-return theLogModuleInstance::get().m_aLogModule;
-}
-
-
-} // namespace logging
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/logging/log_module.hxx 
b/extensions/source/logging/log_module.hxx
deleted file mode 100644
index f6f5397..000
--- a/extensions/source/logging/log_module.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOG_MODULE_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOG_MODULE_HXX
-
-#include 
-
-
-namespace logging
-{
-
-
-class LogModule : public ::comphelper::OModule
-{
-friend struct LogModuleCreator;
-typedef ::comphelper::OModule BaseClass;
-
-public:
-static LogModule& getInstance();
-
-private:
-LogModule();
-};
-
-/*  */
-class LogModuleClient 

[Libreoffice-commits] core.git: 3 commits - comphelper/source comphelper/util framework/source

[Matúš Kukan]

 comphelper/source/inc/comphelper_services.hxx |2 
 comphelper/source/misc/comphelper_services.cxx|2 
 comphelper/source/misc/officerestartmanager.cxx   |   59 
+++
 comphelper/source/misc/officerestartmanager.hxx   |   10 -
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx |   83 
+++---
 comphelper/source/officeinstdir/officeinstallationdirectories.hxx |8 
 comphelper/util/comphelp.component|6 
 framework/source/helper/persistentwindowstate.cxx |   51 +-
 8 files changed, 77 insertions(+), 144 deletions(-)

New commits:
commit 4db23a9d172103b72506e3837a3b6576c181
Author: Matúš Kukan 
Date:   Sat Dec 26 22:39:08 2015 +0100

tdf#74608: Constructor function for OfficeInstallationDirectories singleton

Change-Id: Ia0de503c50b6b1d568df27f6a8139fdcc8d0cfbf

diff --git a/comphelper/source/inc/comphelper_services.hxx 
b/comphelper/source/inc/comphelper_services.hxx
index 08ed94d..d62a16a 100644
--- a/comphelper/source/inc/comphelper_services.hxx
+++ b/comphelper/source/inc/comphelper_services.hxx
@@ -29,7 +29,6 @@ void createRegistryInfo_NamedPropertyValuesContainer();
 void createRegistryInfo_OInstanceLocker();
 void createRegistryInfo_OPropertyBag();
 void createRegistryInfo_OSimpleLogRing();
-void createRegistryInfo_OfficeInstallationDirectories();
 void createRegistryInfo_SequenceInputStream();
 void createRegistryInfo_SequenceOutputStream();
 void createRegistryInfo_UNOMemoryStream();
diff --git a/comphelper/source/misc/comphelper_services.cxx 
b/comphelper/source/misc/comphelper_services.cxx
index 122f192..979cd36 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -41,7 +41,6 @@ namespace comphelper { namespace module
 createRegistryInfo_IndexedPropertyValuesContainer();
 createRegistryInfo_NamedPropertyValuesContainer();
 createRegistryInfo_AnyCompareFactory();
-createRegistryInfo_OfficeInstallationDirectories();
 createRegistryInfo_OInstanceLocker();
 createRegistryInfo_Map();
 createRegistryInfo_OSimpleLogRing();
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx 
b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index ca2aa0d..6342182 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -19,8 +19,6 @@
 
 #include 
 
-#include "comphelper_module.hxx"
-#include "comphelper_services.hxx"
 #include 
 
 /**
@@ -30,7 +28,7 @@
  */
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -38,13 +36,6 @@
 
 using namespace com::sun::star;
 
-using namespace comphelper;
-
-
-// helpers
-
-
-
 static bool makeCanonicalFileURL( OUString & rURL )
 {
 OSL_ENSURE(comphelper::isFileUrl(rURL), "File URL expected!");
@@ -82,13 +73,7 @@ static bool makeCanonicalFileURL( OUString & rURL )
 return false;
 }
 
-
-
-
-// OfficeInstallationDirectories Implementation.
-
-
-
+namespace comphelper {
 
 OfficeInstallationDirectories::OfficeInstallationDirectories(
 const uno::Reference< uno::XComponentContext > & xCtx )
@@ -212,7 +197,7 @@ OUString SAL_CALL
 OfficeInstallationDirectories::getImplementationName()
 throw ( uno::RuntimeException, std::exception )
 {
-return getImplementationName_static();
+return OUString("com.sun.star.comp.util.OfficeInstallationDirectories");
 }
 
 // virtual
@@ -228,40 +213,9 @@ uno::Sequence< OUString > SAL_CALL
 OfficeInstallationDirectories::getSupportedServiceNames()
 throw ( uno::RuntimeException, std::exception )
 {
-return getSupportedServiceNames_static();
-}
-
-
-// static
-OUString SAL_CALL
-OfficeInstallationDirectories::getImplementationName_static()
-{
-return OUString("com.sun.star.comp.util.OfficeInstallationDirectories");
-}
-
-
-// static
-uno::Sequence< OUString > SAL_CALL
-OfficeInstallationDirectories::getSupportedServiceNames_static()
-{
-const OUString 
aServiceName("com.sun.star.util.OfficeInstallationDirectories");
-return uno::Sequence< OUString >( , 1 );
-}
-
-
-// static
-uno::Reference< uno::XInterface > SAL_CALL
-OfficeInstallationDirectories::Create(
-const uno::Reference< uno::XComponentContext > & rxContext )
-{
-return static_cast< cppu::OWeakObject * >(
-new OfficeInstallationDirectories( rxContext ) );
+return { "com.sun.star.util.OfficeInstallationDirectories" };
 }
 
-
-// non-UNO
-
-
 void OfficeInstallationDirectories::initDirs()
 {
 if ( m_pOfficeBrandDir == nullptr )
@@ -293,9 +247,34 @@ void 

[Libreoffice-commits] core.git: svx/source

[Matúš Kukan]

 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd258f168f7e5952a71d84a2564c3d5162a613c8
Author: Matúš Kukan 
Date:   Sat Dec 19 09:29:53 2015 +0100

loplugin:redundantcast

Change-Id: Ie80a8e8132214164a4a237b0e5ea89c1b41d8ee3

diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx 
b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 03516df..2b11b23 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -138,7 +138,7 @@ drawinglayer::primitive2d::Primitive2DContainer 
PagePrimitiveExtractor::createPr
 // PagePreviewPrimitive2D::create2DDecomposition)
 basegfx::B2DRange(),
 
-GetXDrawPageForSdrPage(const_cast< SdrPage* >(pStartPage)),
+GetXDrawPageForSdrPage(pStartPage),
 0.0, // no time; page previews are not animated
 rOriginalViewInformation.getExtendedInformationSequence());
 updateViewInformation2D(aNewViewInformation2D);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/Library_dba.mk dbaccess/source

[Matúš Kukan]

 dbaccess/Library_dba.mk  |1 
 dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx |   30 -
 dbaccess/source/core/dataaccess/databasecontext.cxx  |1 
 dbaccess/source/core/inc/module_dba.hxx  |   34 ---
 dbaccess/source/core/misc/module_dba.cxx |   29 
 5 files changed, 10 insertions(+), 85 deletions(-)

New commits:
commit e0075eb0c0b87f52ed74e19133d26cbd8138bb39
Author: Matúš Kukan 
Date:   Sat Nov 21 01:46:57 2015 +0100

dbaccess: module_dba not used anymore

Change-Id: I6f9222dd40c553e1d0ad63e00e5874be939a97c1

diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 6ed0a2b..beeddad 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
 dbaccess/source/core/misc/ContainerMediator \
 dbaccess/source/core/misc/DatabaseDataProvider \
 dbaccess/source/core/misc/dsntypes \
-dbaccess/source/core/misc/module_dba \
 dbaccess/source/core/misc/objectnameapproval \
 dbaccess/source/core/misc/PropertyForward \
 dbaccess/source/core/misc/sdbcoretools \
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 8ff8df3..b12ace6 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -27,7 +27,6 @@
 #include "databaseregistrations.hxx"
 #include "datasource.hxx"
 #include "dbastrings.hrc"
-#include "module_dba.hxx"
 
 #include 
 #include 
diff --git a/dbaccess/source/core/inc/module_dba.hxx 
b/dbaccess/source/core/inc/module_dba.hxx
deleted file mode 100644
index c79b53c..000
--- a/dbaccess/source/core/inc/module_dba.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-
-#include 
-
-namespace dba
-{
-
-DEFINE_MODULE( DbaModule, DbaClient, DbaRes )
-
-} // namespace sdbtools
-
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/module_dba.cxx 
b/dbaccess/source/core/misc/module_dba.cxx
deleted file mode 100644
index 7b554e7..000
--- a/dbaccess/source/core/misc/module_dba.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "module_dba.hxx"
-
-namespace dba
-{
-
-IMPLEMENT_MODULE( DbaModule, "dba" )
-
-} // namespace sdbtools
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 30289fcab7fdeb21e8380d55d2ae550fc888e6f5
Author: Matúš Kukan 
Date:   Sun Dec 13 12:51:52 2015 +0100

XComponentContext not needed for DataAccessDescriptor

Change-Id: If5ede0c308930d37bff9e97afc8a76cc5b709034

diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx 
b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index e351d29..13df4cf 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ 

[Libreoffice-commits] core.git: cui/source

[Matúš Kukan]

 cui/source/customize/cfg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58f6e2ec8c546e7f927dfc333c8ae401f98e3dcf
Author: Matúš Kukan 
Date:   Sat Dec 19 07:20:51 2015 +0100

loplugin:stringconstant

Change-Id: Iafe0c422f8681bd2ed5b825af180facb59aaf531

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index b1defa9..9f6c8fd 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3396,7 +3396,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, 
MenuButton *, pButton, vo
 if ( pNameDialog->Execute() == RET_OK ) {
 pNameDialog->GetName(aNewName);
 
-if( aNewName == "" ) //tdf#80758 - Accelerator character ("~") 
is passed as
+if( aNewName.isEmpty() ) //tdf#80758 - Accelerator character 
("~") is passed as
 pEntry->SetName( "~" ); // the button name in case of 
empty values.
 else
 pEntry->SetName( aNewName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Matúš Kukan]

 RepositoryExternal.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 15614c847dde4c52a4974022e5523c9c4fea856b
Author: Matúš Kukan 
Date:   Sat Dec 5 07:05:37 2015 +0100

gengal: Don't depend on whole instsetoo_native_setup package

..to avoid rebuilding galleries all the time
because 'version' rc-file target is PHONY.
Instead name what exactly is needed.

Change-Id: Idf3c5a4a5b64a48ae06c46acf24e49f6a1ac2114
Reviewed-on: https://gerrit.libreoffice.org/20407
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cba5316..356da54 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3747,8 +3747,9 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
-   $(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
-   $(call gb_Package_get_target_for_build,instsetoo_native_setup) \
+   $(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,uno) \
+   $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,fundamental) \
+   $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source dbaccess/util sw/qa

[Matúš Kukan]

 dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx |   78 +--
 dbaccess/source/core/inc/services.hxx|   31 -
 dbaccess/source/core/misc/services.cxx   |   25 
 dbaccess/util/dba.component  |3 
 sw/qa/extras/uiwriter/data/tdf34957.odt  |binary
 5 files changed, 31 insertions(+), 106 deletions(-)

New commits:
commit 0769ad9284c4d71ab11e4460c0f380eca8d4c788
Author: Matúš Kukan 
Date:   Sat Dec 5 07:56:36 2015 +0100

test for tdf#34957: change font in test document to make it work here

Previously the text was too long, ending on second page,
and table was on third page here, but is expected on second.
Change font to 'Liberation Serif' which seems to be used elsewhere,
and set line spacing to 'single' which makes the test succeed.

Change-Id: I4fc903c5d83308608e70e3e440d5277abd487052

diff --git a/sw/qa/extras/uiwriter/data/tdf34957.odt 
b/sw/qa/extras/uiwriter/data/tdf34957.odt
index 5aacca0..291c6a2 100644
Binary files a/sw/qa/extras/uiwriter/data/tdf34957.odt and 
b/sw/qa/extras/uiwriter/data/tdf34957.odt differ
commit 1ded035f853ba62f02958175046948d2b47b8075
Author: Matúš Kukan 
Date:   Sat Nov 21 01:32:49 2015 +0100

tdf#74608 dbaccess: Constructor for singleton DataAccessDescriptorFactory

Change-Id: Id1453e3cf1c8aef22536b4e0797cca7e654316c0

diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx 
b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index 567e231..e351d29 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "dbastrings.hrc"
-#include "module_dba.hxx"
-#include "services.hxx"
 
 #include 
 #include 
@@ -28,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -36,28 +35,20 @@
 #include 
 #include 
 
-namespace dbaccess
+namespace
 {
 
 using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::XInterface;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::UNO_SET_THROW;
-using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::makeAny;
 using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::XComponentContext;
 using ::com::sun::star::lang::XServiceInfo;
-using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::beans::XPropertySetInfo;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::sdbc::XConnection;
 using ::com::sun::star::sdbc::XResultSet;
-using ::com::sun::star::sdb::XDataAccessDescriptorFactory;
 using ::com::sun::star::beans::XPropertySet;
-using ::com::sun::star::uno::XComponentContext;
 using ::com::sun::star::beans::PropertyValue;
 
 namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
@@ -211,10 +202,7 @@ namespace dbaccess
 }
 
 // DataAccessDescriptorFactory
-typedef ::cppu::WeakImplHelper<   XServiceInfo
-  ,   XDataAccessDescriptorFactory
-  >   DataAccessDescriptorFactory_Base;
-class DataAccessDescriptorFactory : public DataAccessDescriptorFactory_Base
+class DataAccessDescriptorFactory: public 
::cppu::WeakImplHelper
 {
 public:
 // XServiceInfo
@@ -222,16 +210,9 @@ namespace dbaccess
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName 
) throw (RuntimeException, std::exception) override;
 virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) 
throw (RuntimeException, std::exception) override;
 
-// XServiceInfo - static versions
-static Sequence< OUString >  getSupportedServiceNames_static() throw( 
RuntimeException );
-static OUString  getImplementationName_static() throw( 
RuntimeException );
-static Reference< XInterface >  Create(const Reference< 
XComponentContext >& _rxContext);
-static OUString  getSingletonName_static();
-
 // XDataAccessDescriptorFactory
 virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor( 
 ) throw (RuntimeException, std::exception) override;
 
-protected:
 explicit DataAccessDescriptorFactory( const Reference< 
XComponentContext >& _rxContext );
 virtual ~DataAccessDescriptorFactory();
 
@@ -248,30 +229,9 @@ namespace dbaccess
 {
 }
 
-OUString DataAccessDescriptorFactory::getSingletonName_static()
-{
-return OUString( "com.sun.star.sdb.DataAccessDescriptorFactory" );
-}
-
-Sequence< OUString > 

[Libreoffice-commits] core.git: dbaccess/source extensions/source

[Matúš Kukan]

 dbaccess/source/inc/registrationhelper.hxx |   36 -
 extensions/source/inc/componentmodule.hxx  |   41 -
 2 files changed, 77 deletions(-)

New commits:
commit e32dcddaa5b74b3d163413c685d7c088cef1cbd9
Author: Matúš Kukan 
Date:   Sat Dec 12 18:59:32 2015 +0100

OOneInstanceAutoRegistration is not used

Change-Id: I6928dec92655e4655af6c519405712892bf7d870

diff --git a/dbaccess/source/inc/registrationhelper.hxx 
b/dbaccess/source/inc/registrationhelper.hxx
index 4703147..b49b40f 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -87,7 +87,6 @@ public:
 Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&)
 the instantiation of this object will automatically register the class 
via OModuleRegistration::registerComponent.
 The factory creation function used is 
::cppu::createSingleFactory.
-@see OOneInstanceAutoRegistration
 */
 OMultiInstanceAutoRegistration();
 ~OMultiInstanceAutoRegistration();
@@ -110,39 +109,4 @@ 
OMultiInstanceAutoRegistration::~OMultiInstanceAutoRegistration()
 OModuleRegistration::revokeComponent(TYPE::getImplementationName_Static());
 }
 
-template 
-class OOneInstanceAutoRegistration
-{
-public:
-/** provided that the template argument has three methods
-static OUString getImplementationName_Static()
-static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static()
-and
-static css::uno::Reference< css::uno::XInterface >
-Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&)
-the instantiation of this object will automatically register the class 
via OModuleRegistration::registerComponent.
-The factory creation function used is 
::cppu::createSingleFactory.
-@see OMultiInstanceAutoRegistration
-*/
-OOneInstanceAutoRegistration();
-~OOneInstanceAutoRegistration();
-};
-
-template 
-OOneInstanceAutoRegistration::OOneInstanceAutoRegistration()
-{
-OModuleRegistration::registerComponent(
-TYPE::getImplementationName_Static(),
-TYPE::getSupportedServiceNames_Static(),
-TYPE::Create,
-::cppu::createOneInstanceFactory
-);
-}
-
-template 
-OOneInstanceAutoRegistration::~OOneInstanceAutoRegistration()
-{
-OModuleRegistration::revokeComponent(TYPE::getImplementationName_Static());
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/inc/componentmodule.hxx 
b/extensions/source/inc/componentmodule.hxx
index 79a6ebf..58f80ba 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -170,7 +170,6 @@ typedef css::uno::Reference< 
css::lang::XSingleServiceFactory > (SAL_CALL *Facto
 the instantiation of this object will automatically register the 
class via OModule::registerComponent.
 
 The factory creation function used is 
::cppu::createSingleFactory.
-@see OOneInstanceAutoRegistration
 */
 OMultiInstanceAutoRegistration();
 ~OMultiInstanceAutoRegistration();
@@ -193,46 +192,6 @@ typedef css::uno::Reference< 
css::lang::XSingleServiceFactory > (SAL_CALL *Facto
 OModule::revokeComponent(TYPE::getImplementationName_Static());
 }
 
-template 
-class OOneInstanceAutoRegistration
-{
-public:
-/** automatically registeres a single instance component
-Assumed that the template argument has the three methods
-
-static OUString 
getImplementationName_Static()
-static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static()
-static css::uno::Reference< css::uno::XInterface 
>
-Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&)
-
-
-the instantiation of this object will automatically register the 
class via OModule::registerComponent.
-
-The factory creation function used is 
::cppu::createOneInstanceFactory.
-@see OOneInstanceAutoRegistration
-*/
-OOneInstanceAutoRegistration();
-~OOneInstanceAutoRegistration();
-};
-
-template 
-OOneInstanceAutoRegistration::OOneInstanceAutoRegistration()
-{
-OModule::registerComponent(
-TYPE::getImplementationName_Static(),
-TYPE::getSupportedServiceNames_Static(),
-TYPE::Create,
-::cppu::createOneInstanceFactory
-);
-}
-
-template 
-OOneInstanceAutoRegistration::~OOneInstanceAutoRegistration()
-{
-OModule::revokeComponent(TYPE::getImplementationName_Static());
-}
-
-
 }   // namespace COMPMOD_NAMESPACE
 
 
___

[Libreoffice-commits] core.git: 2 commits - dbaccess/source dbaccess/util

[Matúš Kukan]

 dbaccess/source/core/dataaccess/ComponentDefinition.cxx |   45 ++
 dbaccess/source/core/dataaccess/ComponentDefinition.hxx |   18 +---
 dbaccess/source/core/dataaccess/databasedocument.cxx|   66 
 dbaccess/source/core/dataaccess/databasedocument.hxx|6 -
 dbaccess/source/core/inc/services.hxx   |2 
 dbaccess/source/core/misc/services.cxx  |2 
 dbaccess/util/dba.component |6 -
 7 files changed, 40 insertions(+), 105 deletions(-)

New commits:
commit f229b9b04a9267f7f277304c0ebed7f8b2582a5d
Author: Matúš Kukan 
Date:   Sat Nov 21 00:39:35 2015 +0100

tdf#74608 dbaccess: Constructor feature for ODatabaseDocument

Change-Id: Id524a1a717c350cb0558ef5ff11da3e6c941c203

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 3b07612..e25b714 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -22,8 +22,6 @@
 #include "datasource.hxx"
 #include "databasedocument.hxx"
 #include "dbastrings.hrc"
-#include "module_dba.hxx"
-#include "services.hxx"
 #include "documenteventexecutor.hxx"
 #include "databasecontext.hxx"
 #include "documentcontainer.hxx"
@@ -52,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -111,11 +108,6 @@ using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::script::provider;
 using namespace ::com::sun::star::ui;
 using namespace ::cppu;
-using namespace ::osl;
-
-using ::com::sun::star::awt::XWindow;
-using ::com::sun::star::ucb::XContent;
-using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
 
 namespace dbaccess
 {
@@ -147,17 +139,6 @@ bool ViewMonitor::onSetCurrentController( const Reference< 
XController >& _rxCon
 return bLoadFinished;
 }
 
-} // namespace dbaccess
-
-// ODatabaseDocument
-
-extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument()
-{
-static ::dba::OAutoRegistration< ::dbaccess::ODatabaseDocument > 
aAutoRegistration;
-}
-
-namespace dbaccess
-{
 
 ODatabaseDocument::ODatabaseDocument(const 
::rtl::Reference& _pImpl )
 :ModelDependentComponent( _pImpl )
@@ -611,7 +592,7 @@ namespace
 {
 bool lcl_hasAnyModifiedSubComponent_throw( const Reference< XController >& 
i_rController )
 {
-Reference< XDatabaseDocumentUI > xDatabaseUI( i_rController, 
UNO_QUERY_THROW );
+Reference< css::sdb::application::XDatabaseDocumentUI > xDatabaseUI( 
i_rController, UNO_QUERY_THROW );
 
 Sequence< Reference< XComponent > > aComponents( 
xDatabaseUI->getSubComponents() );
 const Reference< XComponent >* component = aComponents.getConstArray();
@@ -1900,37 +1881,14 @@ void SAL_CALL ODatabaseDocument::removeEventListener( 
const Reference< lang::XEv
 }
 
 // XServiceInfo
-OUString ODatabaseDocument::getImplementationName(  ) throw(RuntimeException, 
std::exception)
-{
-return getImplementationName_static();
-}
-
-OUString ODatabaseDocument::getImplementationName_static(  ) 
throw(RuntimeException)
+OUString ODatabaseDocument::getImplementationName() throw(RuntimeException, 
std::exception)
 {
 return OUString("com.sun.star.comp.dba.ODatabaseDocument");
 }
 
-Sequence< OUString > ODatabaseDocument::getSupportedServiceNames(  ) throw 
(RuntimeException, std::exception)
+Sequence< OUString > ODatabaseDocument::getSupportedServiceNames() throw 
(RuntimeException, std::exception)
 {
-return getSupportedServiceNames_static();
-}
-
-Reference< XInterface > ODatabaseDocument::Create( const Reference< 
XComponentContext >& _rxContext )
-{
-Reference< XUnoTunnel > xDBContextTunnel( 
DatabaseContext::create(_rxContext), UNO_QUERY_THROW );
-ODatabaseContext* pContext = reinterpret_cast< ODatabaseContext* >( 
xDBContextTunnel->getSomething( 
ODatabaseContext::getUnoTunnelImplementationId() ) );
-
-::rtl::Reference pImpl( new ODatabaseModelImpl( 
_rxContext, *pContext ) );
-Reference< XModel > xModel( pImpl->createNewModel_deliverOwnership( false 
) );
-return xModel.get();
-}
-
-Sequence< OUString > ODatabaseDocument::getSupportedServiceNames_static(  ) 
throw (RuntimeException)
-{
-Sequence< OUString > aSNS( 2 );
-aSNS[0] = "com.sun.star.sdb.OfficeDatabaseDocument";
-aSNS[1] = "com.sun.star.document.OfficeDocument";
-return aSNS;
+return { "com.sun.star.sdb.OfficeDatabaseDocument", 
"com.sun.star.document.OfficeDocument" };
 }
 
 sal_Bool ODatabaseDocument::supportsService( const OUString& _rServiceName ) 
throw (RuntimeException, std::exception)
@@ -2252,4 +2210,20 @@ OUString SAL_CALL ODatabaseDocument::getUntitledPrefix() 
   throw (uno::RuntimeE
 
 }   // namespace dbaccess
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context,
+

[Libreoffice-commits] core.git: dbaccess/source

[Matúš Kukan]

 dbaccess/source/ui/misc/WTypeSelect.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d4279b53a7835303e0804c2b1cf9aa53fd723aa
Author: Matúš Kukan 
Date:   Sat Dec 5 17:34:01 2015 +0100

loplugin:defaultparams

Change-Id: I9015579a93e58d382866cbebe7af462735b08700

diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx 
b/dbaccess/source/ui/misc/WTypeSelect.cxx
index e16e00f..96fdd65 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -443,7 +443,7 @@ bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
 }
 
 if (bCheckOk)
-aContextMenu.CheckItem( SID_TABLEDESIGN_TABED_PRIMARYKEY, true 
);
+aContextMenu.CheckItem( SID_TABLEDESIGN_TABED_PRIMARYKEY );
 
 switch( aContextMenu.Execute( this, ptWhere ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source dbaccess/util

[Matúš Kukan]

 dbaccess/source/core/dataaccess/commanddefinition.cxx |   49 +-
 dbaccess/source/core/dataaccess/commanddefinition.hxx |   20 ++-
 dbaccess/source/core/inc/services.hxx |1 
 dbaccess/source/core/misc/services.cxx|1 
 dbaccess/util/dba.component   |3 -
 5 files changed, 25 insertions(+), 49 deletions(-)

New commits:
commit f7c94c5b8a7de7f24bea8c612eb2b15a26c2a61a
Author: Matúš Kukan 
Date:   Sat Nov 21 00:10:07 2015 +0100

tdf#74608 dbaccess: Constructor feature for OCommandDefinition

Change-Id: Ibaa1fd8310fdba073190a7721891ebb835eb0e6e

diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx 
b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 6fd3dc0..e05b10f 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -20,29 +20,17 @@
 #include "commanddefinition.hxx"
 #include "apitools.hxx"
 #include "dbastrings.hrc"
-#include "module_dba.hxx"
-#include "services.hxx"
 
 #include 
 #include 
 
 #include 
-#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
-using namespace ::osl;
-using namespace ::comphelper;
-using namespace ::cppu;
-
-// OCommandDefinition
-extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition()
-{
-static ::dba::OAutoRegistration< ::dbaccess::OCommandDefinition > 
aAutoRegistration;
-}
 
 namespace dbaccess
 {
@@ -99,33 +87,18 @@ 
IMPLEMENT_GETTYPES2(OCommandDefinition,OCommandDefinition_Base,OComponentDefinit
 IMPLEMENT_FORWARD_XINTERFACE2( 
OCommandDefinition,OComponentDefinition,OCommandDefinition_Base)
 
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP)
 
-OUString OCommandDefinition::getImplementationName_static(  ) 
throw(RuntimeException)
+OUString SAL_CALL OCommandDefinition::getImplementationName() 
throw(RuntimeException, std::exception)
 {
 return OUString("com.sun.star.comp.dba.OCommandDefinition");
 }
 
-OUString SAL_CALL OCommandDefinition::getImplementationName(  ) 
throw(RuntimeException, std::exception)
-{
-return getImplementationName_static();
-}
-
-Sequence< OUString > OCommandDefinition::getSupportedServiceNames_static(  ) 
throw(RuntimeException)
+css::uno::Sequence SAL_CALL 
OCommandDefinition::getSupportedServiceNames() throw(RuntimeException, 
std::exception)
 {
-Sequence< OUString > aServices(3);
-aServices.getArray()[0] = "com.sun.star.sdb.QueryDefinition";
-aServices.getArray()[1] = "com.sun.star.sdb.CommandDefinition";
-aServices.getArray()[2] = "com.sun.star.ucb.Content";
-return aServices;
-}
-
-Sequence< OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames(  ) 
throw(RuntimeException, std::exception)
-{
-return getSupportedServiceNames_static();
-}
-
-Reference< XInterface > OCommandDefinition::Create(const Reference< 
XComponentContext >& _rxContext)
-{
-return *(new OCommandDefinition( _rxContext, nullptr, TContentPtr( new 
OCommandDefinition_Impl ) ) );
+return {
+"com.sun.star.sdb.QueryDefinition",
+"com.sun.star.sdb.CommandDefinition",
+"com.sun.star.ucb.Content"
+};
 }
 
 void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw 
(SQLException, ElementExistException, RuntimeException, std::exception)
@@ -150,4 +123,12 @@ void SAL_CALL OCommandDefinition::rename( const OUString& 
newName ) throw (SQLEx
 
 }   // namespace dbaccess
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_dba_OCommandDefinition(css::uno::XComponentContext* context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new dbaccess::OCommandDefinition(
+context, nullptr, dbaccess::TContentPtr( new 
dbaccess::OCommandDefinition_Impl )));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx 
b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index 1769142..d885b27 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -58,15 +58,13 @@ class OCommandDefinition   : public OComponentDefinition
 protected:
 virtual ~OCommandDefinition();
 
-OCommandDefinition(const css::uno::Reference< css::uno::XComponentContext 
>&
-,const css::uno::Reference< css::uno::XInterface >&   _xParentContainer
-,const TContentPtr& _pImpl
-);
-
 inline const OCommandDefinition_Impl& getCommandDefinition() const { 
return dynamic_cast< const OCommandDefinition_Impl& >( *m_pImpl.get() ); }
 inline   OCommandDefinition_Impl& getCommandDefinition()   { 
return dynamic_cast<   OCommandDefinition_Impl& >( *m_pImpl.get() ); }
 
 

[Libreoffice-commits] core.git: dbaccess/source dbaccess/util

[Matúš Kukan]

 dbaccess/source/core/dataaccess/datasource.cxx |   42 +
 dbaccess/source/core/dataaccess/datasource.hxx |6 ---
 dbaccess/source/core/inc/services.hxx  |1 
 dbaccess/source/core/misc/services.cxx |1 
 dbaccess/util/dba.component|3 +
 5 files changed, 11 insertions(+), 42 deletions(-)

New commits:
commit 81fa5340191baf8687f9c82f1f414f5afc86b529
Author: Matúš Kukan 
Date:   Fri Nov 20 21:12:27 2015 +0100

tdf#74608 dbaccess: Constructor feature for ODatabaseSource

Change-Id: I9ab9c0eaf463c93caf116c98e47564562af0af5d

diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index 73bf3c8..00e9d3f 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "datasource.hxx"
-#include "module_dba.hxx"
-#include "services.hxx"
 #include "userinformation.hxx"
 #include "commandcontainer.hxx"
 #include "dbastrings.hrc"
@@ -472,17 +470,6 @@ namespace
 };
 }
 
-} // namespace dbaccess
-
-// ODatabaseContext
-
-extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource()
-{
-static ::dba::OAutoRegistration< ::dbaccess::ODatabaseSource > 
aAutoRegistration;
-}
-
-namespace dbaccess
-{
 
 ODatabaseSource::ODatabaseSource(const ::rtl::Reference& 
_pImpl)
 :ModelDependentComponent( _pImpl )
@@ -560,31 +547,12 @@ void SAL_CALL ODatabaseSource::disposing( const 
css::lang::EventObject& Source )
 // XServiceInfo
 OUString ODatabaseSource::getImplementationName(  ) throw(RuntimeException, 
std::exception)
 {
-return getImplementationName_static();
-}
-
-OUString ODatabaseSource::getImplementationName_static(  ) 
throw(RuntimeException)
-{
 return OUString("com.sun.star.comp.dba.ODatabaseSource");
 }
 
 Sequence< OUString > ODatabaseSource::getSupportedServiceNames(  ) throw 
(RuntimeException, std::exception)
 {
-return getSupportedServiceNames_static();
-}
-
-Reference< XInterface > ODatabaseSource::Create( const Reference< 
XComponentContext >& _rxContext )
-{
-Reference< XDatabaseContext > xDBContext( 
DatabaseContext::create(_rxContext) );
-return xDBContext->createInstance();
-}
-
-Sequence< OUString > ODatabaseSource::getSupportedServiceNames_static(  ) 
throw (RuntimeException)
-{
-Sequence< OUString > aSNS( 2 );
-aSNS[0] = SERVICE_SDB_DATASOURCE;
-aSNS[1] = "com.sun.star.sdb.DocumentDataSource";
-return aSNS;
+return { SERVICE_SDB_DATASOURCE, "com.sun.star.sdb.DocumentDataSource" };
 }
 
 sal_Bool ODatabaseSource::supportsService( const OUString& _rServiceName ) 
throw (RuntimeException, std::exception)
@@ -1355,4 +1323,12 @@ Reference< XInterface > ODatabaseSource::getThis() const
 
 }   // namespace dbaccess
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_dba_ODatabaseSource(css::uno::XComponentContext* context,
+css::uno::Sequence const &)
+{
+css::uno::Reference< XDatabaseContext > xDBContext( 
DatabaseContext::create(context) );
+return 
cppu::acquire(static_cast(xDBContext->createInstance().get()));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx 
b/dbaccess/source/core/dataaccess/datasource.hxx
index 3c4caf2..446b846 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -129,12 +129,6 @@ public:
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
throw(css::uno::RuntimeException, std::exception) override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  
) throw(css::uno::RuntimeException, std::exception) override;
 
-// css::lang::XServiceInfo - static methods
-static css::uno::Sequence< OUString > getSupportedServiceNames_static() 
throw( css::uno::RuntimeException );
-static OUString getImplementationName_static() throw( 
css::uno::RuntimeException );
-static css::uno::Reference< css::uno::XInterface >
-SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext 
>&);
-
 // OComponentHelper
 virtual void SAL_CALL disposing() override;
 
diff --git a/dbaccess/source/core/inc/services.hxx 
b/dbaccess/source/core/inc/services.hxx
index d93b505..1919ff8 100644
--- a/dbaccess/source/core/inc/services.hxx
+++ b/dbaccess/source/core/inc/services.hxx
@@ -28,7 +28,6 @@ extern "C" void SAL_CALL 
createRegistryInfo_DataAccessDescriptorFactory();
 extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition();
 extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition();
 extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument();
-extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource();
 
 #endif
 
diff --git a/dbaccess/source/core/misc/services.cxx 
b/dbaccess/source/core/misc/services.cxx
index 

[Libreoffice-commits] core.git: Changes to 'private/matus/component_ctors'

[Matúš Kukan]

New branch 'private/matus/component_ctors' available with the following commits:
commit 05088e5d92b252c9e98336b6025ede00e288e000
Author: Matúš Kukan 
Date:   Sat Nov 21 01:46:57 2015 +0100

dbaccess: module_dba not used anymore

Change-Id: I6f9222dd40c553e1d0ad63e00e5874be939a97c1

commit d404da0d0f2f69fb1dd3ec24b47ca37c481742bf
Author: Matúš Kukan 
Date:   Sat Nov 21 01:32:49 2015 +0100

tdf#74608 dbaccess: Constructor for singleton DataAccessDescriptorFactory

Change-Id: Id1453e3cf1c8aef22536b4e0797cca7e654316c0

commit bc138784b5c90e9ccedb48744b5d84c8b0adb457
Author: Matúš Kukan 
Date:   Sat Nov 21 00:39:35 2015 +0100

tdf#74608 dbaccess: Constructor feature for ODatabaseDocument

Change-Id: Id524a1a717c350cb0558ef5ff11da3e6c941c203

commit d562734c315b52f3da146acd66bfae6bce6b892e
Author: Matúš Kukan 
Date:   Sat Nov 21 00:27:24 2015 +0100

tdf#74608 dbaccess: Constructor feature for OComponentDefinition

Change-Id: I150cdaa46a0d86e1a4b6598ac580a10b2e8f071f

commit 87b0b483a21eebd8d5a21742a71f6490541db27a
Author: Matúš Kukan 
Date:   Sat Nov 21 00:10:07 2015 +0100

tdf#74608 dbaccess: Constructor feature for OCommandDefinition

Change-Id: Ibaa1fd8310fdba073190a7721891ebb835eb0e6e

commit ae26b786e54a2bbc460df7aed6c73a0c560f1b4b
Author: Matúš Kukan 
Date:   Fri Nov 20 21:12:27 2015 +0100

tdf#74608 dbaccess: Constructor feature for ODatabaseSource

Change-Id: I9ab9c0eaf463c93caf116c98e47564562af0af5d

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Matúš Kukan]

 dbaccess/source/core/api/RowSet.cxx |   19 ---
 dbaccess/source/core/api/RowSet.hxx |4 
 2 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 9e36549c68ecb4d96c56614df5d9f369db95e128
Author: Matúš Kukan 
Date:   Fri Nov 20 21:29:36 2015 +0100

dbaccess: small cleanup

Change-Id: Id0a0aa66ffd5788873fa5dc99fcc1b912c0e90fa

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index 04a7ada..0772ef2 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -27,9 +27,7 @@
 #include "RowSet.hxx"
 #include "dbastrings.hrc"
 #include "sdbcoretools.hxx"
-#include "services.hxx"
 #include "SingleSelectQueryComposer.hxx"
-#include "module_dba.hxx"
 #include "CRowSetColumn.hxx"
 #include "CRowSetDataColumn.hxx"
 #include "RowSetCache.hxx"
@@ -76,6 +74,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace utl;
@@ -483,15 +482,10 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType 
) throw(RuntimeExcepti
 return aRet;
 }
 
-OUString ORowSet::getImplementationName_static(  ) throw(RuntimeException)
-{
-return OUString("com.sun.star.comp.dba.ORowSet");
-}
-
 // css::XServiceInfo
-OUString SAL_CALL ORowSet::getImplementationName(  ) throw(RuntimeException, 
std::exception)
+OUString SAL_CALL ORowSet::getImplementationName() throw(RuntimeException, 
std::exception)
 {
-return getImplementationName_static();
+return OUString("com.sun.star.comp.dba.ORowSet");
 }
 
 sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) 
throw(RuntimeException, std::exception)
@@ -499,7 +493,7 @@ sal_Bool SAL_CALL ORowSet::supportsService( const OUString& 
_rServiceName ) thro
 return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > ORowSet::getSupportedServiceNames_static(  ) throw 
(RuntimeException)
+Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames() 
throw(RuntimeException, std::exception)
 {
 Sequence< OUString > aSNS( 5 );
 aSNS[0] = SERVICE_SDBC_RESULTSET;
@@ -510,11 +504,6 @@ Sequence< OUString > 
ORowSet::getSupportedServiceNames_static(  ) throw (Runtime
 return aSNS;
 }
 
-Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames(  ) 
throw(RuntimeException, std::exception)
-{
-return getSupportedServiceNames_static();
-}
-
 // OComponentHelper
 void SAL_CALL ORowSet::disposing()
 {
diff --git a/dbaccess/source/core/api/RowSet.hxx 
b/dbaccess/source/core/api/RowSet.hxx
index 4e406d1..f8d52df 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -267,10 +267,6 @@ namespace dbaccess
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName 
) throw(css::uno::RuntimeException, std::exception) override;
 virtual css::uno::Sequence< OUString > SAL_CALL 
getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) 
override;
 
-// css::lang::XServiceInfo - static methods
-static css::uno::Sequence< OUString > 
getSupportedServiceNames_static() throw( css::uno::RuntimeException );
-static OUString getImplementationName_static() throw( 
css::uno::RuntimeException );
-
 // OComponentHelper
 virtual void SAL_CALL disposing() override;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - framework/source Library_merged.mk solenv/gbuild

[Matúš Kukan]

 Library_merged.mk  |3 ---
 framework/source/services/frame.cxx|   10 --
 solenv/gbuild/LinkTarget.mk|3 +++
 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +++
 4 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit c1c13e6e38b8c58b0def4f462fd0ea3a5b2697cd
Author: Matúš Kukan 
Date:   Mon Nov 23 22:23:12 2015 +0100

Add i18nlangtag and ucbhelper to libmerged

Change-Id: I717d3289d63787cd8148d480783092868a60873b

diff --git a/Library_merged.mk b/Library_merged.mk
index 49dcbb5..8247e5a 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -18,13 +18,11 @@ $(eval $(call gb_Library_use_library_objects,merged,\
 $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
-   i18nlangtag \
$(if $(ENABLE_JAVA), \
jvmaccess \
jvmfwk) \
sal \
salhelper \
-   ucbhelper \
xmlreader \
$(gb_UWINAPI) \
 ))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d9a97a1..7f24a57 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -821,12 +821,14 @@ gb_BUILD_HELPER_LIBS := basegfx \
comphelper \
cppu \
cppuhelper \
+   i18nlangtag \
reg \
sal \
salhelper \
sax \
store \
tl \
+   ucbhelper \
unoidl \
xmlreader \
 
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index c9275f4..4ad27fb 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -30,6 +30,7 @@ MERGE_LIBRARY_LIST := \
fwi \
fwk \
$(call gb_Helper_optional,DESKTOP,helplinker) \
+   i18nlangtag \
i18npool \
i18nutil \
lng \
@@ -51,6 +52,7 @@ MERGE_LIBRARY_LIST := \
tl \
$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
ucb1 \
+   ucbhelper \
ucpexpand1 \
ucpfile1 \
unoxml \
commit 8668e044b27ca70de2e5b47741d5ccb2d4418ac4
Author: Matúš Kukan 
Date:   Mon Nov 23 22:16:31 2015 +0100

Add comphelper to libmerged

Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb

diff --git a/Library_merged.mk b/Library_merged.mk
index 2e482e8..49dcbb5 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\
 ))
 
 $(eval $(call gb_Library_use_libraries,merged,\
-   comphelper \
cppu \
cppuhelper \
i18nlangtag \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6af790c..d9a97a1 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -818,6 +818,7 @@ endef
 
 # libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS
 gb_BUILD_HELPER_LIBS := basegfx \
+   comphelper \
cppu \
cppuhelper \
reg \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 97953ee..c9275f4 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -14,6 +14,7 @@ MERGE_LIBRARY_LIST := \
$(if $(filter $(OS),ANDROID),,basebmp) \
basegfx \
canvastools \
+   comphelper \
configmgr \
cppcanvas \
$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
commit c6122fe6143ff1efa9f449d46a848cf3071ac67e
Author: Matúš Kukan 
Date:   Mon Nov 23 22:07:12 2015 +0100

Make this static WeakReference local to Frame::impl_checkMenuCloser()

..to avoid problem shown with comphelper added to libmerged. More info in
http://lists.freedesktop.org/archives/libreoffice/2015-November/071189.html

Change-Id: I2017d87f64f1ae3a1a1cf2e50bce24c05cff6321

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 754768e..bcd12d4 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -402,7 +402,6 @@ private:
 SvtCommandOptions   
m_aCommandOptions;   /// ref counted class to support disabling 
commands defined by configuration file
 bool
m_bSelfClose;/// in case of CloseVetoException on method 
close() was thrown by ourself - we must close ourself later if no internal 
processes are running
 bool
m_bIsHidden; /// indicates, if this frame is used in hidden 
mode or not
-static css::uno::WeakReference< css::frame::XFrame2 >   
m_xCloserFrame;  /// holds the only 

problems with static WeakReference when comphelper is in libmerged

[Matúš Kukan]

Hi there,

I was looking again at adding comphelper to libmerged and found that
only problem visible in tests is caused by static
WeakReference m_xCloserFrame from
framework/source/services/frame.cxx
I am getting crashes at exit like below:

#0  0x in TYPELIB_DANGER_GET(typelib_TypeDescription**,
typelib_TypeDescriptionReference*) (ppMacroTypeDescr=0xbfff6524,
pMacroTypeRef=0x85c8b70) at
/home/matus/git/master/include/typelib/typedescription.h:1008
#1  0x in uno_type_sequence_construct(uno_Sequence**,
typelib_TypeDescriptionReference*, void*, sal_Int32, uno_AcquireFunc)
(ppSequence=0xbfff65d8, pType=0x85c8b70, pElements=0x0, len=17,
acquire=0xb708a4a0 )
at /home/matus/git/master/cppu/source/uno/sequence.cxx:695
#2  0x in
com::sun::star::uno::Sequence::Sequence(long) (this=0xbfff65d8, len=17) at
/home/matus/git/master/include/com/sun/star/uno/Sequence.hxx:89
#3  0x in
cppu::sequenceRemoveElementAt(com::sun::star::uno::Sequence&, long) (rSeq=uno::Sequence of length 18 = {...}, index=14) at
/home/matus/git/master/cppuhelper/source/interfacecontainer.cxx:54
#4  0x in
cppu::OInterfaceContainerHelper::removeInterface(com::sun::star::uno::Reference
const&) (this=0x86b1f5c, rListener=uno::Reference to
(com::sun::star::uno::OWeakRefListener *) 0x86c38a0)
at /home/matus/git/master/cppuhelper/source/interfacecontainer.cxx:255
#5  0x in
cppu::OWeakConnectionPoint::removeReference(com::sun::star::uno::Reference
const&) (this=0x86b1f50, rRef=uno::Reference to
(com::sun::star::uno::OWeakRefListener *) 0x86c38a0) at
/home/matus/git/master/cppuhelper/source/weak.cxx:166
#6  0x in com::sun::star::uno::WeakReferenceHelper::clear()
(this=0xb6e82600 <(anonymous namespace)::Frame::m_xCloserFrame>)
at /home/matus/git/master/cppuhelper/source/weak.cxx:443
#7  0x in
com::sun::star::uno::WeakReferenceHelper::~WeakReferenceHelper()
(this=0xb6e82600 <(anonymous namespace)::Frame::m_xCloserFrame>)
at /home/matus/git/master/cppuhelper/source/weak.cxx:482
#8  0x in
com::sun::star::uno::WeakReference::~WeakReference()
(this=0xb6e82600 <(anonymous namespace)::Frame::m_xCloserFrame>) at
/home/matus/git/master/include/cppuhelper/weakref.hxx:122
#9  0x in __run_exit_handlers (status=status@entry=0,
listp=0xb7d063c4 <__exit_funcs>,
run_list_atexit=run_list_atexit@entry=true)
at exit.c:82
#10 0x in __GI_exit (status=0) at exit.c:104
#11 0x in __libc_start_main (main=0x804af00 , argc=22, argv=0xbfff6864, init=
0x8058920 <__libc_csu_init>, fini=0x8058990 <__libc_csu_fini>,
rtld_fini=0xb7fed660 <_dl_fini>, stack_end=0xbfff685c) at
libc-start.c:319
#12 0x0804ae2f in _start () at ../sysdeps/i386/start.S:115

And I would like to get help with fixing this.
There are more static WeakReferences.
I was able to work around the problem e.g. by commenting out
m_pImpl->m_XWeakConnectionPoint->removeReference in cppuhelper/source/weak.cxx

What should be done here?
1, find out why it crashes and fix the problem? I thought it would be
hard and did not try
2, Possibly this work-around solution above is acceptable?
3, kill all static WeakReferences - in the case of m_xCloserFrame,
perhaps it could be plain pointer?
4, something else?

When comphelper is in, we could add ucbhelper and i18nlangtag too.

Thanks,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: problems with static WeakReference when comphelper is in libmerged

[Matúš Kukan]

On 23 November 2015 at 21:33, Caolán McNamara <caol...@redhat.com> wrote:
> On Mon, 2015-11-23 at 20:52 +0100, Matúš Kukan wrote:
>> Hi there,
>>
>> I was looking again at adding comphelper to libmerged and found that
>> only problem visible in tests is caused by static
>> WeakReference m_xCloserFrame from
>> framework/source/services/frame.cxx
>> I am getting crashes at exit like below:
>
> As a bodge, does it make a difference to turn it from a global to a
> local static inside Frame::impl_checkMenuCloser ?

:) Hmm, yes, it helps.
So probably best to make it local - almost all other static
WeakReferences are local to a function too - and be done with it.
Thanks!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - sc/Library_scqahelper.mk sc/Module_sc.mk

[Matúš Kukan]

 sc/Library_scqahelper.mk |2 -
 sc/Module_sc.mk  |   83 +++
 2 files changed, 42 insertions(+), 43 deletions(-)

New commits:
commit 86a1d732b3812d6040ce3e60558a8dd8017e42f8
Author: Matúš Kukan 
Date:   Tue Nov 17 18:32:38 2015 +0100

Be consistent in using tabs at least here

Change-Id: I961516d92abd693c19efe8a051e35ae5192ef7d2

diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index a91d2c0..3cfd6d4 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\
comphelper \
cppu \
cppuhelper \
-editeng \
+   editeng \
for \
sal \
sc \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 99dabe9..1d802f9 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -39,61 +39,61 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-Library_scqahelper \
+   Library_scqahelper \
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sc_ucalc) \
-CppunitTest_sc_filters_test \
-CppunitTest_sc_rangelst_test \
-CppunitTest_sc_core \
+   CppunitTest_sc_filters_test \
+   CppunitTest_sc_rangelst_test \
+   CppunitTest_sc_core \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \
-CppunitTest_sc_condformats \
-CppunitTest_sc_new_cond_format_api \
-CppunitTest_sc_subsequent_filters_test \
-CppunitTest_sc_subsequent_export_test \
-CppunitTest_sc_bugfix_test \
-CppunitTest_sc_html_export_test \
-CppunitTest_sc_opencl_test \
-CppunitTest_sc_copypaste \
+   CppunitTest_sc_condformats \
+   CppunitTest_sc_new_cond_format_api \
+   CppunitTest_sc_subsequent_filters_test \
+   CppunitTest_sc_subsequent_export_test \
+   CppunitTest_sc_bugfix_test \
+   CppunitTest_sc_html_export_test \
+   CppunitTest_sc_opencl_test \
+   CppunitTest_sc_copypaste \
 ))
 
 # Disabled to allow the check tinderbox execute the sd tests
 # CppunitTest_sc_chart_regression_test \
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
-JunitTest_sc_complex \
-JunitTest_sc_unoapi_1 \
-JunitTest_sc_unoapi_2 \
-JunitTest_sc_unoapi_3 \
-JunitTest_sc_unoapi_4 \
-JunitTest_sc_unoapi_5 \
-JunitTest_sc_unoapi_6 \
-JunitTest_sc_unoapi_7 \
-CppunitTest_sc_annotationshapeobj \
-CppunitTest_sc_outlineobj \
-CppunitTest_sc_styleloaderobj \
-CppunitTest_sc_recordchanges \
-CppunitTest_sc_annotationobj \
-CppunitTest_sc_annotationsobj \
-CppunitTest_sc_cellrangeobj \
-$(if $(filter-out $(OS),IOS), \
-CppunitTest_sc_databaserangeobj) \
-CppunitTest_sc_datapilottableobj \
-CppunitTest_sc_datapilotfieldobj \
-CppunitTest_sc_macros_test \
-CppunitTest_sc_namedrangeobj \
-CppunitTest_sc_namedrangesobj \
-CppunitTest_sc_tablesheetobj \
-CppunitTest_sc_tablesheetsobj \
-CppunitTest_sc_editfieldobj_cell \
-CppunitTest_sc_editfieldobj_header \
-CppunitTest_sc_modelobj \
+   JunitTest_sc_complex \
+   JunitTest_sc_unoapi_1 \
+   JunitTest_sc_unoapi_2 \
+   JunitTest_sc_unoapi_3 \
+   JunitTest_sc_unoapi_4 \
+   JunitTest_sc_unoapi_5 \
+   JunitTest_sc_unoapi_6 \
+   JunitTest_sc_unoapi_7 \
+   CppunitTest_sc_annotationshapeobj \
+   CppunitTest_sc_outlineobj \
+   CppunitTest_sc_styleloaderobj \
+   CppunitTest_sc_recordchanges \
+   CppunitTest_sc_annotationobj \
+   CppunitTest_sc_annotationsobj \
+   CppunitTest_sc_cellrangeobj \
+   $(if $(filter-out $(OS),IOS), \
+   CppunitTest_sc_databaserangeobj) \
+   CppunitTest_sc_datapilottableobj \
+   CppunitTest_sc_datapilotfieldobj \
+   CppunitTest_sc_macros_test \
+   CppunitTest_sc_namedrangeobj \
+   CppunitTest_sc_namedrangesobj \
+   CppunitTest_sc_tablesheetobj \
+   CppunitTest_sc_tablesheetsobj \
+   CppunitTest_sc_editfieldobj_cell \
+   CppunitTest_sc_editfieldobj_header \
+   CppunitTest_sc_modelobj \
 ))
 
 $(eval $(call gb_Module_add_perfcheck_targets,sc,\
-CppunitTest_sc_perfobj \
-CppunitTest_sc_tablesheetobj \
+   CppunitTest_sc_perfobj \
+   CppunitTest_sc_tablesheetobj \
 ))
 
 
commit 02edab32d9cc1ee5403e3946d53d66838f03ae0e
Author: Matúš Kukan 
Date:   Tue Nov 17 18:28:13 2015 +0100

There is no need for this broken 'if' here

Change-Id: I10f926af9ca19252878b9b6e20365c38c885ce83

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 02f41e1..99dabe9 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-   $(if $(filter $(BUILD_TYPE),$(DESKTOP)),, \
-   Library_scqahelper) \
+

[Libreoffice-commits] core.git: sd/Library_sdui.mk svx/Library_svx.mk

[Matúš Kukan]

 sd/Library_sdui.mk |1 -
 svx/Library_svx.mk |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 510f463099272cec7f2193f3ffa1dbbd20d9f718
Author: Matúš Kukan 
Date:   Tue Nov 17 18:38:46 2015 +0100

No point to link against pure UNO component library fwk

Change-Id: I44d979180e53a7251547cebd60cf05c8322b2b83
Reviewed-on: https://gerrit.libreoffice.org/20028
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 60409c0..27b4069 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,sdui,\
 cppuhelper \
 editeng \
 i18nlangtag \
-fwk \
 fwl \
 fwe \
 sal \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 6fcce69..c30276e 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,svx,\
 drawinglayer \
 editeng \
 fwe \
-fwk \
 i18nlangtag \
 i18nutil \
 sal \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source

[Matúš Kukan]

 oox/source/shape/WpsContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 494aa9ee5d01699c0dcbc912091de30a314c09fc
Author: Matúš Kukan 
Date:   Fri Sep 18 12:57:39 2015 +0200

Workaround unit test failure by comparing as long

On 32bit system, for some reason casting to double gives wrong results.
Failing unit test was testTdf87924 in CppunitTest_sw_ooxmlimport.

Change-Id: If93e5288a381e50f30d035d56131b1d9235ac658
Reviewed-on: https://gerrit.libreoffice.org/18684
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 657071b..0cf558c 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -100,7 +100,7 @@ oox::core::ContextHandlerRef 
WpsContext::onCreateContext(sal_Int32 nElementToken
 
 // If the text is not rotated the way the shape wants it 
already, set the angle.
 const sal_Int32 nRotation = -270;
-if (basegfx::rad2deg(fRotate) != 
static_cast(NormAngle360(nRotation * 100)) / 100)
+if (static_cast(basegfx::rad2deg(fRotate)) != 
NormAngle360(nRotation * 100) / 100)
 {
 comphelper::SequenceAsHashMap 
aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
 aCustomShapeGeometry["TextPreRotateAngle"] = 
uno::makeAny(nRotation);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: unit test fails in writerperfect

[Matúš Kukan]

Hi Regina,

>> On Sat, Aug 29, 2015 at 04:56:02PM +0200, Regina Henschel wrote:
>>>
>>> Hi all,
>>>
>>> my current build fails in writerperfect. It has build
>>> Version: 5.1.0.0.alpha1+
>>> Build ID: 51c3a6421ecdb3443121c26e3bdeb21b07bd1fd8
>>> Locale: de-DE (de_DE)
>>>
>>> But unit test fails in writerperfect.
>>> make[1]: ***
>>> [C:/LO_devhelp/core/workdir/CppunitTest/writerperfect_writer.test] Error
>>> 1
>>
>>
>> Could you include more lines of the log? I need to know on which file
>> the test failed. Also, if you are building with system libwps or
>> libmwaw, which versions do you have?
>>
>
> I have put a log to http://pastebin.ca/3138459

I had the same problem.
I believe it was fixed by

commit ca77ec422ea617c84400370b082e71437e4590cc
Author: Jan Holesovsky 
Date:   Mon Aug 31 15:37:22 2015 +0200

vcl: Improve management of mnRef0Count.

Follow-up to 34700400247e378e074ce4164ab2809edb092201; this fixes
sw_ww8export
unit test on Windows.

You can try to pull and rebuild master.

Best,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Need help with temporary files

[Matúš Kukan]

On 22 July 2015 at 13:07, Caolán McNamara caol...@redhat.com wrote:
 On Wed, 2015-07-22 at 10:43 +0100, Caolán McNamara wrote:
 On Wed, 2015-07-22 at 10:28 +0100, Caolán McNamara wrote:
  On Tue, 2015-07-21 at 22:41 +0200, Matúš Kukan wrote:
   Hi there,
  
   I am working on a bug around saving big file in Writer:
   https://bugs.documentfoundation.org/show_bug.cgi?id=88314
  
 E_MFILE, too many open files, so the problem is a file handle leak.

 See https://gerrit.libreoffice.org/#/c/17289/ for a possible solution.
 That odt has  14k files in it and in parallel deflate mode each one
 gets a separate ZipOutputEntry which all exist at the same time until
 the threads are completed. Each ZipOutputEntry has an open temp file so
 it runs out of file handles.

Yay - thanks for explaining what's wrong and even fixing the bug.
I don't have much time to play with LibreOffice these days. :/

Your patch looks good, except we still open files in main thread,
so in theory, there can be still many files opened at the same time?
But it seems to help, commented in gerrit.

 So what works for me, though maybe it destroys the perf gains, is to
 close each entry's output stream after its processed and reopen it when
 we need its data.

I would not worry about the perf effect, at least I don't have better solution.
This is nice fix.

Thanks a lot.

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Need help with temporary files

[Matúš Kukan]

Hi there,

I am working on a bug around saving big file in Writer:
https://bugs.documentfoundation.org/show_bug.cgi?id=88314

The problem seems to be we deflate streams in parallel and run out of memory.
I thought there are temporary files used for deflating since
f92183833fa569006602ac7e93c906d2094e0d4d but I see this:

#2  0xb73c9e13 in __GI_abort () at abort.c:90
#3  0xb73c12c7 in __assert_fail_base (fmt=0xb7509564 %s%s%s:%u:
%s%sAssertion `%s' failed.\n%n,
assertion=assertion@entry=0xb462e257 .L.str31 pBuf 
\Possibly Reallocate failed\,
file=file@entry=0xb462df3b .L.str13
/home/matus/git/dbgutil/tools/source/stream/stream.cxx,
line=line@entry=1828,
function=function@entry=0xb462e27c
.L__PRETTY_FUNCTION__._ZN14SvMemoryStream7PutDataEPKvm virtual
sal_Size SvMemoryStream::PutData(const void *, sal_Size)) at
assert.c:92
#4  0xb73c1377 in __GI___assert_fail (assertion=0xb462e257 .L.str31
pBuf  \Possibly Reallocate failed\,
file=0xb462df3b .L.str13
/home/matus/git/dbgutil/tools/source/stream/stream.cxx, line=1828,
function=0xb462e27c
.L__PRETTY_FUNCTION__._ZN14SvMemoryStream7PutDataEPKvm virtual
sal_Size SvMemoryStream::PutData(const void *, sal_Size))
at assert.c:101
#5  0xb4614d46 in SvMemoryStream::PutData (this=0x6168b908,
pData=0x61b7f5e8, nCount=0)
at /home/matus/git/dbgutil/tools/source/stream/stream.cxx:1828
#6  0xb460da7a in SvStream::Write (this=0x6168b908, pData=0x61b7f5e8,
nCount=644) at /home/matus/git/dbgutil/tools/source/stream/stream.cxx:1359
#7  0xb437b197 in OTempFileService::writeBytes (this=0x6168b8a8,
aData=uno::Sequence of length 644 = {...})
at /home/matus/git/dbgutil/unotools/source/ucbhelper/xtempfile.cxx:268
#8  0xb437b369 in non-virtual thunk to
OTempFileService::writeBytes(com::sun::star::uno::Sequencesigned
char const) ()
at /home/matus/git/dbgutil/unotools/source/ucbhelper/xtempfile.cxx:272
#9  0xab02a77e in ZipOutputEntry::doDeflate (this=0x61a7e148) at
/home/matus/git/dbgutil/package/source/zipapi/ZipOutputEntry.cxx:180
#10 0xab02a0d6 in ZipOutputEntry::closeEntry (this=0x61a7e148) at
/home/matus/git/dbgutil/package/source/zipapi/ZipOutputEntry.cxx:90
#11 0xab0833eb in deflateZipEntry (pZipEntry=0x61a7e148,
xInStream=uno::Reference to (OInputCompStream *) 0xd56a3b4)
at 
/home/matus/git/dbgutil/package/source/zippackage/ZipPackageStream.cxx:456
#12 0xab08b07c in DeflateThread::doWork (this=0x61983c00) at
/home/matus/git/dbgutil/package/source/zippackage/ZipPackageStream.cxx:474

Does that mean css::io::TempFile UNO service I use in
package/source/zipapi/ZipOutputEntry.cxx provides in fact memory
stream?
OTempFileService::OTempFileService has
  mpTempFile = new ::utl::TempFile;

and TempFile::GetStream has
 if (!aName.isEmpty())
  pStream = new SvFileStream(aName, eMode);
else
  pStream = new SvMemoryStream(NULL, 0, eMode);

Should we fix that?
And/Or is there another way to get file stream?
package/ does not have many dependencies, so I would not like to
introduce some new.

Thanks,
All the best,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcompiler/Executable_helpindexer.mk helpcompiler/Executable_HelpIndexer.mk helpcompiler/Executable_helplinker.mk helpcompiler/Executable_HelpLinker.mk helpcompiler/M

[Matúš Kukan]

 helpcompiler/Executable_HelpIndexer.mk |   28 +++
 helpcompiler/Executable_HelpLinker.mk  |   34 +
 helpcompiler/Executable_helpindexer.mk |   28 ---
 helpcompiler/Executable_helplinker.mk  |   34 -
 helpcompiler/Module_helpcompiler.mk|4 +--
 5 files changed, 64 insertions(+), 64 deletions(-)

New commits:
commit 8be85ad170d5e1fa23606de9be2ae255296eab52
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat May 2 14:45:15 2015 +0200

Rename makefile to match target name

Change-Id: Iba879e0c2c79fd1c307c3dfe45370dbbfd4ae998

diff --git a/helpcompiler/Executable_helpindexer.mk 
b/helpcompiler/Executable_HelpIndexer.mk
similarity index 100%
rename from helpcompiler/Executable_helpindexer.mk
rename to helpcompiler/Executable_HelpIndexer.mk
diff --git a/helpcompiler/Executable_helplinker.mk 
b/helpcompiler/Executable_HelpLinker.mk
similarity index 100%
rename from helpcompiler/Executable_helplinker.mk
rename to helpcompiler/Executable_HelpLinker.mk
diff --git a/helpcompiler/Module_helpcompiler.mk 
b/helpcompiler/Module_helpcompiler.mk
index f4e0923..7bb53ab 100644
--- a/helpcompiler/Module_helpcompiler.mk
+++ b/helpcompiler/Module_helpcompiler.mk
@@ -10,8 +10,8 @@
 $(eval $(call gb_Module_Module,helpcompiler))
 
 $(eval $(call gb_Module_add_targets,helpcompiler,\
-Executable_helpindexer \
-Executable_helplinker \
+Executable_HelpIndexer \
+Executable_HelpLinker \
 Library_helplinker \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: rsc/Module_rsc.mk

[Matúš Kukan]

 rsc/Module_rsc.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 45704914a5b73e106c35323210159f82201cbf56
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat May 2 14:40:06 2015 +0200

Bin empty eval statement

Change-Id: I52755c373f86490ba3e8910e71e3fab88b1ca38c

diff --git a/rsc/Module_rsc.mk b/rsc/Module_rsc.mk
index e1a8b24..40e7f03 100644
--- a/rsc/Module_rsc.mk
+++ b/rsc/Module_rsc.mk
@@ -9,9 +9,6 @@
 
 $(eval $(call gb_Module_Module,rsc))
 
-$(eval $(call gb_Module_add_targets,rsc,\
-))
-
 $(eval $(call gb_Module_add_targets_for_build,rsc,\
Executable_rsc \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: FastAttributeList and docx export problems

[Matúš Kukan]

On 28 April 2015 at 16:44, Caolán McNamara caol...@redhat.com wrote:
 On Fri, 2015-04-17 at 20:52 +0200, Matúš Kukan wrote:
 I have high hopes for

 http://cgit.freedesktop.org/libreoffice/core/commit/?id=11cac95f57c5e7836413a73667d74128c4afd3e7

 to knock another significant wedge of the remaining docx failures on
 export.

Nice.

Do you plan to backport some of the patches?
E.g. https://bugs.documentfoundation.org/show_bug.cgi?id=85769
was fixed by 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=89964955e535f7343cccf1399312f0e8ac76323d
but also by your more general
http://cgit.freedesktop.org/libreoffice/core/commit/?id=870a7ee60ab01246ad8d9beae5705f59c6b73cbf
I am not sure which one to backport.

Thanks,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: i18npool/Library_i18npool.mk solenv/gbuild

[Matúš Kukan]

 i18npool/Library_i18npool.mk |9 -
 solenv/gbuild/CppunitTest.mk |   12 +---
 solenv/gbuild/Helper.mk  |2 +-
 solenv/gbuild/LinkTarget.mk  |5 +
 4 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit d311260c0d347b3c933706b8cac48b82a653e1c7
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Apr 25 07:34:04 2015 +0200

--enable-mergelibs: Turns out we don't need to install sax

We are lucky, saxparser(expwrap) is only needed to build localedata* libs
which are only runtime dependencies, and can be built *after* libmerged.
So, simplify and move runtime deps to CppunitTest.

This reverts commits 59cea45ec247df1acb691308c940ff97673e4c48
and partially 5e45637568ceefee21fe329a5254881963fecd7a

Change-Id: I1a1fb4a48fd1a22a9b3a48f0eb0f123649c113b0

diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 3c60ace..f694be0 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -147,13 +147,4 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
$(if $(filter GCC,$(COM)),-Wno-unused-macros) \
 ))
 
-# i18npool dlopens localedata_* libraries.
-# This is runtime dependency to prevent tests
-# to be run sooner then localedata_* exists.
-$(call gb_Library_get_target,i18npool) : | \
-   $(call gb_Library_get_target,localedata_en) \
-   $(call gb_Library_get_target,localedata_es) \
-   $(call gb_Library_get_target,localedata_euro) \
-   $(call gb_Library_get_target,localedata_others) \
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a6eae56..a4e9fa9 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -40,11 +40,17 @@ gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind 
--dump-instr=yes --inst
 endif
 
 # defined by platform
-#  gb_CppunitTest_TARGETTYPE
 #  gb_CppunitTest_get_filename
-gb_CppunitTest_CPPTESTDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunittester)
+gb_CppunitTest_RUNTIMEDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunittester)
 gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_target_for_build,cppunittester)
 
+# i18npool dlopens localedata_* libraries.
+gb_CppunitTest_RUNTIMEDEPS += \
+   $(call gb_Library_get_target,localedata_en) \
+   $(call gb_Library_get_target,localedata_es) \
+   $(call gb_Library_get_target,localedata_euro) \
+   $(call gb_Library_get_target,localedata_others) \
+
 define gb_CppunitTest__make_args
 $(HEADLESS) \
 -env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT)) \
@@ -78,7 +84,7 @@ $(call gb_CppunitTest_get_clean_target,%) :
rm -f $(call gb_CppunitTest_get_target,$*) $(call 
gb_CppunitTest_get_target,$*).log)
 
 .PHONY : $(call gb_CppunitTest_get_target,%)
-$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
+$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
$(call gb_Output_announce,$*,$(true),CUT,2)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@)  \
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 028b7cb..253d6db 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -191,7 +191,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group 
for installed librarie
 endif
 $(call gb_Helper__register_libraries,$(1),$(3))
 
-gb_Library_MODULE_$(2) += $(filter-out $(filter-out sax,$(gb_MERGEDLIBS)),$(3))
+gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS),$(3))
 
 $(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\
gb_SdkLinkLibrary_MODULE_sdk += $(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 82c4739..b8c11f3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -836,10 +836,7 @@ gb_BUILD_HELPER_TOOLS := $(foreach exe,\
svidl \
unoidl-check \
unoidl-write \
-   , $(call gb_Executable__get_workdir_linktargetname,$(exe))) \
-   $(foreach lib,\
-   expwrap \
-   , $(call gb_Library__get_workdir_linktargetname,$(lib)))
+   , $(call gb_Executable__get_workdir_linktargetname,$(exe)))
 
 # call gb_LinkTarget__is_build_lib,linktargetname
 define gb_LinkTarget__is_build_lib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sw/source

[Matúš Kukan]

 sw/source/core/table/swnewtable.cxx |   27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

New commits:
commit f13cf2437f34402ef76bec6dc2c77f9f388f15b8
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Apr 23 08:13:38 2015 +0200

Avoid out-of-bounds container index on import of ooo112657-2.rtf

Change-Id: I47dfab3cf276919bfef2829e1159857abb05bb3d

diff --git a/sw/source/core/table/swnewtable.cxx 
b/sw/source/core/table/swnewtable.cxx
index 89b07f1..f844257 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -377,7 +377,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM 
rPam ) const
 long nRightSpan = 0;
 long nLeftSpanCnt = 0;
 long nRightSpanCnt = 0;
-for( size_t nRow = nTop; nRow = nBottom  bOkay; ++nRow )
+for( size_t nRow = nTop; nRow = nBottom  bOkay  nRow  nLines; ++nRow 
)
 {
 SwTableLine* pLine = aLines[nRow];
 OSL_ENSURE( pLine, Missing table line );
commit c33422e2c21ed8160fbbb969698216a8a1aeb0b8
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Apr 22 19:46:18 2015 +0200

Avoid dereference a past-the-end iterator on import of fdo81650-2.docx

Change-Id: I8b503da737b3f3c35e7dee18166068323ef6f76e

diff --git a/sw/source/core/table/swnewtable.cxx 
b/sw/source/core/table/swnewtable.cxx
index fb1f78b..89b07f1 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2126,19 +2126,22 @@ void SwTable::CheckConsistency() const
 {
 SAL_WARN_IF( aIter == aRowSpanCells.end(),
 sw.core, Missing master box);
-SAL_WARN_IF( aIter-nLeft != nWidth || aIter-nRight != 
nNewWidth,
-sw.core, Wrong position/size of overlapped table box);
---(aIter-nRowSpan);
-SAL_WARN_IF( aIter-nRowSpan != -nRowSp, sw.core,
-Wrong row span value );
-if( nRowSp == -1 )
+if (aIter != aRowSpanCells.end())
 {
-std::list RowSpanCheck ::iterator aEraseIter = aIter;
-++aIter;
-aRowSpanCells.erase( aEraseIter );
+SAL_WARN_IF( aIter-nLeft != nWidth || aIter-nRight != 
nNewWidth,
+sw.core, Wrong position/size of overlapped table 
box);
+--(aIter-nRowSpan);
+SAL_WARN_IF( aIter-nRowSpan != -nRowSp, sw.core,
+Wrong row span value );
+if( nRowSp == -1 )
+{
+std::list RowSpanCheck ::iterator aEraseIter = aIter;
+++aIter;
+aRowSpanCells.erase( aEraseIter );
+}
+else
+++aIter;
 }
-else
-++aIter;
 }
 else if( nRowSp != 1 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac connectivity/CppunitTest_connectivity_commontools.mk solenv/bin solenv/gbuild sw/source

[Matúš Kukan]

 configure.ac |   12 --
 connectivity/CppunitTest_connectivity_commontools.mk |2 
 solenv/bin/install-gdb-printers  |2 
 solenv/gbuild/extensions/pre_MergedLibsList.mk   |   96 ---
 sw/source/filter/ww8/docxattributeoutput.cxx |3 
 5 files changed, 7 insertions(+), 108 deletions(-)

New commits:
commit 89964955e535f7343cccf1399312f0e8ac76323d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 17 20:30:27 2015 +0200

tdf#85769 Avoid writing font name attribute twice, by ignoring empty value

Change-Id: If2491db482fc6eebc5d28f03ace12a89ac6c0a0f

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c9cd83d..1783a28 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6120,7 +6120,8 @@ void DocxAttributeOutput::CharFont( const SvxFontItem 
rFont)
 GetExport().GetId( rFont ); // ensure font info is written to fontTable.xml
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-AddToAttrList( m_pFontsAttrList, 2,
+if (!sFontNameUtf8.isEmpty())
+AddToAttrList( m_pFontsAttrList, 2,
 FSNS( XML_w, XML_ascii ), sFontNameUtf8.getStr(),
 FSNS( XML_w, XML_hAnsi ), sFontNameUtf8.getStr() );
 }
commit fa8dc38372185d6d29d8d91391907e95b689
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Apr 20 19:48:38 2015 +0200

Bin confusing --enable-mergelibs=all option

It was most probably not working anyway and is something different to
libmerged, which intends to merge only core set of libraries.
To build everything into one library, approach similar to what we do for
Android could be better idea.

Change-Id: Id5b8c2fa2b26e8faaaeb022ea55eb2e39909e875

diff --git a/configure.ac b/configure.ac
index 0d492ad..d2a7aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -915,11 +915,10 @@ AC_ARG_ENABLE([hardlink-deliver],
 )
 
 AC_ARG_ENABLE(mergelibs,
-AS_HELP_STRING([--enable-mergelibs=all/yes],
+AS_HELP_STRING([--enable-mergelibs],
 [Enables linking of big, merged, library. Experimental feature, tested
 only for Linux at some stage in history, but possibly does not work 
even
-for Linux any more. 'all' will link a lot of libraries into libmerged
-while 'yes' will do it for just a core set of libraries.])
+for Linux any more. This will link a core set of libraries into 
libmerged.])
 )
 
 AC_ARG_ENABLE(graphite,
@@ -12735,12 +12734,7 @@ if test -n $enable_mergelibs -a $enable_mergelibs 
!= no; then
 if test $_os != Linux -a $_os != WINNT; then
 add_warning --enable-mergelibs is not tested for this platform
 fi
-if test $enable_mergelibs = all; then
-MERGELIBS=ALL
-AC_DEFINE(STATIC_LINKING)
-else
-MERGELIBS=CORE
-fi
+MERGELIBS=TRUE
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk 
b/connectivity/CppunitTest_connectivity_commontools.mk
index 146c6af..9c2e645 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -32,7 +32,7 @@ endif
 # In mergedlibs mode we have multiply-defined symbols, which Visual Studio
 # does not like. There is no good solution, so just force it.
 ifeq ($(COM),MSC)
-ifeq ($(MERGELIBS),CORE)
+ifneq (,$(MERGELIBS))
 $(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\
 /FORCE:MULTIPLE \
 ))
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 036339e..0362a5c 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -123,7 +123,7 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 fi
 
 if [[ -n ${MERGELIBS} ]]; then
-make_autoload merged program libmergedlo.$DYLIB merge svl tl basegfx `[[ 
${MERGELIBS} == ALL ]]  echo sw`
+make_autoload merged program libmergedlo.$DYLIB merge svl tl basegfx
 make_autoload cppu program libuno_cppu.$DYLIB.3
 make_autoload sal program libuno_sal.$DYLIB.3
 make_autoload sw program libswlo.$DYLIB
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ed77c1f0..1ca047f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -9,101 +9,6 @@
 #
 
 ifneq ($(MERGELIBS),)
-# set of libraries to link even more stuff into one merged library
-gb_EXTRAMERGEDLIBS := \
-   $(if $(filter-out ANDROID IOS,$(OS)),abp) \
-   $(if $(filter unx,$(GUIBASE)),basebmp) \
-   $(call gb_Helper_optional,DBCONNECTIVITY,bib) \
-   $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
-   chartcore \
-   $(call 

[Libreoffice-commits] core.git: solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/Helper.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59cea45ec247df1acb691308c940ff97673e4c48
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Apr 20 19:23:02 2015 +0200

Do not filter out libsax from installation even if it's merged

expwrap links against sax and can't link against libmerged because
it is needed to build libmerged :-/ (saxparser in i18npool)

Change-Id: Ie4dca11e8e1bb16a2506cf7cdb7d69b804d98cc0
Reviewed-on: https://gerrit.libreoffice.org/15447
Tested-by: Jenkins c...@libreoffice.org
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 253d6db..028b7cb 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -191,7 +191,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group 
for installed librarie
 endif
 $(call gb_Helper__register_libraries,$(1),$(3))
 
-gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS),$(3))
+gb_Library_MODULE_$(2) += $(filter-out $(filter-out sax,$(gb_MERGEDLIBS)),$(3))
 
 $(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\
gb_SdkLinkLibrary_MODULE_sdk += $(3))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

[Matúš Kukan]

 scp2/source/ooo/module_ooo.scp   |   14 --
 scp2/source/writer/module_writer.scp |7 +--
 2 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 7a8f48ba8739c491b5bae23bc9947e44f1813926
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Apr 17 21:03:03 2015 +0200

scp2: remove unused gids

Change-Id: I723e752ff4bab9e36b3f3a08fc1fe8d10511d774

diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 09dcd34..73214d7 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -32,32 +32,18 @@ Module gid_Module_Root
  gid_File_Txt_Pagein_Impress,
  gid_File_Txt_Pagein_Writer,
  gid_File_extras_newfiles,
- gid_File_Jar_Letter,
  gid_File_Wizards_Common,
  gid_File_Wizards_Fax,
- gid_File_Jar_Agenda,
- gid_File_Jar_Web,
  gid_File_Rdb_Offapi,
  gid_Starregistry_Services_Rdb,
  auto_ooo_ALL,
  auto_ooobinarytable_ALL,
- gid_File_Lib_Bib,
- gid_File_Lib_J,
- gid_File_Lib_Zip,
  gid_Unixlink_File_Lib_Curl,
- gid_File_Lib_Recentfile,
- gid_File_Lib_Tab,
- gid_File_Lib_Tab2,
  gid_Unixlink_File_Lib_Raptor,
  gid_Unixlink_File_Lib_Rasqal,
  gid_Unixlink_File_Lib_Rdf,
- gid_File_Lib_Sndfile,
- gid_File_Lib_Neon,
  gid_Unixlink_File_Lib_Xslt,
  gid_Unixlink_File_Lib_eXslt,
- gid_File_Lib_I18n,
- gid_File_Lib_Accessbridge,
- gid_File_Lib_Dl,
  GID_FILE_LIB_WPD,
  gid_File_Lib_Cli_Oootypes_Assembly,
  gid_File_Lib_Policy_Cli_Oootypes_Assembly,
diff --git a/scp2/source/writer/module_writer.scp 
b/scp2/source/writer/module_writer.scp
index 6256c10..91786895 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -35,12 +35,7 @@ Module gid_Module_Prg_Wrt_Bin
 Sortkey = 100;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = 
(gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
-gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-auto_writer_ALL,
-gid_File_Jar_Email, 
-gid_File_Jar_Mail, 
-gid_File_Jar_Activation,
+Files = (auto_writer_ALL,
 gid_File_Share_Registry_Writer_Xcd,
 gid_File_Tmp_Userinstall_Wrt_Inf);
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

FastAttributeList and docx export problems

[Matúš Kukan]

Hi,

Before 9ae701509add0f0192b02fab787c6acbc64be349 FastAttributeList used
map to store attribute=value pairs in XML elements. I guess I did
not realize when changing map to list that it will cause problems
because somebody writes the same attribute twice.

One problem is described in
https://bugs.documentfoundation.org/show_bug.cgi?id=85769 for which I
did https://gerrit.libreoffice.org/#/c/15367/
but no idea if that fix is OK.
Caolan tried to avoid assert with 969c1d5e44ed11e08f64334ed65ce01d2fa54acb
(but I now get Assertion `aColorString.equalsL(pExistingValue,
rtl_str_getLength(pExistingValue))' failed. for docx/fdo72640-3.docx)

The question is: should we return to using map in Writer or try to fix
these problems one by one as they come?

Feel free to approve https://gerrit.libreoffice.org/#/c/15367/ :-)

Thanks,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - Repository.mk svx/Library_svxcore.mk sw/Library_sw.mk

[Matúš Kukan]

 Repository.mk  |   29 -
 svx/Library_svxcore.mk |1 -
 sw/Library_sw.mk   |1 -
 3 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit 4daf6600a3f5c1d58ff1c79396f05d3ea5cb7103
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Apr 15 23:41:45 2015 +0200

Move these together

Change-Id: I0352e3180d553c46c6ca905628d5b46d1af0b8a7

diff --git a/Repository.mk b/Repository.mk
index 0928df6..f9a5208 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -186,26 +186,6 @@ $(eval $(call 
gb_Helper_register_executables_for_install,UREBIN,ure,\
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
 ))
 
-ifneq (,$(filter ANDROID IOS,$(OS)))
-
-# these are in NONE layer because
-# a) scp2 is not used on mobile b) layers don't mean anything on mobile
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-   $(if $(filter $(OS),ANDROID), \
-   lo-bootstrap \
-   ) \
-))
-
-endif
-
-ifeq ($(OS),MACOSX)
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-   OOoSpotlightImporter \
-))
-
-endif
-
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
abp \
dbp \
@@ -519,6 +499,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
writerfilter \
 ))
 
+# cli_cppuhelper is NONE even though it is actually in URE because it is 
CliNativeLibrary
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
getuid \
smoketest \
@@ -533,6 +514,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
vclbootstrapprotector \
scqahelper \
unowinreg \
+   $(if $(filter MSC,$(COM)),cli_cppuhelper) \
+   $(if $(filter $(OS),ANDROID),lo-bootstrap) \
+   $(if $(filter $(OS),MACOSX),OOoSpotlightImporter) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
@@ -576,11 +560,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
xmlreader \
 ))
 
-# this is NONE even though it is actually in URE because it is CliNativeLibrary
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-   $(if $(filter MSC,$(COM)),cli_cppuhelper) \
-))
-
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_VLC),avmediavlc) \
$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
commit fa3daee4b694202009f3d98c7b374825ec34605d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Apr 15 20:02:25 2015 +0200

DBTOOLS_DLL_NAME not used anymore

Change-Id: Ieb9a373e4d59bfe72a7709bd7822617f9877054a

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 1c619c6..ce93cc8 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,7 +47,6 @@ $(eval $(call 
gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
 $(eval $(call gb_Library_add_defs,svxcore,\
 -DSVX_DLLIMPLEMENTATION \
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
--DDBTOOLS_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\ \
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 673585a..a6f7a3a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 $(eval $(call gb_Library_add_defs,sw,\
 -DSW_DLLIMPLEMENTATION \
-DSWUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,swui))\ \
-   -DDBTOOLS_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\ \
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

libmerged works on Windows

[Matúš Kukan]

Hi there,

I forgot to write about --enable-mergelibs build working on Windows now too.
Since 4c251ddd72af765dd9e665150176c2d931322b9c - patch only in master,
simple to backport if it makes sense.

I think it would be good to release with that option - should make (at
least) first start faster.
If anyone know how and can produce some numbers on Windows, that would be great.
Bjoern had some numbers for linux in the past IIRC.

Also, it would be great if some tinderboxes could build with mergelibs
(switching the option requires make clean :-( [or you need to know
what to clean exactly])
So far, I know only about Linux-x86_64_32-callgrind using that.

Hoping it will be useful,

Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - forms/Library_frm.mk forms/source unusedcode.easy

[Matúš Kukan]

 forms/Library_frm.mk   |1 
 forms/source/component/DatabaseForm.cxx|7 
 forms/source/component/Filter.cxx  |1 
 forms/source/component/navigationbar.cxx   |1 
 forms/source/component/scrollbar.cxx   |   19 +
 forms/source/component/scrollbar.hxx   |4 
 forms/source/component/spinbutton.cxx  |   20 +
 forms/source/component/spinbutton.hxx  |4 
 forms/source/inc/forms_module.hxx  |  288 -
 forms/source/inc/forms_module_impl.hxx |  131 ---
 forms/source/inc/frm_module.hxx|   30 --
 forms/source/inc/services.hxx  |   15 -
 forms/source/misc/frm_module.cxx   |   27 --
 forms/source/richtext/richtextcontrol.cxx  |1 
 forms/source/richtext/richtextmodel.cxx|   34 +-
 forms/source/richtext/richtextmodel.hxx|4 
 forms/source/runtime/formoperations.cxx|1 
 forms/source/solar/component/navbarcontrol.cxx |1 
 forms/source/xforms/xpathlib/extension.cxx |1 
 unusedcode.easy|3 
 20 files changed, 64 insertions(+), 529 deletions(-)

New commits:
commit 39c4b2787ea05233dbd47ca71007c13487628284
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Mar 27 23:27:32 2015 +0100

forms: Replace these macros

Change-Id: I656905cf6f0e3647824ff3836fcea93920251264

diff --git a/forms/source/component/DatabaseForm.cxx 
b/forms/source/component/DatabaseForm.cxx
index 6dea519..28b312a 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -21,7 +21,6 @@
 #include componenttools.hxx
 #include DatabaseForm.hxx
 #include EventThread.hxx
-#include frm_module.hxx
 #include frm_resource.hrc
 #include frm_resource.hxx
 #include GroupManager.hxx
diff --git a/forms/source/component/Filter.cxx 
b/forms/source/component/Filter.cxx
index 016ac70..2cfd52d 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -19,7 +19,6 @@
 
 #include Filter.hxx
 #include FormComponent.hxx
-#include frm_module.hxx
 #include frm_resource.hrc
 #include frm_resource.hxx
 #include property.hrc
diff --git a/forms/source/component/navigationbar.cxx 
b/forms/source/component/navigationbar.cxx
index 8f0bfad..c52d1b6 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -18,7 +18,6 @@
  */
 
 #include navigationbar.hxx
-#include frm_module.hxx
 
 #include com/sun/star/text/WritingMode2.hpp
 
diff --git a/forms/source/component/scrollbar.cxx 
b/forms/source/component/scrollbar.cxx
index 92f4181..f52aebb 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -106,13 +106,28 @@ namespace frm
 {
 }
 
+OUString SAL_CALL OScrollBarModel::getImplementationName() throw ( 
RuntimeException, std::exception )
+{
+return OUString( com.sun.star.comp.forms.OScrollBarModel );
+}
 
-IMPLEMENT_SERVICE_REGISTRATION_2( OScrollBarModel, OControlModel, 
FRM_SUN_COMPONENT_SCROLLBAR, BINDABLE_INTEGER_VALUE_RANGE )
 // note that we're passing OControlModel as base class. This is 
because
 // OBoundControlModel, our real base class, claims to support the 
DataAwareControlModel
 // service, which isn't really true for us. We only derive from this 
class
 // to benefit from the functionality for binding to spreadsheet cells
-
+Sequence OUString  SAL_CALL OScrollBarModel::getSupportedServiceNames() 
throw (RuntimeException, std::exception)
+{
+Sequence OUString  aOwnNames( 2 );
+aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SCROLLBAR;
+aOwnNames[ 1 ] = BINDABLE_INTEGER_VALUE_RANGE;
+
+return ::comphelper::combineSequences(
+getAggregateServiceNames(),
+::comphelper::concatSequences(
+OControlModel::getSupportedServiceNames_Static(),
+aOwnNames)
+);
+}
 
 IMPLEMENT_DEFAULT_CLONING( OScrollBarModel )
 
diff --git a/forms/source/component/scrollbar.hxx 
b/forms/source/component/scrollbar.hxx
index a561c44..a99b391 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 
 #include FormComponent.hxx
-#include frm_module.hxx
 
 namespace frm
 {
@@ -37,7 +36,8 @@ namespace frm
 
 protected:
 // XServiceInfo
-DECLARE_SERVICE_REGISTRATION( OScrollBarModel )
+virtual OUString SAL_CALL getImplementationName() throw 
(::css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+virtual ::css::uno::Sequence OUString  SAL_CALL 
getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
 
 // XPersistObject
 DECLARE_XPERSISTOBJECT()
diff --git a/forms/source/component/spinbutton.cxx 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-2' - package/source

[Matúš Kukan]

 package/source/zippackage/ZipPackageStream.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ae9434662a9165aa31575448bc577e4b48db753
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Mar 25 21:35:55 2015 +0100

tdf#90010 Partially revert package: Do not bother with deflating jpeg 
images

This reverts commit 0843ade74e5848c0babad509b10c334b01847be2 for the case, 
when
the document is protected by password. Would be nice to fix properly later.

Change-Id: If159639d6f74de4e106e9dad382faac9d5de4a09
(cherry picked from commit ca5ff4559726455d0c8fbdd08cb35af3308492bf)
Reviewed-on: https://gerrit.libreoffice.org/15006
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
(cherry picked from commit da651b6ccb47e82f71d890fc8bb9d6cf0201f289)
Reviewed-on: https://gerrit.libreoffice.org/15010
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index e22b234..c34ba01 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -775,7 +775,8 @@ bool ZipPackageStream::saveChild(
 
 uno::Reference io::XSeekable  xSeek(xStream, uno::UNO_QUERY);
 // It's not worth to deflate jpegs to save ~1% in a slow process
-if (xSeek.is()  msMediaType.endsWith(/jpeg))
+// Unfortunately, does not work for streams protected by password
+if (xSeek.is()  msMediaType.endsWith(/jpeg)  !m_bToBeEncrypted)
 {
 ImplSetStoredData(*pTempEntry, xStream);
 xSeek-seek(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: package/source

[Matúš Kukan]

 package/source/zippackage/ZipPackageStream.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ca5ff4559726455d0c8fbdd08cb35af3308492bf
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Mar 25 21:35:55 2015 +0100

tdf#90010 Partially revert package: Do not bother with deflating jpeg 
images

This reverts commit 0843ade74e5848c0babad509b10c334b01847be2 for the case, 
when
the document is protected by password. Would be nice to fix properly later.

Change-Id: If159639d6f74de4e106e9dad382faac9d5de4a09

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 9b5eb69..8e2bbb0 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -775,7 +775,8 @@ bool ZipPackageStream::saveChild(
 
 uno::Reference io::XSeekable  xSeek(xStream, uno::UNO_QUERY);
 // It's not worth to deflate jpegs to save ~1% in a slow process
-if (xSeek.is()  msMediaType.endsWith(/jpeg))
+// Unfortunately, does not work for streams protected by password
+if (xSeek.is()  msMediaType.endsWith(/jpeg)  !m_bToBeEncrypted)
 {
 ImplSetStoredData(*pTempEntry, xStream);
 xSeek-seek(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - package/source

[Matúš Kukan]

 package/source/zippackage/ZipPackageStream.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit da651b6ccb47e82f71d890fc8bb9d6cf0201f289
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Mar 25 21:35:55 2015 +0100

tdf#90010 Partially revert package: Do not bother with deflating jpeg 
images

This reverts commit 0843ade74e5848c0babad509b10c334b01847be2 for the case, 
when
the document is protected by password. Would be nice to fix properly later.

Change-Id: If159639d6f74de4e106e9dad382faac9d5de4a09
(cherry picked from commit ca5ff4559726455d0c8fbdd08cb35af3308492bf)
Reviewed-on: https://gerrit.libreoffice.org/15006
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index e22b234..c34ba01 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -775,7 +775,8 @@ bool ZipPackageStream::saveChild(
 
 uno::Reference io::XSeekable  xSeek(xStream, uno::UNO_QUERY);
 // It's not worth to deflate jpegs to save ~1% in a slow process
-if (xSeek.is()  msMediaType.endsWith(/jpeg))
+// Unfortunately, does not work for streams protected by password
+if (xSeek.is()  msMediaType.endsWith(/jpeg)  !m_bToBeEncrypted)
 {
 ImplSetStoredData(*pTempEntry, xStream);
 xSeek-seek(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bin/module-deps.pl config_host.mk.in configure.ac desktop/Pagein_common.mk Library_urelibs.mk Repository.mk RepositoryModule_host.mk solenv/bin solenv/gbuil

[Matúš Kukan]

 Library_urelibs.mk |   47 -
 Repository.mk  |1 
 RepositoryModule_host.mk   |1 
 bin/module-deps.pl |1 
 config_host.mk.in  |1 
 configure.ac   |2 -
 desktop/Pagein_common.mk   |1 
 solenv/bin/install-gdb-printers|   11 +
 solenv/gbuild/Helper.mk|2 -
 solenv/gbuild/Library.mk   |2 -
 solenv/gbuild/LinkTarget.mk|   11 ++---
 solenv/gbuild/Pagein.mk|2 -
 solenv/gbuild/extensions/pre_MergedLibsList.mk |   22 ---
 vcl/Library_vcl.mk |1 
 vcl/source/window/builder.cxx  |   17 +++--
 15 files changed, 26 insertions(+), 96 deletions(-)

New commits:
commit 4c251ddd72af765dd9e665150176c2d931322b9c
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Mar 19 23:57:49 2015 +0100

Fix creating custom dialog windows for libmerged

Change-Id: Idb1e67d8165298faca7c9a5a2a48097d5a82b497

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a1a2d7f..7017664 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
-DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,cui))\ \
-DDESKTOP_DETECTOR_DLL_NAME=\$(call 
gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,desktop_detector))\ \
-DTK_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,tk))\ \
+   -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,vcl))
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5a6475f..0d921f1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1664,14 +1664,15 @@ vcl::Window *VclBuilder::makeObject(vcl::Window 
*pParent, const OString name, c
 }
 else
 {
+#ifndef SAL_DLLPREFIX
+#define SAL_DLLPREFIX 
+#endif
 sal_Int32 nDelim = name.indexOf('-');
 if (nDelim != -1)
 {
 #ifndef DISABLE_DYNLOADING
 OUStringBuffer sModuleBuf;
-#ifdef SAL_DLLPREFIX
 sModuleBuf.append(SAL_DLLPREFIX);
-#endif
 sModuleBuf.append(OStringToOUString(name.copy(0, nDelim), 
RTL_TEXTENCODING_UTF8));
 sModuleBuf.append(SAL_DLLEXTENSION);
 #endif
@@ -1682,7 +1683,19 @@ vcl::Window *VclBuilder::makeObject(vcl::Window 
*pParent, const OString name, c
 if (aI == m_aModuleMap.end())
 {
 osl::Module* pModule = new osl::Module;
+#if ENABLE_MERGELIBS
+sModuleBuf.append(SAL_DLLPREFIX);
+sModuleBuf.append(mergedlo);
+sModuleBuf.append(SAL_DLLEXTENSION);
+OUString sMergedModule = sModuleBuf.makeStringAndClear();
+pModule-loadRelative(thisModule, sMergedModule);
+if (!pModule-getFunctionSymbol(sFunction))
+{
+pModule-loadRelative(thisModule, sModule);
+}
+#else
 pModule-loadRelative(thisModule, sModule);
+#endif
 aI = m_aModuleMap.insert(sModule, pModule).first;
 }
 customMakeWidget pFunction = 
reinterpret_castcustomMakeWidget(aI-second-getFunctionSymbol(sFunction));
commit f5c74abc9fbbe8fc652a85801a87073d40a79b2d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Mar 20 08:05:07 2015 +0100

Remove library urelibs. It was more just a temporary hack and is not used.

Change-Id: I7566dcf21aae6b800adb58d8c94e350bb0da720c

diff --git a/Library_urelibs.mk b/Library_urelibs.mk
deleted file mode 100644
index dfcdd53..000
--- a/Library_urelibs.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,urelibs))
-
-# gb_URELIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
-$(eval $(call gb_Library_use_library_objects,urelibs,\
-   $(gb_URELIBS) \
-))
-
-# needed to generate proper deps for module-deps.pl
-$(eval $(call gb_Library_use_libraries,urelibs,\
-   $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_use_static_libraries,urelibs,\
-   findsofficepath \
-))
-
-$(eval $(call gb_Library_use_externals,urelibs,\
-   libxml2 \
-))
-
-$(eval $(call gb_Library_add_libs,urelibs,\
-   $(if $(filter $(OS),LINUX), \
-   -ldl \
-   -lpthread \
-   -lrt \
-   ) \
-))
-
-$(if 

Re: Make.exe for Cygwin

[Matúš Kukan]

On 13 February 2015 at 20:54, Pavel Laštovička pa...@goodsailors.com wrote:
 Dne 12.2.2015 v 17:06 Michael Stahl napsal(a):

 the make binary is 32-bit, if you install a 64-bit cygwin it won't run
 but you can build from source from this repo:

 git://gerrit.libreoffice.org/gnu-make-lo.git

 https://gerrit.libreoffice.org/gitweb?p=gnu-make-lo.git;a=summary

 try the gnu-make-lo-4.0 branch, build and copy to /opt/lo/make

 Thanks :)  After some struggle I managed to finally compile it.
 I found I had to ignore config.h.W32 and build_w32.bat and use
 configure/make instead.

Nice :-), could we perhaps upload 64bit version to
http://dev-www.libreoffice.org/bin/cygwin/ too?

I am confused, do people build make themselves or don't use 64bit cygwin.

Thanks,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/Module_sc.mk sd/Module_sd.mk sw/Module_sw.mk

[Matúš Kukan]

 sc/Module_sc.mk |3 ++-
 sd/Module_sd.mk |3 ++-
 sw/Module_sw.mk |3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3ff9136efebf8c09dd5af530d5060f976f8dc3e6
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Feb 21 17:51:51 2015 +0100

Disable more tests with _use_library_objects for mergelibs

Change-Id: Iad803091864fb1a1a974df7c8eea6dba566d186c

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 63541d2..83a9742 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -45,7 +45,8 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-CppunitTest_sc_ucalc \
+   $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+   CppunitTest_sc_ucalc) \
 CppunitTest_sc_filters_test \
 CppunitTest_sc_rangelst_test \
 ))
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 93aba69..0c2d577 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -27,7 +27,8 @@ $(eval $(call gb_Module_add_l10n_targets,sd,\
 
 ifneq ($(OS),DRAGONFLY)
 $(eval $(call gb_Module_add_check_targets,sd,\
-CppunitTest_sd_uimpress \
+   $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+   CppunitTest_sd_uimpress) \
 CppunitTest_sd_import_tests \
 CppunitTest_sd_export_tests \
 CppunitTest_sd_filters_test \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 5476010..d15c5b5 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -49,7 +49,8 @@ $(eval $(call gb_Module_add_targets,sw,\
 endif
 
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
-CppunitTest_sw_uwriter \
+   $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+   CppunitTest_sw_uwriter) \
 CppunitTest_sw_htmlexport \
 CppunitTest_sw_htmlimport \
 CppunitTest_sw_macros_test \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source unusedcode.easy

[Matúš Kukan]

 connectivity/source/commontools/formattedcolumnvalue.cxx |   20 ---
 unusedcode.easy  |3 --
 2 files changed, 23 deletions(-)

New commits:
commit 8f74734c9b872bc3b2f48071d189049b98ce6b86
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Feb 7 18:50:14 2015 +0100

unusedcode: Remove few methods

Change-Id: Iacb18a06057b6becd077a49a71a95fb7e0961f3f

diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx 
b/connectivity/source/commontools/formattedcolumnvalue.cxx
index aba3c05..a164763 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -242,19 +242,6 @@ namespace dbtools
 clear();
 }
 
-
-sal_Int32 FormattedColumnValue::getFormatKey() const
-{
-return m_pData-m_nFormatKey;
-}
-
-
-sal_Int32 FormattedColumnValue::getFieldType() const
-{
-return m_pData-m_nFieldType;
-}
-
-
 sal_Int16 FormattedColumnValue::getKeyType() const
 {
 return m_pData-m_nKeyType;
@@ -266,13 +253,6 @@ namespace dbtools
 return m_pData-m_xColumn;
 }
 
-
-const Reference XColumnUpdate  FormattedColumnValue::getColumnUpdate() 
const
-{
-return m_pData-m_xColumnUpdate;
-}
-
-
 bool FormattedColumnValue::setFormattedValue( const OUString 
_rFormattedStringValue ) const
 {
 OSL_PRECOND( m_pData-m_xColumnUpdate.is(), 
FormattedColumnValue::setFormattedValue: no column! );
diff --git a/unusedcode.easy b/unusedcode.easy
index 9eec7a1..72884d2 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -197,9 +197,6 @@ dbaui::OQueryViewSwitch::resizeDocumentView(Rectangle)
 dbaui::OQueryViewSwitch::setReadOnly(bool)
 dbaui::OTableRowView::SetUpdatable(bool)
 dbaui::OTableWindowAccess::isEditable() const
-dbtools::FormattedColumnValue::getColumnUpdate() const
-dbtools::FormattedColumnValue::getFieldType() const
-dbtools::FormattedColumnValue::getFormatKey() const
 dp_registry::backend::RegisteredDb::getEntry(rtl::OUString const)
 oglcanvas::CanvasHelper::flush() const
 oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const, 
com::sun::star::rendering::RenderState const, 
com::sun::star::uno::Referencecom::sun::star::rendering::XGraphicDevice 
const) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryModule_host.mk

[Matúš Kukan]

 RepositoryModule_host.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7b32c5f80fa6a2408e1e30713e59adaffdf8ec58
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Jan 31 18:57:13 2015 +0100

Fix circular dependency with libmerged, finally

It was there for a long time. Not a fatal error.

Change-Id: I7804de7494ad027eac6434a542ae55f8d42953e9

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 76bcea2..2d7fcb8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -191,9 +191,9 @@ $(eval $(call repositorymodule_serialize,\
$(call gb_Helper_optional,DESKTOP,swui) \
sw sd \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
-   writerfilter cui chartcontroller chartcore oox svx \
-   $(if $(MERGELIBS),merged,svxcore) \
-   xo sfx fwk svt vcl \
+   writerfilter cui chartcontroller chartcore oox \
+   $(if $(MERGELIBS), merged, \
+   svx svxcore xo sfx fwk svt vcl) \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] buildbot.git: bin/sendEmail tb/tb_send_email

[Matúš Kukan]

 bin/sendEmail|2 --
 tb/tb_send_email |4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 6d3435b4578eb5fc3d52773ab5a36bf7dd4d633f
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Jan 24 19:53:27 2015 +0100

Make tb/tb_send_email and bin/sendEmail the same

Apply b855d0a95e74b6ab04d5e5e714ebbfebb7881c31 also to tb/tb_send_email
and remove now not needed check for cygwin in both.

diff --git a/bin/sendEmail b/bin/sendEmail
index 07b6dd7..8487be8 100755
--- a/bin/sendEmail
+++ b/bin/sendEmail
@@ -1904,8 +1904,6 @@ else {
 printmsg(DEBUG = Starting TLS, 2);
 if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
 my $ssl_ver = 'SSLv3';
-chomp(my $system = `uname -o`);
-if ($system eq 'Cygwin') { $ssl_ver = 'SSLv3'; }
 if (! IO::Socket::SSL-start_SSL($SERVER, SSL_version = $ssl_ver)) {
 quit(ERROR = TLS setup failed:  . IO::Socket::SSL::errstr(), 1);
 }
diff --git a/tb/tb_send_email b/tb/tb_send_email
index 841e6ed..8487be8 100755
--- a/tb/tb_send_email
+++ b/tb/tb_send_email
@@ -1903,9 +1903,7 @@ else {
 if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} 
=~ /^(yes|auto)$/) {
 printmsg(DEBUG = Starting TLS, 2);
 if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
-my $ssl_ver = 'SSLv3 TLSv1';
-chomp(my $system = `uname`);
-if ($system =~ /CYGWIN/) { $ssl_ver = 'SSLv3'; }
+my $ssl_ver = 'SSLv3';
 if (! IO::Socket::SSL-start_SSL($SERVER, SSL_version = $ssl_ver)) {
 quit(ERROR = TLS setup failed:  . IO::Socket::SSL::errstr(), 1);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: buildbot/bin/sendEmail issue

[Matúš Kukan]

On 24 January 2015 at 10:38, Maarten Hoes hoes.maar...@gmail.com wrote:
  if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and
 $opt{'tls'} =~ /^(yes|auto)$/) {
  printmsg(DEBUG = Starting TLS, 2);
  if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
 -my $ssl_ver = 'SSLv3 TLSv1';
 +my $ssl_ver = 'SSLv3';

That's exactly what I did after spent some time.
And I was told it's a known issue.
I am for pushing this or at least put some comment into the script.
I am sorry, I forgot to do the latter.

Thanks,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: xmloff/Module_xmloff.mk

[Matúš Kukan]

 xmloff/Module_xmloff.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8dfe08697b94e9b167a9bf66acf44ab5d6be562a
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 9 20:30:43 2015 +0100

xmloff_uxmloff fails on Linux too, now - disable it (mergelibs)

Would be nicer to fix it though.

Change-Id: Ia5f49a69374e9e79a9a16542bc44f279b9e5a6f7

diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index 93b9c9b..a3c5603 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,xmloff,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,xmloff,\
-   $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+   $(if $(MERGELIBS),, \
CppunitTest_xmloff_uxmloff) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source svx/Library_svxcore.mk svx/source sw/Library_sw.mk sw/source toolkit/Library_tk.mk toolkit/source vcl/Library_vcl.mk vcl/source vcl/unx

[Matúš Kukan]

 sd/Library_sd.mk  |1 +
 sd/source/ui/dlg/sdabstdlg.cxx|2 +-
 svx/Library_svxcore.mk|1 +
 svx/source/form/dbtoolsclient.cxx |2 +-
 sw/Library_sw.mk  |2 ++
 sw/source/uibase/dbui/swdbtoolsclient.cxx |2 +-
 sw/source/uibase/dialog/swabstdlg.cxx |2 +-
 toolkit/Library_tk.mk |1 +
 toolkit/source/awt/vclxtoolkit.cxx|2 +-
 vcl/Library_vcl.mk|4 
 vcl/source/app/svapp.cxx  |2 +-
 vcl/source/window/abstdlg.cxx |3 +--
 vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
 13 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 5c5edaef89e953d260501678c3d62c47ad9763ac
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 8 21:14:04 2015 +0100

Revert Use SVLIBRARY instead of gb_Library_get_runtime_filename

$(call gb_Library__get_name,foo) returns libmerged if library foo is 
merged.

This reverts commit ee567a63fad9e755b11ca28696da35f00ed3b0fc.

Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a38b6eb..2afcf9b 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\
 
 $(eval $(call gb_Library_add_defs,sd,\
-DSD_DLLIMPLEMENTATION \
+   -DSDUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,sdui))\ \
 ))
 
 ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 4594295..acf4705 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -42,7 +42,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
-static const OUString sLibName(SVLIBRARY(sdui));
+static const OUString sLibName(SDUI_DLL_NAME);
 if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule, 
sLibName ) )
 fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
 aDialogLibrary.getFunctionSymbol( SdCreateDialogFactory );
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index a1c7696..39d6be5 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,6 +47,7 @@ $(eval $(call 
gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
 $(eval $(call gb_Library_add_defs,svxcore,\
 -DSVX_DLLIMPLEMENTATION \
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+-DDBTOOLS_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\ \
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\
diff --git a/svx/source/form/dbtoolsclient.cxx 
b/svx/source/form/dbtoolsclient.cxx
index baee838..79e6eab 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -116,7 +116,7 @@ namespace svxform
 
 // load the dbtools library
 s_hDbtoolsModule = osl_loadModuleRelative(
-thisModule, OUString(SVLIBRARY(dbtools)).pData, 0);
+thisModule, OUString(DBTOOLS_DLL_NAME).pData, 0);
 OSL_ENSURE(NULL != s_hDbtoolsModule, 
ODbtoolsClient::registerClient: could not load the dbtools library!);
 if (NULL != s_hDbtoolsModule)
 {
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index a5b853a..2af35f2 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 
 $(eval $(call gb_Library_add_defs,sw,\
 -DSW_DLLIMPLEMENTATION \
+   -DSWUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,swui))\ \
+   -DDBTOOLS_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\ \
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\
diff --git a/sw/source/uibase/dbui/swdbtoolsclient.cxx 
b/sw/source/uibase/dbui/swdbtoolsclient.cxx
index 2c1ce9a..a7bc6d9 100644
--- a/sw/source/uibase/dbui/swdbtoolsclient.cxx
+++ b/sw/source/uibase/dbui/swdbtoolsclient.cxx
@@ -102,7 +102,7 @@ void SwDbtoolsClient::registerClient()
 
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
-const OUString sModuleName(SVLIBRARY(dbtools));
+const OUString sModuleName(DBTOOLS_DLL_NAME);
 
 // load the dbtools library
 getDbToolsClientModule() = osl_loadModuleRelative(
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx 
b/sw/source/uibase/dialog/swabstdlg.cxx
index 127ac29..7b5ec71 100644
--- a/sw/source/uibase/dialog/swabstdlg.cxx
+++ b/sw/source/uibase/dialog/swabstdlg.cxx
@@ -41,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
-static const OUString sLibName(SVLIBRARY(swui));
+static const OUString 

[Libreoffice-commits] core.git: Changes to 'private/matus/condformats'

[Matúš Kukan]

New branch 'private/matus/condformats' available with the following commits:
commit ec0f92cb7a7f5dad4bcc05d5822b6f1a919f81d4
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Dec 22 14:09:25 2014 +0100

UNO API test for conditional formats

Change-Id: I45d4b9652f35174eaf59c8868d593764c2ef2ebf

commit 1a9fbf612c64ca9945dceb36f190f95d9b946041
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Tue Dec 23 20:39:53 2014 +0100

fdo#82014: Remove old conditional formats when setting new one by UNO API

Change-Id: I76488045eba281227124041da505e38c4c3d31c1

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Matúš Kukan]

 sc/source/ui/docshell/docfunc.cxx |   25 -
 1 file changed, 4 insertions(+), 21 deletions(-)

New commits:
commit 81938e2b4121d0ffbe2240706ae92af606ee1338
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Dec 22 14:09:47 2014 +0100

Be more direct; bin simple local functions

Change-Id: I3e06f4bb18449c56d0cc396230c56d5fb6a6ed98

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 22b804d1..9b95184 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5282,21 +5282,6 @@ bool ScDocFunc::InsertAreaLink( const OUString rFile, 
const OUString rFilter,
 return true;
 }
 
-namespace {
-
-void RemoveCondFormatAttributes(ScDocument* pDoc, const ScConditionalFormat* 
pFormat, SCTAB nTab)
-{
-const ScRangeList rRangeList = pFormat-GetRange();
-pDoc-RemoveCondFormatData( rRangeList, nTab, pFormat-GetKey() );
-}
-
-void SetConditionalFormatAttributes(ScDocument* pDoc, const ScRangeList 
rRanges, sal_uLong nIndex, SCTAB nTab)
-{
-pDoc-AddCondFormatData( rRanges, nTab, nIndex );
-}
-
-}
-
 void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, 
ScConditionalFormat* pFormat, SCTAB nTab, const ScRangeList rRanges )
 {
 ScDocShellModificator aModificator(rDocShell);
@@ -5336,7 +5321,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong 
nOldFormat, ScConditionalFor
 if(pOldFormat)
 {
 pRepaintRange.reset(new ScRange( pOldFormat-GetRange().Combine() 
));
-RemoveCondFormatAttributes(rDoc, pOldFormat, nTab);
+rDoc.RemoveCondFormatData(pOldFormat-GetRange(), nTab, 
pOldFormat-GetKey());
 }
 
 rDoc.DeleteConditionalFormat(nOldFormat, nTab);
@@ -5351,7 +5336,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong 
nOldFormat, ScConditionalFor
 
 sal_uLong nIndex = rDoc.AddCondFormat(pFormat, nTab);
 
-SetConditionalFormatAttributes(rDoc, rRanges, nIndex, nTab);
+rDoc.AddCondFormatData(rRanges, nTab, nIndex);
 rDoc.SetStreamValid(nTab, false);
 }
 
@@ -5384,15 +5369,13 @@ void ScDocFunc::SetConditionalFormatList( 
ScConditionalFormatList* pList, SCTAB
 ScConditionalFormatList* pOldList = rDoc.GetCondFormList(nTab);
 for(ScConditionalFormatList::const_iterator itr = pOldList-begin(), 
itrEnd = pOldList-end(); itr != itrEnd; ++itr)
 {
-RemoveCondFormatAttributes(rDoc, (*itr), nTab);
+rDoc.RemoveCondFormatData(itr-GetRange(), nTab, itr-GetKey());
 }
 
 // then set new entries
 for(ScConditionalFormatList::iterator itr = pList-begin(); itr != 
pList-end(); ++itr)
 {
-sal_uLong nIndex = itr-GetKey();
-const ScRangeList rRange = itr-GetRange();
-SetConditionalFormatAttributes(rDoc, rRange, nIndex, nTab);
+rDoc.AddCondFormatData(itr-GetRange(), nTab, itr-GetKey());
 }
 
 rDoc.SetCondFormList(pList, nTab);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits