CWS gnumake2: rebase to DEV300_m76; fix build problems

2 files changed, 30 insertions, 17 deletions

diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index 5a67b9414181..4b2cd9f9b26b 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -14,6 +14,7 @@ st	svtools\source\filter.vcl\igif		nmake	-	all	st_vigif st_inc NULL
 st	svtools\source\filter.vcl\jpeg		nmake	-	all	st_vjpeg st_inc NULL
 st	svtools\source\filter.vcl\ixbm		nmake	-	all	st_vixbm st_inc NULL
 st	svtools\source\filter.vcl\ixpm		nmake	-	all	st_vixpm st_inc NULL
+st	svtools\source\graphic				nmake	-	all	st_svtgraphic  st_inc NULL
 st	svtools\source\java					nmake	-	all	st_svtjava  st_inc NULL
 st	svtools\source\misc					nmake	-	all	st__misc st_bmp st_inc NULL
 st	svtools\source\plugapp				nmake	-	all	st_papp st_inc NULL
@@ -22,7 +23,7 @@ st	svtools\source\svrtf				nmake	-	all	st_rtf st_inc NULL
 st	svtools\source\table               	nmake	-	all	st_table st_inc NULL
 st	svtools\source\uno					nmake	-	all	st_uno st_inc NULL
 st	svtools\source\urlobj				nmake	-	all	st__url st_inc NULL
-st  svtools\util                        nmake   -   all st_util st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url  st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL
+st  svtools\util                        nmake   -   all st_util st_svtgraphic st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url  st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL
 st	svtools\source\hatchwindow			nmake	-	all	st_hatchwin st_inc NULL
 st	svtools\source\productregistration	nmake	-	all	st_prodreg st_util st_inc NULL
 st  svtools\workben\unodialog           nmake   -   all st_workben_udlg st_util NULL
diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk
index 223e7fc44650..f688dd16fa71 100644
--- a/svtools/prj/target_lib_svt.mk
+++ b/svtools/prj/target_lib_svt.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/config/optionsdrawinglayer \
     svtools/source/config/menuoptions \
     svtools/source/config/helpopt \
+    svtools/source/config/htmlcfg \
     svtools/source/config/accessibilityoptions \
     svtools/source/config/printoptions \
     svtools/source/config/miscopt \
@@ -110,29 +111,30 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/config/colorcfg \
     svtools/source/config/fontsubstconfig \
     svtools/source/config/apearcfg \
-    svtools/source/misc/svtaccessiblefactory \
-    svtools/source/misc/templatefoldercache \
-    svtools/source/misc/imagemgr \
-    svtools/source/misc/imap3 \
     svtools/source/misc/acceleratorexecute \
+    svtools/source/misc/chartprettypainter \
+    svtools/source/misc/cliplistener \
+    svtools/source/misc/dialogclosedlistener \
+    svtools/source/misc/dialogcontrolling \
+    svtools/source/misc/ehdl \
+    svtools/source/misc/embedhlp \
+    svtools/source/misc/embedtransfer \
     svtools/source/misc/helpagentwindow \
+    svtools/source/misc/imagemgr \
+    svtools/source/misc/imageresourceaccess \
     svtools/source/misc/imap \
-    svtools/source/misc/wallitem \
-    svtools/source/misc/langtab \
-    svtools/source/misc/dialogclosedlistener \
+    svtools/source/misc/imap2 \
+    svtools/source/misc/imap3 \
     svtools/source/misc/itemdel \
-    svtools/source/misc/dialogcontrolling \
+    svtools/source/misc/langtab \
+    svtools/source/misc/stringtransfer \
+    svtools/source/misc/svtaccessiblefactory \
     svtools/source/misc/svtdata \
+    svtools/source/misc/templatefoldercache \
     svtools/source/misc/transfer2 \
-    svtools/source/misc/chartprettypainter \
-    svtools/source/misc/imageresourceaccess \
-    svtools/source/misc/imap2 \
-    svtools/source/misc/ehdl \
-    svtools/source/misc/embedtransfer \
-    svtools/source/misc/embedhlp \
-    svtools/source/misc/cliplistener \
     svtools/source/misc/transfer \
-    svtools/source/misc/stringtransfer \
+    svtools/source/misc/unitconv \
+    svtools/source/misc/wallitem \
     svtools/source/plugapp/ttprops \
     svtools/source/control/ctrlbox \
     svtools/source/control/valueacc \
@@ -250,6 +252,16 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/filter.vcl/ixbm/xbmread \
     svtools/source/filter.vcl/jpeg/jpeg \
     svtools/source/filter.vcl/ixpm/xpmread \
+    svtools/source/graphic/descriptor \
+    svtools/source/graphic/graphic \
+    svtools/source/graphic/graphicunofactory \
+    svtools/source/graphic/grfattr \
+    svtools/source/graphic/grfcache \
+    svtools/source/graphic/grfmgr \
+    svtools/source/graphic/grfmgr2 \
+    svtools/source/graphic/provider \
+    svtools/source/graphic/renderer \
+    svtools/source/graphic/transformer \
 ))
 
 $(eval $(call gb_Library_add_cobjects,svt,\