CWS gnumake3: repair windows build; convert svx to gbuild

6 files changed, 49 insertions, 69 deletions

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index cdbc9e13eed5..35dc04ebc096 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,svx))
 
 $(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx))
-#$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx/source/svdraw))
 
 $(eval $(call gb_AllLangResTarget_add_srs,svx,\
     svx/res \
@@ -40,29 +39,12 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
     -I$(WORKDIR)/inc \
+    -I$(WORKDIR)/inc/svx \
     -I$(SRCDIR)/svx/source/inc \
     -I$(SRCDIR)/svx/source/dialog \
     -I$(SRCDIR)/svx/inc/ \
 ))
 
-# ofa res:
-#svx/source/src/errtxt.src
-#svx/source/src/app.src
-
-#svx/source/intro/iso.src
-#svx/source/intro/ooo.src
-
-# textconversiondlgs res:
-#svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
-#svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
-
-# localization of globlmn.hrc
-#echo LASTRUN_MERGED:=TRUE > ../unxlngx6.pro/inc/inc_lastrun.mk
-#mkdir ../unxlngx6.pro/inc/
-#rm -f ../unxlngx6.pro/inc/globlmn.hrc
-#: &&     LD_LIBRARY_PATH=/home/mathias/OOO/o_gnumake3/DEV300/ooo/solver/300/unxlngx6.pro/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} /home/mathias/OOO/o_gnumake3/DEV300/ooo/solver/300/unxlngx6.pro/bin/transex3 -p svx -i globlmn_tmpl.hrc -o ../unxlngx6.pro/inc//globlmn_tmpl.hrc.unxlngx6.pro -m /home/mathias/OOO/o_gnumake3/DEV300/ooo/l10n/unxlngx6.pro/misc/sdf/svx/inc/localize.sdf -l all
-#mv ../unxlngx6.pro/inc/globlmn_tmpl.hrc.unxlngx6.pro ../unxlngx6.pro/inc/globlmn.hrc
-
 $(eval $(call gb_SrsTarget_add_files,svx/res,\
     svx/source/accessibility/accessibility.src \
     svx/source/dialog/bmpmask.src \
@@ -117,3 +99,39 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
     svx/source/unodraw/unodraw.src \
 ))
 
+$(call gb_SrsPartTarget_get_target,svx/source/fmcomp/gridctrl.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/fmexpl.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean
+
+# hack !!!
+# just a temporary - globlmn.hrc about to be removed!
+ifeq ($(WITH_LANG),)
+$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc
+    echo copying $@
+    -mkdir -p $(WORKDIR)/inc/svx
+    cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
+    rm -f $(WORKDIR)/inc/svx/lastrun.mk 
+else
+-include $(WORKDIR)/inc/svx/lastrun.mk
+ifneq ($(gb_lastrun_globlmn),MERGED)
+.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc
+endif
+$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
+    echo merging $@
+    -mkdir -p $(WORKDIR)/inc/svx
+    rm -f $(WORKDIR)/inc/svx/lastrun.mk
+    echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk
+    $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+        -p svx \
+         -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all
+endif
+
+.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean
+$(WORKDIR)/inc/svx/globlmn.hrc_clean :
+    rm -f $(WORKDIR)/inc/svx/lastrun.mk \
+        $(WORKDIR)/inc/svx/globlmn.hrc
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 2ea9066b1f5a..6d88e0601bcc 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     sal \
     sfx \
     sot \
+    stl \
     svl \
     svt \
     svxcore \
@@ -65,7 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     vos3 \
     xo \
     xcr \
-    stl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,svx,\
@@ -229,19 +229,15 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     oldnames \
     user32 \
     uwinapi \
+))
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/dialog/sendreportw32 \
 ))
-))
 else
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/dialog/sendreportgen \
 ))
 endif
-
-$(eval $(call gb_Library_add_linked_libs,svx,\
-    shell \
-))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 5401963fb864..e14f3b34d826 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     sal \
     sfx \
     sot \
+    stl \
     svl \
     svt \
     tk \
@@ -435,7 +436,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     dl \
     m \
     pthread \
