incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1394326 [11/15] - in /incubator/ooo/branches/buildsys/main: ./ basebmp/inc/basebmp/ basebmp/prj/ basebmp/test/ basegfx/inc/basegfx/color/ basegfx/inc/basegfx/curve/ basegfx/inc/basegfx/matrix/ basegfx/inc/basegfx/numeric/ basegfx/inc/baseg...
Date Thu, 04 Oct 2012 23:16:58 GMT
Modified: incubator/ooo/branches/buildsys/main/svl/JunitTest_svl_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svl/JunitTest_svl_complex.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svl/JunitTest_svl_complex.mk (original)
+++ incubator/ooo/branches/buildsys/main/svl/JunitTest_svl_complex.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,svl_complex))
+$(eval $(call gb_JunitTest_JunitTest,svl_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,svl_complex,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/svl/Library_svl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svl/Library_svl.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svl/Library_svl.mk (original)
+++ incubator/ooo/branches/buildsys/main/svl/Library_svl.mk Thu Oct  4 23:16:35 2012
@@ -36,8 +36,7 @@ $(eval $(call gb_Library_set_include,svl
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,svl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,svl,\
 	-DSVL_DLLIMPLEMENTATION \
 ))
 

Modified: incubator/ooo/branches/buildsys/main/svtools/JunitTest_svtools_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/JunitTest_svtools_unoapi.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/JunitTest_svtools_unoapi.mk (original)
+++ incubator/ooo/branches/buildsys/main/svtools/JunitTest_svtools_unoapi.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk (original)
+++ incubator/ooo/branches/buildsys/main/svtools/Library_svt.mk Thu Oct  4 23:16:35 2012
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,svt
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,svt,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,svt,\
 	-DSVT_DLLIMPLEMENTATION \
 ))
 
