openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1755455 [14/18] - in /openoffice/trunk: ./ ext_libraries/apr-util/ ext_libraries/gtest/win/ ext_libraries/ratscan/scan/ ext_libraries/serf/win/ main/ main/UnoControls/prj/ main/accessibility/prj/ main/animations/prj/ main/basctl/source/dlg...
Date Sun, 07 Aug 2016 19:24:15 GMT
Modified: openoffice/trunk/main/udkapi/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udkapi/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/udkapi/prj/d.lst (original)
+++ openoffice/trunk/main/udkapi/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,55 +0,0 @@
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-mkdir: %_DEST%\bin%_EXT%\ure
-
-..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl%_EXT%\udkapi.autodoc
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\udkapi.rdb
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\ure\types.rdb
-..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin%_EXT%\udkapi_doc.rdb
-
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\beans\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-..\com\sun\star\bridge\oleautomation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-..\com\sun\star\connection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-..\com\sun\star\container\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-..\com\sun\star\io\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-..\com\sun\star\java\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-..\com\sun\star\lang\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-..\com\sun\star\registry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-..\com\sun\star\loader\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\test\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-..\com\sun\star\uno\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\uri\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib

Modified: openoffice/trunk/main/unotools/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/prj/build.lst (original)
+++ openoffice/trunk/main/unotools/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,14 +1,2 @@
-ut	unotools	: LIBXSLT:libxslt comphelper cppuhelper offuh tools ucbhelper NULL
-ut	unotools								usr1	-	all	ut_mkout NULL
-ut	unotools\inc							nmake	-	all	ut_inc NULL
-ut	unotools\source\misc					nmake	-	all	ut_misc ut_config ut_inc NULL
-ut	unotools\source\streaming				nmake	-	all	ut_streaming ut_inc NULL
-ut	unotools\source\config					nmake	-	all	ut_config ut_i18n ut_inc NULL
-ut	unotools\source\ucbhelper				nmake	-	all	ut_ucbhelper ut_inc NULL
-ut	unotools\source\processfactory				nmake	-	all	ut_procfact ut_inc NULL
-ut	unotools\source\i18n					nmake	-	all	ut_i18n ut_inc NULL
-ut	unotools\source\property				nmake	-	all	ut_property ut_inc NULL
-ut	unotools\source\accessibility				nmake	-	all	ut_accessibility ut_inc NULL
-ut	unotools\util						nmake	-	all	ut_util ut_config ut_i18n ut_misc ut_procfact ut_streaming ut_ucbhelper ut_property ut_accessibility NULL
-
-ut	unotools\qa\complex\tempfile				nmake	-	all	ut_qa_complex ut_util NULL
+ut	unotools	: LIBXSLT:libxslt comphelper cppuhelper offapi tools ucbhelper NULL
+ut	unotools\prj							nmake	-	all	ut_prj NULL

Modified: openoffice/trunk/main/unotools/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/prj/d.lst (original)
+++ openoffice/trunk/main/unotools/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,12 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\inc\*.bin %_DEST%\bin%_EXT%\*.bin
-
-mkdir: %_DEST%\inc%_EXT%\unotools
-..\inc\unotools\*.hxx %_DEST%\inc%_EXT%\unotools\*.hxx
-..\inc\unotools\unotoolsdllapi.h %_DEST%\inc%_EXT%\unotools\unotoolsdllapi.h
-..\%__SRC%\misc\utl.component %_DEST%\xml%_EXT%\utl.component