-    stl \
 ))
 endif
 
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 8d34482e45c0..bcdfdfc7f9b5 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\
 
 $(eval $(call gb_Library_set_defs,textconversiondlgs,\
     $$(DEFS) \
-    -DACCESSIBLE_LAYOUT \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
@@ -61,7 +60,7 @@ $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\
 ))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,svxcore,\
+$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
     dl \
     m \
     pthread \
@@ -70,7 +69,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,svxcore,\
+$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
     advapi32 \
     kernel32 \
     msvcrt \
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 536d7cc29fc8..1471763b4cb8 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,39 +1,6 @@
 sx	svx	:	sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
-sx	svx										usr1	-	all	sx_mkout NULL
-sx	svx\inc									nmake	-	all	sx_inc NULL
-sx	svx\uiconfig\layout						nmake	-	all	sx_layout NULL
-sx	svx\source\unodialogs\textconversiondlgs   	nmake	-	all	sx_textconversiondlgs sx_inc NULL
-sx	svx\sdi									nmake	-	all	sx_sdi sx_inc NULL
-sx	svx\source\src							nmake	-	all	sx_src sx_inc sx_sdi NULL
-sx	svx\source\intro						nmake	-	all	sx_intro sx_inc NULL
-sx	svx\source\items						nmake	-	all	sx_items sx_inc sx_sdi NULL
-sx	svx\source\xoutdev						nmake	-	all	sx_xout sx_items sx_inc NULL
-sx	svx\source\svdraw						nmake	-	all	sx_draw sx_inc NULL
-sx	svx\source\sdr\attribute				nmake	-	all	sx_attribute sx_inc NULL
-sx	svx\source\sdr\primitive2d				nmake	-	all	sx_primitive2d sx_inc NULL
-sx	svx\source\sdr\primitive3d				nmake	-	all	sx_primitive3d sx_inc NULL
-sx  svx\source\table						nmake	-	all sx_table sx_inc NULL
-sx	svx\source\sdr\properties				nmake	-	all	sx_properties sx_inc NULL
-sx	svx\source\sdr\contact					nmake	-	all	sx_contact sx_inc NULL
-sx	svx\source\sdr\event					nmake	-	all	sx_event sx_inc NULL
-sx	svx\source\sdr\animation				nmake	-	all	sx_animation sx_inc NULL
-sx	svx\source\sdr\overlay					nmake	-	all	sx_overlay sx_inc NULL
-sx	svx\source\smarttags					nmake	-	all	sx_smarttags sx_inc NULL
-sx	svx\source\stbctrls						nmake	-	all	sx_stbc sx_inc NULL
-sx	svx\source\mnuctrls						nmake	-	all	sx_mnuc sx_inc NULL
-sx	svx\source\engine3d						nmake	-	all	sx_3deng sx_inc NULL
-sx	svx\source\form							nmake	-	all	sx_form sx_sdi sx_inc NULL
-sx	svx\source\fmcomp						nmake	-	all	sx_fmcmp sx_sdi sx_inc NULL
-sx	svx\source\tbxctrls						nmake	-	all	sx_tbxc sx_inc NULL
-sx  svx\source\dialog                                               nmake   -       all     sx_dlg sx_inc NULL
-sx	svx\source\unodraw						nmake	-	all	sx_undrw sx_inc NULL
-sx	svx\source\unogallery					nmake	-	all	sx_ungal sx_inc NULL
-sx	svx\source\gallery2						nmake	-	all	sx_gall sx_inc NULL
-sx	svx\source\xml							nmake	-	all	sx_xml sx_inc NULL
-sx	svx\source\core							nmake	-	all	sx_core sx_inc NULL
-sx	svx\source\accessibility				nmake	-	all	sx_accessibility sx_inc NULL
-sx	svx\source\customshapes					nmake	-	all sx_customshapes sx_inc NULL
-sx	svx\source\toolbars						nmake	-	all sx_toolbars sx_inc NULL
-sx      svx\util                                                                nmake   -       all     sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_core sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
-sx	svx\source\gengal						nmake	-	all	sx_gengal sx_util NULL
-sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL
+
+sx	svx									usr1	-	all	sx_mkout NULL
+sx	svx\prj								nmake	-	all	sx_prj NULL
+
+# sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 02d18cef9c45..e0e8a8effb7f 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -47,13 +47,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(