@@ -54,7 +53,6 @@ $(eval $(call gb_Library_add_linked_libs
 	cppuhelper \
 	i18nisolang1 \
 	i18nutil \
-	icuuc \
 	jvmfwk \
 	sal \
 	sot \
@@ -69,26 +67,10 @@ $(eval $(call gb_Library_add_linked_libs
 	$(gb_STDLIBS) \
 ))
 
-ifeq ($(SYSTEM_JPEG),YES)
-$(eval $(call gb_Library_add_linked_libs,svt,\
+$(call gb_Library_use_externals,svt,\
+	icuuc \
 	jpeg \
-))
-$(eval $(call gb_Library_set_ldflags,svt,\
-	$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
-))
-ifeq ($(GUIBASE),os2)
-# YD FIXME above is not working... needs ldflags hack...
-$(eval $(call gb_Library_set_ldflags,svt,\
-    $$(LDFLAGS) \
-    -ljpeg \
-))
-endif
-
-else
-$(eval $(call gb_Library_add_linked_static_libs,svt,\
-	jpeglib \
-))
-endif
+)
 
 $(eval $(call gb_Library_add_exception_objects,svt,\
 	svtools/source/brwbox/brwbox1 \

Modified: incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/AllLangResTarget_svx.mk Thu Oct  4 23:16:35 2012
@@ -131,5 +131,16 @@ $(WORKDIR)/inc/svx/globlmn.hrc_clean :
 	rm -f $(WORKDIR)/inc/svx/lastrun.mk \
 		$(WORKDIR)/inc/svx/globlmn.hrc
 
+$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc
+	echo copying $@
+	-mkdir -p $(OUTDIR)/inc/svx
+	cp $(WORKDIR)/inc/svx/globlmn.hrc $(OUTDIR)/inc/svx/globlmn.hrc
+
+.PHONY : $(OUTDIR)/inc/svx/globlmn.hrc_clean
+$(OUTDIR)/inc/svx/globlmn.hrc_clean :
+	rm -f $(OUTDIR)/inc/svx/globlmn.hrc
+
+$(call gb_AllLangResTarget_get_target,svx) : $(OUTDIR)/inc/svx/globlmn.hrc
+
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/svx/JunitTest_svx_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/JunitTest_svx_unoapi.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/JunitTest_svx_unoapi.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/JunitTest_svx_unoapi.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,svx_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svx_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/Library_svx.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/Library_svx.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/Library_svx.mk Thu Oct  4 23:16:35 2012
@@ -33,8 +33,7 @@ $(eval $(call gb_Library_set_include,svx
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,svx,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,svx,\
 	-DSVX_DLLIMPLEMENTATION \
 	-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 ))
@@ -48,7 +47,6 @@ $(eval $(call gb_Library_add_linked_libs
 	drawinglayer \
 	editeng \
 	i18nisolang1 \
-	icuuc \
 	sal \
 	sfx \
 	sot \
@@ -67,6 +65,8 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,svx,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/accessibility/AccessibleControlShape \
     svx/source/accessibility/AccessibleEmptyEditSource \

Modified: incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/Library_svxcore.mk Thu Oct  4 23:16:35 2012
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_Library,svxcore
 
 $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
 
-$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
 
 $(eval $(call gb_Library_add_package_headers,svxcore,\
 	svx_inc \
@@ -47,8 +47,7 @@ $(eval $(call gb_Library_set_include,svx
 #CFLAGS+= -DUNICODE -D_UNICODE
 #.ENDIF
 
-$(eval $(call gb_Library_set_defs,svxcore,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,svxcore,\
 	-DSVX_DLLIMPLEMENTATION \
 	-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 ))
@@ -64,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs
 	editeng \
 	fwe \
 	i18nisolang1 \
-	icuuc \
 	lng \
 	sal \
 	sfx \
@@ -82,6 +80,8 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,svxcore,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
 	svx/source/core/coreservices \
     svx/source/customshapes/EnhancedCustomShape2d \

Modified: incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/Library_textconversiondlgs.mk Thu Oct  4 23:16:35 2012
@@ -32,10 +32,6 @@ $(eval $(call gb_Library_set_include,tex
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,textconversiondlgs,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
 	comphelper \
 	cppuhelper \

Modified: incubator/ooo/branches/buildsys/main/svx/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/Package_inc.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/Package_inc.mk (original)
+++ incubator/ooo/branches/buildsys/main/svx/Package_inc.mk Thu Oct  4 23:16:35 2012
@@ -554,5 +554,4 @@ $(eval $(call gb_Package_add_file,svx_in
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc))
 

Modified: incubator/ooo/branches/buildsys/main/svx/source/xoutdev/xattrbmp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svx/source/xoutdev/xattrbmp.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svx/source/xoutdev/xattrbmp.cxx (original)
+++ incubator/ooo/branches/buildsys/main/svx/source/xoutdev/xattrbmp.cxx Thu Oct  4 23:16:35 2012
@@ -28,7 +28,7 @@
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <svl/style.hxx>
 #include <editeng/memberids.hrc>
 #include <svx/dialogs.hrc>

Modified: incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_complex.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_complex.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_complex.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,sw_complex))
+$(eval $(call gb_JunitTest_JunitTest,sw_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sw_complex,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_unoapi.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_unoapi.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/JunitTest_sw_unoapi.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/sw/Library_msword.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_msword.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_msword.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_msword.mk Thu Oct  4 23:16:35 2012
@@ -38,10 +38,6 @@ $(eval $(call gb_Library_set_include,msw
 	-I$(OUTDIR)/inc/sw \
 ))
 
-$(eval $(call gb_Library_set_defs,msword,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,msword,\
 	basegfx \
 	comphelper \
@@ -50,7 +46,6 @@ $(eval $(call gb_Library_add_linked_libs
 	editeng \
 	i18nisolang1 \
 	i18nutil \
-	icuuc \
 	msfilter \
 	sal \
 	sfx \
@@ -70,6 +65,8 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,msword,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,msword,\
 	sw/source/filter/rtf/rtffld \
 	sw/source/filter/rtf/rtffly \

Modified: incubator/ooo/branches/buildsys/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_sw.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_sw.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_sw.mk Thu Oct  4 23:16:35 2012
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,sw,
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,sw,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,sw,\
 	-DSW_DLLIMPLEMENTATION \
 ))
 
@@ -57,7 +56,6 @@ $(eval $(call gb_Library_add_linked_libs
 	editeng \
 	i18nisolang1 \
 	i18nutil \
-	icuuc \
 	lng \
 	sal \
 	salhelper \
@@ -69,6 +67,7 @@ $(eval $(call gb_Library_add_linked_libs
 	svt \
 	svx \
 	svxcore \
+	swd \
 	tk \
 	tl \
 	ucbhelper \
@@ -80,6 +79,8 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,sw,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,sw,\
 	sw/source/core/SwNumberTree/SwNodeNum \
 	sw/source/core/SwNumberTree/SwNumberTree \
@@ -468,7 +469,6 @@ $(eval $(call gb_Library_add_exception_o
 	sw/source/filter/ascii/wrtasc \
 	sw/source/filter/basflt/docfact \
 	sw/source/filter/basflt/fltini \
-	sw/source/filter/basflt/iodetect \
 	sw/source/filter/basflt/shellio \
 	sw/source/filter/html/SwAppletImpl \
 	sw/source/filter/html/css1atr \

Modified: incubator/ooo/branches/buildsys/main/sw/Library_swd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_swd.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_swd.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_swd.mk Thu Oct  4 23:16:35 2012
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,swd
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,swd,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,swd,\
+	-DSWD_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,swd,\
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs
 ))
 
 $(eval $(call gb_Library_add_exception_objects,swd,\
-	sw/source/core/except/errhdl \
 	sw/source/filter/basflt/iodetect \
 	sw/source/ui/uno/detreg \
 	sw/source/ui/uno/swdet2 \

Modified: incubator/ooo/branches/buildsys/main/sw/Library_swui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_swui.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_swui.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_swui.mk Thu Oct  4 23:16:35 2012
@@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,swu
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,swui,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,swui,\
 	comphelper \
 	cppu \
@@ -56,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs
 	svx \
 	svxcore \
 	sw \
+	swd \
 	tk \
 	tl \
 	ucbhelper \

Modified: incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk (original)
+++ incubator/ooo/branches/buildsys/main/sw/Library_vbaswobj.mk Thu Oct  4 23:16:35 2012
@@ -109,12 +109,4 @@ $(eval $(call gb_Library_add_exception_o
 	sw/source/ui/vba/wordvbahelper \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_ldflags,vbaswobj,\
-	$$(LDFLAGS) \
-	-Wl$(COMMA)-O1 \
-	-Wl$(COMMA)-z$(COMMA)noexecstack \
-))
-endif
-
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/sw/inc/iodetect.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/inc/iodetect.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/inc/iodetect.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sw/inc/iodetect.hxx Thu Oct  4 23:16:35 2012
@@ -30,7 +30,7 @@
 #include <osl/endian.h>
 #include <errhdl.hxx>		// for ASSERT
 #include <tools/string.hxx>
-#include <swdllapi.h>
+#include <swddllapi.h>
 
 #define FILTER_RTF      "RTF"       // RTF-Filter
 #define sRtfWH          "WH_RTF"
@@ -82,7 +82,7 @@ enum ReaderWriterEnum {
     MAXFILTER
 };
 
-extern SwIoDetect aFilterDetect[];
+extern SWD_DLLPUBLIC SwIoDetect aFilterDetect[];
 
 // Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
 // des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
@@ -93,13 +93,15 @@ class SwIoSystem
 {
 public:
     // suche ueber den internen FormatNamen den Filtereintrag
-    SW_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
+    SWD_DLLPUBLIC static const SfxFilter*
+        GetFilterOfFormat( const String& rFormat,
             const SfxFilterContainer* pCnt = 0 );
 
     // Feststellen des zu verwendenden Filters fuer die uebergebene
     // Datei. Der Filtername wird zurueckgeliefert. Konnte kein Filter
     // zurueckgeliefert werden, wird der Name des ASCII-Filters geliefert!
-    static const SfxFilter* GetFileFilter( const String& rFileName,
+    SWD_DLLPUBLIC static const SfxFilter*
+        GetFileFilter( const String& rFileName,
             const String& rPrefFltName,
             SfxMedium* pMedium = 0 );
 
@@ -111,13 +113,15 @@ public:
     static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& );
     static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
 
-    static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, 
+    SWD_DLLPUBLIC static bool
+        IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
             CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
     //    static bool IsDetectableW4W(const String& rFileName, const String& rUserData);
 
     static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
 
-    static const String GetSubStorageName( const SfxFilter& rFltr );
+    SWD_DLLPUBLIC static const String
+        GetSubStorageName( const SfxFilter& rFltr );
 };
 
 #endif

Modified: incubator/ooo/branches/buildsys/main/sw/source/filter/basflt/iodetect.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sw/source/filter/basflt/iodetect.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sw/source/filter/basflt/iodetect.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sw/source/filter/basflt/iodetect.cxx Thu Oct  4 23:16:35 2012
@@ -197,9 +197,9 @@ sal_Bool SwIoSystem::IsValidStgFilter(So
 
 void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferLen)
 {
-    ASSERT(nBytesRead <= nBufferLen - 2,
+    OSL_ENSURE(nBytesRead <= nBufferLen - 2,
             "what you read must be less than the max + null termination");
-    ASSERT(!(nBufferLen & 0x00000001), "nMaxReadBuf must be an even number");
+    OSL_ENSURE(!(nBufferLen & 0x00000001),"nMaxReadBuf must be an even number");
     if (nBytesRead <= nBufferLen - 2)
     {
         pBuffer[nBytesRead] = '\0';

Modified: incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc (original)
+++ incubator/ooo/branches/buildsys/main/testautomation/graphics/optional/includes/impress/i_us_present.inc Thu Oct  4 23:16:35 2012
@@ -511,7 +511,7 @@ testcase i_us_presentation
     DocumentImpress.TypeKeys "End"
     printlog "Inserted ending -slide."
     Kontext "Gallery"
-
+    printlog "Checking if gallery is closed..."
     if Gallery.Exists(2) then
         warnlog "The Gallery was visible. Closed it. Check earlier ran tests for inconsistency."
         ToolsGallery
@@ -519,15 +519,15 @@ testcase i_us_presentation
     end if
 
     kontext "slides"
-
+    printlog "moving up to first slide.."
     for i = 1 to 8
         sleep 1
         SlidesControl.TypeKeys "<PAGEUP>"
     next i
-
+    printlog "Starting presentation with f5."
     hTypeKeys "<F5>"
     kontext "DocumentPresentation"
-
+    printlog "Hitting pagedown 8 times to go through the presentation and end it."
     for iKeyStroke = 1 to 8
         wait( 3000 )
         DocumentPresentation.TypeKeys "<PAGEDOWN>"
@@ -535,7 +535,7 @@ testcase i_us_presentation
     next iKeyStroke
 
     kontext "DocumentPresentation"
-
+    printlog "Checking if presentation has ended."
     if ( DocumentPresentation.notExists( 5 ) ) then
         printlog( "Presentation closed. Good." )
     else

Modified: incubator/ooo/branches/buildsys/main/testautomation/graphics/tools/id_tools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/testautomation/graphics/tools/id_tools.inc?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/testautomation/graphics/tools/id_tools.inc (original)
+++ incubator/ooo/branches/buildsys/main/testautomation/graphics/tools/id_tools.inc Thu Oct  4 23:16:35 2012
@@ -97,10 +97,10 @@ function LiberalMeasurement ( sShould$, 
             printlog "took units from http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src"
             select case GetMeasUnit(sShould$)
             case "mm", "ミリ", "公厘" : iTolerance = 2.0             '01, 81,     88
-            case "cm","センãƒ?","厘米","公分"  : iTolerance = 0.5       '01, 81, 86, 88
+            case "cm","セン�?","厘米","公分"  : iTolerance = 0.5       '01, 81, 86, 88
             case chr$(34) : iTolerance = 2.5
             case "pi","ピクセル" : iTolerance = 2.5                 '01, 81
-            case "pt",  "ãƒ?イント" : iTolerance = 2.5                '01, 81
+            case "pt",  "�?イント" : iTolerance = 2.5                '01, 81
             case "" : iTolerance = 1.5 ' cm is presubposition in old functions
             case else
                 iTolerance = 2.5
@@ -1117,7 +1117,8 @@ function CreateTextSetEffectAndAngle
         TabEntrance.OK
     end if
     kontext "tasks"
-    EffectStart.TypeKeys "<HOME><DOWN>" 'Select the second entry.
+    EffectStart.TypeKeys "<HOME>", true
+    EffectStart.TypeKeys "<DOWN>", true 'Select the second entry.
 
     kontext "DocumentImpress"
     FormatPositionAndSize

Modified: incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_complex.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_complex.mk (original)
+++ incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_complex.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_add_jars,toolkit_complex,\
 	$(OUTDIR)/bin/OOoRunner.jar \

Modified: incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_unoapi.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_unoapi.mk (original)
+++ incubator/ooo/branches/buildsys/main/toolkit/JunitTest_toolkit_unoapi.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk (original)
+++ incubator/ooo/branches/buildsys/main/toolkit/Library_tk.mk Thu Oct  4 23:16:35 2012
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,tk,
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,tk,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,tk,\
 	-DTOOLKIT_DLLIMPLEMENTATION \
 ))
 
@@ -156,8 +155,9 @@ $(eval $(call gb_Library_add_exception_o
 ))
 
 ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
-	$$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+$(eval $(call gb_Library_add_cxxflags,tk,\
+	$(gb_OBJCXXFLAGS) \
+))
 endif
 
 ifeq ($(OS),LINUX)

Modified: incubator/ooo/branches/buildsys/main/tools/Executable_mkunroll.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/Executable_mkunroll.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/Executable_mkunroll.mk (original)
+++ incubator/ooo/branches/buildsys/main/tools/Executable_mkunroll.mk Thu Oct  4 23:16:35 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
 	-I$(SRCDIR)/tools/bootstrp/ \
 ))
 
-$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
-	$$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,mkunroll,\
 	-D_TOOLS_STRINGLIST \
 ))
 

Modified: incubator/ooo/branches/buildsys/main/tools/Executable_rscdep.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/Executable_rscdep.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/Executable_rscdep.mk (original)
+++ incubator/ooo/branches/buildsys/main/tools/Executable_rscdep.mk Thu Oct  4 23:16:35 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
 	-I$(SRCDIR)/tools/bootstrp/ \
 ))
 
-$(eval $(call gb_Executable_set_cxxflags,rscdep,\
-	$$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,rscdep,\
 	-D_TOOLS_STRINGLIST \
 ))
 

Modified: incubator/ooo/branches/buildsys/main/tools/Executable_so_checksum.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/Executable_so_checksum.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/Executable_so_checksum.mk (original)
+++ incubator/ooo/branches/buildsys/main/tools/Executable_so_checksum.mk Thu Oct  4 23:16:35 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
 	-I$(SRCDIR)/tools/bootstrp/ \
 ))
 
-$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
-	$$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,so_checksum,\
 	-D_TOOLS_STRINGLIST \
 ))
 

Modified: incubator/ooo/branches/buildsys/main/tools/Executable_sspretty.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/Executable_sspretty.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/Executable_sspretty.mk (original)
+++ incubator/ooo/branches/buildsys/main/tools/Executable_sspretty.mk Thu Oct  4 23:16:35 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
 	-I$(SRCDIR)/tools/bootstrp/ \
 ))
 
-$(eval $(call gb_Executable_set_cxxflags,sspretty,\
-	$$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,sspretty,\
 	-D_TOOLS_STRINGLIST \
 ))
 

Modified: incubator/ooo/branches/buildsys/main/tools/Library_tl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/tools/Library_tl.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/tools/Library_tl.mk (original)
+++ incubator/ooo/branches/buildsys/main/tools/Library_tl.mk Thu Oct  4 23:16:35 2012
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,tl,
 	-I$(OUTDIR)/inc/stl \
 ))
 
-$(eval $(call gb_Library_set_defs,tl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,tl,\
 	-DTOOLS_DLLIMPLEMENTATION \
 	-DVCL \
 ))
@@ -128,24 +127,11 @@ $(eval $(call gb_Library_add_exception_o
 ))
 endif
 
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_cxxflags,tl,\
-	$$(CXXFLAGS) \
-	-DSYSTEM_ZLIB \
-))
-$(eval $(call gb_Library_add_linked_libs,tl,\
-	z \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,tl,\
-	zlib \
-))
-endif
+$(call gb_Library_use_external,tl,zlib)
 
 ifeq ($(OS),OS2)
 # YD FIXME above is not working... needs ldflags hack...
-$(eval $(call gb_Library_set_ldflags,tl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,tl,\
     -lz \
 ))
 endif

Modified: incubator/ooo/branches/buildsys/main/ucbhelper/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/ucbhelper/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/ucbhelper/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/ucbhelper/prj/build.lst Thu Oct  4 23:16:35 2012
@@ -1,7 +1,2 @@
 uh	ucbhelper   :   offuh sal cppu cppuhelper salhelper NULL
-uh	ucbhelper                   usr1    -   all uh_mkout NULL
-uh	ucbhelper\inc               nmake   -   all uh_inc NULL
-uh	ucbhelper\source\client     nmake   -   all uh_client uh_inc NULL
-uh	ucbhelper\source\provider   nmake   -   all uh_provider uh_inc NULL
-uh	ucbhelper\util              nmake   -   all uh_util uh_client uh_provider NULL
-uh	ucbhelper\workben\myucp     nmake   -   all uh_wb_myucp uh_util NULL
+uh	ucbhelper\prj               nmake   -   all uh_prj NULL

Modified: incubator/ooo/branches/buildsys/main/ucbhelper/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/ucbhelper/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/ucbhelper/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/ucbhelper/prj/d.lst Thu Oct  4 23:16:35 2012
@@ -1,40 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\misc\*.sym %_DEST%\bin%_EXT%\*.sym
-
-..\util\ucbhelper.xml %_DEST%\xml%_EXT%\ucbhelper.xml
-
-mkdir: %_DEST%\inc%_EXT%\ucbhelper
-..\inc\ucbhelper\configurationkeys.hxx %_DEST%\inc%_EXT%\ucbhelper\configurationkeys.hxx
-..\inc\ucbhelper\registerucb.hxx %_DEST%\inc%_EXT%\ucbhelper\registerucb.hxx
-..\inc\ucbhelper\content.hxx %_DEST%\inc%_EXT%\ucbhelper\content.hxx
-..\inc\ucbhelper\contentbroker.hxx %_DEST%\inc%_EXT%\ucbhelper\contentbroker.hxx
-..\inc\ucbhelper\commandenvironment.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironment.hxx
-..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contenthelper.hxx %_DEST%\inc%_EXT%\ucbhelper\contenthelper.hxx
-..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contentinfo.hxx %_DEST%\inc%_EXT%\ucbhelper\contentinfo.hxx
-..\inc\ucbhelper\fileidentifierconverter.hxx %_DEST%\inc%_EXT%\ucbhelper\fileidentifierconverter.hxx
-..\inc\ucbhelper\macros.hxx %_DEST%\inc%_EXT%\ucbhelper\macros.hxx
-..\inc\ucbhelper\propertyvalueset.hxx %_DEST%\inc%_EXT%\ucbhelper\propertyvalueset.hxx
-..\inc\ucbhelper\providerhelper.hxx %_DEST%\inc%_EXT%\ucbhelper\providerhelper.hxx
-..\inc\ucbhelper\resultset.hxx %_DEST%\inc%_EXT%\ucbhelper\resultset.hxx
-..\inc\ucbhelper\resultsetmetadata.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsetmetadata.hxx
-..\inc\ucbhelper\resultsethelper.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsethelper.hxx
-..\inc\ucbhelper\activedatasink.hxx %_DEST%\inc%_EXT%\ucbhelper\activedatasink.hxx
-..\inc\ucbhelper\commandenvironmentproxy.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironmentproxy.hxx
-..\inc\ucbhelper\interactionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\interactionrequest.hxx
-..\inc\ucbhelper\interceptedinteraction.hxx %_DEST%\inc%_EXT%\ucbhelper\interceptedinteraction.hxx
-..\inc\ucbhelper\simpleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleinteractionrequest.hxx
-..\inc\ucbhelper\simpleauthenticationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleauthenticationrequest.hxx
-..\inc\ucbhelper\simplenameclashresolverequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplenameclashresolverequest.hxx
-..\inc\ucbhelper\simplecertificatevalidationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplecertificatevalidationrequest.hxx
-..\inc\ucbhelper\simpleioerrorrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleioerrorrequest.hxx
-..\inc\ucbhelper\cancelcommandexecution.hxx %_DEST%\inc%_EXT%\ucbhelper\cancelcommandexecution.hxx
-..\inc\ucbhelper\handleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\handleinteractionrequest.hxx
-..\inc\ucbhelper\proxydecider.hxx %_DEST%\inc%_EXT%\ucbhelper\proxydecider.hxx
-..\version.mk %_DEST%\inc%_EXT%\ucbhelper\version.mk
-..\inc\ucbhelper\ucbhelperdllapi.h %_DEST%\inc%_EXT%\ucbhelper\ucbhelperdllapi.h

Modified: incubator/ooo/branches/buildsys/main/unotools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/unotools/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/unotools/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/unotools/prj/build.lst Thu Oct  4 23:16:35 2012
@@ -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\prj							nmake	-	all	ut_prj NULL

Modified: incubator/ooo/branches/buildsys/main/unotools/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/unotools/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/unotools/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/unotools/prj/d.lst Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unordf_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unordf_complex.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unordf_complex.mk (original)
+++ incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unordf_complex.mk Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unoxml_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unoxml_complex.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unoxml_complex.mk (original)
+++ incubator/ooo/branches/buildsys/main/unoxml/JunitTest_unoxml_complex.mk Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/unoxml/Library_unordf.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/unoxml/Library_unordf.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/unoxml/Library_unordf.mk (original)
+++ incubator/ooo/branches/buildsys/main/unoxml/Library_unordf.mk Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/unoxml/Library_unoxml.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/unoxml/Library_unoxml.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/unoxml/Library_unoxml.mk (original)
+++ incubator/ooo/branches/buildsys/main/unoxml/Library_unoxml.mk Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk (original)
+++ incubator/ooo/branches/buildsys/main/vbahelper/Library_vbahelper.mk Thu Oct  4 23:16:35 2012
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,vba
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,vbahelper,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vbahelper,\
 	-DVBAHELPER_DLLIMPLEMENTATION \
 ))
 
@@ -56,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs
 	stl \
 	svl \
 	svt \
+	svxcore \
 	tk \
 	tl \
 	utl \

Modified: incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_desktop_detector.mk Thu Oct  4 23:16:35 2012
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,des
 	-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 +50,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -68,6 +65,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: incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vcl.mk Thu Oct  4 23:16:35 2012
@@ -35,6 +35,11 @@ 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 \
@@ -51,8 +56,7 @@ $(eval $(call gb_Library_set_cxxflags,vc
 ))
 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)) \
@@ -66,8 +70,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -79,6 +81,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 \
@@ -87,24 +94,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
@@ -178,22 +179,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
 ifneq ($(ENABLE_FONTCONFIG),)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_FONTCONFIG \
 ))
 ## handle CUPS
 ifneq ($(ENABLE_CUPS),)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_CUPS \
 ))
 endif