Modified: openoffice/trunk/main/unoxml/JunitTest_unordf_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unoxml/JunitTest_unordf_complex.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/unoxml/JunitTest_unordf_complex.mk (original)
+++ openoffice/trunk/main/unoxml/JunitTest_unordf_complex.mk Sun Aug  7 19:24:03 2016
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,unordf_complex))
+$(eval $(call gb_JunitTest_JunitTest,unordf_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
 	$$(DEFS) \

Modified: openoffice/trunk/main/unoxml/JunitTest_unoxml_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unoxml/JunitTest_unoxml_complex.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/unoxml/JunitTest_unoxml_complex.mk (original)
+++ openoffice/trunk/main/unoxml/JunitTest_unoxml_complex.mk Sun Aug  7 19:24:03 2016
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,unoxml_complex))
+$(eval $(call gb_JunitTest_JunitTest,unoxml_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
 	$$(DEFS) \

Modified: openoffice/trunk/main/unoxml/Library_unordf.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unoxml/Library_unordf.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/unoxml/Library_unordf.mk (original)
+++ openoffice/trunk/main/unoxml/Library_unordf.mk Sun Aug  7 19:24:03 2016
@@ -27,11 +27,11 @@ $(eval $(call gb_Library_set_componentfi
 
 $(eval $(call gb_Library_set_include,unordf,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,unordf,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_api,unordf,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,unordf,\
@@ -39,12 +39,15 @@ $(eval $(call gb_Library_add_linked_libs
 	cppu \
 	sal \
 	stl \
-	rdf \
-	xml2 \
-	xslt \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,unordf,\
+	librdf \
+	libxml2 \
+	libxslt \
+)
+
 $(eval $(call gb_Library_add_exception_objects,unordf,\
 	unoxml/source/rdf/CBlankNode \
 	unoxml/source/rdf/CURI \
@@ -53,19 +56,5 @@ $(eval $(call gb_Library_add_exception_o
 	unoxml/source/rdf/librdf_services \
 ))
 
-ifeq ($(SYSTEM_REDLAND),YES)
-$(eval $(call gb_Library_set_cxxflags,unordf,\
-	$$(CXXFLAGS) \
-	-DSYSTEM_REDLAND $$(REDLAND_CFLAGS) \
-))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-$(eval $(call gb_Library_set_cxxflags,unordf,\
-	$$(CXXFLAGS) \
-	$$(LIBXSLT_CFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
 

Modified: openoffice/trunk/main/unoxml/Library_unoxml.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unoxml/Library_unoxml.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/unoxml/Library_unoxml.mk (original)
+++ openoffice/trunk/main/unoxml/Library_unoxml.mk Sun Aug  7 19:24:03 2016
@@ -27,11 +27,11 @@ $(eval $(call gb_Library_set_componentfi
 
 $(eval $(call gb_Library_set_include,unoxml,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,unoxml,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_api,unoxml,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,unoxml,\
@@ -42,10 +42,11 @@ $(eval $(call gb_Library_add_linked_libs
 	cppu \
 	sal \
 	stl \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,unoxml,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,unoxml,\
 	unoxml/source/dom/node \
 	unoxml/source/dom/document \
@@ -81,12 +82,5 @@ $(eval $(call gb_Library_add_exception_o
 	unoxml/source/service/services \
 ))
 
-ifeq ($(SYSTEM_LIBXML),YES)
-$(eval $(call gb_Library_set_cxxflags,unoxml,\
-	$$(CXXFLAGS) \
-	-DSYSTEM_LIBXML $$(LIBXML_CFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
 

Modified: openoffice/trunk/main/unoxml/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unoxml/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/unoxml/prj/build.lst (original)
+++ openoffice/trunk/main/unoxml/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,2 +1,2 @@
-ux	unoxml	:	offuh cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
+ux	unoxml	:	offapi cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
 ux	unoxml\prj    nmake	-	all ux_prj NULL

Modified: openoffice/trunk/main/vbahelper/Library_msforms.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vbahelper/Library_msforms.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vbahelper/Library_msforms.mk (original)
+++ openoffice/trunk/main/vbahelper/Library_msforms.mk Sun Aug  7 19:24:03 2016
@@ -37,7 +37,12 @@ $(eval $(call gb_Library_set_componentfi
 # add any additional include paths for this library here
 $(eval $(call gb_Library_set_include,msforms,\
 	$$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,msforms,\
+	udkapi \
+	offapi \
+	oovbaapi \
 ))
 
 # add libraries to be linked to LIB; again these names need to be given as

Modified: openoffice/trunk/main/vbahelper/Library_vbahelper.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vbahelper/Library_vbahelper.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vbahelper/Library_vbahelper.mk (original)
+++ openoffice/trunk/main/vbahelper/Library_vbahelper.mk Sun Aug  7 19:24:03 2016
@@ -35,14 +35,18 @@ $(eval $(call gb_Library_add_package_hea
 # add any additional include paths for this library here
 $(eval $(call gb_Library_set_include,vbahelper,\
 	$$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,vbahelper,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vbahelper,\
 	-DVBAHELPER_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,vbahelper,\
+	udkapi \
+	offapi \
+	oovbaapi \
+))
+
 # add libraries to be linked to vbahelper; again these names need to be given as
 # specified in Repository.mk
 $(eval $(call gb_Library_add_linked_libs,vbahelper,\
@@ -56,6 +60,7 @@ $(eval $(call gb_Library_add_linked_libs
 	stl \
 	svl \
 	svt \
+	svxcore \
 	ootk \
 	tl \
 	utl \

Modified: openoffice/trunk/main/vbahelper/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vbahelper/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vbahelper/prj/build.lst (original)
+++ openoffice/trunk/main/vbahelper/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,3 +1,3 @@
-vba	vbahelper	:	oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal unotools LIBXSLT:libxslt NULL
+vba	vbahelper	:	oovbaapi offapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal unotools LIBXSLT:libxslt NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
 vba	vbahelper\prj	nmake	-	all	vba_prj NULL

Modified: openoffice/trunk/main/vcl/Library_desktop_detector.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_desktop_detector.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_desktop_detector.mk (original)
+++ openoffice/trunk/main/vcl/Library_desktop_detector.mk Sun Aug  7 19:24:03 2016
@@ -27,18 +27,21 @@ $(eval $(call gb_Library_Library,desktop
 
 $(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
 
+$(eval $(call gb_Library_add_api,desktop_detector,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,desktop_detector,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,desktop_detector,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,desktop_detector,\
     -DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
 
@@ -51,8 +54,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -68,6 +69,11 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,desktop_detector,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
     vcl/unx/generic/desktopdetect/desktopdetector \
 ))

Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Sun Aug  7 19:24:03 2016
@@ -35,15 +35,18 @@ endif
 
 $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
 
+$(eval $(call gb_Library_add_api,vcl,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,vcl,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
-    $$(FREETYPE_CFLAGS) \
 ))
 ifeq ($(GUIBASE),os2)
 $(eval $(call gb_Library_set_include,vcl,\
@@ -52,13 +55,13 @@ $(eval $(call gb_Library_set_include,vcl
 ))
 endif
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+	$$(INCLUDE) \
+     $$(FREETYPE_CFLAGS) \
 ))
 endif
 
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
 	-DVCL_DLLIMPLEMENTATION \
     -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
     -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
@@ -72,8 +75,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -85,6 +86,11 @@ $(eval $(call gb_Library_add_linked_libs
 	$(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vcl,\
+	icule \
+	icuuc \
+)
+
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     freetype \
@@ -93,24 +99,18 @@ endif
 
 ifeq ($(GUIBASE),os2)
 # YD FIXME this is not working... needs ldflags hack...
-$(eval $(call gb_Library_add_linked_libs,vcl,\
-    ft2lib \
-))
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
     -lft2lib \
 ))
 
 endif
 
 ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
-    $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+    $(gb_OBJCXXFLAGS) \
 ))
 ifeq ($(ENABLE_CAIRO),TRUE)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
 	-DCAIRO \
 ))
 endif
@@ -184,22 +184,19 @@ $(eval $(call gb_Library_add_exception_o
 endif
 
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
     -DSAL_DLLPOSTFIX=\"\" \
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
 ))
 ## handle fontconfig
 ifeq ($(ENABLE_FONTCONFIG),TRUE)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_FONTCONFIG \
 ))
 ## handle CUPS
 ifeq ($(ENABLE_CUPS),TRUE)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_CUPS \
 ))
 endif
@@ -454,8 +451,7 @@ $(eval $(call gb_Library_add_exception_o
 ## handle Graphite
 ifeq ($(ENABLE_GRAPHITE),TRUE)
 # add defines, graphite sources for all platforms
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
 	-DENABLE_GRAPHITE \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
@@ -471,23 +467,9 @@ $(eval $(call gb_Library_add_exception_o
     vcl/source/glyphs/graphite_adaptors \
     vcl/source/glyphs/graphite_serverfont \
 ))
-ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
-    $(GRAPHITE_LIBS) \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
-    graphite \
-))
-endif
-endif
-# on windows link static graphite library
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
-    graphite \
-))
 endif
+
+$(call gb_Library_use_external,vcl,graphite)
 endif
 
 ifeq ($(OS),LINUX)
@@ -500,13 +482,11 @@ endif
 
 ifeq ($(OS),SOLARIS)
 ifeq ($(CPUNAME)$(CPU),SPARCU)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     -R/usr/sfw/lib/64 \
 ))
 else
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     -R/usr/sfw/lib \
 ))
 endif
@@ -516,8 +496,7 @@ ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
 	AppleRemote \
 ))
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
     -framework Cocoa \
     -framework Carbon \
     -framework CoreFoundation \
@@ -530,8 +509,7 @@ endif
 
 ifeq ($(OS),WNT)
 ifeq ($(USE_MINGW),)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     /ENTRY:LibMain@12 \
 ))
 endif

Modified: openoffice/trunk/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_gen.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_gen.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_gen.mk Sun Aug  7 19:24:03 2016
@@ -23,12 +23,16 @@
 
 $(eval $(call gb_Library_Library,vclplug_gen))
 
+$(eval $(call gb_Library_add_api,vclplug_gen,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,vclplug_gen,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
@@ -42,8 +46,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -59,6 +61,11 @@ $(eval $(call gb_Library_add_linked_libs
 	$(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vclplug_gen,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/app/i18n_cb \
     vcl/unx/generic/app/i18n_ic \
@@ -108,8 +115,7 @@ $(eval $(call gb_Library_add_exception_o
     vcl/unx/generic/window/salobj \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
     -DVCLPLUG_GEN_IMPLEMENTATION \
 ))
@@ -117,21 +123,18 @@ $(eval $(call gb_Library_set_defs,vclplu
 
 ## handle RandR 
 ifeq ($(ENABLE_RANDR),TRUE)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
 	-DUSE_RANDR \
 ))
 ifeq ($(XRANDR_DLOPEN),FALSE)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gen,\
+	$$(INCLUDE) \
 ))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     $(XRANDR_LIBS) \
 ))
 else
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
 	-DXRANDR_DLOPEN \
 ))
 endif
@@ -141,39 +144,33 @@ endif
 ifneq ($(USE_XINERAMA),NO)
 ifneq ($(OS),SOLARIS)
 # not Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
 	-DUSE_XINERAMA \
 	-DUSE_XINERAMA_XORG \
 ))
 ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
 ))
 
 else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
 ))
 endif
 else
 # Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
 	-DUSE_XINERAMA \
 	-DUSE_XINERAMA_XSUN \
 ))
 ifeq ($(USE_XINERAMA_VERSION),Xorg)
 # Solaris, Xorg
 ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     -lXinerama \
 ))
 else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
 ))
 endif
@@ -183,12 +180,10 @@ endif
 
 ## handle Render linking
 ifeq ($(XRENDER_LINK),YES)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
 	-DXRENDER_LINK \
 ))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     $(shell pkg-config --libs xrender) \
 ))
 endif
