CWS gnumake2: resync to DEV300_m84

1 files changed, 165 insertions, 144 deletions

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 8968775b8e7c..f8415a98b922 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -84,38 +84,136 @@ $(eval $(call gb_Library_add_linked_static_libs,svt,\
 endif
 
 $(eval $(call gb_Library_add_exception_objects,svt,\
+    svtools/source/brwbox/brwbox1 \
+    svtools/source/brwbox/brwbox2 \
+    svtools/source/brwbox/brwbox3 \
+    svtools/source/brwbox/brwhead \
+    svtools/source/brwbox/datwin \
+    svtools/source/brwbox/ebbcontrols \
+    svtools/source/brwbox/editbrowsebox \
+    svtools/source/brwbox/editbrowsebox2 \
+    svtools/source/config/accessibilityoptions \
+    svtools/source/config/apearcfg \
+    svtools/source/config/colorcfg \
+    svtools/source/config/extcolorcfg \
+    svtools/source/config/fontsubstconfig \
+    svtools/source/config/helpopt \
+    svtools/source/config/htmlcfg \
+    svtools/source/config/itemholder2 \
+    svtools/source/config/menuoptions \
+    svtools/source/config/miscopt \
+    svtools/source/config/optionsdrawinglayer \
+    svtools/source/config/printoptions \
+    svtools/source/contnr/contentenumeration \
+    svtools/source/contnr/ctrdll \
+    svtools/source/contnr/fileview \
+    svtools/source/contnr/imivctl1 \
+    svtools/source/contnr/imivctl2 \
+    svtools/source/contnr/ivctrl \
+    svtools/source/contnr/svicnvw \
+    svtools/source/contnr/svimpbox \
+    svtools/source/contnr/svimpicn \
+    svtools/source/contnr/svlbitm \
+    svtools/source/contnr/svlbox \
+    svtools/source/contnr/svtabbx \
+    svtools/source/contnr/svtreebx \
+    svtools/source/contnr/templwin \
+    svtools/source/contnr/tooltiplbox \
+    svtools/source/contnr/treelist \
+    svtools/source/control/asynclink \
+    svtools/source/control/calendar \
+    svtools/source/control/collatorres \
+    svtools/source/control/ctrlbox \
+    svtools/source/control/ctrldll \
+    svtools/source/control/ctrltool \
+    svtools/source/control/filectrl \
+    svtools/source/control/filectrl2 \
+    svtools/source/control/fileurlbox \
+    svtools/source/control/fixedhyper \
+    svtools/source/control/fmtfield \
+    svtools/source/control/headbar \
+    svtools/source/control/hyperlabel \
+    svtools/source/control/indexentryres \
+    svtools/source/control/inettbc \
+    svtools/source/control/prgsbar \
+    svtools/source/control/roadmap \
+    svtools/source/control/ruler \
+    svtools/source/control/scriptedtext \
+    svtools/source/control/scrwin \
+    svtools/source/control/stdctrl \
+    svtools/source/control/stdmenu \
+    svtools/source/control/tabbar \
+    svtools/source/control/taskbar \
+    svtools/source/control/taskbox \
+    svtools/source/control/taskmisc \
+    svtools/source/control/taskstat \
+    svtools/source/control/toolbarmenu \
+    svtools/source/control/toolbarmenuacc \
+    svtools/source/control/urlcontrol \
+    svtools/source/control/valueacc \
+    svtools/source/control/valueset \
+    svtools/source/dialogs/addresstemplate \
+    svtools/source/dialogs/colctrl \
+    svtools/source/dialogs/colrdlg \
+    svtools/source/dialogs/filedlg \
+    svtools/source/dialogs/filedlg2 \
+    svtools/source/dialogs/insdlg \
+    svtools/source/dialogs/mcvmath \
+    svtools/source/dialogs/printdlg \
+    svtools/source/dialogs/prnsetup \
+    svtools/source/dialogs/property \
+    svtools/source/dialogs/roadmapwizard \
+    svtools/source/dialogs/wizardmachine \
+    svtools/source/dialogs/wizdlg \
+    svtools/source/edit/editsyntaxhighlighter \
     svtools/source/edit/svmedit \
     svtools/source/edit/svmedit2 \
-    svtools/source/edit/textundo \
-    svtools/source/edit/syntaxhighlight \
-    svtools/source/edit/textwindowpeer \
     svtools/source/edit/sychconv \
-    svtools/source/edit/xtextedt \
-    svtools/source/edit/txtattr \
+    svtools/source/edit/syntaxhighlight \
+    svtools/source/edit/textdata \
     svtools/source/edit/textdoc \
     svtools/source/edit/texteng \
-    svtools/source/edit/textdata \
-    svtools/source/edit/editsyntaxhighlighter \
+    svtools/source/edit/textundo \
     svtools/source/edit/textview \
-    svtools/source/urlobj/inetimg \
-    svtools/source/java/javainteractionhandler \
+    svtools/source/edit/textwindowpeer \
+    svtools/source/edit/txtattr \
+    svtools/source/edit/xtextedt \
+    svtools/source/filter.vcl/filter/FilterConfigCache \
+    svtools/source/filter.vcl/filter/FilterConfigItem \
+    svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
+    svtools/source/filter.vcl/filter/dlgejpg \
+    svtools/source/filter.vcl/filter/dlgepng \
+    svtools/source/filter.vcl/filter/dlgexpor \
+    svtools/source/filter.vcl/filter/filter \
+    svtools/source/filter.vcl/filter/filter2 \
+    svtools/source/filter.vcl/filter/fldll \
+    svtools/source/filter.vcl/filter/sgfbram \
+    svtools/source/filter.vcl/filter/sgvmain \
+    svtools/source/filter.vcl/filter/sgvspln \
+    svtools/source/filter.vcl/filter/sgvtext \
+    svtools/source/filter.vcl/igif/decode \
+    svtools/source/filter.vcl/igif/gifread \
+    svtools/source/filter.vcl/ixbm/xbmread \
+    svtools/source/filter.vcl/ixpm/xpmread \
+    svtools/source/filter.vcl/jpeg/jpeg \
+    svtools/source/filter.vcl/wmf/emfwr \
+    svtools/source/filter.vcl/wmf/enhwmf \
+    svtools/source/filter.vcl/wmf/winmtf \
+    svtools/source/filter.vcl/wmf/winwmf \
+    svtools/source/filter.vcl/wmf/wmf \
+    svtools/source/filter.vcl/wmf/wmfwr \
+    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 \
     svtools/source/java/javacontext \
-    svtools/source/svhtml/htmlout \
-    svtools/source/svhtml/htmlsupp \
-    svtools/source/svhtml/parhtml \
-    svtools/source/svhtml/htmlkywd \
-    svtools/source/config/itemholder2 \
-    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 \
-    svtools/source/config/extcolorcfg \
-    svtools/source/config/colorcfg \
-    svtools/source/config/fontsubstconfig \
-    svtools/source/config/apearcfg \
+    svtools/source/java/javainteractionhandler \
     svtools/source/misc/acceleratorexecute \
     svtools/source/misc/chartprettypainter \
     svtools/source/misc/cliplistener \
@@ -136,137 +234,60 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/misc/svtaccessiblefactory \
     svtools/source/misc/svtdata \
     svtools/source/misc/templatefoldercache \
-    svtools/source/misc/transfer2 \
     svtools/source/misc/transfer \
+    svtools/source/misc/transfer2 \
     svtools/source/misc/unitconv \
     svtools/source/misc/wallitem \
+    svtools/source/misc/xwindowitem \
     svtools/source/plugapp/ttprops \
-    svtools/source/control/ctrlbox \
-    svtools/source/control/valueacc \
-    svtools/source/control/valueset \
-    svtools/source/control/taskbar \
-    svtools/source/control/urlcontrol \
-    svtools/source/control/scriptedtext \
-    svtools/source/control/headbar \
-    svtools/source/control/fileurlbox \
-    svtools/source/control/fmtfield \
-    svtools/source/control/collatorres \
-    svtools/source/control/indexentryres \
-    svtools/source/control/filectrl \
-    svtools/source/control/scrwin \
-    svtools/source/control/taskbox \
-    svtools/source/control/hyperlabel \
-    svtools/source/control/filectrl2 \
-    svtools/source/control/fixedhyper \
-    svtools/source/control/taskstat \
-    svtools/source/control/inettbc \
-    svtools/source/control/calendar \
-    svtools/source/control/roadmap \
-    svtools/source/control/ctrltool \
-    svtools/source/control/asynclink \
-    svtools/source/control/stdctrl \
-    svtools/source/control/ctrldll \
-    svtools/source/control/tabbar \
-    svtools/source/control/ruler \
-    svtools/source/control/stdmenu \
-    svtools/source/control/prgsbar \
-    svtools/source/control/taskmisc \
-    svtools/source/dialogs/insdlg \
-    svtools/source/dialogs/roadmapwizard \
-    svtools/source/dialogs/mcvmath \
-    svtools/source/dialogs/logindlg \
-    svtools/source/dialogs/wizdlg \
-    svtools/source/dialogs/addresstemplate \
-    svtools/source/dialogs/printdlg \
-    svtools/source/dialogs/filedlg2 \
-    svtools/source/dialogs/colctrl \
-    svtools/source/dialogs/colrdlg \
-    svtools/source/dialogs/wizardmachine \
-    svtools/source/dialogs/prnsetup \
-    svtools/source/dialogs/filedlg \
-    svtools/source/dialogs/property \
-    svtools/source/table/tablecontrol \
-    svtools/source/table/tablegeometry \
-    svtools/source/table/gridtablerenderer \
-    svtools/source/table/tabledatawindow \
+    svtools/source/svhtml/htmlkywd \
+    svtools/source/svhtml/htmlout \
+    svtools/source/svhtml/htmlsupp \
+    svtools/source/svhtml/parhtml \
+    svtools/source/svrtf/parrtf \
+    svtools/source/svrtf/rtfkeywd \
+    svtools/source/svrtf/rtfout \
+    svtools/source/svrtf/svparser \
     svtools/source/table/defaultinputhandler \
+    svtools/source/table/gridtablerenderer \
+    svtools/source/table/tablecontrol \
     svtools/source/table/tablecontrol_impl \
-    svtools/source/contnr/svlbox \
-    svtools/source/contnr/svtabbx \
-    svtools/source/contnr/ivctrl \
-    svtools/source/contnr/templwin \
-    svtools/source/contnr/svicnvw \
-    svtools/source/contnr/contentenumeration \
-    svtools/source/contnr/svimpbox \
-    svtools/source/contnr/imivctl1 \
-    svtools/source/contnr/svtreebx \
-    svtools/source/contnr/fileview \
-    svtools/source/contnr/svimpicn \
-    svtools/source/contnr/svlbitm \
-    svtools/source/contnr/ctrdll \
-    svtools/source/contnr/tooltiplbox \
-    svtools/source/contnr/treelist \
-    svtools/source/contnr/imivctl2 \
-    svtools/source/uno/unoiface \
-    svtools/source/uno/genericunodialog \
-    svtools/source/uno/unocontroltablemodel \
+    svtools/source/table/tabledatawindow \
+    svtools/source/table/tablegeometry \
+    svtools/source/toolpanel/drawerlayouter \
+    svtools/source/toolpanel/dummypanel \
+    svtools/source/toolpanel/paneldecklisteners \
+    svtools/source/toolpanel/paneltabbar \
+    svtools/source/toolpanel/paneltabbarpeer \
+    svtools/source/toolpanel/refbase \
+    svtools/source/toolpanel/tabbargeometry \
+    svtools/source/toolpanel/tablayouter \
+    svtools/source/toolpanel/toolpanel \
+    svtools/source/toolpanel/toolpanelcollection \
+    svtools/source/toolpanel/toolpaneldeck \
+    svtools/source/toolpanel/toolpaneldeckpeer \
+    svtools/source/toolpanel/toolpaneldrawer \
+    svtools/source/toolpanel/toolpaneldrawerpeer \
+    svtools/source/uno/addrtempuno \
     svtools/source/uno/contextmenuhelper \
-    svtools/source/uno/toolboxcontroller \
+    svtools/source/uno/framestatuslistener \
     svtools/source/uno/generictoolboxcontroller \
-    svtools/source/uno/addrtempuno \
+    svtools/source/uno/genericunodialog \
     svtools/source/uno/miscservices \
+    svtools/source/uno/popupmenucontrollerbase \
+    svtools/source/uno/popupwindowcontroller \
     svtools/source/uno/statusbarcontroller \
     svtools/source/uno/svtxgridcontrol \
-    svtools/source/uno/unoimap \
-    svtools/source/uno/unoevent \
+    svtools/source/uno/toolboxcontroller \
     svtools/source/uno/treecontrolpeer \
-    svtools/source/uno/framestatuslistener \
-    svtools/source/brwbox/editbrowsebox \
-    svtools/source/brwbox/brwhead \
-    svtools/source/brwbox/brwbox3 \
-    svtools/source/brwbox/brwbox1 \
-    svtools/source/brwbox/ebbcontrols \
-    svtools/source/brwbox/brwbox2 \
-    svtools/source/brwbox/datwin \
-    svtools/source/brwbox/editbrowsebox2 \
-    svtools/source/svrtf/rtfkeywd \
-    svtools/source/svrtf/svparser \
-    svtools/source/svrtf/parrtf \
-    svtools/source/svrtf/rtfout \
-    svtools/source/filter.vcl/filter/dlgepng \
-    svtools/source/filter.vcl/filter/filter2 \
-    svtools/source/filter.vcl/filter/FilterConfigItem \
-    svtools/source/filter.vcl/filter/sgvspln \
-    svtools/source/filter.vcl/filter/filter \
-    svtools/source/filter.vcl/filter/sgvtext \
-    svtools/source/filter.vcl/filter/sgfbram \
-    svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
-    svtools/source/filter.vcl/filter/dlgexpor \
-    svtools/source/filter.vcl/filter/fldll \
-    svtools/source/filter.vcl/filter/sgvmain \
-    svtools/source/filter.vcl/filter/FilterConfigCache \
-    svtools/source/filter.vcl/filter/dlgejpg \
-    svtools/source/filter.vcl/wmf/winwmf \
-    svtools/source/filter.vcl/wmf/winmtf \
-    svtools/source/filter.vcl/wmf/emfwr \
-    svtools/source/filter.vcl/wmf/wmf \
-    svtools/source/filter.vcl/wmf/enhwmf \
-    svtools/source/filter.vcl/wmf/wmfwr \
-    svtools/source/filter.vcl/igif/decode \
-    svtools/source/filter.vcl/igif/gifread \
-    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 \
+    svtools/source/uno/unocontroltablemodel \
+    svtools/source/uno/unoevent \
+    svtools/source/uno/unoiface \
+    svtools/source/uno/unoimap \
+    svtools/source/uno/wizard/unowizard \
+    svtools/source/uno/wizard/wizardpagecontroller \
+    svtools/source/uno/wizard/wizardshell \
+    svtools/source/urlobj/inetimg \
 ))
 
 $(eval $(call gb_Library_add_cobjects,svt,\