@@ -445,8 +443,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,\
@@ -456,39 +453,15 @@ $(eval $(call gb_Library_add_exception_o
     vcl/source/glyphs/graphite_textsrc \
 ))
 
-#building with stlport, but graphite was not built with stlport
-ifneq ($(USE_SYSTEM_STL),YES)
-ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
-	-DADAPT_EXT_STL \
-))
-endif
-endif
-
 # handle X11 platforms, which have additional files and possibly system graphite
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     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)
@@ -501,13 +474,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
@@ -517,8 +488,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 QuickTime \
     -framework Cocoa \
     -framework Carbon \
@@ -528,8 +498,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: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gen.mk Thu Oct  4 23:16:35 2012
@@ -42,8 +42,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -59,6 +57,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 +111,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,22 +119,19 @@ $(eval $(call gb_Library_set_defs,vclplu
 
 ## handle RandR 
 ifneq ($(ENABLE_RANDR),)
-$(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) \
     $$(XRANDR_CFLAGS) \
 ))
-$(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
@@ -142,39 +141,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
@@ -184,12 +177,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
@@ -200,13 +191,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: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_gtk.mk Thu Oct  4 23:16:35 2012
@@ -33,13 +33,12 @@ $(eval $(call gb_Library_set_include,vcl
 	-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 +48,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 +71,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -99,6 +86,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: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde.mk Thu Oct  4 23:16:35 2012
@@ -33,19 +33,17 @@ $(eval $(call gb_Library_set_include,vcl
 	-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 +56,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -74,6 +70,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: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_kde4.mk Thu Oct  4 23:16:35 2012
@@ -33,19 +33,17 @@ $(eval $(call gb_Library_set_include,vcl
 	-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 +56,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basegfx \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -74,6 +70,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: incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/Library_vclplug_svp.mk Thu Oct  4 23:16:35 2012
@@ -33,8 +33,7 @@ $(eval $(call gb_Library_set_include,vcl
 	-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 +47,6 @@ $(eval $(call gb_Library_add_linked_libs
 	basebmp \
 	comphelper \
     cppuhelper \
-    icuuc \
-    icule \
 	i18nisolang1 \
 	i18npaper \
     i18nutil \
@@ -65,6 +62,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: incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk (original)
+++ incubator/ooo/branches/buildsys/main/vcl/StaticLibrary_vclmain.mk Thu Oct  4 23:16:35 2012
@@ -50,6 +50,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: incubator/ooo/branches/buildsys/main/wizards/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/wizards/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/wizards/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/wizards/prj/build.lst Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/wizards/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/wizards/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/wizards/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/wizards/prj/d.lst Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/TagLogger.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/TagLogger.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/TagLogger.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/TagLogger.hxx Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/writerfilter/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/prj/build.lst Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/writerfilter/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/prj/d.lst Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/writerfilter/qa/complex/ooxml/LoadDocuments.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/qa/complex/ooxml/LoadDocuments.java?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/qa/complex/ooxml/LoadDocuments.java (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/qa/complex/ooxml/LoadDocuments.java Thu Oct  4 23:16:35 2012
@@ -19,12 +19,22 @@
  * 
  *************************************************************/
 
-
 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: incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx Thu Oct  4 23:16:35 2012
@@ -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: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapper.cxx Thu Oct  4 23:16:35 2012
@@ -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) )
@@ -2207,7 +2206,6 @@ void DomainMapper::sprmWithProps( Sprm& 
     Value::Pointer_t pValue = rSprm.getValue();
     sal_Int32 nIntValue = pValue->getInt();
     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)
@@ -2847,7 +2845,7 @@ void DomainMapper::sprmWithProps( Sprm& 
                 {
                     //get value from style sheet and invert it
                     sal_Int16 nStyleValue = 0;
-                    double fDoubleValue;
+                    double fDoubleValue = 0.0;
                     uno::Any aStyleVal = m_pImpl->GetPropertyFromStyleSheet(ePropertyId);
                     if( !aStyleVal.hasValue() )
                     {
@@ -3863,8 +3861,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;
         }
 
     }
@@ -4150,8 +4149,9 @@ void DomainMapper::sprmWithProps( Sprm& 
                                                                     uno::makeAny( nNumType ));
             }
         }
-        catch( const uno::Exception& )
+        catch( const uno::Exception& e)
         {
+            (void) e;
         }
     }
     break;
@@ -4456,7 +4456,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---------------------------------------------------
@@ -4519,8 +4524,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---------------------------------------------------
@@ -4545,7 +4551,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: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx Thu Oct  4 23:16:35 2012
@@ -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; 
@@ -724,6 +777,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, 
                                     aCellProperties,
                                     aRowProperties,
@@ -733,12 +792,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( ));
@@ -823,7 +884,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: incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/dmapper/DomainMapperTableHandler.hxx Thu Oct  4 23:16:35 2012
@@ -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;   



Mime
View raw message