@@ -199,13 +194,13 @@ $(eval $(call gb_Library_add_linked_libs
 	m \
 	pthread \
 ))
-$(eval $(call gb_Library_add_external_libs,vclplug_gen,	\
-	Xinerama Xrandr					\
+$(eval $(call gb_Library_add_libs,vclplug_gen, \
+	-lXinerama -lXrandr \
 ))
 endif
 ifeq ($(OS),FREEBSD)
-$(eval $(call gb_Library_add_external_libs,vclplug_gen,	\
-	Xinerama Xrandr					\
+$(eval $(call gb_Library_add_libs,vclplug_gen, \
+	-lXinerama -lXrandr \
 ))
 endif
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Library_vclplug_gtk.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_gtk.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_gtk.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_gtk.mk Sun Aug  7 19:24:03 2016
@@ -23,23 +23,26 @@
 
 $(eval $(call gb_Library_Library,vclplug_gtk))
 
+$(eval $(call gb_Library_add_api,vclplug_gtk,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,vclplug_gtk,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+	$$(INCLUDE) \
     $$(GTK_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
     -DVCLPLUG_GTK_IMPLEMENTATION \
     -DVERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
@@ -49,27 +52,17 @@ $(eval $(call gb_Library_set_include,vcl
 	$$(INCLUDE) \
 	$(shell pkg-config --cflags-only-I dbus-glib-1) \
 ))
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
     -DENABLE_DBUS \
 ))
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
-	$$(LDFLAGS) \
-	$(filter-out -l%,$(shell pkg-config --libs dbus-glib-1)) \
-))
-$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \
-	$(patsubst -l%,%, $(filter -l%, $(shell pkg-config --libs dbus-glib-1))) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+	$(shell pkg-config --libs dbus-glib-1) \
 ))
 endif
 
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,	\
-    $$(LDFLAGS)						\
-    $(filter-out -l%,$(GTK_LIBS))			\
-    $(filter-out -l%,$(GTHREAD_LIBS)) \
-))
-$(eval $(call gb_Library_add_external_libs,vclplug_gtk,	\
-    $(patsubst -l%,%, $(filter -l%, $(GTK_LIBS)))	\
-    $(patsubst -l%,%, $(filter -l%, $(GTHREAD_LIBS))) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+    $(GTK_LIBS) \
+    $(GTHREAD_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
@@ -82,8 +75,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -99,6 +90,11 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vclplug_gtk,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
     vcl/unx/gtk/a11y/atkaction \
     vcl/unx/gtk/a11y/atkbridge \

Modified: openoffice/trunk/main/vcl/Library_vclplug_kde.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_kde.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_kde.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_kde.mk Sun Aug  7 19:24:03 2016
@@ -23,29 +23,31 @@
 
 $(eval $(call gb_Library_Library,vclplug_kde))
 
+$(eval $(call gb_Library_add_api,vclplug_kde,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,vclplug_kde,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde,\
+	$$(INCLUDE) \
     $$(KDE_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_kde,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde,\
     -DVCLPLUG_KDE_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
-    $$(KDE_LIBS)\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+    $$(KDE_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
@@ -58,8 +60,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -74,6 +74,11 @@ $(eval $(call gb_Library_add_linked_libs
     ICE \
 ))
 
+$(call gb_Library_use_externals,vclplug_kde,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
     vcl/unx/kde/kdedata \
     vcl/unx/kde/salnativewidgets-kde \

Modified: openoffice/trunk/main/vcl/Library_vclplug_kde4.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_kde4.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_kde4.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_kde4.mk Sun Aug  7 19:24:03 2016
@@ -23,29 +23,31 @@
 
 $(eval $(call gb_Library_Library,vclplug_kde4))
 
+$(eval $(call gb_Library_add_api,vclplug_kde4,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,vclplug_kde4,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde4,\
+	$$(INCLUDE) \
     $$(KDE4_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_kde4,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde4,\
     -DVCLPLUG_KDE4_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
-    $$(KDE4_LIBS)\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+    $$(KDE4_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
@@ -58,8 +60,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -74,6 +74,11 @@ $(eval $(call gb_Library_add_linked_libs
     ICE \
 ))
 
+$(call gb_Library_use_externals,vclplug_kde4,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
     vcl/unx/kde4/KDEData \
     vcl/unx/kde4/KDESalDisplay \

Modified: openoffice/trunk/main/vcl/Library_vclplug_svp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_svp.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_svp.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_svp.mk Sun Aug  7 19:24:03 2016
@@ -23,18 +23,21 @@
 
 $(eval $(call gb_Library_Library,vclplug_svp))
 
+$(eval $(call gb_Library_add_api,vclplug_svp,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,vclplug_svp,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_svp,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_svp,\
     -DVCLPLUG_SVP_IMPLEMENTATION \
 ))
 
@@ -48,8 +51,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basebmp \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -65,6 +66,11 @@ $(eval $(call gb_Library_add_linked_libs
 	$(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vclplug_svp,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
     vcl/unx/generic/printergfx/bitmap_gfx \
     vcl/unx/generic/printergfx/common_gfx \

Modified: openoffice/trunk/main/vcl/StaticLibrary_vclmain.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/StaticLibrary_vclmain.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/StaticLibrary_vclmain.mk (original)
+++ openoffice/trunk/main/vcl/StaticLibrary_vclmain.mk Sun Aug  7 19:24:03 2016
@@ -23,12 +23,16 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
+$(eval $(call gb_StaticLibrary_add_api,vclmain,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,vclmain,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
@@ -42,7 +46,7 @@ $(eval $(call gb_StaticLibrary_add_excep
 # Instead of this evil linking of an object from $(OUTDIR)
 define StaticLibrary_salmain_hack
 $(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain),$(1)))
 
 $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
 	$$(call gb_Deliver_deliver,$$<,$$@)
@@ -50,6 +54,7 @@ $(OUTDIR)/lib/$(1) : $(call gb_CxxObject
 endef
 
 ifeq ($(OS),WNT)
+$(eval $(call gb_StaticLibrary_add_defs,vclmain,-D_DLL))
 $(eval $(call StaticLibrary_salmain_hack,salmain.obj))
 else
 $(eval $(call StaticLibrary_salmain_hack,salmain.o))

Modified: openoffice/trunk/main/vcl/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/prj/build.lst (original)
+++ openoffice/trunk/main/vcl/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,4 +1,4 @@
-vc	vcl	:	L10N:l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
+vc	vcl	:	L10N:l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\prj									nmake	-	all	vc_prj NULL
 

Modified: openoffice/trunk/main/wizards/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/prj/build.lst (original)
+++ openoffice/trunk/main/wizards/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,28 +1,2 @@
 wz      wizards     :    L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
-wz      wizards\util                                            nmake           -       all     wz_util NULL
-wz      wizards\source\config                                   nmake           -       all     wz_config NULL
-wz      wizards\source\configshare                              nmake           -       all     wz_configshare NULL
-wz      wizards\source\imagelists                               nmake           -       all     wz_imglists NULL
-wz      wizards\source\euro                                     nmake           -       all     wz_eurowiz NULL
-wz      wizards\source\formwizard                               nmake           -       all     wz_reswiz NULL
-wz      wizards\source\gimmicks                                 nmake           -       all     wz_gimmickswz NULL
-wz      wizards\source\importwizard                             nmake           -       all     wz_importwiz NULL
-wz      wizards\source\schedule                                 nmake           -       all     wz_schedulewiz NULL
-wz      wizards\source\template                                 nmake           -       all     wz_templatewiz NULL
-wz      wizards\source\tools                                    nmake           -       all     wz_toolswiz NULL
-wz      wizards\source\depot                                    nmake           -       all     wz_depot NULL
-wz      wizards\source\tutorials                                nmake           -       all     wz_tutorials NULL
-wz      wizards\source\standard                                 nmake           -       all     wz_standard NULL
-wz      wizards\com\sun\star\wizards                            nmake           -       all     wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\query                      nmake           -       all     wz_querywiz wz_formwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\report                     nmake           -       all     wz_reportwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\reportbuilder\layout       nmake           -       all     wz_rptlayoutwiz wz_reportwiz NULL
-wz      wizards\com\sun\star\wizards\reportbuilder              nmake           -       all     wz_rptbldwiz    wz_rptlayoutwiz NULL
-wz      wizards\com\sun\star\wizards\table                      nmake           -       all     wz_tablewiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\form                       nmake           -       all     wz_formwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\letter                     nmake           -       all     wz_letterwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\fax                        nmake           -       all     wz_faxwiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\agenda                     nmake           -       all     wz_agendawiz wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\web\data                   nmake           -       all     wz_webdata wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\web\export                 nmake           -       all     wz_webexport wz_webdata wz_commonwiz NULL
-wz      wizards\com\sun\star\wizards\web                        nmake           -       all     wz_webwiz wz_webexport NULL
+wz      wizards\prj                                             nmake           -       all     wz_prj NULL

Modified: openoffice/trunk/main/wizards/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/prj/d.lst (original)
+++ openoffice/trunk/main/wizards/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\pck%_EXT%
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\wzi*.res %_DEST%\bin%_EXT%\wzi*.res
-..\%__SRC%\bin\dbw*.res %_DEST%\bin%_EXT%\dbw*.res
-..\%__SRC%\bin\tpl*.res %_DEST%\bin%_EXT%\tpl*.res
-..\%__SRC%\bin\imp*.res %_DEST%\bin%_EXT%\imp*.res
-..\%__SRC%\bin\wwz*.res %_DEST%\bin%_EXT%\wwz*.res
-..\%__SRC%\bin\eur*.res %_DEST%\bin%_EXT%\eur*.res
-..\%__SRC%\bin\cal*.res %_DEST%\bin%_EXT%\cal*.res
-..\%__SRC%\bin\com*.res %_DEST%\bin%_EXT%\com*.res
-REM ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\misc\agenda.component %_DEST%\xml%_EXT%\agenda.component
-..\%__SRC%\misc\fax.component %_DEST%\xml%_EXT%\fax.component
-..\%__SRC%\misc\form.component %_DEST%\xml%_EXT%\form.component
-..\%__SRC%\misc\letter.component %_DEST%\xml%_EXT%\letter.component
-..\%__SRC%\misc\query.component %_DEST%\xml%_EXT%\query.component
-..\%__SRC%\misc\report.component %_DEST%\xml%_EXT%\report.component
-..\%__SRC%\misc\table.component %_DEST%\xml%_EXT%\table.component
-..\%__SRC%\misc\web.component %_DEST%\xml%_EXT%\web.component

Modified: openoffice/trunk/main/writerfilter/inc/resourcemodel/TagLogger.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/inc/resourcemodel/TagLogger.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/inc/resourcemodel/TagLogger.hxx (original)
+++ openoffice/trunk/main/writerfilter/inc/resourcemodel/TagLogger.hxx Sun Aug  7 19:24:03 2016
@@ -78,7 +78,8 @@ namespace writerfilter
         void chars(const string & rChars);
         void chars(const ::rtl::OUString & rChars);
         const string & getTag() const;
-        string toString() const; 
+        string toString() const;
+        string toTree(const string & sIndent = "") const;
         
         ostream & output(ostream & o, const string & sIndent = "") const;
     };

Modified: openoffice/trunk/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx (original)
+++ openoffice/trunk/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx Sun Aug  7 19:24:03 2016
@@ -391,17 +391,45 @@ public:
 */
 Stream::Pointer_t WRITERFILTER_DLLPUBLIC createStreamHandler();
 
-    void WRITERFILTER_DLLPUBLIC analyzerIds();
-    Stream::Pointer_t WRITERFILTER_DLLPUBLIC createAnalyzer();
-    
-    void WRITERFILTER_DLLPUBLIC logger(string prefix, string message);
-    
-    void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props);
-    void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n);
-    void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, 
-                                     const rtl::OUString & /*str*/); 
-    void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary);
-    
+void WRITERFILTER_DLLPUBLIC analyzerIds();
+Stream::Pointer_t WRITERFILTER_DLLPUBLIC createAnalyzer();
+
+void WRITERFILTER_DLLPUBLIC logger(string prefix, string message);
+
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props);
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n);
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, 
+                                 const rtl::OUString & /*str*/); 
+void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary);
+
+class Token_t
+{
+    sal_Int32 m_nId;
+#ifdef DEBUG
+    ::std::string m_string;
+#endif
+
+    void assign(sal_Int32 nId);
+
+public:
+    Token_t();
+    Token_t(sal_Int32 nId);
+    virtual ~Token_t();
+
+    sal_Int32 getId() const;
+    operator sal_Int32() const;
+    Token_t & operator = (sal_Int32 n);
+ 
+#ifdef DEBUG
+    ::std::string toString() const;
+#endif
+};
+
+struct TokenHash
+{
+    size_t operator()(const Token_t & rToken) const;
+};
+
 }
 
 

Modified: openoffice/trunk/main/writerfilter/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/prj/build.lst (original)
+++ openoffice/trunk/main/writerfilter/prj/build.lst Sun Aug  7 19:24:03 2016
@@ -1,11 +1,2 @@
 wf	writerfilter	: soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox NULL
-wf	writerfilter	usr1	-	all	wf_mkout NULL
-wf	writerfilter\source\resourcemodel	nmake	-	all	wf_resourcemodel NULL
-wf	writerfilter\source\doctok	nmake	-	all	wf_doctok wf_resourcemodel NULL
-wf	writerfilter\source\ooxml	nmake	-	all	wf_ooxml wf_resourcemodel NULL
-wf  writerfilter\source\filter      nmake   - all   wf_filter NULL
-wf  writerfilter\source\dmapper      nmake   - all   wf_dmapper wf_doctok wf_ooxml wf_resourcemodel NULL
-wf	writerfilter\unocomponent\debugservices\doctok	nmake	-	all	wf_debugservicesdoctok NULL
-wf	writerfilter\unocomponent\debugservices\ooxml	nmake	-	all	wf_debugservicesooxml NULL
-wf	writerfilter\unocomponent	nmake	-	all	wf_unocomponent wf_doctok wf_ooxml wf_resourcemodel wf_debugservicesdoctok wf_debugservicesooxml NULL
-wf  writerfilter\util   nmake   - all wf_util wf_filter wf_dmapper wf_doctok wf_ooxml wf_unocomponent NULL
+wf	writerfilter\prj	nmake	-	all	wf_prj NULL

Modified: openoffice/trunk/main/writerfilter/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/prj/d.lst (original)
+++ openoffice/trunk/main/writerfilter/prj/d.lst Sun Aug  7 19:24:03 2016
@@ -1,8 +0,0 @@
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\writerfilter.component %_DEST%\xml%_EXT%\writerfilter.component
-
-mkdir: %_DEST%\inc%_EXT%\writerfilter\doctok
-..\%__SRC%\inc\doctok\sprmids.hxx %_DEST%\inc%_EXT%\writerfilter\doctok\sprmids.hxx

Modified: openoffice/trunk/main/writerfilter/qa/complex/ooxml/LoadDocuments.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/qa/complex/ooxml/LoadDocuments.java?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/qa/complex/ooxml/LoadDocuments.java (original)
+++ openoffice/trunk/main/writerfilter/qa/complex/ooxml/LoadDocuments.java Sun Aug  7 19:24:03 2016
@@ -21,10 +21,20 @@
 
 
 package complex.ooxml;
+
+import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
 import complexlib.ComplexTestCase;
 import java.io.File;
-import com.sun.star.text.XTextDocument;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.Argument;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 
 /*
  * To change this template, choose Tools | Templates
@@ -35,38 +45,54 @@ import com.sun.star.text.XTextDocument;
  *
  * @author hb137859
  */
-public class LoadDocuments extends ComplexTestCase {
-    private XMultiServiceFactory m_xMSF;
-
-    @Override
-    public String[] getTestMethodNames() {
-        return new String [] {
-            "test1"
-        };
-    }
-
-    public void before() throws Exception {
-        m_xMSF = (XMultiServiceFactory) param.getMSF();
-    }
-
-    public void test1() {
-        String testDocumentsPath = util.utils.getFullTestDocName("");
-        log.println("Test documents in:" + testDocumentsPath);
+public class LoadDocuments {
+    @Test public void test1() {
+        String testDocumentsPath = Argument.get("tdoc");
+        System.out.println("Test documents in:" + testDocumentsPath);
 
         File dir = new File(testDocumentsPath);
         String [] files = dir.list();
 
-        if (files != null) {
-            for (int i = 0; i < files.length; ++i) {
-                log.println(files[i]);
-                String url = util.utils.getFullTestURL(files[i]);
-                log.println(url);
-
-                XTextDocument xDoc = util.WriterTools.loadTextDoc(m_xMSF, url);
-                util.DesktopTools.closeDoc(xDoc);
+        try {            
+            if (files != null) {
+                for (int i = 0; i < files.length; ++i) {
+                    System.out.println(files[i]);
+                    String url = TestDocument.getUrl(files[i]);
+                    System.out.println(url);
+                    
+                    XComponent xDoc = util.DesktopTools.loadDoc(getMSF(), url, null);
+                    System.out.println("loaded.");
+                    util.DesktopTools.closeDoc(xDoc);
+                    System.out.println("done.");
+                }          
+            } else {
+                fail("Files not found");
             }
-        } else {
-            failed();
         }
+        catch (Exception e) {
+            System.out.println(e);
+            fail("failed");
+        }
+    }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
     }
+    private static final OfficeConnection connection = new OfficeConnection();
 }

Modified: openoffice/trunk/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx (original)
+++ openoffice/trunk/main/writerfilter/qa/cppunittests/doctok/testdoctok.cxx Sun Aug  7 19:24:03 2016
@@ -28,14 +28,10 @@
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
 
-#include <resourcemodel/exceptions.hxx>
 #include <doctok/WW8Document.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
 
 #include <iostream>
 
@@ -133,7 +129,7 @@ namespace testdoctok
 
             rtl::OUString sInputFileURL( absfile );
 
-            for (sal_uInt32 n = 0; n < sInputFileURL.getLength(); ++n)
+            for (sal_Int32 n = 0; n < sInputFileURL.getLength(); ++n)
             {
                 sal_uChar nC = sInputFileURL[n];
 
@@ -150,7 +146,7 @@ namespace testdoctok
             WW8Stream::Pointer_t pStream =
                 WW8DocumentFactory::createStream(xContext, xStream);
 
-            pDocument = WW8Document::Pointer_t(WW8DocumentFactory::createDocument(pStream));
+            pDocument.reset(WW8DocumentFactory::createDocument(pStream));
         }
         catch (::writerfilter::Exception e)
         {
@@ -159,48 +155,6 @@ namespace testdoctok
 
         ASSERT_TRUE(pDocument != NULL) << "creating document failed";
 
-#if 1
-    }
-
-    TEST_F(test, testTraversal)
-    {
-#endif
-        sal_uInt32 nResult = 0;
-
-        try
-        {
-            WW8DocumentIterator::Pointer_t pIt = pDocument->begin();
-            WW8DocumentIterator::Pointer_t pItEnd = pDocument->end();
-
-            while (! pIt->equal(*pItEnd))
-            {
-                pIt->dump(clog);
-
-                clog << endl;
-
-// Doesn't compile:
-//                WW8PropertySet::Pointer_t pAttrs = pIt->getProperties();
-//
-//                if (pAttrs != NULL)
-//                {
-//                    pAttrs->dump(clog);
-//                }
-
-                pIt->getText().dump(clog);
-                ++(*pIt);
-                ++nResult;
-            }
-        }
-        catch (::writerfilter::Exception e)
-        {
-            clog << "Exception!!" << endl;
-        }
-
-        char sBuffer[256];
-        snprintf(sBuffer, 255, "%d", nResult);
-        clog << "Iterator steps:" << sBuffer << endl;
-
-        ASSERT_TRUE(nResult > 0) << "traversing document failed";
     }
 
     TEST_F(test, testEvents)

Modified: openoffice/trunk/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx (original)
+++ openoffice/trunk/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx Sun Aug  7 19:24:03 2016
@@ -123,25 +123,29 @@ public:
 	}
 	virtual void endElement(QName_t name)
 	{
-		//printf("</{%s}:%s>\n", QName::serializer().getNamespaceUri(name), QName::serializer().getLocalName(name));
-		events++;
-		switch(name)
-		{
-		case NS_table::LN_table:
-		case NS_ss11::LN_Table:
-			currentRow->append(*currentTable);
-			currentRow=NULL;
-			break;
-		case NS_table::LN_table_row:
-		case NS_ss11::LN_Row:
-			currentCell->append(*currentRow);
-			currentCell=NULL;
-			break;
-		case NS_table::LN_table_cell:
-		case NS_ss11::LN_Cell:
-			break;
-
-		};
+            //printf("</{%s}:%s>\n", QName::serializer().getNamespaceUri(name), QName::serializer().getLocalName(name));
+            events++;
+            switch(name)
+            {
+            case NS_table::LN_table:
+            case NS_ss11::LN_Table:
+                if (currentTable != NULL)
+                {
+                    currentRow->append(*currentTable);
+                }
+                currentRow=NULL;
+                break;
+            case NS_table::LN_table_row:
+            case NS_ss11::LN_Row:
+                if (currentRow != NULL)
+                    currentCell->append(*currentRow);
+                currentCell=NULL;
+                break;
+            case NS_table::LN_table_cell:
+            case NS_ss11::LN_Cell:
+                break;
+                
+            };
 	}
 	virtual void characters(const xxml::Value &value)
 	{

Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx (original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx Sun Aug  7 19:24:03 2016
@@ -194,7 +194,6 @@ void DomainMapper::lcl_attribute(Id nNam
     
     SectionPropertyMap * pSectionContext = m_pImpl->GetSectionContext();
     
-    // printf ( "DomainMapper::attribute(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)nName, (unsigned int)nIntValue, ::rtl::OUStringToOString(sStringValue, RTL_TEXTENCODING_DONTKNOW).getStr());
     if( nName >= NS_rtf::LN_WIDENT && nName <= NS_rtf::LN_LCBSTTBFUSSR )
         m_pImpl->GetFIB().SetData( nName, nIntValue );
     else //if( !m_pImpl->getTableManager().attribute( nName, val) )
@@ -2219,7 +2218,6 @@ void DomainMapper::sprmWithProps( Sprm&
     Value::Pointer_t pValue = rSprm.getValue();
     sal_Int32 nIntValue = pValue->getInt();
     const rtl::OUString sStringValue = pValue->getString();
-    // printf ( "DomainMapper::sprm(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)nSprmId, (unsigned int)nIntValue, ::rtl::OUStringToOString(sStringValue, RTL_TEXTENCODING_DONTKNOW).getStr());
     /* WRITERFILTERSTATUS: table: sprmdata */
 
     switch(nSprmId)
@@ -3908,8 +3906,9 @@ void DomainMapper::sprmWithProps( Sprm&
                 xLineNumberingPropSet->setPropertyValue(rNameSupplier.GetName( PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) );
             xLineNumberingPropSet->setPropertyValue(rNameSupplier.GetName( PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) );
         }
-        catch( const uno::Exception& )
+        catch( const uno::Exception& e)
         {
+            (void) e;
         }
 
     }
@@ -4197,8 +4196,9 @@ void DomainMapper::sprmWithProps( Sprm&
                                                                     uno::makeAny( nNumType ));
             }
         }
-        catch( const uno::Exception& )
+        catch( const uno::Exception& e)
         {
+            (void) e;
         }
     }
     break;
@@ -4503,7 +4503,12 @@ void DomainMapper::lcl_text(const sal_uI
     }
     catch( const uno::RuntimeException& )
     {
-        std::clog << __FILE__ << "(l" << __LINE__ << ")" << std::endl;
+#ifdef DEBUG_DOMAINMAPPER
+        dmapper_logger->startElement("exception");
+        dmapper_logger->attribute("file", __FILE__);
+        dmapper_logger->attribute("line", __LINE__);
+        dmapper_logger->endElement("exception");
+#endif
     }
 }
 /*-- 09.06.2006 09:52:15---------------------------------------------------
@@ -4570,8 +4575,9 @@ void DomainMapper::lcl_utext(const sal_u
 
         }
     }
-    catch( const uno::RuntimeException& )
+    catch( const uno::RuntimeException& e)
     {
+        (void) e;
     }
 }
 /*-- 09.06.2006 09:52:15---------------------------------------------------
@@ -4596,7 +4602,6 @@ void DomainMapper::lcl_props(writerfilte
 -----------------------------------------------------------------------*/
 void DomainMapper::lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
 {
-    // printf ( "DomainMapper::table(0x%.4x)\n", (unsigned int)name);
     m_pImpl->SetAnyTableImport(true);
     /* WRITERFILTERSTATUS: table: attributedata */
     switch(name)

Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx (original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx Sun Aug  7 19:24:03 2016
@@ -42,6 +42,58 @@ using namespace ::std;
 #define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented 
 
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
+XMLTag::Pointer_t handleToTag(Handle_t & rHandle)
+{
+    XMLTag::Pointer_t pTag(new XMLTag("handle"));
+
+    pTag->chars(rHandle->getString());
+
+    return pTag;
+}
+
+void cellSequenceToTags(XMLTag::Pointer_t pTag, CellSequence_t & rCellSequence)
+{
+    sal_Int32 nCount = rCellSequence.getLength();
+    pTag->addAttr("count", nCount);
+
+    for (sal_Int32 n = 0; n < nCount; n++)
+    {
+        Handle_t aHandle = rCellSequence[n];        
+        pTag->addTag(handleToTag(aHandle));
+    }
+}
+
+void rowSequenceToTags(XMLTag::Pointer_t pTag, RowSequence_t & rRowSequence)
+{
+    sal_Int32 nCount = rRowSequence.getLength();
+    pTag->addAttr("count", nCount);
+
+    for (sal_Int32 n = 0; n < nCount; n++)
+    {
+        CellSequence_t & rCells = rRowSequence[n];
+        XMLTag::Pointer_t pCellTag(new XMLTag("cell"));
+        cellSequenceToTags(pCellTag, rCells);
+        pTag->addTag(pCellTag);
+    }
+}
+
+XMLTag::Pointer_t tableSequenceToTag(TableSequence_t & rTableSequence)
+{
+    XMLTag::Pointer_t pTag(new XMLTag("table"));
+    sal_Int32 nCount = rTableSequence.getLength();
+    pTag->addAttr("count", nCount);
+
+    for (sal_Int32 n = 0; n < nCount; n++)
+    {
+        RowSequence_t & rRowSequence = rTableSequence[n];
+        XMLTag::Pointer_t pRowTag(new XMLTag("row"));
+        rowSequenceToTags(pRowTag, rRowSequence);
+        pTag->addTag(pRowTag);
+    }
+
+    return pTag;
+}
+
 static void  lcl_printProperties( PropertyMapPtr pProps )
 {
     if( pProps.get() )
@@ -54,8 +106,9 @@ static void  lcl_printProperties( Proper
         for( ; aMapIter != aEndIter; ++aMapIter )
         {
             rtl::OUString aOUStr = rPropSupplier.GetName( aMapIter->first.eId );
-            rtl::OString aOStr(aOUStr.getStr(), aOUStr.getLength(),  RTL_TEXTENCODING_ASCII_US );
-            clog << aOStr.getStr();
+            dmapper_logger->startElement("entry");
+            dmapper_logger->chars(aOUStr);
+            dmapper_logger->endElement("entry");
 
             table::BorderLine aLine;
             sal_Int32 nColor; 
@@ -737,6 +790,12 @@ void DomainMapperTableHandler::endTable(
     {
         try
         {
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+            XMLTag::Pointer_t pTag = tableSequenceToTag(*m_pTableSeq);
+            dmapper_logger->addTag(pTag);
+
+            ::std::clog << pTag->toTree() << ::std::endl;
+#endif
             uno::Reference< text::XTextTable > xTable =
                     m_xText->convertToTable(
                         *m_pTableSeq,
@@ -748,12 +807,14 @@ void DomainMapperTableHandler::endTable(
         }
         catch (lang::IllegalArgumentException e)
         {
+            (void) e;
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
             dmapper_logger->chars("failed to import table!");
 #endif
         }
         catch ( uno::Exception e )
         {
+            (void) e;
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
             dmapper_logger->startElement("exception");
             dmapper_logger->chars(rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ));
@@ -838,7 +899,6 @@ void DomainMapperTableHandler::endCell(c
     dmapper_logger->chars(toString(end));
     dmapper_logger->endElement("table.cell.end");
     dmapper_logger->endElement("table.cell");
-    clog << "</table.cell>" << endl;
 #endif
 
     if (!end.get()) 

Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx (original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx Sun Aug  7 19:24:03 2016
@@ -31,24 +31,33 @@
 namespace writerfilter {
 namespace dmapper {
 
-typedef ::com::sun::star::text::XTextRange TextRange_t;
-typedef ::com::sun::star::uno::Reference< TextRange_t > Handle_t;
-typedef ::com::sun::star::uno::Sequence< Handle_t> CellSequence_t;
+using namespace ::com::sun::star;
+
+typedef text::XTextRange TextRange_t;
+typedef uno::Reference< TextRange_t > Handle_t;
+typedef uno::Sequence< Handle_t> CellSequence_t;
 typedef boost::shared_ptr<CellSequence_t> CellSequencePointer_t;
-typedef ::com::sun::star::uno::Sequence< CellSequence_t > RowSequence_t;
+typedef uno::Sequence< CellSequence_t > RowSequence_t;
 typedef boost::shared_ptr<RowSequence_t> RowSequencePointer_t;
-typedef ::com::sun::star::uno::Sequence< RowSequence_t> TableSequence_t;
+typedef uno::Sequence< RowSequence_t> TableSequence_t;
 typedef boost::shared_ptr<TableSequence_t> TableSequencePointer_t;
-typedef ::com::sun::star::text::XTextAppendAndConvert Text_t;
-typedef ::com::sun::star::uno::Reference<Text_t> TextReference_t;
+typedef text::XTextAppendAndConvert Text_t;
+typedef uno::Reference<Text_t> TextReference_t;
 
-typedef ::com::sun::star::beans::PropertyValues                     TablePropertyValues_t;
-typedef ::com::sun::star::uno::Sequence< TablePropertyValues_t >    RowPropertyValuesSeq_t;
-typedef ::com::sun::star::uno::Sequence< RowPropertyValuesSeq_t>    CellPropertyValuesSeq_t;
+typedef beans::PropertyValues                     TablePropertyValues_t;
+typedef uno::Sequence< TablePropertyValues_t >    RowPropertyValuesSeq_t;
+typedef uno::Sequence< RowPropertyValuesSeq_t>    CellPropertyValuesSeq_t;
 
 typedef std::vector<PropertyMapPtr>     PropertyMapVector1;
 typedef std::vector<PropertyMapVector1> PropertyMapVector2;
 
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+XMLTag::Pointer_t handleToTag(Handle_t & rHandle);
+void cellSequenceToTag(XMLTag::Pointer_t pTag, CellSequence_t & pCellSequence);
+void rowSequenceToTag(XMLTag::Pointer_t pTag, RowSequence_t & pRowSequence);
+XMLTag::Pointer_t tableSequenceToTag(TableSequence_t & rTableSequence);
+#endif
+
 class DomainMapper_Impl;
 class TableStyleSheetEntry; 
 struct TableInfo;   

Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx (original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx Sun Aug  7 19:24:03 2016
@@ -55,7 +55,7 @@ DomainMapperTableManager::DomainMapperTa
 {
     m_pTablePropsHandler->SetTableManager( this );
     
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
 #ifdef DEBUG_TABLE
     setTagLogger(dmapper_logger);
 #endif
@@ -66,15 +66,15 @@ DomainMapperTableManager::DomainMapperTa
   -----------------------------------------------------------------------*/
 DomainMapperTableManager::~DomainMapperTableManager()
 {
-    if ( m_pTablePropsHandler )
-        delete m_pTablePropsHandler, m_pTablePropsHandler = NULL;
+    delete m_pTablePropsHandler;
+  m_pTablePropsHandler = NULL;
 }
 /*-- 23.04.2007 15:25:37---------------------------------------------------
 
   -----------------------------------------------------------------------*/
 bool DomainMapperTableManager::sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("tablemanager.sprm");
     string sSprm = rSprm.toString();
     dmapper_logger->chars(sSprm);
@@ -124,7 +124,7 @@ bool DomainMapperTableManager::sprm(Sprm
                         if( m_nTableWidthOfCurrentTable.top() > 0 )
                             pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nTableWidthOfCurrentTable.top() );
                     }
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
                     dmapper_logger->addTag(pPropMap->toTag());
 #endif
                     insertTableProps(pPropMap);
@@ -267,7 +267,7 @@ bool DomainMapperTableManager::sprm(Sprm
             case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell
                 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
             {    
-#if DEBUG_DOMAINMAPPER
+#if DEBUG_DMAPPER_TABLE_HANDLER
                 dmapper_logger->startElement("tablemanager.GridSpan");
                 dmapper_logger->attribute("gridSpan", nIntValue);
                 dmapper_logger->endElement("tablemanager.GridSpan");
@@ -310,7 +310,7 @@ bool DomainMapperTableManager::sprm(Sprm
                 bRet = false;
                 
 #ifdef DEBUG_DOMAINMAPPER
-                dmapper_logger->element("unhandled");
+                dmapper_logger->element("TableManager.unhandled");
 #endif
         }
     }
@@ -383,7 +383,7 @@ void DomainMapperTableManager::endLevel(
 
     DomainMapperTableManager_Base_t::endLevel();
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("dmappertablemanager.endLevel");
     PropertyMapPtr pProps = getTableProps();
     if (pProps.get() != NULL)
@@ -398,7 +398,7 @@ void DomainMapperTableManager::endLevel(
   -----------------------------------------------------------------------*/
 void DomainMapperTableManager::endOfCellAction()
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->element("endOFCellAction");
 #endif
 
@@ -411,7 +411,7 @@ void DomainMapperTableManager::endOfCell
   -----------------------------------------------------------------------*/
 void DomainMapperTableManager::endOfRowAction()
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("endOfRowAction");
 #endif
     
@@ -421,13 +421,13 @@ void DomainMapperTableManager::endOfRowA
     {
         ::std::vector<sal_Int32>::const_iterator aCellIter = pTableGrid->begin();
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->startElement("tableWidth");
 #endif
 
         while( aCellIter != pTableGrid->end() )
         {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
             dmapper_logger->startElement("col");
             dmapper_logger->attribute("width", *aCellIter);
             dmapper_logger->endElement("col");
@@ -443,7 +443,7 @@ void DomainMapperTableManager::endOfRowA
             insertTableProps(pPropMap);
         }
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->endElement("tableWidth");
 #endif
     }
@@ -455,7 +455,7 @@ void DomainMapperTableManager::endOfRowA
         pCurrentSpans->insert( pCurrentSpans->end( ), m_nCellCounterForCurrentRow.top() - pCurrentSpans->size(), 1 );
     }    
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("gridSpans");
     {
         ::std::vector<sal_Int32>::const_iterator aGridSpanIter = pCurrentSpans->begin();
@@ -511,7 +511,7 @@ void DomainMapperTableManager::endOfRowA
         TablePropertyMapPtr pPropMap( new TablePropertyMap );
         pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny( aSeparators ) );
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->startElement("rowProperties");
         dmapper_logger->addTag(pPropMap->toTag());
         dmapper_logger->endElement("rowProperties");
@@ -523,7 +523,7 @@ void DomainMapperTableManager::endOfRowA
     m_nCurrentCellBorderIndex.top() = 0;
     pCurrentSpans->clear();
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->endElement("endOfRowAction");
 #endif
 }



Mime
View raw message