4111 files changed, 42446 insertions, 53884 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index d48817b51a6c..c1909a807863 100755
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -39,7 +39,7 @@ PACKAGE	= org$/openoffice$/java$/accessibility
 .INCLUDE :  settings.mk
 
 JAVADIR = $(OUT)$/misc$/java
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
 JAVAFILES = \
     logging$/XAccessibleEventLog.java \
     logging$/XAccessibleHypertextLog.java \
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 847c8ad2f0af..5f264b388fda 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -32,7 +32,7 @@
 #define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/textdata.hxx>
 #include <svtools/texteng.hxx>
 #include <svtools/textview.hxx>
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index cd30f3452a30..f410ece56d9b 100755
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -14,4 +14,5 @@ ac accessibility\workben\org\openoffice\accessibility\misc          nmake   -
 ac accessibility\workben\org\openoffice\accessibility\awb\canvas    nmake   -   all ac_awb_canvas ac_awb_tree NULL
 ac accessibility\workben\org\openoffice\accessibility\awb\tree      nmake   -   all ac_awb_tree ac_awb_misc NULL
 ac accessibility\workben\org\openoffice\accessibility\awb\view      nmake   -   all ac_awb_view ac_awb_view_text NULL
-ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake   -   all ac_awb_view_text NULL
+# dependency on ac_awb_misc to avoid concurrent creation of java_ver.mk
+ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake   -   all ac_awb_view_text ac_awb_misc NULL
diff --git a/accessibility/workben/makefile.in b/accessibility/workben/makefile.in
index ad97448e7780..d81df5fb7363 100644
--- a/accessibility/workben/makefile.in
+++ b/accessibility/workben/makefile.in
@@ -11,7 +11,6 @@ CLASS_FILES = $(patsubst %.java, %.class, $(JAVAFILES))
 CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
 		$(PATH_SEPARATOR)$(OUT_COMP_JAVA)\
 		$(PATH_SEPARATOR).\
diff --git a/accessibility/workben/makefile.mk b/accessibility/workben/makefile.mk
index 33c1e2a0ef5e..7f19d8936757 100644
--- a/accessibility/workben/makefile.mk
+++ b/accessibility/workben/makefile.mk
@@ -15,7 +15,6 @@ JAR_PATH = $(SOLARBINDIR)$/
 
 JAR_FILES =		\
     unoil.jar	\
-    sandbox.jar	\
     ridl.jar	\
     jurt.jar	\
     juh.jar		\
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
index 3b7262a8489d..5bb567414220 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 		\
 	CanvasShape.java  	\
 	Canvas.java        	\
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
index eb744d465cfb..032a75b16d04 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
+++ b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
@@ -68,7 +68,7 @@ USE_JAVAVER:=TRUE
 .INCLUDE :  settings.mk
 
 .IF "$(JAVAVER:s/.//)" >= "140" 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 
 .INCLUDE : makefile.common
 
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/manifest b/accessibility/workben/org/openoffice/accessibility/awb/manifest
index 951f9ec3128f..36111c54081d 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/manifest
+++ b/accessibility/workben/org/openoffice/accessibility/awb/manifest
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: org.openoffice.accessibility.awb.AccessibilityWorkBench
-Class-Path: classes.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
+Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
index 7a0813b099db..6b32a5db09a8 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 						\
 	AccessibilityModel.java \
 	AccessibilityNode.java \
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
index d4929e3f1cd8..4f5f99ed0cf1 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 						\
 	ComponentView.java				\
 	ContextView.java				\
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
index 32655a0c6a6f..e3303bb6890f 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 					\
 	CaretSpinnerModel.java		\
 	TextActionDialog.java		\
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
index d06336e12c56..f2462a88f841 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
+JARFILES = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
 JAVAFILES = 					\
 	AccessibleEventMulticaster.java \
 	InformationWriter.java  \
diff --git a/agg/prj/build.lst b/agg/prj/build.lst
index d1456c605f32..57a09328f82a 100755
--- a/agg/prj/build.lst
+++ b/agg/prj/build.lst
@@ -1,4 +1,4 @@
-ag	agg	:	sal xml2cmp soltools NULL
+ag      agg     :       soltools stlport NULL
 ag	agg										usr1	-	all	ag_mkout NULL
 ag	agg\inc									get		-	all	ag_inc NULL
 ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst
index 0a9f79b5ffd7..c509ce0336dd 100644
--- a/apache-commons/prj/build.lst
+++ b/apache-commons/prj/build.lst
@@ -1,4 +1,4 @@
-ac	apache-commons	:	solenv TOMCAT:tomcat NULL
+ac      apache-commons  :       solenv TOMCAT:tomcat NULL
 ac	apache-commons								usr1	-	all	ac_mkout 							NULL
 ac	apache-commons\java\codec					nmake	-	all	ac_codec								NULL
 ac	apache-commons\java\lang					nmake	-	all	ac_lang									NULL
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 2a7b702e38cb..3804ad3048e5 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -31,7 +31,7 @@
 #ifndef _COMMUNI_HXX
 #define _COMMUNI_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vos/thread.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/timer.hxx>
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index 0ab2b48d3579..55048d05cbb0 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -58,7 +58,7 @@
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 
 #include "editwin.hxx"
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 8888a007918c..a8abce528746 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -30,9 +30,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_automation.hxx"
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include "scmdstrm.hxx"
 #include "svcommstream.hxx"
 #include "rcontrol.hxx"
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 988f4055a2eb..890e6ace540d 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -55,7 +55,7 @@
 #if 1
 #include <svtools/ttprops.hxx>
 #include <basic/ttstrhlp.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/stringtransfer.hxx>
 #include <vcl/sound.hxx>
 #include "testtool.hrc"
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 65be45907b90..1477220d5953 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -85,7 +85,7 @@
 #include <vcl/wintypes.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/roadmap.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/extensionlistbox.hxx>
 // Hat keinen Includeschutz
 #include <svtools/svtdata.hxx>
@@ -102,14 +102,14 @@
 //#include <vcl/drag.hxx>
 #endif
 #include <tools/fsys.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/ttprops.hxx>
 #ifndef _BASIC_TTRESHLP_HXX
 #include <basic/ttstrhlp.hxx>
 #endif
 #include <basic/dispdefs.hxx>
 #include <vos/socket.hxx>
-#include <svtools/pickerhistory.hxx>
+#include <svl/pickerhistory.hxx>
 #include <com/sun/star/util/XCancellable.hpp>
 
 #include <sot/storage.hxx>
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index 79a811fdaee7..e72c92c3b8e1 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -84,9 +84,9 @@ $(INCCOM)$/r_cmds.hxx :   ..$/inc$/rcontrol.hxx \
                           $(MISC)$/xfilter.pl
     $(PERL) $(MISC)$/xfilter.pl ..$/inc  rcontrol.hxx  $(INCCOM)$/r_cmds  RC_
 
-$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/vcl$/wintypes.hxx \
+$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/wintypes.hxx \
                           $(MISC)$/xfilter.pl
-    $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)  vcl$/wintypes.hxx  $(INCCOM)$/res_type  WINDOW_
+    $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)  tools$/wintypes.hxx  $(INCCOM)$/res_type  WINDOW_
 
 
 
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index d3937963c155..76e297c3de8a 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::devtools;
 #include <vcl/svapp.hxx>
 #endif
 #include <svtools/stringtransfer.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 //#ifndef _SBXCLASS_HXX //autogen
 #include <basic/sbx.hxx>
 //#endif
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index 4863f1fd428c..f31d397a7a00 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -30,7 +30,7 @@
 
 #include <automation/communi.hxx>
 #include <tools/link.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include <vos/thread.hxx>
 
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 31aa6e9d597c..b341a8f61998 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/rtti.hxx>
 #ifndef _POOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #endif
 #include <com/sun/star/media/ZoomLevel.hpp>
 
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index f9a52d584ea0..e7e1e0df2d1c 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -31,7 +31,7 @@
 #ifndef _AVMEDIA_MEDIATOOLBOX_HXX
 #define _AVMEDIA_MEDIATOOLBOX_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 
 namespace avmedia
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 4d3d229826d5..2e51b0500441 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -31,7 +31,7 @@
 #ifndef _AVMEDIA_HELPIDS_HRC
 #define _AVMEDIA_HELPIDS_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define HID_AVMEDIA_TOOLBOXITEM_PLAY    (HID_AVMEDIA_START+0)
 #define HID_AVMEDIA_TOOLBOXITEM_PAUSE   (HID_AVMEDIA_START+1)
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 9ed28adc7067..e5ecac180b6c 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -37,7 +37,7 @@
 #include <tools/time.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <math.h>
 #include <algorithm>
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index df1ddeb6237c..367ad725fa9a 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include <tools/resmgr.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 
 namespace avmedia {
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 52c8cf61b103..6c2ea64f1fcc 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -35,7 +35,7 @@
 #include "mediacontrol.hrc"
 #include "helpids.hrc"
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/bindings.hxx>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index b445aa87d62e..f207713ac47a 100644
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -51,7 +51,7 @@ JAVAFILES  = \
     FrameGrabber.java       \
     x11$/SystemWindowAdapter.java   
 
-JARFILES        = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
+JARFILES        = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
 JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
 
 JARTARGET               = $(TARGET).jar
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 5a3376c0ce65..4cf91bd3d199 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -36,7 +36,7 @@
 #include "mediawindow.hrc"
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0ff13c806a07..00356d2bc5c4 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index e975d6464194..be1612ea7429 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -77,19 +77,19 @@
 #include "vcl/svapp.hxx"
 #include "vcl/scrbar.hxx"
 
-#include "svtools/svarray.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/svarray.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/stritem.hxx"
+#include "svl/whiter.hxx"
 #include "svtools/langtab.hxx"
 #include "svtools/texteng.hxx"
 #include "svtools/textview.hxx"
 #include "svtools/xtextedt.hxx"
 #include "svtools/txtattr.hxx"
 #include "svtools/textwindowpeer.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 
 #define _BASIC_TEXTPORTIONS
 #include "basic/sbdef.hxx"
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index bb9cd1172af9..d2b3cb602ab8 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "6706E0E7-FB05-101B-804c-04021c007002"
 "6806E0E7-FB05-101B-804c-04021c007002"
@@ -37,10 +35,14 @@ BasicIDE
 [
 HelpText( "BasicIDE" )
 SlotIdFile( "basslots.hrc" )
-TypeLibFile( "basslots.tlb" )
 ]
 {
     //=========================================================================
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
 
     include "baside.sdi"
 
diff --git a/basctl/sdi/makefile.mk b/basctl/sdi/makefile.mk
index d94921bf9ae2..2244eafcd654 100644
--- a/basctl/sdi/makefile.mk
+++ b/basctl/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,11 @@ SDI1EXPORT=basctl
 # --- Files --------------------------------------------------------
 
 SVSDI1DEPEND= \
-    $(SOLARINCXDIR)$/svxslots.ilb \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
     baside.sdi
 
 # --- Targets -------------------------------------------------------
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index e21a0c9d09c6..25f47c980c5d 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -32,7 +32,7 @@
 #define _BASICBOX_HXX
 
 #include "doceventnotifier.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svheader.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 030fa5e68e26..e23cd68a75af 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1430,7 +1430,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
     m_aSyntaxColors[TT_UNKNOWN] = aColor;
     m_aSyntaxColors[TT_WHITESPACE] = aColor;
     m_aSyntaxColors[TT_EOL] = aColor;
-    StartListening(m_aColorConfig);
+    m_aColorConfig.AddListener(this);
     m_aSyntaxColors[TT_IDENTIFIER]
         = Color(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).nColor);
     m_aSyntaxColors[TT_NUMBER]
@@ -1458,7 +1458,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
 
 ModulWindowLayout::~ModulWindowLayout()
 {
-    EndListening(m_aColorConfig);
+    m_aColorConfig.RemoveListener(this);
 }
 
 void __EXPORT ModulWindowLayout::Resize()
@@ -1602,7 +1602,7 @@ void ModulWindowLayout::DockaWindow( DockingWindow* pDockingWindow )
         // evtl. Sonderbehandlung...
         ArrangeWindows();
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         DBG_ERROR( "Wer will sich denn hier andocken ?" );
 #endif
@@ -1652,13 +1652,8 @@ void ModulWindowLayout::DataChanged(DataChangedEvent const & rDCEvt)
 }
 
 // virtual
-void ModulWindowLayout::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
+void ModulWindowLayout::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    (void)rBc;
-
-    if (rHint.ISA(SfxSimpleHint)
-        && (static_cast< SfxSimpleHint const & >(rHint).GetId()
-            == SFX_HINT_COLORS_CHANGED))
     {
         Color aColor(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).
                      nColor);
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 7c9fd764cef0..0c575229411e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -48,7 +48,7 @@ class SvxSearchItem;
 #endif
 #include <basic/sbmod.hxx>
 #include <vcl/split.hxx>
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include <svtools/colorcfg.hxx>
 
 #include <sfx2/progress.hxx>
@@ -58,6 +58,10 @@ DBG_NAMEEX( ModulWindow )
 
 #define MARKER_NOMARKER 0xFFFF
 
+namespace utl
+{
+    class SourceViewConfig;
+}
 
 // #108672 Helper functions to get/set text in TextEngine
 // using the stream interface (get/setText() only supports
@@ -108,13 +112,13 @@ namespace svt {
 class SourceViewConfig;
 }
 
-class EditorWindow : public Window, public SfxListener
+class EditorWindow : public Window, public SfxListener, public utl::ConfigurationListener
 {
 private:
     ExtTextView*    pEditView;
     ExtTextEngine*  pEditEngine;
 
-    svt::SourceViewConfig* pSourceViewConfig;
+    utl::SourceViewConfig* pSourceViewConfig;
 
     long            nCurTextWidth;
 
@@ -151,6 +155,7 @@ protected:
     virtual void    Command( const CommandEvent& rCEvt );
     virtual void    LoseFocus();
     virtual void    RequestHelp( const HelpEvent& rHEvt );
+    virtual void    ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     void            DoSyntaxHighlight( ULONG nPara );
     String          GetWordAtCursor();
@@ -442,7 +447,7 @@ public:
     void                    SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; }
 };
 
-class ModulWindowLayout: public Window, public SfxListener
+class ModulWindowLayout: public Window, public utl::ConfigurationListener
 {
 private:
 
@@ -465,8 +470,7 @@ private:
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
-    using Window::Notify;
-    virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint);
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     void updateSyntaxHighlighting();
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 644bd85bcb4d..66065d77f71e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_basctl.hxx"
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #define _BASIC_TEXTPORTIONS
 #include <basic/sbdef.hxx>
 #include <ide_pch.hxx>
@@ -40,7 +40,7 @@
 
 #include <tools/urlobj.hxx>
 #include <unotools/charclass.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <basic/sbx.hxx>
 #include <vcl/sound.hxx>
 #include <svtools/xtextedt.hxx>
@@ -62,7 +62,7 @@
 //#ifndef _SFX_HELP_HXX //autogen
 //#include <sfx2/sfxhelp.hxx>
 //#endif
-#include <svtools/sourceviewconfig.hxx>
+#include <unotools/sourceviewconfig.hxx>
 
 #ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
 #include <com/sun/star/script/XLibraryContainer2.hpp>
@@ -172,7 +172,7 @@ EditorWindow::EditorWindow( Window* pParent ) :
     pModulWindow = 0;
     pEditView = 0;
     pEditEngine = 0;
-    pSourceViewConfig = new svt::SourceViewConfig;
+    pSourceViewConfig = new utl::SourceViewConfig;
     bHighlightning = FALSE;
     pProgress = 0;
     nCurTextWidth = 0;
@@ -181,15 +181,14 @@ EditorWindow::EditorWindow( Window* pParent ) :
     SetPointer( Pointer( POINTER_TEXT ) );
 
     SetHelpId( HID_BASICIDE_EDITORWINDOW );
-
-    StartListening( *pSourceViewConfig );
+    pSourceViewConfig->AddListener(this);
 }
 
 
 
 __EXPORT EditorWindow::~EditorWindow()
 {
-    EndListening( *pSourceViewConfig );
+    pSourceViewConfig->RemoveListener(this);
     delete pSourceViewConfig;
 
     aSyntaxIdleTimer.Stop();
@@ -662,7 +661,7 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
     }
 }
 
-void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if ( rHint.ISA( TextHint ) )
     {
@@ -718,10 +717,11 @@ void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             DoDelayedSyntaxHighlight( rTextHint.GetValue() );
         }
     }
-    else if ( &rBC == pSourceViewConfig )
-    {
-        ImplSetFont();
-    }
+}
+
+void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
+{
+    ImplSetFont();
 }
 
 void EditorWindow::SetScrollBarRanges()
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index b821c7ca51c6..044c61d5cc21 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -36,7 +36,7 @@
 #define GLOBALOVERFLOW2
 #include <basic/sbx.hxx>
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <ide_pch.hxx>
 
 #define _SOLAR__PRIVATE 1
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e6b147cc46c8..2d2e0f6a5693 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -52,7 +52,7 @@
 
 #define _SOLAR__PRIVATE 1
 #include <basic/sbx.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #include <tools/diagnose_ex.h>
 #include <basidesh.hrc>
 #include <basidesh.hxx>
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index e4abb3fad92e..f7ddd62e144a 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -36,7 +36,7 @@
 #include <vector>
 #include <algorithm>
 #include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <basobj.hxx>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 8ef06af7dc25..a1887e0ea7a0 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -36,7 +36,7 @@
 #include <vector>
 #include <algorithm>
 #include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index d10bdbc0e7f2..ce96ca3892a9 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -37,7 +37,7 @@
 
 #define _SVICNVW_HXX
 #include <svtools/svtreebx.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <basic/sbstar.hxx>
 #include <sbxitem.hxx>
 #include "basobj.hxx"
diff --git a/basctl/source/basicide/brkdlg.hrc b/basctl/source/basicide/brkdlg.hrc
index aaf243b5475a..1fcfc9286cff 100644
--- a/basctl/source/basicide/brkdlg.hrc
+++ b/basctl/source/basicide/brkdlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _BRKDLG_HRC
 #define _BRKDLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_BASICIDE_BREAKPOINTDLG      ( RID_BASICIDE_START + 80 )
 
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index 4029e45fe082..9f294b87577d 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -33,11 +33,11 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/menu.hxx>
 
-#include <svtools/svarray.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/svarray.hxx>
+#include <svl/itemset.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
 
 #define _BASIC_TEXTPORTIONS
 #include <basic/sbdef.hxx>
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index cf8ed498d474..5f2ed2301758 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/genlink.hxx>
 
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
 #include <iderid.hxx>
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
index 6702af8febab..23005cddd294 100644
--- a/basctl/source/basicide/macrodlg.hrc
+++ b/basctl/source/basicide/macrodlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _MACRODLG_HRC
 #define _MACRODLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_MACROCHOOSER                ( RID_BASICIDE_START + 50 )
 #define RID_STR_BTNDEL                  ( RID_BASICIDE_START + 51 )
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index f0143cc8517b..ea5f7cec9878 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -72,7 +72,7 @@
 #include "com/sun/star/ucb/XCommandEnvironment.hpp"
 #include <com/sun/star/ucb/NameClash.hpp>
 #include "com/sun/star/packages/manifest/XManifestWriter.hpp"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/util/VetoException.hpp>
diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc
index 88f167167d42..755e382cf618 100644
--- a/basctl/source/basicide/moduldlg.hrc
+++ b/basctl/source/basicide/moduldlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _MODULDLG_HRC
 #define _MODULDLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_STR_LIB             1
 #define RID_TRLBOX              2
diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc
index a03a90c2d59a..ca1e43e080fb 100644
--- a/basctl/source/basicide/moptions.hrc
+++ b/basctl/source/basicide/moptions.hrc
@@ -30,7 +30,7 @@
 #ifndef _MOPTIONS_HRC
 #define _MOPTIONS_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_MACROOPTIONS        ( RID_BASICIDE_START + 55 )
 
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 7004541ea465..490a38a5c8fd 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _OBJDLG_HRC
 #define _OBJDLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_BASICIDE_OBJCAT     ( RID_BASICIDE_START + 70 )
 #define RID_FT_MACRODESCR   8
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index b9ffe708e6fa..a87ad521c2f5 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -70,7 +70,7 @@
 
 #include <xmlscript/xmldlg_imexp.hxx>
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include <unotools/collatorwrapper.hxx>
 
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 3ebc749c30aa..bac7e8854cf6 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -42,7 +42,7 @@
 #include <tbxctl.hrc>
 #include <idetemp.hxx>
 #include <sfx2/imagemgr.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/toolbox.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc
index 1811614d9d37..b26570b5b8bf 100644
--- a/basctl/source/basicide/tbxctl.hrc
+++ b/basctl/source/basicide/tbxctl.hrc
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_TBXCONTROLS         ( RID_BASICIDE_START + 65 )
 #define RID_TOOLBOX             ( RID_BASICIDE_START + 66 )
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 6d1080ed659b..423ef39079a0 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -46,7 +46,7 @@
 #include <iderdll.hxx>
 #include <vcl/scrbar.hxx>
 #include <tools/shl.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 8552f9f09e10..db446d479ead 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -37,7 +37,7 @@
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <vector>
 
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 45eace9f6137..4c361d4545f5 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -36,7 +36,7 @@
 #endif
 
 #include <bastypes.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index c917de5a6dee..a2911dcccb8f 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -32,7 +32,7 @@
 
 #include "scriptdocument.hxx"
 #include <tools/string.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
 #include <com/sun/star/io/XInputStreamProvider.hpp>
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 908331b0ad63..9a75e80a53e2 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -38,8 +38,8 @@
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <vcl/timer.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/hint.hxx>
+#include <svl/brdcst.hxx>
 
 #define DLGED_PAGE_WIDTH_MIN    1280
 #define DLGED_PAGE_HEIGHT_MIN   1024
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index 928434749862..b92be11b286f 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -33,7 +33,7 @@
 
 // include     -----------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Dialog Control Id's -----------------------------------------------------------
 
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 8e3fa615d960..f9be90b38b4b 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -37,8 +37,8 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <comphelper/composedprops.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/childwin.hxx>
 #include <svx/svdmark.hxx>
 
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 654e283128fb..b1192b51d9bf 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -31,7 +31,7 @@
 #define _SBXITEM_HXX
 
 #include "scriptdocument.hxx"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 const USHORT BASICIDE_TYPE_UNKNOWN  =   0;
 const USHORT BASICIDE_TYPE_SHELL    =   1;
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 15d2da39851a..d4d836a4b553 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index afadcad3b3fb..1b9e4ca0c68f 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 33ed58c25402..978c4bbe6243 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 2172b0b667a7..41da8cac617a 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index fcc4e5df5fa3..ba25cfa9044e 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 1a424864f893..b78175128eba 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 3ea13868aeb4..f7a5dded4cf1 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ CFLAGS += -fno-inline
 
 # SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
 # if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS" 
+.IF "$(OS)"=="SOLARIS"
 # For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
 .IF "$(CCNUMVER)"!="00050005"
 CDEFS+=-xalias_level=compatible
@@ -68,7 +68,7 @@ CDEFS+=-xalias_level=compatible
 .IF "$(L10N_framework)"==""
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:tests by codegen.pl 
+# auto generated Target:tests by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/basictest.obj		\
     $(SLO)$/bmpmasktest.obj		\
@@ -88,13 +88,14 @@ SHL1OBJS=  \
 # source/makefile.mk
 SHL1TARGET= tests
 SHL1STDLIBS= 	$(SALLIB)		 \
+                                $(TESTSHL2LIB)\
                 $(CPPUNITLIB)	 \
-                $(BASEGFXLIB)	
+                $(BASEGFXLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map 
+SHL1VERSIONMAP = export.map
 .ENDIF
 # END ------------------------------------------------------------------
 
@@ -111,7 +112,7 @@ SHL1VERSIONMAP = export.map
 #			$(CPPUHELPERLIB)	\
 #			$(UCBHELPERLIB)		\
 #			$(SALLIB)			\
-#			$(VCLLIB)	
+#			$(VCLLIB)
 #
 #.IF "$(GUI)"!="UNX"
 #APP2DEF=	$(MISC)$/$(TARGET).def
@@ -119,12 +120,12 @@ SHL1VERSIONMAP = export.map
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS) 
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk 
+.INCLUDE : _cppunit.mk
 
 # --- Enable test execution in normal build ------------------------
 .IF "$(L10N_framework)"==""
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 61f329f094f2..94e5bc42a5ea 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index e35c8c834bd9..da118e4b6d8a 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index f058b0034fa7..454ed23289b2 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace basegfx1d
 {
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 4f0305df953f..ab6715467dba 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index fc59ffbced4e..f0fe463ce23d 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace basegfx3d
 {
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 1bd4d59b98d5..da61c60f9308 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ SHL1OBJS=  \
     $(SLO)$/basegfx1d.obj \
     $(SLO)$/basegfx2d.obj \
     $(SLO)$/basegfx3d.obj \
-    $(SLO)$/testtools.obj	
+    $(SLO)$/testtools.obj
 
 # linking statically against basegfx parts
 SHL1LIBS=\
@@ -66,23 +66,24 @@ SHL1STDLIBS= \
                 $(SALLIB)        \
                 $(CPPUHELPERLIB) \
                         $(CPPULIB)       \
+                                $(TESTSHL2LIB) \
                 $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map 
+SHL1VERSIONMAP = export.map
 
 # END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS) 
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk 
+.INCLUDE : _cppunit.mk
 
 # --- Enable testshl2 execution in normal build ------------------------
 
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 159bd6f78de9..29f2d7ebc25c 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -32,7 +32,7 @@
 #define _BASMGR_HXX
 
 #include <tools/string.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <basic/sbstar.hxx>
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index dbb6e703b0c6..f15391e227d1 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -32,7 +32,7 @@
 #define _SB_SBDEF_HXX
 
 #include <basic/sbxdef.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #define _BASIC_TEXTPORTIONS
 
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index ce2e992da854..87aacbcab44f 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -32,9 +32,9 @@
 #define _SBXCLASS_HXX
 
 #include "tools/ref.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/svarray.hxx"
+#include "svl/smplhint.hxx"
+#include "svl/lstner.hxx"
 #include <basic/sbxdef.hxx>
 #include <basic/sbxform.hxx>
 
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index dc7707cce57d..c8cd59ba320f 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -33,7 +33,7 @@
 
 #include <i18npool/lang.h>
 #include "tools/list.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 #include <basic/sbxdef.hxx>
 
 class SbxFactory;
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 6a62f4a52978..bd3bb8333b54 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -31,7 +31,7 @@
 #ifndef _SBX_SBXOBJECT_HXX
 #define _SBX_SBXOBJECT_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <basic/sbxvar.hxx>
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 1cdb42fd042c..64645e05ba55 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -30,7 +30,7 @@
 #ifndef _BASIC_TESTTOOL_HXX_
 #define _BASIC_TESTTOOL_HXX_
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/string.hxx>
 
 #define TESTTOOL_DEFAULT_PORT 12479
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 32b4fd480afb..f1c120b2618f 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -173,35 +173,35 @@
 #include "sot/storage.hxx"
 #include "sot/storinfo.hxx"
 
-#include "svtools/brdcst.hxx"
+#include "svl/brdcst.hxx"
 #include "svtools/ctrlbox.hxx"
 #include "svtools/ctrltool.hxx"
 #include "svtools/ehdl.hxx"
 #include "svtools/filedlg.hxx"
-#include "svtools/hint.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/pathoptions.hxx"
+#include "svl/hint.hxx"
+#include "svl/lstner.hxx"
+#include "unotools/pathoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/solar.hrc"
+#include "svl/smplhint.hxx"
+#include "svl/solar.hrc"
 #include "svtools/stringtransfer.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svdde.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svdde.hxx"
 #include "svtools/svmedit.hxx"
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include "svtools/svtdata.hxx"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 #include "svtools/svtreebx.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
 #include "svtools/taskbar.hxx"
 #include "svtools/textdata.hxx"
 #include "svtools/texteng.hxx"
 #include "svtools/textview.hxx"
 #include "svtools/transfer.hxx"
 #include "svtools/txtattr.hxx"
-#include "svtools/undo.hxx"
-#include "svtools/zforlist.hxx"
-#include "svtools/zformat.hxx"
+#include "svl/undo.hxx"
+#include "svl/zforlist.hxx"
+#include "svl/zformat.hxx"
 
 
 #include "tools/color.hxx"
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index 6275ad19c996..89db04cef511 100644
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
@@ -31,7 +31,7 @@
 #ifndef _SB_HRC
 #define _SB_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #ifndef IDS_SBERR_START
  #define IDS_SBERR_START RID_BASIC_START
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 4743b8c0ddca..31385f2f6e9e 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -80,7 +80,7 @@
 #include <com/sun/star/ucb/XContentProviderManager.hpp>
 
 #include <ucbhelper/content.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 using namespace comphelper;
 using namespace cppu;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index 4fc9e9cb9c07..68b3db186785 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -42,8 +42,8 @@
 #include <vcl/wrkwin.hxx>
 #endif
 #include <vcl/timer.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 
 class BasicFrame;
 #include <basic/mybasic.hxx>
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index a9b7b1d03b77..31e4192e5965 100644
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -34,7 +34,7 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/textview.hxx>
 #include <svtools/texteng.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 #ifndef _BASIC_TTRESHLP_HXX
 #include <basic/ttstrhlp.hxx>
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 8c4df4186f41..00eba2fbac6c 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -60,13 +60,13 @@
 #include <svtools/stringtransfer.hxx>
 #include <vcl/splitwin.hxx>
 #ifndef _ZFORLIST_HXX //autogen
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #endif
 #include <svtools/ctrltool.hxx>
 
 // Ohne Includeschutz
 #include <svtools/svtdata.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 
 #include <basic/dispdefs.hxx>
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 7d0755d39aa6..544d7c9f4d4d 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -48,7 +48,7 @@ Version 3           Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
 #endif
 #include <tools/fsys.hxx>
 #include <svtools/stringtransfer.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #ifndef _BASIC_TTRESHLP_HXX
 #include <basic/ttstrhlp.hxx>
 #endif
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 1598d4867140..5caf90d738d7 100644
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -40,7 +40,7 @@ class BreakpointWindow;
 #include <vcl/timer.hxx>
 #include <tools/table.hxx>
 #include <tools/debug.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/svmedit.hxx>
 
 #include "dataedit.hxx"
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 17bd8a712763..3a0be2efa41c 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -44,8 +44,8 @@
 /** === end UNO includes === **/
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/smplhint.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/smplhint.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 2620852370b1..0645bfb85c2a 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -33,14 +33,14 @@
 #include <tools/stream.hxx>
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbx.hxx>
 #include <sot/storinfo.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <basic/sbmod.hxx>
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index aed5b2b3c575..f54cdc800d38 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -35,7 +35,7 @@
 
 #include <tools/urlobj.hxx>
 #include <tools/errcode.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <basic/sbstar.hxx>
 #include <sbunoobj.hxx>
 
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index a6ae8cac29af..26d17d77c84b 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -36,7 +36,7 @@
 #ifndef _TOOLERR_HXX //autogen
 #include <tools/errcode.hxx>
 #endif
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -750,11 +750,11 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
             // SbUnoObject instanzieren
             String aName;
             SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue );
-            //If this is called externally e.g. from the scripting 

-            //framework then there is no 'active' runtime the default property will not be set up

-            //only a vba object will have XDefaultProp set anyway so... this

-            //test seems a bit of overkill

-            //if ( SbiRuntime::isVBAEnabled() )

+            //If this is called externally e.g. from the scripting
+            //framework then there is no 'active' runtime the default property will not be set up
+            //only a vba object will have XDefaultProp set anyway so... this
+            //test seems a bit of overkill
+            //if ( SbiRuntime::isVBAEnabled() )
             {
                 String sDfltPropName;
 
@@ -3377,9 +3377,10 @@ SbxVariable* SbUnoService::Find( const String& rName, SbxClassType )
                     // Create and insert SbUnoServiceCtor
                     SbxVariableRef xSbCtorRef = new SbUnoServiceCtor( aName, xCtor );
                     QuickInsert( (SbxVariable*)xSbCtorRef );
-                    pRes = xSbCtorRef;
                 }
             }
+
+            pRes = SbxObject::Find( rName, SbxCLASS_METHOD );
         }
     }
 
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 2d5f4f7cdf89..393719b71c2d 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -36,7 +36,7 @@
 #include <vos/macros.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/stream.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <tools/shl.hxx>
 #include <basic/sbx.hxx>
 #include "sb.hxx"
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index c3e8a000cf8c..8b840770a0e6 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -83,7 +83,7 @@ void SbiCodeGen::GenStmnt()
 
 UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( eOpcode < SbOP0_START || eOpcode > SbOP0_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE1" );
 #endif
@@ -94,7 +94,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
 
 UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( eOpcode < SbOP1_START || eOpcode > SbOP1_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE2" );
 #endif
@@ -107,7 +107,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
 
 UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( eOpcode < SbOP2_START || eOpcode > SbOP2_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE3" );
 #endif
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index c18501c98e40..32a0007a61ca 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -170,7 +170,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
 
 void SbiExprNode::GenElement( SbiOpcode eOp )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( (eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM )
         pGen->GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" );
 #endif
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 2eb87dcdcc52..089dc068773a 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -175,7 +175,7 @@ void SbiSymPool::Add( SbiSymDef* pDef )
     {
         if( pDef->pIn )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             // schon in einem anderen Pool drin!
             pParser->Error( SbERR_INTERNAL_ERROR, "Dbl Pool" );
 #endif
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 565c7a358a97..698b3d453d5b 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFX_PROPBAG_HXX
 #define _SFX_PROPBAG_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
 #include <com/sun/star/beans/PropertyValue.hpp>
 #endif
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index f3d691bf059a..7221ee68252f 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -31,7 +31,7 @@
 #ifndef _SYMTBL_HXX
 #define _SYMTBL_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <basic/sbxdef.hxx>
 #include <basic/sbdef.hxx>
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index e4c9ad1fe307..aa3fda6a7116 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -33,7 +33,7 @@
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 751bd57cc808..425eec2eaf85 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
 #include <tools/errcode.hxx>
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 #include "ddectrl.hxx"
 #ifndef _SBERRORS_HXX
 #include <basic/sberrors.hxx>
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 607abaa843fa..ae25e570f10c 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -32,9 +32,9 @@
 #define _DLLMGR_HXX
 
 #define _SVSTDARR_BYTESTRINGSSORT
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #ifndef _SVSTDARR_HXX //autogen
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 // !!! nur zum debuggen fuer infoboxes !!!
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e92c8c974eb2..6c26409a883c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -43,7 +43,7 @@
 #include <vcl/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/time.h>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index dbd66a61575c..bac63edb62f9 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -44,7 +44,7 @@
 #ifndef _SBX_HXX
 #include <basic/sbx.hxx>
 #endif
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/fsys.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index cc276eea766b..6c83c6e2f3f1 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -33,8 +33,8 @@
 #include <tools/fsys.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/wldcrd.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/zforlist.hxx>
+#include <unotools/syslocale.hxx>
 #include "runtime.hxx"
 #include "sbintern.hxx"
 #include "opcodes.hxx"
@@ -867,7 +867,7 @@ void SbiRuntime::PushVar( SbxVariable* pVar )
 
 SbxVariableRef SbiRuntime::PopVar()
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( !nExprLvl )
     {
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -902,7 +902,7 @@ BOOL SbiRuntime::ClearExprStack()
 SbxVariable* SbiRuntime::GetTOS( short n )
 {
     n = nExprLvl - n - 1;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( n < 0 )
     {
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index 938e5f6ad236..3c461c1f5541 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -160,7 +160,7 @@ void SbiRuntime::StepPAD( UINT32 nOp1 )
 
 void SbiRuntime::StepJUMP( UINT32 nOp1 )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // #QUESTION shouln't this be
     // if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
     if( nOp1 >= pImg->GetCodeSize() )
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index 8609bbc875b3..618b6d97a8d1 100644
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 
 String STR_BASICKEY_FORMAT_ON
 {
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index c6862a88a56c..76bb917699ce 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
 #include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/errcode.hxx>
 #include <tools/color.hxx>
 #include <i18npool/lang.h>
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 3f747f27c5bd..bb62caba2076 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -35,7 +35,7 @@
 #include <basic/sbx.hxx>
 #include <basic/sbxbase.hxx>
 #include "sbxres.hxx"
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 TYPEINIT1(SbxMethod,SbxVariable)
 TYPEINIT1(SbxProperty,SbxVariable)
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index acc5d91c4e2e..1fc3ad018b15 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -34,7 +34,7 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
 
 #if defined ( UNX )
 #include <stdlib.h>
@@ -50,12 +50,12 @@
 #include "sbxres.hxx"
 #include <basic/sbxbase.hxx>
 #include <basic/sbxform.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #include "basrid.hxx"
 #include "runtime.hxx"
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 
 
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 66c56adc731a..2f517c3453ca 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -33,7 +33,7 @@
 
 
 #include <tools/stream.hxx>
-#include "svtools/brdcst.hxx"
+#include "svl/brdcst.hxx"
 
 #include <basic/sbx.hxx>
 #include <basic/sbxbase.hxx>
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index f7e5f9a842e4..f199353c2d7a 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -51,7 +51,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c397e402fac4..02a7b174da1c 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -54,7 +54,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <basic/basmgr.hxx>
@@ -940,7 +940,17 @@ sal_Bool SfxLibraryContainer::init_Impl(
     // #110009
 
     if( !bStorage && meInitMode == DEFAULT )
-        implScanExtensions();
+    {
+        try
+        {
+            implScanExtensions();
+        }
+        catch( uno::Exception& )
+        {
+            // TODO: error handling?
+            OSL_ASSERT( "Cannot access extensions!" );
+        }
+    }
 
     // #110009 Preload?
     {
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index aad4815872c0..e72205744ce0 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -58,7 +58,7 @@
 #include <tools/urlobj.hxx>
 
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <basic/basmgr.hxx>
diff --git a/bean/com/sun/star/beans/makefile.mk b/bean/com/sun/star/beans/makefile.mk
index 1c38ff105ec9..cb4be6263a37 100644
--- a/bean/com/sun/star/beans/makefile.mk
+++ b/bean/com/sun/star/beans/makefile.mk
@@ -44,7 +44,7 @@ dummy:
 
 .ELSE		# "$(OS)"=="MACOSX"
 
-JARFILES 		= sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar
+JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar
 
 # --- Sources --------------------------------------------------------
 
diff --git a/bean/com/sun/star/comp/beans/makefile.mk b/bean/com/sun/star/comp/beans/makefile.mk
index 983991fd0c70..2faff8ac14ae 100644
--- a/bean/com/sun/star/comp/beans/makefile.mk
+++ b/bean/com/sun/star/comp/beans/makefile.mk
@@ -44,7 +44,7 @@ dummy:
 
 .ELSE		# "$(OS)"=="MACOSX"
 
-JARFILES 		= sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar
+JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar
 
 # --- Sources --------------------------------------------------------
 
diff --git a/bean/prj/build.lst b/bean/prj/build.lst
index 06b806b613a5..3767e8fff387 100644
--- a/bean/prj/build.lst
+++ b/bean/prj/build.lst
@@ -1,4 +1,4 @@
-ob	bean	:	javaunohelper sandbox jurt ridljar unoil offapi udkapi NULL
+ob	bean	:	javaunohelper jurt ridljar unoil offapi udkapi NULL
 ob	bean\com\sun\star\comp\beans	nmake	-	all	ob_beanjava NULL
 ob	bean\com\sun\star\beans			nmake	-	all	ob_legacybeanjava ob_beanjava NULL
 ob	bean\native\win32				nmake	-	n	ob_beanwin32 NULL
diff --git a/bean/qa/complex/makefile.mk b/bean/qa/complex/makefile.mk
index dbf6e8362e1b..4fb1ce0ea8b2 100644
--- a/bean/qa/complex/makefile.mk
+++ b/bean/qa/complex/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = complex
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = OOoBeanTest.java ScreenComparer.java WriterFrame.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/bean/test/applet/oooapplet/makefile.mk b/bean/test/applet/oooapplet/makefile.mk
index 5056e0bbb4c6..8abfe7131aed 100644
--- a/bean/test/applet/oooapplet/makefile.mk
+++ b/bean/test/applet/oooapplet/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = oooapplet
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar 
+JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar 
 JAVAFILES       = OOoViewer.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/bean/test/makefile.mk b/bean/test/makefile.mk
index f214fe4f24cc..5a29c4b1033c 100644
--- a/bean/test/makefile.mk
+++ b/bean/test/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = test
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar 
+JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar 
 JAVAFILES       = Test.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index 30f252ef589c..c97522f62612 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -33,7 +33,7 @@
 +    $(SLO)$/bt_stat.obj	\
 +    $(SLO)$/bt_upgrade.obj	\
 +    $(SLO)$/bt_verify.obj \
-+    $(SLO)$/btree_auto.obj 
++    $(SLO)$/btree_auto.obj
 +
 +.INCLUDE :  target.mk
 +
@@ -53,7 +53,7 @@
 +INCPRE+=..$/build_windows ..$/dbinc ..$/
 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
 +
-+SLOFILES= $(SLO)$/strsep.obj 
++SLOFILES= $(SLO)$/strsep.obj
 +
 +.INCLUDE :  target.mk
 +
@@ -88,7 +88,7 @@
 +    $(SLO)$/util_cache.obj \
 +    $(SLO)$/util_log.obj \
 +    $(SLO)$/util_sig.obj \
-+    $(SLO)$/zerofill.obj 
++    $(SLO)$/zerofill.obj
 +
 +.INCLUDE :  target.mk
 +
@@ -119,7 +119,7 @@
 +    $(SLO)$/cxx_mpool.obj \
 +    $(SLO)$/cxx_multi.obj \
 +    $(SLO)$/cxx_seq.obj \
-+    $(SLO)$/cxx_txn.obj	
++    $(SLO)$/cxx_txn.obj
 +
 +.INCLUDE :  target.mk
 +
@@ -324,7 +324,7 @@
 +
 +	local:
 +		*;
-+}; 
++};
 --- misc/db-4.7.25.NC/dbm/makefile.mk	2009-07-21 11:42:40.000000000 +0200
 +++ misc/build/db-4.7.25.NC/dbm/makefile.mk	2009-07-21 11:39:25.000000000 +0200
 @@ -1 +1,16 @@
@@ -375,29 +375,29 @@
 @@ -13,7 +13,7 @@
  libdir=	@libdir@
  docdir=	$(prefix)/docs
- 
+
 -dmode=	755
 +dmode=	775
  emode=	555
  fmode=	444
- 
+
 @@ -56,6 +56,7 @@
  CCLINK=		@MAKEFILE_CCLINK@ @CFLAGS@
- 
+
  LDFLAGS=	@LDFLAGS@
 +LDFLAGSVERSION=  @LDFLAGSVERSION@
  LIBS=		@LIBSO_LIBS@
  TEST_LIBS=	@TEST_LIBS@
  LIBCSO_LIBS=	@LIBCSO_LIBS@ @LIBSO_LIBS@
 @@ -733,7 +734,7 @@
- 
+
  # Shared C library.
  $(libso_target): $(C_OBJS)
 -	$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
 +	$(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
  	$(RM) -f $(libdb)
  	$(LN) -s .libs/$(libdb_version) $(libdb)
- 
+
 --- misc/db-4.7.25.NC/dist/configure	2008-05-15 23:12:41.000000000 +0200
 +++ misc/build/db-4.7.25.NC/dist/configure	2009-07-21 11:39:25.000000000 +0200
 @@ -3757,8 +3757,10 @@
@@ -410,7 +410,7 @@
 +#CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
 +CFLAGS="$CFLAGS $optimize_def"
 +CXXFLAGS="$CXXFLAGS $CFLAGS"
- 
+
  # The default compiler is cc (NOT gcc), the default CFLAGS is as specified
  # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags
 @@ -12566,7 +12568,8 @@
@@ -434,7 +434,7 @@
 @@ -36655,7 +36659,7 @@
  DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim
  _ACEOF
- 
+
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
      break
@@ -482,7 +482,7 @@
 +    $(SLO)$/env_region.obj \
 +    $(SLO)$/env_register.obj \
 +    $(SLO)$/env_sig.obj \
-+    $(SLO)$/env_stat.obj 
++    $(SLO)$/env_stat.obj
 +
 +.INCLUDE :  target.mk
 +
@@ -646,12 +646,13 @@
 +
 --- misc/db-4.7.25.NC/makefile.mk	2009-07-21 11:42:40.000000000 +0200
 +++ misc/build/db-4.7.25.NC/makefile.mk	2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,80 @@
+@@ -1 +1,81 @@
 -dummy
 +PRJ=..$/..$/..$/..
 +PRJNAME=libdb47
 +TARGET=libdb47
 +USE_DEFFILE=true
++UWINAPILIB=
 +
 +.INCLUDE :  settings.mk
 +CFLAGS+=-GS -EHsc -Gy
@@ -669,7 +670,7 @@
 +    hash hmac hsearch lock \
 +    log mp mutex os os_windows \
 +    qam rep repmgr sequence \
-+    txn xa 
++    txn xa
 +
 +LIB1TARGET= $(SLB)$/$(TARGET).lib
 +LIB1FILES= \
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 7ee3beb1b07d..bc5df6964bc5 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -59,8 +59,6 @@ ADDITIONAL_FILES= \
     sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \
     db_4_7_gcc4.map
 
-
-
 # not needed for win32. comment out when causing problems...
 .IF "$(GUI)$(COM)"=="WNTGCC"
 PATCH_FILES=db-4.7.25-mingw.patch
@@ -115,7 +113,7 @@ BUILD_DIR_OUT=$(CONFIGURE_DIR)
 
 .IF "$(OS)"=="IRIX"
 CONFIGURE_ACTION= $(CONFIG_SHELL) ..$/dist$/configure
-BUILD_ACTION=gmake 
+BUILD_ACTION=gmake
 .ELSE
 BUILD_ACTION=make
 .ENDIF
diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst
index 4631e5605f51..c74e15efd2fd 100644
--- a/berkeleydb/prj/build.lst
+++ b/berkeleydb/prj/build.lst
@@ -1,3 +1,3 @@
-db	berkeleydb	:	external xml2cmp sal NULL
+db      berkeleydb      :    external stlport NULL
 db	berkeleydb						nmake	-	u	as_mkout NULL
 db	berkeleydb						nmake	-	w,vc7	as_mkout NULL
diff --git a/bridges/source/remote/static/proxy.cxx b/bridges/source/remote/static/proxy.cxx
index 6f07ba95d6ff..6cfd9c11e9fb 100644
--- a/bridges/source/remote/static/proxy.cxx
+++ b/bridges/source/remote/static/proxy.cxx
@@ -30,12 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
 #include <sal/alloca.h>
 #include <bridges/remote/proxy.hxx>
 #include <bridges/remote/context.h>
@@ -84,7 +78,7 @@ void acquireRemote2UnoProxy( uno_Interface *pThis )
             freeRemote2UnoProxy,
             p->m_sOid.pData,
             p->m_pType );
-        assert( (uno_Interface *)p == pThis );
+        OSL_ASSERT( (uno_Interface *)p == pThis );
     }
 }
 
diff --git a/bridges/source/remote/static/remote.cxx b/bridges/source/remote/static/remote.cxx
index 1cb26b4ccd9c..ed8b1dbc9d59 100644
--- a/bridges/source/remote/static/remote.cxx
+++ b/bridges/source/remote/static/remote.cxx
@@ -30,12 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
 #include <bridges/remote/remote.hxx>
 #include <bridges/remote/counter.hxx>
 
@@ -90,7 +84,7 @@ void acquireRemote2RemoteStub( remote_Interface *pThis )
             freeRemote2RemoteStub,
             p->m_sOid.pData,
             p->m_pType );
-        assert( (remote_Interface *)p == pThis );
+        OSL_ASSERT( (remote_Interface *)p == pThis );
     }
 }
 
diff --git a/bridges/source/remote/urp/urp_log.hxx b/bridges/source/remote/urp/urp_log.hxx
index c7811faf51e9..6c96ea0dbffc 100644
--- a/bridges/source/remote/urp/urp_log.hxx
+++ b/bridges/source/remote/urp/urp_log.hxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 namespace bridges_urp
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define BRIDGES_URP_PROT
 #endif
 
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index df5ac58d1a2d..ce870bc19ea9 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -32,11 +32,6 @@
 #include "precompiled_bridges.hxx"
 #include <string.h>
 
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <osl/time.h>
 
 #include <osl/mutex.hxx>
@@ -193,10 +188,10 @@ int main( int argc, char *argv[] )
                         {
                             // test the factory
                               Reference < XBridge > rBridge2 = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
-                              assert( rBridge2.is() );
-                              assert( rBridge2->getDescription() == rBridge->getDescription( ) );
-                              assert( rBridge2->getName() == rBridge->getName() );
-                              assert( rBridge2 == rBridge );
+                              OSL_ASSERT( rBridge2.is() );
+                              OSL_ASSERT( rBridge2->getDescription() == rBridge->getDescription( ) );
+                              OSL_ASSERT( rBridge2->getName() == rBridge->getName() );
+                              OSL_ASSERT( rBridge2 == rBridge );
                         }
 
 
@@ -230,7 +225,7 @@ int main( int argc, char *argv[] )
                     }
 
                     Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
-//                      assert( ! rBridge.is() );
+//                      OSL_ASSERT( ! rBridge.is() );
                 }
 
             }
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 432a32f2a554..90a07ab31f43 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -30,11 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <osl/time.h>
@@ -598,7 +593,7 @@ void testException( const Reference < XCallMe > &r )
 {
     try {
         r->call( OUString( RTL_CONSTASCII_USTRINGPARAM("dummy")) , -1 );
-        assert( ! "no exception flown !" );
+        OSL_ASSERT( ! "no exception flown !" );
     }
     catch( TestBridgeException  & e )
     {
@@ -606,11 +601,11 @@ void testException( const Reference < XCallMe > &r )
     }
     catch( Exception & e )
     {
-        assert( ! "only base class of exception could be catched!" );
+        OSL_ASSERT( ! "only base class of exception could be catched!" );
     }
     catch(...)
     {
-        assert(! "wrong unknown exception !" );
+        OSL_ASSERT(! "wrong unknown exception !" );
     }
 }
 
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index bae00be6caaa..bf5b470d7185 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -30,10 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <osl/time.h>
 
 #include <osl/mutex.hxx>
@@ -96,7 +92,7 @@ void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
         rSmgr->createInstance( OUString::createFromAscii( "com.sun.star.io.Pipe" ) ),
         UNO_QUERY );
 
-    assert( rOut.is() );
+    OSL_ASSERT( rOut.is() );
 
     {
         Sequence < sal_Int8 > seq( 10 );
@@ -115,7 +111,7 @@ void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
         if( ! ( 42 == seq.getArray()[0] ) )
             printf( "wrong element in sequence\n" );
 
-//          assert( 0 );
+//          OSL_ASSERT( 0 );
     }
 }
 #include<stdio.h>
@@ -155,7 +151,7 @@ void testDocument( const Reference < XMultiServiceFactory > & rSmgr )
         rSmgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" ))),
         UNO_QUERY );
 
-    assert( rLoader.is() );
+    OSL_ASSERT( rLoader.is() );
 
     sal_Char *urls[] = {
         "private:factory/swriter",
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index cf67d2484cb3..1cfc44078376 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -30,11 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <osl/time.h>
 
 #include <osl/mutex.hxx>
@@ -201,7 +196,7 @@ int main( int argc, char *argv[] )
 
             Reference < XBridge > rBridge = rFactory->getBridge(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
-            assert( ! rBridge.is() );
+            OSL_ASSERT( ! rBridge.is() );
 
         }
         catch( Exception & )
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index 48f44e3ba816..e124d4d78e6a 100755
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -144,6 +144,9 @@ namespace dxcanvas
         }
     }
 
+    void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) {}
+    void DXCanvasItem::Commit() {}
+
     bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const
     {
         return maValues.find(rDeviceInfo) == maValues.end();
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 34deddb509a7..1fffcb2ed56e 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -77,6 +77,8 @@ namespace dxcanvas
         bool isBlacklistCurrentDevice() const;
         void blacklistDevice( const DeviceInfo& rDeviceInfo );
         void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
+            virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+            virtual void            Commit();
 
     private:
         typedef std::set< DeviceInfo > ValueSet;
diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx
index e8af809b1af2..53b88ebc28ad 100644
--- a/chart2/inc/pch/precompiled_chart2.hxx
+++ b/chart2/inc/pch/precompiled_chart2.hxx
@@ -213,17 +213,17 @@
 
 #include "sot/clsids.hxx"
 
-#include "svtools/eitem.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/syslocale.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
 
 #include "svx/brshitem.hxx"
 #include "svx/crsditem.hxx"
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index df3cab9e39b4..81b85cfacf34 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -50,7 +50,7 @@
 #include <vcl/svapp.hxx>
 #include <rtl/uuid.h>
 #include <cppuhelper/queryinterface.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/unofdesc.hxx>
 #include <svx/outliner.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc
index 8823b582a28e..d3aa3ebbff2f 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -31,7 +31,7 @@
 #define CHART_BITMAPS_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #ifndef STD_MASKCOLOR
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
index 8dd4acaffd15..71a181b92559 100644
--- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
@@ -28,10 +28,10 @@
  *
  ************************************************************************/
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
-// RID_SCH_START is 30512 (see svtools/solar.hrc)
+// RID_SCH_START is 30512 (see svl/solar.hrc)
 
 // next free: 100
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index b13333dcb323..bab952cf317b 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -36,10 +36,10 @@
 #ifndef _ZFORLIST_DECLARE_TABLE
 #define _ZFORLIST_DECLARE_TABLE
 #endif
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #endif
 // header for SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "DataBrowser.hxx"
 #include "DataBrowserModel.hxx"
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 24b717adba7f..fbbbca7fd826 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -49,7 +49,7 @@
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
 
-// #include <svtools/syslocale.hxx>
+// #include <unotools/syslocale.hxx>
 
 #include <com/sun/star/chart2/XTitle.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index d1365b908eac..f049f77ee312 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -34,7 +34,7 @@
 #include "TextDirectionListBox.hxx"
 #include "ResId.hxx"
 #include "Strings.hrc"
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <vcl/window.hxx>
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index f3b601453bee..d433aaff4cb3 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -43,10 +43,10 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 // for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include <vcl/edit.hxx>
 
@@ -104,7 +104,7 @@ DataEditor::DataEditor(
     SvtMiscOptions aMiscOptions;
     const sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() );
     // react on changes
-    aMiscOptions.AddListener( LINK( this, DataEditor, MiscHdl ) );
+    aMiscOptions.AddListenerLink( LINK( this, DataEditor, MiscHdl ) );
     m_aTbxData.SetOutStyle( nStyle );
 
     // set good window width
@@ -132,7 +132,7 @@ DataEditor::~DataEditor()
     notifySystemWindow( this, & m_aTbxData, ::comphelper::mem_fun( & TaskPaneList::RemoveWindow ));
 
     SvtMiscOptions aMiscOptions;
-    aMiscOptions.RemoveListener( LINK( this, DataEditor, MiscHdl ) );
+    aMiscOptions.RemoveListenerLink( LINK( this, DataEditor, MiscHdl ) );
 
     OSL_TRACE( "DataEditor: DTOR" );
 }
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 99b88b956c88..859465e3fd0d 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -41,7 +41,7 @@
 #include "ObjectNameProvider.hxx"
 
 // header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 9ffaa2b28490..036ad921679d 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -41,7 +41,7 @@
 // header for enum SvxChartLegendPos
 #include <svx/chrtitem.hxx>
 // header for class SfxItemPool
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index c8684bdaecbc..184214d3c5b0 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -34,7 +34,7 @@
 #include "dlg_NumberFormat.hxx"
 
 // header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 // header for class SvxNumberInfoItem
 #define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO
@@ -45,7 +45,7 @@
 #include <sfx2/tabdlg.hxx>
 
 // header for SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 097c6c1d0107..ec8a0eaaa784 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -34,7 +34,7 @@
 #ifndef _ZFORLIST_DECLARE_TABLE
 #define _ZFORLIST_DECLARE_TABLE
 #endif
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #endif
 
 #include "dlg_ObjectProperties.hxx"
@@ -66,8 +66,8 @@
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XChartType.hpp>
 #include <com/sun/star/chart2/XDataSeries.hpp>
-#include <svtools/intitem.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/intitem.hxx>
+#include <svl/languageoptions.hxx>
 
 #include <svx/svxids.hrc>
 
@@ -82,7 +82,7 @@
 #include <svx/flagsdef.hxx>
 #include <svx/numinf.hxx>
 
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index c6129629a51a..44fd27f7d09a 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -42,13 +42,13 @@
 
 // header for class SvxNumberInfoItem
 #include <svx/numinf.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 // for SfxUInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 // header for class SfxStringItem
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 //SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/frmdiritem.hxx>
 
@@ -56,7 +56,7 @@
 #include <vcl/msgbox.hxx>
 #include <svx/svxids.hrc>
 // header for SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/controldims.hrc>
 
 
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index e560eed9f573..9d887f7fbc33 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -34,7 +34,7 @@
 // header for class CheckBox
 #include <vcl/button.hxx>
 // header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "TextDirectionListBox.hxx"
 
 #include <svx/dialcontrol.hxx>
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 73af56b5a4d0..1f17fe39a9c0 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -43,7 +43,7 @@
 
 #include <rtl/math.hxx>
 #include <vcl/dialog.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 45623ebad3c5..4bbe7344c78d 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -50,7 +50,7 @@
 #include "chartview/ChartSfxItemIds.hxx"
 #include <svx/chrtitem.hxx>
 // header for class SfxItemPool
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx
index 571a0dfc33ff..81d30eb7b294 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx
@@ -36,7 +36,7 @@
 #endif
 #include <vcl/fixed.hxx>
 // header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index e1becbf8631f..181341f5c55e 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -34,7 +34,7 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/chrtitem.hxx>
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index ae20b1db1d2b..a7407b4781ee 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -41,7 +41,7 @@
 #include <svx/chrtitem.hxx>
 
 // header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/frmdiritem.hxx>
 
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index d1e17f677646..0b10204c54bc 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -46,9 +46,9 @@
 // header for class SvxDoubleItem
 #include <svx/chrtitem.hxx>
 // header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 // header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 // header for class WarningBox
 #include <vcl/msgbox.hxx>
@@ -58,7 +58,7 @@
 #ifndef _ZFORLIST_DECLARE_TABLE
 #define _ZFORLIST_DECLARE_TABLE
 #endif
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #endif
 
 #include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 7e2fa80dd556..d5dcad1eb02d 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -38,7 +38,7 @@
 #include "chartview/ChartSfxItemIds.hxx"
 
 // header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 // header for class Svx3DHorizontalSegmentsItem
 #include <svx/svx3ditems.hxx>
 
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 38d36d032921..1681962eb5fe 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -35,8 +35,8 @@
 #include "chartview/ChartSfxItemIds.hxx"
 #include "NoWarningThisInCTOR.hxx"
 
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/controldims.hrc>
 
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index a2c3694a8469..dc2c1f156bcb 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -46,9 +46,9 @@
 // header for class SvxDoubleItem
 #include <svx/chrtitem.hxx>
 // header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 // header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 // header for class WarningBox
 #include <vcl/msgbox.hxx>
@@ -58,7 +58,7 @@
 #ifndef _ZFORLIST_DECLARE_TABLE
 #define _ZFORLIST_DECLARE_TABLE
 #endif
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #endif
 
 #include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index cc8ac2139639..a5247e47ad1e 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -38,11 +38,11 @@
 #include "NoWarningThisInCTOR.hxx"
 
 // header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 // header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 //SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 #include <svtools/controldims.hrc>
 
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 6733d9e08c3a..d04f43c7031b 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -40,7 +40,7 @@
 #include <svx/frmdiritem.hxx>
 
 // header for class SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 92b37e8b4195..c1ba3ed3ed6c 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -57,7 +57,7 @@
 //oldChartModelWrapper
 
 // header for class SfxItemPool
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 // header for class FontList
 #include <svtools/ctrltool.hxx>
 // header for class Application
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index ccff9e913f97..89010d2bc8b5 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -30,7 +30,7 @@
 #ifndef CHART_HELPIDS_HRC
 #define CHART_HELPIDS_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 //next is 120
 
 //see old chart: schhids.h
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index e55456519cd1..52d98132ea82 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -31,8 +31,8 @@
 #define CHART_ITEMCONVERTER_HXX
 
 #include <unotools/eventlisteneradapter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 // for pair
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index fd565aba081b..cd82c4a7f46d 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -31,7 +31,7 @@
 #ifndef _SCH_DGRDATA_HXX
 #define _SCH_DGRDATA_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/stdctrl.hxx>
 #include <vcl/toolbox.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index d5748a3e990f..d5e19b6de40c 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -37,7 +37,7 @@
 #include <vcl/button.hxx>
 #endif
 // header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 //for auto_ptr
 #include <memory>
 
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 13382ff9bffa..f463fc1e854f 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -32,7 +32,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <memory>
 #include <com/sun/star/frame/XModel.hpp>
 
diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
index 517da8fb6930..44f660373b41 100644
--- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
@@ -32,7 +32,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <memory>
 
 //.............................................................................
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index e1490f5b7e50..a37ed80cbd30 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -35,7 +35,7 @@
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/chrtitem.hxx>
 #include "chartview/ChartSfxItemIds.hxx"
 #include "RangeSelectionButton.hxx"
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 0c7ff467a91b..07cc3191b906 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -49,11 +49,11 @@
 #include <com/sun/star/chart2/AxisOrientation.hpp>
 
 // for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 // for SvxDoubleItem
 #include <svx/chrtitem.hxx>
 // for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <rtl/math.hxx>
 
 #include <algorithm>
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index ad2aab714757..ee83459d4429 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -42,7 +42,7 @@
 #include <svx/postitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/fhgtitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/chart2/XFormattedString.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index af062cf3b93c..c27fa016d00d 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -49,15 +49,15 @@
 
 // header for class XFillColorItem
 #include <svx/xflclit.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/sizeitem.hxx>
 // header for class SfxStringItem
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/brshitem.hxx>
 //SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/graph.hxx>
 #include <com/sun/star/graphic/XGraphic.hpp>
 
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index fff6d87be9ab..7b05b72bb53f 100755
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -42,9 +42,9 @@
 
 #include "GraphicPropertyItemConverter.hxx"
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/chrtitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <rtl/math.hxx>
 
 #include <com/sun/star/chart2/DataPointLabel.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 593b523316e3..1c7273f44c89 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -38,7 +38,7 @@
 #include "CommonConverters.hxx"
 
 // #ifndef _SFXINTITEM_HXX
-// #include <svtools/intitem.hxx>
+// #include <svl/intitem.hxx>
 // #endif
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
@@ -53,7 +53,7 @@
 #include <svx/xlntrit.hxx>
 #include <svx/eeitem.hxx>
 // for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 // for XFillGradientStepCountItem
 #include <svx/xgrscit.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index e0a7b20bfa6f..04b35f275618 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -33,10 +33,10 @@
 #include "ItemConverter.hxx"
 #include "macros.hxx"
 #include <com/sun/star/lang/XComponent.hpp>
-#include <svtools/itemprop.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/itemiter.hxx>
 // header for class SfxWhichIter
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svxids.hrc>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index c62fa6735512..69209884fbdb 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/chart2/XRegressionCurve.hpp>
 
 // for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/chrtitem.hxx>
 
 #include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 6ac0d87b3e5f..439aa84c0073 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -39,7 +39,7 @@
 #include "CharacterPropertyItemConverter.hxx"
 #include "MultipleItemConverter.hxx"
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <rtl/math.hxx>
 
 #include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index f30bb4aeda57..d74eff927bc4 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -48,13 +48,13 @@
 #include <com/sun/star/chart2/XDataSeries.hpp>
 
 // for SfxBoolItem
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 
 //SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <rtl/math.hxx>
 #include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index eed9235aff9b..acaf493836bc 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -43,9 +43,9 @@
 
 #include "GraphicPropertyItemConverter.hxx"
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/chrtitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <rtl/math.hxx>
 
 #include <com/sun/star/chart2/DataPointLabel.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 96f6e01cadb5..a94c1f07909f 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -37,7 +37,7 @@
 #include "GraphicPropertyItemConverter.hxx"
 #include "CharacterPropertyItemConverter.hxx"
 #include "MultipleItemConverter.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <rtl/math.hxx>
 
 #include <com/sun/star/chart2/XTitled.hpp>
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 4cf4de81480b..4cbb6db76bd4 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -48,7 +48,7 @@
 #include <vcl/msgbox.hxx>
 #include <svx/svxids.hrc>
 #include <svx/rectenum.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index e1f83550bd5d..855357ce701b 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -54,7 +54,7 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/fontitem.hxx>
 
 //.............................................................................
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index f71d26b7b3c2..65cebdbc13d3 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -35,7 +35,7 @@
 #include "macros.hxx"
 
 // header for class SvtSysLocale
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 // header for class ConfigItem
 #include <unotools/configitem.hxx>
 // header for rtl::Static
@@ -69,6 +69,8 @@ public:
     virtual ~CalcConfigItem();
 
     FieldUnit getFieldUnit();
+    virtual void                    Commit();
+    virtual void                    Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
 };
 
 CalcConfigItem::CalcConfigItem()
@@ -80,6 +82,9 @@ CalcConfigItem::~CalcConfigItem()
 {
 }
 
+void CalcConfigItem::Commit() {}
+void CalcConfigItem::Notify( const uno::Sequence<rtl::OUString>& ) {}
+
 FieldUnit CalcConfigItem::getFieldUnit()
 {
     FieldUnit eResult( FUNIT_CM );
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index fea8bb867057..3353e48e9238 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -31,7 +31,7 @@
 #define CHART_STRINGS_HRC
 
 // this includes no link dependency
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 //next free is 290
 //single free is: 134
diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
index 5077541abe2c..03c182229d45 100644
--- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
@@ -30,7 +30,7 @@
 #ifndef _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
 #define _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include "chartviewdllapi.hxx"
 
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index e25cb92d4012..f3971b28d40f 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -41,7 +41,7 @@
 // header contains only macros
 #include <svtools/sfxecode.hxx>
 // header for class SvtSaveOptions
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <comphelper/genericpropertyset.hxx>
 // header for struct PropertyMapEntry
 #include <comphelper/propertysetinfo.hxx>
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 4882ecef72de..1286a6e553cc 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -49,7 +49,7 @@
 #include <comphelper/processfactory.hxx>
 
 // header for class SvNumberFormatsSupplierObj
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx
index 87383dcf5817..4c8e3bdfc8c9 100644
--- a/chart2/source/model/main/ImplChartModel.cxx
+++ b/chart2/source/model/main/ImplChartModel.cxx
@@ -45,9 +45,9 @@
 #include "AxisHelper.hxx"
 
 // header for class SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 // header for class SvNumberFormatsSupplierObj
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/component_context.hxx>
 
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 5e6c0bce8717..b7dfd60f8712 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -42,7 +42,7 @@
 #include "DataSeriesHelper.hxx"
 #include "Scaling.hxx"
 
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
 
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 4f558b35df0a..6981d7fab9a2 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -58,7 +58,7 @@
 
 // header for struct SvtLinguConfig
 #ifndef _SVTOOLS_LINGUCFG_HXX_
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #endif
 #ifndef INCLUDED_I18NPOOL_MSLANGID_HXX
 #include <i18npool/mslangid.hxx>
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 835872aad8e4..648aca20bc77 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -76,6 +76,7 @@ public:
 
 protected:
     // ____ ::utl::ConfigItem ____
+    virtual void                    Commit();
     virtual void Notify( const Sequence< OUString > & aPropertyNames );
 
 private:
@@ -100,6 +101,9 @@ void ChartConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
     }
 }
 
+void ChartConfigItem::Commit()
+{}
+
 void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName )
 {
     m_aPropertiesToNotify.insert( rPropertyName );
diff --git a/chart2/source/tools/ImplUndoManager.cxx b/chart2/source/tools/ImplUndoManager.cxx
index 91d5f869bc53..e6c87ae16f9e 100644
--- a/chart2/source/tools/ImplUndoManager.cxx
+++ b/chart2/source/tools/ImplUndoManager.cxx
@@ -463,6 +463,10 @@ void UndoStepsConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
     }
 }
 
+void UndoStepsConfigItem::Commit()
+{
+}
+
 // mtehod is not const, because GetProperties is not const
 sal_Int32 UndoStepsConfigItem::getUndoSteps()
 {
diff --git a/chart2/source/tools/ImplUndoManager.hxx b/chart2/source/tools/ImplUndoManager.hxx
index 94d04b69a5a4..35a90becbcf2 100644
--- a/chart2/source/tools/ImplUndoManager.hxx
+++ b/chart2/source/tools/ImplUndoManager.hxx
@@ -200,6 +200,7 @@ public:
 protected:
     // ____ ::utl::ConfigItem ____
     virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & aPropertyNames );
+    virtual void Commit();
 
 private:
     ConfigItemListener &    m_rListener;
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 4ba7f99edcc1..d1cf27758110 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -377,7 +377,7 @@ void SAL_CALL OPropertySet::getFastPropertyValue
         uno::Reference< beans::XFastPropertySet > xStylePropSet( m_pImplProperties->GetStyle(), uno::UNO_QUERY );
         if( xStylePropSet.is() )
         {
-#ifndef NDEBUG
+#ifdef DBG_UTIL
             {
                 // check if the handle of the style points to the same property
                 // name as the handle in this property set
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index f3024a10e958..3da8fe225f8c 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -36,15 +36,15 @@
 
 #include "chartview/ChartSfxItemIds.hxx"
 #include <svx/chrtitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/sizeitem.hxx>
 // header for class SfxStringItem
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 //SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index 00c813ed4922..22bc5b900d06 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -30,8 +30,8 @@
 #ifndef _CHART2_ITEMPOOL_HXX
 #define _CHART2_ITEMPOOL_HXX
 
-#include <svtools/poolitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itempool.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index dfd57f9bce92..fed4b52f3b5f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -103,7 +103,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <sot/clsids.hxx>
 
 //.............................................................................
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index b536998fd5bd..b1d7c5eede78 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -36,7 +36,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 
 // header for class SfxListener
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 95b5144265ae..4212640033ac 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -37,15 +37,15 @@
 #include "ChartItemPool.hxx"
 #include "ObjectIdentifier.hxx"
 #include <svx/unomodel.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 // header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 // header for define EE_PARA_HYPHENATE
 #include <svx/eeitem.hxx>
 // header for class Svx3DPercentDiagonalItem
 #include <svx/svx3ditems.hxx>
 // header for class SvtPathOptions
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 // header E3dObjFactory
 #include <svx/objfac3d.hxx>
 // header for class SdrObjList
diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx
index 2a01d2f1cde3..b947894c77bb 100644
--- a/chart2/source/view/main/NumberFormatterWrapper.cxx
+++ b/chart2/source/view/main/NumberFormatterWrapper.cxx
@@ -34,9 +34,9 @@
 #include "macros.hxx"
 #include <comphelper/processfactory.hxx>
 // header for class SvNumberFormatsSupplierObj
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 // header for class SvNumberformat
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <tools/color.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index b9fa4b3aba84..8e65dd6c2458 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 
 #include <vector>
 #include <algorithm>
diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index 007a01aec93f..268240c4597b 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -1,4 +1,4 @@
-ure	cli_ure	:	cppu cppuhelper sal codemaker stoc udkapi tools NULL
+ure     cli_ure :       cppu cppuhelper sal codemaker stoc udkapi bridges NULL
 ure	cli_ure						usr1	-	all	ure_mkout NULL
 ure	cli_ure\inc					nmake   -   all   ure_inc NULL
 ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
diff --git a/cli_ure/qa/climaker/makefile.mk b/cli_ure/qa/climaker/makefile.mk
index cde3f4066142..a5b0af914f29 100644
--- a/cli_ure/qa/climaker/makefile.mk
+++ b/cli_ure/qa/climaker/makefile.mk
@@ -41,7 +41,7 @@ CLIMAKER*=$(WRAPCMD) $(BIN)$/climaker
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = ClimakerTestCase.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 075a3cdb75bd..9ef17010b0d2 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -38,7 +38,7 @@
 #include <windows.h>
 
 #include "sal/types.h"
-#include "tools/pathutils.hxx"
+//#include "tools/pathutils.hxx"
 
 namespace cli_ure {
 
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index bab3dcbb30ea..1bc926dc0fe0 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
index 2f5c75fc1d92..9cd3dc70d3fd 100644
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
@@ -369,7 +369,7 @@
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Type.hxx"
 #include "com/sun/star/uno/TypeClass.hpp"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
index cfc597570bc4..52c57a9d77de 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SHL1TARGET = $(TARGET)_weakbag
 SHL1OBJS = $(SLO)$/test_weakbag.obj
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
@@ -55,4 +55,4 @@ SLOFILES = $(SHL1OBJS)
 ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN)
-    testshl2 $(SHL1TARGETN)
+    $(TESTSHL2) $(SHL1TARGETN)
diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
index 035e56fdb8c4..c237158beccc 100644
--- a/comphelper/qa/test_string.cxx
+++ b/comphelper/qa/test_string.cxx
@@ -32,7 +32,7 @@
 #include "sal/config.h"
 
 #include "comphelper/string.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/string.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx
index dd4a8356eb5a..470ac2eef6c0 100644
--- a/comphelper/qa/test_weakbag.cxx
+++ b/comphelper/qa/test_weakbag.cxx
@@ -35,7 +35,7 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "comphelper/weakbag.hxx"
 #include "cppuhelper/weak.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 
 namespace {
 
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index 77ab145e2581..8fa318a92eb1 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -39,6 +39,7 @@ extern void createRegistryInfo_AnyCompareFactory();
 extern void createRegistryInfo_OfficeInstallationDirectories();
 extern void createRegistryInfo_OInstanceLocker();
 extern void createRegistryInfo_Map();
+extern void createRegistryInfo_OSimpleLogRing();
 
 //........................................................................
 namespace comphelper { namespace module
@@ -63,6 +64,7 @@ namespace comphelper { namespace module
                 createRegistryInfo_OfficeInstallationDirectories();
                 createRegistryInfo_OInstanceLocker();
                 createRegistryInfo_Map();
+                createRegistryInfo_OSimpleLogRing();
             }
         }
     }
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index 7969b938e108..8b999aaf4449 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -34,6 +34,8 @@
 #include <com/sun/star/frame/DoubleInitializationException.hpp>

 #include <com/sun/star/lang/IllegalArgumentException.hpp>

 

+#include <comphelper_module.hxx>

+

 #include "documentiologring.hxx"

 

 using namespace ::com::sun::star;

@@ -56,33 +58,33 @@ OSimpleLogRing::~OSimpleLogRing()
 }

 

 // ----------------------------------------------------------

-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::impl_staticGetSupportedServiceNames()

+uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()

 {

     uno::Sequence< rtl::OUString > aResult( 1 );

-    aResult[0] = impl_staticGetServiceName();

+    aResult[0] = getServiceName_static();

     return aResult;

 }

 

 // ----------------------------------------------------------

-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetImplementationName()

+::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName_static()

 {

     return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.logging.SimpleLogRing" ) );

 }

 

 // ----------------------------------------------------------

-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetSingletonName()

+::rtl::OUString SAL_CALL OSimpleLogRing::getSingletonName_static()

 {

     return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.DocumentIOLogRing" ) );

 }

 

 // ----------------------------------------------------------

-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetServiceName()

+::rtl::OUString SAL_CALL OSimpleLogRing::getServiceName_static()

 {

     return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.SimpleLogRing" ) );

 }

 

 // ----------------------------------------------------------

-uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::impl_staticCreateSelfInstance( const uno::Reference< uno::XComponentContext >& rxContext )

+uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( const uno::Reference< uno::XComponentContext >& rxContext )

 {

     return static_cast< cppu::OWeakObject* >( new OSimpleLogRing( rxContext ) );

 }

@@ -149,13 +151,13 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
 // ----------------------------------------------------------

 ::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException)

 {

-    return impl_staticGetImplementationName();

+    return getImplementationName_static();

 }

 

 // ----------------------------------------------------------

 ::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException)

 {

-    const uno::Sequence< rtl::OUString > & aSupportedNames = impl_staticGetSupportedServiceNames();

+    const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static();

     for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ )

     {

         if ( aSupportedNames[ nInd ].equals( aServiceName ) )

@@ -168,8 +170,13 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
 // ----------------------------------------------------------

 uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException)

 {

-    return impl_staticGetSupportedServiceNames();

+    return getSupportedServiceNames_static();

 }

 

 } // namespace comphelper

 

+void createRegistryInfo_OSimpleLogRing()

+{

+    static ::comphelper::module::OAutoRegistration< ::comphelper::OSimpleLogRing > aAutoRegistration;

+    static ::comphelper::module::OSingletonRegistration< ::comphelper::OSimpleLogRing > aSingletonRegistration;

+}

diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index ae7d2a6eaf19..b2b935c478af 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.hxx
@@ -60,17 +60,16 @@ public:
     virtual ~OSimpleLogRing();
 
     static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-            impl_staticGetSupportedServiceNames();
+            getSupportedServiceNames_static();
 
-    static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+    static ::rtl::OUString SAL_CALL getImplementationName_static();
 
-    static ::rtl::OUString SAL_CALL impl_staticGetSingletonName();
+    static ::rtl::OUString SAL_CALL getSingletonName_static();
 
-    static ::rtl::OUString SAL_CALL impl_staticGetServiceName();
+    static ::rtl::OUString SAL_CALL getServiceName_static();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        impl_staticCreateSelfInstance(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+        Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 
 // XSimpleLogRing
     virtual void SAL_CALL logString( const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index b27cef88319c..c5d134eb9982 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -76,7 +76,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount )
     {
         OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         PropertyInfoHash::iterator aIter = maMap.find( aName );
         if( aIter != maMap.end() )
             OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index e74d21b2d755..91a9a17856d4 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -84,7 +84,7 @@ void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8
     {
         OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         PropertyDataHash::iterator aIter = maMap.find( aName );
         if( aIter != maMap.end() )
             OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
@@ -102,7 +102,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
 
     while ( aIter != aEnd )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         PropertyDataHash::iterator aDebugIter = maMap.find( (*aIter).first );
         if( aDebugIter != maMap.end() )
             OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index e155d695e2c9..83b769553331 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -82,7 +82,7 @@ void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw()
     {
         OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         PropertyMap::iterator aIter = maPropertyMap.find( aName );
         if( aIter != maPropertyMap.end() )
         {
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx
index d53d52d55ad7..7d5be659283c 100644
--- a/configmgr/qa/unit/common.hxx
+++ b/configmgr/qa/unit/common.hxx
@@ -44,7 +44,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "cppuhelper/component_context.hxx"
 #include "cppuhelper/servicefactory.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/file.hxx"
 #include "osl/thread.h"
 #include "osl/process.h"
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index a6a79ebdd0ca..aededf799d4f 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
 SHL1VERSIONMAP = export.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx
index 1531e9f49138..68baee1c6829 100644
--- a/configmgr/qa/unit/threading.cxx
+++ b/configmgr/qa/unit/threading.cxx
@@ -53,7 +53,7 @@ class KeyTester : public osl::Thread
     virtual ~KeyTester ()
     {
     }
-    virtual void run ()
+    virtual void SAL_CALL run ()
     {
         testIteration();
         while (!m_pCond->check())
diff --git a/configure.in b/configure.in
index 3505be436cf6..17cc81f905f5 100644
--- a/configure.in
+++ b/configure.in
@@ -1451,7 +1451,8 @@ if test "$COMPATH" = "." ; then
     dnl double square bracket to get single because of M4 quote...
     COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
 fi
-
+COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
+echo $COMPATH
 dnl ===================================================================
 dnl  Test the gcc version,  3 is OK
 dnl ===================================================================
@@ -1595,7 +1596,7 @@ dnl ===================================================================
 if test "$_os" = "SunOS"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
       dnl cc -V outputs to standard error!!!!
       _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
@@ -1639,7 +1640,7 @@ dnl ===================================================================
 if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_CHECKING([the SGI MIPSpro C compiler version])
       dnl cc -version outputs to standard error!!!!
       _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
@@ -1664,7 +1665,7 @@ dnl ===================================================================
 if test "$_os" = "OSF1"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_WARN([******* $_cc , $COMPATH])
       AC_MSG_CHECKING([the Compaq C compiler version])
       dnl cc -V outputs to standard error!!!!
@@ -1790,8 +1791,8 @@ if test "$_os" = "WINNT"; then
 			CC=`cygpath -u "$CC"`
 			# Remove /cl.exe from CC case insensitive
 			AC_MSG_RESULT([found ($CC)])
-			COMPATH=`echo $CC | $SED 's@/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
-			export INCLUDE=`cygpath -d "$COMPATH/../Include"`
+			COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
+			export INCLUDE=`cygpath -d "$COMPATH/Include"`
 			dnl  Check which Microsoft C/C++ compiler is found
 			AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
 dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out.         
@@ -2220,7 +2221,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
     AC_MSG_CHECKING([dynamic libgcc name])
     MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+    MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
         AC_MSG_RESULT([use $MINGW_GCCDLL])
@@ -2237,7 +2238,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
     AC_MSG_CHECKING([dynamic libstdc++ name])
     MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GXXDLL"; then
         MINGW_SHARED_GXXLIB=YES
         AC_MSG_RESULT([use $MINGW_GXXDLL])
@@ -2977,7 +2978,7 @@ if test "$SOLAR_JAVA" != ""; then
         AC_MSG_RESULT([checked (ecj)])
         #TODO: what's to do here? some switch to do 1.5 compiling?
         JAVAFLAGS="-source 1.5 -target 1.5"
-        _gij_longver="50000"
+        _gij_longver="40200"
     fi
 fi
 
@@ -3032,7 +3033,7 @@ fi
 if test "$SOLAR_JAVA" != ""; then
     dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
     if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 [import java.io.File;
 
@@ -3072,7 +3073,7 @@ _ACEOF
     fi
 
     dnl second sanity check JAVA_HOME if possible
-    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then
+    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
       # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
       if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
 
@@ -3852,25 +3853,14 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
         ], []
     )
     AC_MSG_CHECKING([whether db is at least 4.1])
-    for v in `seq 1 7`; do
-       AC_TRY_RUN([
+    AC_TRY_RUN([
 #include <db.h>
 
 int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
        else return 1;
 }
-       ], [DB_VERSION_MINOR=$v], [])
-    done
-    if test "$DB_VERSION_MINOR" -gt "1"; then
-       AC_MSG_RESULT([OK])
-       DB_VERSION=4.$DB_VERSION_MINOR
-    else
-       AC_MSG_ERROR([no. you need at least db 4.1])
-    fi
-    # does not work :/
-    #AC_CHECK_LIB(db, db_create, [],
-    #  [AC_MSG_ERROR([db library not installed or functional])], [])
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
     AC_HAVE_LIBRARY(db, [],
       [AC_MSG_ERROR([db not installed or functional])], [])
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
@@ -4689,7 +4679,8 @@ if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
          [#include <X11/Intrinsic.h>])
    else
        AC_MSG_RESULT([yes])
-       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
+         [#include <X11/Intrinsic.h>])
        AC_CHECK_LIB(Xaw, main, [],
            [AC_MSG_ERROR(Xaw library not found or functional)], [])
    fi
@@ -5418,8 +5409,8 @@ if test "$_os" = "WINNT"; then
    if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
       AC_MSG_RESULT([found])
    else
-      MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
-      MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
       if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
          cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
@@ -5936,37 +5927,74 @@ AC_SUBST(LIBSERIALIZER_JAR)
 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
   AC_MSG_CHECKING([which Apache commons-* libs to use])
   if test "$with_system_apache_commons" = "yes"; then
-       SYSTEM_APACHE_COMMONS=YES
-       AC_MSG_RESULT([external])
+    SYSTEM_APACHE_COMMONS=YES
+    AC_MSG_RESULT([external])
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
-        if test -z "$COMMONS_CODEC_JAR"; then
-                COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
-        fi
-   AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
-        [AC_MSG_ERROR(commons-codec.jar not found.)], [])
-        if test -z "$COMMONS_LANG_JAR"; then
-                COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
-        fi
-   AC_CHECK_FILE($COMMONS_LANG_JAR, [],
-        [AC_MSG_ERROR(commons-lang.jar not found.)], [])
-        if test -z "$COMMONS_HTTPCLIENT_JAR"; then
-                COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
-        fi
-   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+      if test -z $COMMONS_CODEC_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar, 
+          [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-codec.jar, 
+              [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ],
+              [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
+             [AC_MSG_ERROR(commons-codec.jar not found.)], [])
+      fi
+
+      if test -z $COMMONS_LANG_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar, 
+          [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-lang.jar, 
+              [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
+              [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_LANG_JAR, [],
+             [AC_MSG_ERROR(commons-lang.jar not found.)], [])
+      fi
+
+      if test -z $COMMONS_HTTPCLIENT_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, 
+          [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, 
+              [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
+              [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+             [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+      fi
     fi
     if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-        if test -z "$COMMONS_LOGGING_JAR"; then
-                COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
-        fi
-   AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
-        [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-
+      if test -z $COMMONS_LOGGING_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, 
+          [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-logging.jar, 
+              [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
+              [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+             [AC_MSG_ERROR(commons-logging.jar not found.)], [])
+      fi
     fi
   else
-        AC_MSG_RESULT([internal])
-        SYSTEM_APACHE_COMMONS=NO
-        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+    AC_MSG_RESULT([internal])
+    SYSTEM_APACHE_COMMONS=NO
+    BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
 fi
 AC_SUBST(SYSTEM_APACHE_COMMONS)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 20cb27644e29..87e1791ba72e 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity    :    l10n comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
+cn  connectivity    :    shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
 cn  connectivity                                    usr1    -   all cn_mkout NULL
 cn  connectivity\inc                                nmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 76519aa6a551..e1b49c878ba9 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 /** === end UNO includes === **/
 
-#include <svtools/syslocale.hxx>
+//#include <unotools/syslocale.hxx>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 77467dda0bc3..cfcd8b83761b 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -46,7 +46,7 @@
 #include <tools/urlobj.hxx>
 #include "calc/CPreparedStatement.hxx"
 #include "calc/CStatement.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/logfile.hxx>
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 91f917224496..ba6d20ac70f5 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -50,7 +50,7 @@
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
 #include "calc/CConnection.hxx"
 #include "calc/CColumns.hxx"
 #include "connectivity/sdbcx/VColumn.hxx"
@@ -58,7 +58,7 @@
 #include <osl/thread.h>
 #include <tools/config.hxx>
 #include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 620bcd6a8eee..f4019564ed30 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -73,6 +73,7 @@ SHL1STDLIBS=\
     $(VOSLIB)					\
     $(SVLLIB)					\
     $(TOOLSLIB)					\
+        $(UNOTOOLSLIB) \
     $(SALLIB)					\
     $(DBTOOLSLIB)				\
     $(DBFILELIB)				\
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 1db81262e120..e93671441969 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
 #include "dbase/DConnection.hxx"
 #include "dbase/DColumns.hxx"
 #include <osl/thread.h>
@@ -44,8 +44,8 @@
 #include "dbase/DIndexes.hxx"
 //#include "file/FDriver.hxx"
 #include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/zforlist.hxx>
+#include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
 #include <stdio.h>      //sprintf
 #include <ucbhelper/content.hxx>
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index a3c031c05c05..5f71303d7e28 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -36,13 +36,13 @@
 #include "LFolderList.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
 #include "LConnection.hxx"
 #include "LColumns.hxx"
 #include <osl/thread.h>
 #include <tools/config.hxx>
 #include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <stdio.h>      //sprintf
 #include <comphelper/extract.hxx>
@@ -59,7 +59,7 @@
 #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
 #include "LDebug.hxx"
 #endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index cbb4bc53e9f4..3d72e1a3946f 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -39,13 +39,13 @@
 #ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
 //#include <com/sun/star/sdbc/XRow.hpp>
 #endif
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
 #include "LConnection.hxx"
 #include "LColumns.hxx"
 #include <osl/thread.h>
 #include <tools/config.hxx>
 #include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <stdio.h>      //sprintf
 #include <comphelper/extract.hxx>
@@ -56,7 +56,7 @@
 #include <i18npool/mslangid.hxx>
 #include "connectivity/dbconversion.hxx"
 #include <comphelper/types.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
 #include "LDebug.hxx"
 #endif
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index d71908e0afd8..c8cda89b503c 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -54,7 +54,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/string.hxx>
 #include <tools/diagnose_ex.h>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/intlwrapper.hxx>
 
 #include <cstring>
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index e9bb9fdc4d70..6d7ca92fbdd6 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -77,9 +77,7 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB)			\
     $(VOSLIB)					\
     $(SVLLIB)					\
-    $(VCLLIB)					\
     $(TOOLSLIB)					\
-    $(SVTOOLLIB)				\
     $(UNOTOOLSLIB)				\
     $(UCBHELPERLIB)				\
     $(SALLIB)					\
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 52d14e6498cb..caa117037bcf 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 #include <tools/urlobj.hxx>
 #include "file/FCatalog.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <ucbhelper/content.hxx>
 #include <connectivity/dbcharset.hxx>
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 4b2865a67aa2..5f967758c125 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -34,8 +34,8 @@
 #include <osl/diagnose.h>
 #include "connectivity/sqlparse.hxx"
 #include <i18npool/mslangid.hxx>
-#include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
+#include <tools/string.hxx>
 #include "TConnection.hxx"
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index fa4f281ea794..149925d06451 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -36,13 +36,13 @@
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
 #include "flat/EConnection.hxx"
 #include "flat/EColumns.hxx"
 #include <osl/thread.h>
 #include <tools/config.hxx>
 #include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <stdio.h>      //sprintf
 #include <comphelper/extract.hxx>
@@ -54,7 +54,7 @@
 #include "connectivity/dbconversion.hxx"
 #include <comphelper/types.hxx>
 #include "file/quotedstring.hxx"
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <rtl/logfile.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index d044eab2796a..071c8c0cc976 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -84,7 +84,7 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB)			\
     $(VOSLIB)					\
     $(TOOLSLIB)					\
-    $(SVTOOLLIB)				\
+    $(SVLLIB)				\
     $(UNOTOOLSLIB)				\
     $(SALLIB)					\
     $(DBTOOLSLIB)				\
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 1df3315f559d..356d43822be4 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -39,7 +39,7 @@
 #include "KCatalog.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 
 using namespace connectivity::kab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 3e7c69166b1b..2736cb5c6fbc 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -33,7 +33,7 @@
 #include "KDEInit.h"
 #include <osl/diagnose.h>
 #include <osl/process.h>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index c210b52ec4bc..127c70cb4207 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -34,7 +34,7 @@
 #include "KDatabaseMetaData.hxx"
 #include "kfields.hxx"
 #include "KDEInit.h"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include "FDatabaseMetaDataResultSet.hxx"
 #include "OTypeInfo.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 72b1e618be28..51321b106042 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -33,7 +33,7 @@
 
 #include "KStatement.hxx"
 #include "KResultSetMetaData.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index bb219fcf443b..0621eef7fb8b 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -34,7 +34,7 @@
 #ifndef _COMPHELPER_TYPES_H_
 #include <comphelper/types.hxx>
 #endif
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include <connectivity/dbexception.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index d6f8622398b4..e73660ad7858 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -31,7 +31,7 @@
 #ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
 #define _CONNECTIVITY_KAB_FIELDS_HXX_
 
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 #include <connectivity/dbexception.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index 41a280050c06..dd93066074bf 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -32,7 +32,7 @@
 #define _CONNECTIVITY_KAB_ORDER_HXX_
 
 #include "rtl/ustring.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
 
 #include <vector>
 
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 4051dd6d82ec..8b720c832cf4 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -43,28 +43,28 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SHL1TARGET = $(TARGET)_any
 SHL1OBJS = $(SLO)$/test_any.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
 SHL2TARGET = $(TARGET)_unotype
 SHL2OBJS = $(SLO)$/test_unotype.obj
-SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
 SHL2VERSIONMAP = version.map
 SHL2IMPLIB = i$(SHL2TARGET)
 DEF2NAME = $(SHL2TARGET)
 
 SHL3TARGET = $(TARGET)_reference
 SHL3OBJS = $(SLO)$/test_reference.obj
-SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
 SHL3VERSIONMAP = version.map
 SHL3IMPLIB = i$(SHL3TARGET)
 DEF3NAME = $(SHL3TARGET)
 
 SHL4TARGET = $(TARGET)_recursion
 SHL4OBJS = $(SLO)$/test_recursion.obj
-SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
 SHL4VERSIONMAP = version.map
 SHL4IMPLIB = i$(SHL4TARGET)
 DEF4NAME = $(SHL4TARGET)
@@ -92,7 +92,7 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
     $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
 
 test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) $(SHL4TARGETN)
-    testshl2 $(SHL1TARGETN)
-    testshl2 $(SHL2TARGETN)
-    testshl2 $(SHL3TARGETN)
-    testshl2 $(SHL4TARGETN)
\ No newline at end of file
+    $(TESTSHL2) $(SHL1TARGETN)
+    $(TESTSHL2) $(SHL2TARGETN)
+    $(TESTSHL2) $(SHL3TARGETN)
+    $(TESTSHL2) $(SHL4TARGETN)
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index cad91661926f..785af529e51a 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -58,7 +58,7 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/Type.hxx"
 #include "com/sun/star/uno/XInterface.hpp"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "osl/interlck.h"
 #include "rtl/string.h"
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index 6ae70c44d003..60853776662b 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -31,7 +31,7 @@
 #include "precompiled_cppu.hxx"
 #include "sal/config.h"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "sal/types.h"
 
 #include "Rec.hpp"
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index afb12654a124..8bb793c655e4 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -35,7 +35,7 @@
 
 #include "Interface1.hpp"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 0068dcedd463..ad457d516fa2 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -47,7 +47,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppu/unotype.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index ddbc3f7c6f82..cfcfebf246e6 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "com/sun/star/lang/XEventListener.hpp"
 #include "cppuhelper/interfacecontainer.hxx"
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index dd6c13fea52c..624bc797a64b 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/cppu_ifcontainer.obj
 SHL1TARGET= cppu_ifcontainer
@@ -49,6 +49,7 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB) \
     $(SALLIB) \
     $(CPPULIB) \
+    $(TESTSHL2LIB)\
     $(CPPUNITLIB)
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index b081274d8e99..2ad56c05ff1c 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ INCPRE += -I$(MISC)$/$(TARGET)$/inc
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_propertysetmixin.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 5336b60ae68a..ecb7220d110d 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -64,7 +64,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/servicefactory.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/mutex.hxx"
 #include "osl/thread.h"
 #include "rtl/ref.hxx"
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index 21af4b8d1364..f80388d5d122 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "cppuhelper/unourl.hxx"
 #include "rtl/malformeduriexception.hxx"
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index a611b135c7e9..a999532c5b4a 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/cppu_unourl.obj
 SHL1TARGET= cppu_unourl
@@ -49,6 +49,7 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB) \
     $(SALLIB) \
     $(CPPULIB) \
+    $(TESTSHL2LIB)\
     $(CPPUNITLIB)
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 95f1697ef7be..bb0072b4d0f3 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_weak.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
@@ -53,4 +53,4 @@ SLOFILES = $(SHL1OBJS)
 ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN)
-    testshl2 $(SHL1TARGETN)
+    $(TESTSHL2) $(SHL1TARGETN)
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 98bbb6527276..0cf128d519d6 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -41,7 +41,7 @@
 #include "com/sun/star/uno/XWeak.hpp"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/weak.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/ref.hxx"
 #include "sal/types.h"
 
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 88f25e192e49..cc5b7708f1d8 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -40,13 +40,6 @@
 
 #include <hash_map>
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
-
 #include <com/sun/star/lang/XEventListener.hpp>
 
 
diff --git a/cppuhelper/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx
index 8784f59d79e3..89b2d6411e77 100644
--- a/cppuhelper/test/testidlclass.cxx
+++ b/cppuhelper/test/testidlclass.cxx
@@ -30,11 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppuhelper.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#undef  NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
 
 #include <cppuhelper/stdidlclass.hxx>
 
@@ -65,18 +60,18 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
                                 (XServiceInfo * ) 0
                                             );
 
-    assert( r.is() );
+    OSL_ASSERT( r.is() );
 
 
     {  // test the xidlclassprovider interface !
         Reference< XIdlClassProvider > rProv( r , UNO_QUERY );
-        assert( rProv.is() );
+        OSL_ASSERT( rProv.is() );
 
         {
             Sequence < Reference < XIdlClass > > seq = rProv->getIdlClasses();
 
             // is always one
-            assert( seq.getLength() == 1 );
+            OSL_ASSERT( seq.getLength() == 1 );
 
             // test the weak reference
             rProv->getIdlClasses();
@@ -89,7 +84,7 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
     }
 
 
-    assert( r->getName() == sImplName );
+    OSL_ASSERT( r->getName() == sImplName );
 
     // test equals
     Reference < XIdlClass > r2 =
@@ -101,18 +96,18 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
                                 (XServiceInfo * ) 0
                                             );
     // test for implementation name
-    assert( r2->equals( r ) );
+    OSL_ASSERT( r2->equals( r ) );
 
     Sequence < Reference < XIdlClass > > seqIdlClass = r->getInterfaces();
 
     //TODO !
     // one idl class for one interface
     // this test fails, if core reflection fails !
-//  assert( 1 == seqIdlClass.getLength() );
+//  OSL_ASSERT( 1 == seqIdlClass.getLength() );
 //  Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0];
 
     // check for IdlClass interface returned by Core Reflection
-//  assert( rIdlInterface.is() );
+//  OSL_ASSERT( rIdlInterface.is() );
 
 
 
diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx
index e798f86cab54..d3b17ed3e83a 100644
--- a/cppuhelper/test/testproptyphlp.cxx
+++ b/cppuhelper/test/testproptyphlp.cxx
@@ -34,12 +34,6 @@
 
 #include <com/sun/star/beans/Property.hpp>
 
-#if OSL_DEBUG_LEVEL == 0
-#undef  NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
-
 using namespace ::com::sun::star::uno;
 using namespace ::cppu;
 
@@ -51,27 +45,27 @@ void testPropertyTypeHelper()
 
     sal_Int32 i;
     convertPropertyValue( i ,  a );
-    assert( 25 == i );
+    OSL_ASSERT( 25 == i );
 
     sal_Int16 i16;
     convertPropertyValue( i16 ,  a );
-    assert( 25 == i16 );
+    OSL_ASSERT( 25 == i16 );
 
     sal_Int8 i8;
     convertPropertyValue( i8 ,  a );
-    assert( 25 == i8 );
+    OSL_ASSERT( 25 == i8 );
 
     sal_uInt32 i32;
     convertPropertyValue( i32 ,  a );
-    assert( 25 == i32 );
+    OSL_ASSERT( 25 == i32 );
 
     double d;
     convertPropertyValue( d , a );
-    assert( 25. == d );
+    OSL_ASSERT( 25. == d );
 
     float f;
     convertPropertyValue( f , a );
-    assert( 25. == f );
+    OSL_ASSERT( 25. == f );
 
     ::com::sun::star::beans::Property prop;
 
@@ -83,11 +77,11 @@ void testPropertyTypeHelper()
 
     ::com::sun::star::beans::Property prop2;
     convertPropertyValue( prop2 , a );
-     assert( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes );
+     OSL_ASSERT( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes );
 
 
     ::rtl::OUString ow;
     a <<= prop.Name;
     convertPropertyValue( ow , a );
-    assert( ow == prop.Name );
+    OSL_ASSERT( ow == prop.Name );
 }
diff --git a/cppunit/cppunit-1.8.0-r1.patch b/cppunit/cppunit-1.8.0-r1.patch
index 426051d6288d..b632c03596a8 100644
--- a/cppunit/cppunit-1.8.0-r1.patch
+++ b/cppunit/cppunit-1.8.0-r1.patch
@@ -1,12 +1,12 @@
 --- misc/cppunit-1.8.0/AUTHORS	2002-03-26 09:29:58.000000000 +0100
-+++ misc/build/cppunit-1.8.0/AUTHORS	2008-12-09 08:01:30.000000000 +0100
++++ misc/build/cppunit-1.8.0/AUTHORS	2009-09-12 14:15:35.015625000 +0200
 @@ -5,3 +5,4 @@
  Baptiste Lepilleur <gaiacrtn@free.fr> <blep@sourceforge.net>
  Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
  Steve Robbins <smr99@sourceforge.net>
 +Lars Langhans <lla@openoffice.org>
 --- misc/cppunit-1.8.0/ChangeLog	2002-04-11 11:53:02.000000000 +0200
-+++ misc/build/cppunit-1.8.0/ChangeLog	2008-12-09 08:08:42.000000000 +0100
++++ misc/build/cppunit-1.8.0/ChangeLog	2009-09-12 14:15:35.031250000 +0200
 @@ -1,3 +1,9 @@
 +2008-12-09 Lars Langhans <lla@openoffice.org>
 +	* create with some source files a new library
@@ -18,7 +18,7 @@
  
  	* doc/FAQ: removed question about the Exception::operator =() problem.
 --- misc/cppunit-1.8.0/INSTALL	2001-07-06 19:48:28.000000000 +0200
-+++ misc/build/cppunit-1.8.0/INSTALL	2008-12-09 09:39:09.000000000 +0100
++++ misc/build/cppunit-1.8.0/INSTALL	2009-09-12 14:15:35.062500000 +0200
 @@ -1,6 +1,12 @@
  Basic Installation
  ==================
@@ -33,15 +33,15 @@
  
     The `configure' shell script attempts to guess correct values for
 --- misc/cppunit-1.8.0/include/cppunit/Asserter.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Asserter.h	2008-02-27 17:09:30.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <cppunit/Portability.h>
++++ misc/build/cppunit-1.8.0/include/cppunit/Asserter.h	2009-09-12 14:15:35.078125000 +0200
+@@ -5,6 +5,7 @@
  #include <cppunit/SourceLine.h>
  #include <string>
-+#include <rtl/ustring.hxx>
  
++
  namespace CppUnit
  {
+ 
 @@ -44,8 +45,8 @@
  
    /*! Throws a Exception with the specified message and location.
@@ -65,7 +65,7 @@
 +
 +    // LLA: test, if it's possible to use a DEFINE twice ;-)
 +  void CPPUNIT_API failIf( bool shouldFail, 
-+                           rtl::OUString const& message, 
++                           const char* message, 
 +                           SourceLine const& sourceLine = SourceLine() );
  
    /*! Throws a NotEqualException with the specified message and location.
@@ -109,7 +109,7 @@
  } // namespace Asserter
  } // namespace CppUnit
 --- misc/cppunit-1.8.0/include/cppunit/Exception.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Exception.h	2008-02-27 17:10:36.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/Exception.h	2009-09-12 14:15:35.093750000 +0200
 @@ -21,7 +21,7 @@
      class Type
      {
@@ -180,7 +180,7 @@
  } // namespace CppUnit
  
 --- misc/cppunit-1.8.0/include/cppunit/NotEqualException.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/NotEqualException.h	2008-02-27 17:11:12.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/NotEqualException.h	2009-09-12 14:15:35.093750000 +0200
 @@ -19,16 +19,16 @@
     * \param additionalMessage Additionnal information provided to further qualify
     *                          the inequality.
@@ -206,30 +206,47 @@
  
    NotEqualException( const NotEqualException &other );
 --- misc/cppunit-1.8.0/include/cppunit/Portability.h	2002-03-25 19:41:39.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Portability.h	2008-02-27 17:12:24.000000000 +0100
-@@ -3,11 +3,11 @@
- 
- /* include platform specific config */
- #if defined(__BORLANDC__)
--#    include <cppunit/config-bcb5.h>
-+#    include <cppunit/portability/config-bcb5.h>
- #elif defined (_MSC_VER)
--#    include <cppunit/config-msvc6.h>
-+#    include <cppunit/portability/config-msvc6.h>
- #else
--#    include <cppunit/config-auto.h>
-+#    include <cppunit/portability/config-auto.h>
++++ misc/build/cppunit-1.8.0/include/cppunit/Portability.h	2009-09-12 14:15:35.109375000 +0200
+@@ -28,7 +28,7 @@
+ #define CPPUNIT_ENABLE_CU_TEST_MACROS        0
  #endif
  
- 
+-/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) 
++/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.)
+    I don't think there is any C preprocess that does NOT support this! */
+ #ifndef CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION
+ #define CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION   1
+@@ -51,11 +51,11 @@
+ #if CPPUNIT_HAVE_SSTREAM
+ #   include <sstream>
+     namespace CppUnit {
+-      class OStringStream : public std::ostringstream 
++      class OStringStream : public std::ostringstream
+       {
+       };
+     }
+-#else 
++#else
+ #if CPPUNIT_HAVE_CLASS_STRSTREAM
+ #   include <string>
+ #   if CPPUNIT_HAVE_STRSTREAM
+@@ -65,7 +65,7 @@
+ #   endif
+ 
+     namespace CppUnit {
+-      class OStringStream : public std::ostrstream 
++      class OStringStream : public std::ostrstream
+       {
+       public:
+           std::string str()
 --- misc/cppunit-1.8.0/include/cppunit/Test.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Test.h	2008-02-27 17:09:20.000000000 +0100
-@@ -3,14 +3,15 @@
- 
++++ misc/build/cppunit-1.8.0/include/cppunit/Test.h	2009-09-12 14:15:35.125000000 +0200
+@@ -4,13 +4,15 @@
  #include <cppunit/Portability.h>
  #include <string>
-+#include <cppunit/autoregister/htestresult.h>
  
++typedef void* hTestResult;
++
  namespace CppUnit {
  
 -class TestResult;
@@ -242,7 +259,7 @@
   * All test objects should be a subclass of Test.  Some test objects,
   * TestCase for example, represent one individual test.  Other test
   * objects, such as TestSuite, are comprised of several tests.  
-@@ -27,7 +28,7 @@
+@@ -27,7 +29,7 @@
  
      /*! \brief Run the test, collecting results.
       */
@@ -252,13 +269,12 @@
      /*! \brief Return the number of test cases invoked by run().
       *
 --- misc/cppunit-1.8.0/include/cppunit/TestAssert.h	2002-04-04 17:39:37.000000000 +0200
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestAssert.h	2008-02-27 17:12:12.000000000 +0100
-@@ -5,9 +5,12 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/TestAssert.h	2009-09-12 14:15:35.156250000 +0200
+@@ -5,9 +5,10 @@
  #include <cppunit/Exception.h>
  #include <cppunit/Asserter.h>
  
-+#include <cppunit/checkboom.hxx>
- 
+-
  namespace CppUnit {
  
 +
@@ -266,7 +282,7 @@
    /*! \brief Traits used by CPPUNIT_ASSERT_EQUAL().
     *
     * Here is an example of specialization of that traits:
-@@ -31,83 +34,83 @@
+@@ -31,83 +32,83 @@
     * };
     * \endcode
     */
@@ -419,7 +435,7 @@
  
  /* A set of macros which allow us to get the line number
   * and file name at the point of an error.
-@@ -118,15 +121,22 @@
+@@ -118,15 +119,22 @@
  /** Assertions that a condition is \c true.
   * \ingroup Assertions
   */
@@ -450,7 +466,7 @@
  #endif
  
  /** Assertion with a user specified message.
-@@ -136,25 +146,33 @@
+@@ -136,25 +144,33 @@
   * \param condition If this condition evaluates to \c false then the
   *                  test failed.
   */
@@ -493,7 +509,7 @@
  #else
  /** Asserts that two values are equals.
   * \ingroup Assertions
-@@ -173,9 +191,9 @@
+@@ -173,9 +189,9 @@
   * removed by specializing the CppUnit::assertion_traits.
   */
  #define CPPUNIT_ASSERT_EQUAL(expected,actual)                     \
@@ -506,7 +522,7 @@
  
  /** Asserts that two values are equals, provides additional messafe on failure.
   * \ingroup Assertions
-@@ -196,20 +214,20 @@
+@@ -196,20 +212,20 @@
   * removed by specializing the CppUnit::assertion_traits.
   */
  #define CPPUNIT_ASSERT_EQUAL_MESSAGE(message,expected,actual)     \
@@ -535,7 +551,7 @@
  
  // Backwards compatibility
  
-@@ -223,7 +241,6 @@
+@@ -223,7 +239,6 @@
  
  #endif
  
@@ -544,7 +560,7 @@
  
  #endif  // CPPUNIT_TESTASSERT_H
 --- misc/cppunit-1.8.0/include/cppunit/TestCaller.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestCaller.h	2008-02-27 17:09:40.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/TestCaller.h	2009-09-12 14:15:35.171875000 +0200
 @@ -111,7 +111,7 @@
     * \param name name of this TestCaller
     * \param test the method this TestCaller calls in runTest()
@@ -573,17 +589,16 @@
  	    m_ownFixture( true ),
  	    m_fixture( fixture ),
 --- misc/cppunit-1.8.0/include/cppunit/TestCase.h	2002-03-27 18:56:45.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestCase.h	2008-02-27 17:11:00.000000000 +0100
-@@ -3,15 +3,13 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/TestCase.h	2009-09-12 14:15:35.187500000 +0200
+@@ -3,15 +3,12 @@
  
  #include <cppunit/Portability.h>
  #include <cppunit/Test.h>
 -#include <cppunit/TestAssert.h>
  #include <cppunit/TestFixture.h>
  #include <string>
--
-+#include <cppunit/autoregister/htestresult.h>
  
+-
  namespace CppUnit {
  
 -class TestResult;
@@ -592,7 +607,7 @@
  
  /*! \brief A single test object.
   *
-@@ -28,25 +26,25 @@
+@@ -28,25 +25,25 @@
  {
  public:
  
@@ -623,7 +638,7 @@
  private:
      TestCase( const TestCase &other ); 
 --- misc/cppunit-1.8.0/include/cppunit/TestFailure.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestFailure.h	2008-02-27 17:09:50.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/TestFailure.h	2009-09-12 14:15:35.187500000 +0200
 @@ -4,6 +4,16 @@
  #include <cppunit/Portability.h>
  #include <string>
@@ -674,7 +689,7 @@
  private: 
    TestFailure( const TestFailure &other ); 
 --- misc/cppunit-1.8.0/include/cppunit/TestFixture.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestFixture.h	2008-02-27 17:10:26.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/TestFixture.h	2009-09-12 14:15:35.203125000 +0200
 @@ -74,11 +74,6 @@
   *  }
   * \endcode
@@ -688,8 +703,8 @@
  class CPPUNIT_API TestFixture
  {
 --- misc/cppunit-1.8.0/include/cppunit/TestSuite.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestSuite.h	2008-02-27 17:11:24.000000000 +0100
-@@ -4,17 +4,20 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/TestSuite.h	2009-09-12 14:15:35.218750000 +0200
+@@ -4,9 +4,11 @@
  #include <cppunit/Portability.h>
  
  #if CPPUNIT_NEED_DLL_DECL
@@ -701,8 +716,7 @@
  
  #include <cppunit/Test.h>
  #include <vector>
- #include <string>
-+#include <cppunit/autoregister/htestresult.h>
+@@ -14,7 +16,7 @@
  
  namespace CppUnit {
  
@@ -711,7 +725,7 @@
  
  #if CPPUNIT_NEED_DLL_DECL
    template class CPPUNIT_API std::vector<Test *>;
-@@ -35,7 +38,6 @@
+@@ -35,7 +37,6 @@
   * Note that TestSuites assume lifetime
   * control for any tests added to them.
   *
@@ -719,7 +733,7 @@
   * \see Test 
   * \see TestCaller
   */
-@@ -44,10 +46,10 @@
+@@ -44,10 +45,10 @@
  class CPPUNIT_API TestSuite : public Test
  {
  public:
@@ -732,7 +746,7 @@
    int countTestCases() const;
    std::string getName() const;
    std::string toString() const;
-@@ -71,7 +73,9 @@
+@@ -71,7 +72,9 @@
  
  
  #if CPPUNIT_NEED_DLL_DECL
@@ -742,75 +756,9 @@
 +#endif
  
  #endif // CPPUNIT_TESTSUITE_H
---- misc/cppunit-1.8.0/include/cppunit/additionalfunc.hxx	2008-12-10 20:46:05.823290260 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/additionalfunc.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,61 @@
--dummy
-+#ifndef ADDITIONALFUNC_HXX
-+#define ADDITIONALFUNC_HXX
-+
-+#include "cppunit/autoregister/registertestfunction.h"
-+#include "sal/types.h"
-+
-+extern "C" void SAL_CALL RegisterAdditionalFunctions(FktRegFuncPtr _pFunc);
-+
-+#define NOADDITIONAL \
-+void RegisterAdditionalFunctions(FktRegFuncPtr){}
-+
-+namespace {
-+    
-+enum T2_OSType {
-+    T2_OS_WNT32 = 1,
-+    T2_OS_UNIX,
-+    T2_OS_OS2
-+};
-+
-+inline T2_OSType getOSType()
-+{
-+#if defined WNT
-+    return T2_OS_WNT32;
-+#elif defined OS2
-+    return T2_OS_OS2;
-+#else
-+    return T2_OS_UNIX;
-+#endif
-+}
-+ 
-+}
-+
-+#define TESTSHL2_UNO_BOOTSTRAP(file)                                                    \
-+void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)                                  \
-+{                                                                                       \
-+   com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMS;     \
-+   com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext; \
-+   try {                                                                                \
-+       if (strlen(#file) > 0) {                                                         \
-+           ::rtl::OUString iniFile(rtl::OUString::createFromAscii(#file));              \
-+           if (getOSType() == T2_OS_WNT32 || getOSType() == T2_OS_OS2) {                \
-+               iniFile += ::rtl::OUString::createFromAscii(".ini");                     \
-+           } else {                                                                     \
-+               iniFile += ::rtl::OUString::createFromAscii("rc");                       \
-+           }                                                                            \
-+           xComponentContext = cppu::defaultBootstrap_InitialComponentContext(iniFile); \
-+       } else {                                                                         \
-+           xComponentContext = cppu::defaultBootstrap_InitialComponentContext();        \
-+       }                                                                                \
-+       xMS.set(xComponentContext->getServiceManager(), com::sun::star::uno::UNO_QUERY); \
-+       comphelper::setProcessServiceFactory(xMS);                                       \
-+   }                                                                                    \
-+   catch (::com::sun::star::uno::Exception e ) {                                        \
-+       rtl::OString aError;                                                             \
-+       aError = rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);           \
-+       printf("Error at UNO bootstrap time caught: %s\nMust quit.\n", aError.getStr()); \
-+       exit(1);                                                                         \
-+   }                                                                                    \
-+} 
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: additionalfunc.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/callbackfunc_fktptr.h	2008-12-10 20:46:05.931077489 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/callbackfunc_fktptr.h	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,63 @@
+--- misc/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h	2009-09-14 08:43:30.656250000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h	2009-09-12 15:11:06.859375000 +0200
+@@ -1 +1,50 @@
 -dummy
 +/*************************************************************************
 + *
@@ -845,8 +793,6 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: additionalfunc.hxx.dummy.
 +#ifndef _callbackfunc_fktptr_h
 +#define _callbackfunc_fktptr_h
 +
-+#include <sal/types.h>
-+
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
@@ -857,400 +803,99 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: additionalfunc.hxx.dummy.
 +typedef void* hTest;
 +typedef void* hException;
 +
-+typedef sal_Int32 (* FktPtr_CallbackDispatch)(int x, ...);
-+
-+//# typedef void (* FktPtr_TestResult_startTest)(hTestResult, hTest );
-+//# typedef void (* FktPtr_TestResult_addFailure)( hTestResult, hTest , hException pException );
-+//# typedef void (* FktPtr_TestResult_addError)( hTestResult, hTest , hException pException );
-+//# typedef void (* FktPtr_TestResult_endTest)( hTestResult, hTest );
-+//# typedef bool (* FktPtr_TestResult_shouldStop)(hTestResult);
-+//# 
-+//# // Additional functions
-+//# typedef void (* FktPtr_TestResult_addInfo)( hTestResult, hTest, const char* );
-+//# typedef void (* FktPtr_TestResult_enterNode)( hTestResult, const char* );
-+//# typedef void (* FktPtr_TestResult_leaveNode)( hTestResult, const char* );
++typedef long (* FktPtr_CallbackDispatch)(int x, ...);
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: callbackfunc_fktptr.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/callbackstructure.h	2008-12-10 20:46:06.013912039 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/callbackstructure.h	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,89 @@
+--- misc/cppunit-1.8.0/include/cppunit/config-auto.h	2009-09-12 15:20:48.250000000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/config-auto.h	2009-09-12 14:15:35.234375000 +0200
+@@ -1 +1,64 @@
 -dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _callbackstructure_h
-+#define _callbackstructure_h
-+
-+#include <sal/types.h>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/autoregister/registerfunc.h>
-+#include <cppunit/autoregister/registertestfunction.h>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+// this structure will filled by the testshl tool and hand to the testdll
-+
-+struct CallbackStructure
-+{
-+    // a version number, if we want to change/expand this struct 
-+    sal_Int32 nVersion;
-+    sal_Int64 nMagic;
-+
-+    FktRegFuncPtr                aRegisterFunction;
-+    
-+    FktPtr_CallbackDispatch      aCallbackDispatch;
-+
-+    //# FktPtr_TestResult_startTest  aStartTest;
-+    //# FktPtr_TestResult_addFailure aAddFailure; 
-+    //# FktPtr_TestResult_addError   aAddError;
-+    //# FktPtr_TestResult_endTest    aEndTest;  
-+    //# FktPtr_TestResult_shouldStop aShouldStop;
-+    //# 
-+    //# FktPtr_TestResult_addInfo    aAddInfo;
-+    //# FktPtr_TestResult_enterNode  aEnterNode;
-+    //# FktPtr_TestResult_leaveNode  aLeaveNode;
-+    
-+	const char* psForward;
-+    CmdLineBits nBits;
-+
-+    // void* pJobList;
-+
-+    sal_Int64 nMagic2;
-+
-+    CallbackStructure()
-+            :nVersion(1),
-+             nMagic(SAL_CONST_INT64(0x0123456789abcdef)),
-+             aRegisterFunction(NULL),
-+             aCallbackDispatch(NULL),
-+             /* aStartTest(NULL),
-+             aAddFailure(NULL),
-+             aAddError(NULL),
-+             aEndTest(NULL),
-+             aShouldStop(NULL),
-+             aAddInfo(NULL),
-+             aEnterNode(NULL),
-+             aLeaveNode(NULL), */
-+			 psForward(NULL),
-+             nBits(0),
-+             /* pJobList(NULL), */
-+             nMagic2(0)
-+        {}
-+};
++#ifndef _INCLUDE_CPPUNIT_CONFIG_AUTO_H
++#define _INCLUDE_CPPUNIT_CONFIG_AUTO_H 1
++ 
++/* include/cppunit/config-auto.h. Generated automatically at end of configure. */
++/* config/config.h.  Generated automatically by configure.  */
++/* config/config.h.in.  Generated automatically from configure.in by autoheader.  */
 +
++/* define if library uses std::string::compare(string,pos,n) */
++#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
++#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST  1 
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: callbackstructure.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/htestresult.h	2008-12-10 20:46:06.090738039 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/htestresult.h	2008-02-27 17:17:34.000000000 +0100
-@@ -1 +1,6 @@
--dummy
-+#ifndef _htestresult_h
-+#define _htestresult_h
-+
-+typedef void* hTestResult;
 +
++/* define if the library defines sstream */
++#ifndef CPPUNIT_HAVE_SSTREAM
++#define CPPUNIT_HAVE_SSTREAM 1 
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: htestresult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/registerfunc.h	2008-12-10 20:46:06.135034318 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/registerfunc.h	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,50 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _registerfunc_h
-+#define _registerfunc_h
-+
-+#include <sal/types.h>
-+#include <cppunit/autoregister/htestresult.h>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/autoregister/testfunc.h>
-+
-+struct CallbackStructure;
-+
-+// this function is used to register one function into a Container in the testshl tool.
-+extern "C" void SAL_CALL registerFunction(FktPtr aFunc, const char* aFuncName);
-+
-+// this function is the register function for auto registering
-+
-+extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* );
-+typedef void (* FktRegAllPtr)(CallbackStructure*);
-+
 +
++/* Define if you have the <cmath> header file. */
++#ifndef CPPUNIT_HAVE_CMATH 
++#define CPPUNIT_HAVE_CMATH  1 
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: registerfunc.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/registertestfunction.h	2008-12-10 20:46:06.214882818 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/registertestfunction.h	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,54 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _registertestfunction_h
-+#define _registertestfunction_h
-+
-+#include <sal/types.h>
-+#include <cppunit/autoregister/testfunc.h>
 +
-+#ifdef __cplusplus
-+extern "C" {
++/* Define if you have the <dlfcn.h> header file. */
++#ifndef CPPUNIT_HAVE_DLFCN_H 
++#define CPPUNIT_HAVE_DLFCN_H  1 
 +#endif
-+    
-+// function ptr, to register a function
-+typedef void (* FktRegFuncPtr)(FktPtr aFunc, const char* aFuncName);
-+
-+// this function is used in the testdll to register the given function
-+// into the testshl
-+extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr aFunc);
 +
-+#ifdef __cplusplus
-+}
++/* define to 1 if the compiler implements namespaces */
++#ifndef CPPUNIT_HAVE_NAMESPACES 
++#define CPPUNIT_HAVE_NAMESPACES  1 
 +#endif
 +
++/* define if the compiler supports Run-Time Type Identification */
++#ifndef CPPUNIT_HAVE_RTTI 
++#define CPPUNIT_HAVE_RTTI  0 
 +#endif
 +
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: registertestfunction.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/testfunc.h	2008-12-10 20:46:06.292344601 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/testfunc.h	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,47 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _testfunc_h
-+#define _testfunc_h
-+
-+#include <cppunit/autoregister/htestresult.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
++/* define if the compiler has stringstream */
++#ifndef CPPUNIT_HAVE_SSTREAM
++#define CPPUNIT_HAVE_SSTREAM 1
 +#endif
-+    
-+// typedef for a testfunction
-+typedef void (* FktPtr)(hTestResult);
 +
-+#ifdef __cplusplus
-+}
++/* Define if you have the <strstream> header file. */
++#ifndef CPPUNIT_HAVE_STRSTREAM 
++#define CPPUNIT_HAVE_STRSTREAM  1 
 +#endif
 +
++/* Name of package */
++#ifndef CPPUNIT_PACKAGE 
++#define CPPUNIT_PACKAGE  "cppunit" 
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: testfunc.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/checkboom.hxx	2008-12-10 20:46:06.371034174 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/checkboom.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,40 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef CHECKBOOM_HXX
-+#define CHECKBOOM_HXX
-+
-+#include <string>
-+#include <rtl/ustring.hxx>
-+
-+void CheckBoom(bool bCondition, std::string const& msg);
-+void CheckBoom(bool bCondition, rtl::OUString const& msg);
 +
++/* Define to 1 to use type_info::name() for class names */
++#ifndef CPPUNIT_USE_TYPEINFO_NAME 
++#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: checkboom.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/cmdlinebits.hxx	2008-12-10 20:46:06.465888459 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/cmdlinebits.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,52 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef CMDLINEBITS_HXX
-+#define CMDLINEBITS_HXX
-+
-+#include <sal/types.h>
-+
-+typedef sal_uInt32 CmdLineBits;
-+const char* getForwardString();
-+
-+#include <stdarg.h>
-+
-+enum T_Print_Params {
-+    T_INFO = 1,
-+    T_VERBOSE,
-+    T_DEBUG,
-+    T_ERROR
-+};
-+
-+// void t_print(const char*);
-+void t_print(const char*, ...);
-+void t_print(T_Print_Params, const char*, ...);
 +
++/* Version number of package */
++#ifndef CPPUNIT_VERSION 
++#define CPPUNIT_VERSION  "1.8.0" 
++#endif
++ 
++/* _INCLUDE_CPPUNIT_CONFIG_AUTO_H */
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
+--- misc/cppunit-1.8.0/include/cppunit/config-msvc6.h	2002-03-25 19:41:39.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/config-msvc6.h	2009-09-12 14:15:35.250000000 +0200
+@@ -21,12 +21,10 @@
+ #define CPPUNIT_HAVE_NAMESPACES  1 
+ #endif
+ 
+-/* define if the compiler supports Run-Time Type Identification */
+ #ifndef CPPUNIT_HAVE_RTTI 
+-#define CPPUNIT_HAVE_RTTI  1 
++#define CPPUNIT_HAVE_RTTI  0
+ #endif
+ 
+-/* Define to 1 to use type_info::name() for class names */
+ #ifndef CPPUNIT_USE_TYPEINFO_NAME 
+ #define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
+ #endif
 --- misc/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h	2008-02-27 17:16:16.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h	2009-09-12 14:15:35.265625000 +0200
 @@ -1,6 +1,7 @@
  #ifndef CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
  #define CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
@@ -1290,7 +935,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
  
  } // namespace CppUnit
 --- misc/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h	2008-02-27 17:17:12.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h	2009-09-12 14:15:35.281250000 +0200
 @@ -132,6 +132,14 @@
        }                                                                   \
      };                                                                    \
@@ -1361,8 +1006,8 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
  
  #endif  // CPPUNIT_EXTENSIONS_HELPERMACROS_H
 --- misc/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h	2008-02-27 17:16:38.000000000 +0100
-@@ -4,14 +4,18 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h	2009-09-12 14:15:35.296875000 +0200
+@@ -4,13 +4,16 @@
  #include <cppunit/Portability.h>
  
  #if CPPUNIT_NEED_DLL_DECL
@@ -1375,13 +1020,11 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
  #include <cppunit/extensions/TestFactory.h>
  #include <map>
  #include <string>
++#include <cppunit/Test.h>
  
-+#include <cppunit/autoregister/htestresult.h>
-+
  namespace CppUnit {
  
- class TestSuite;
-@@ -79,7 +83,7 @@
+@@ -79,7 +82,7 @@
     * \param name Name of the registry. It is the name of TestSuite returned by
     *             makeTest().
     */
@@ -1390,7 +1033,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
  
    /// Destructor.
    virtual ~TestFactoryRegistry();
-@@ -105,6 +109,7 @@
+@@ -105,6 +108,7 @@
     *         specified name.
     */
    static TestFactoryRegistry &getRegistry( const std::string &name );
@@ -1398,7 +1041,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
  
    /** Adds the registered tests to the specified suite.
     * \param suite Suite the tests are added to.
-@@ -116,9 +121,12 @@
+@@ -116,9 +120,12 @@
     * \param factory Factory to register. 
     * \deprecated Use registerFactory( TestFactory *) instead.
     */
@@ -1412,7 +1055,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
    /** Adds the specified TestFactory to the registry.
     *
     * \param factory Factory to register. 
-@@ -141,8 +149,10 @@
+@@ -141,8 +148,10 @@
  
  
  #if CPPUNIT_NEED_DLL_DECL
@@ -1424,7 +1067,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
  
  #endif  // CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
 --- misc/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h	2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h	2008-02-27 17:17:22.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h	2009-09-12 14:15:35.312500000 +0200
 @@ -34,11 +34,11 @@
        }
  #endif
@@ -1476,9 +1119,9 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
        }
  
      private:
---- misc/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx	2008-12-10 20:46:06.550085206 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,58 @@
+--- misc/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx	2009-09-14 08:43:30.703125000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx	2009-09-12 15:12:02.703125000 +0200
+@@ -1 +1,39 @@
 -dummy
 +/*************************************************************************
 + *
@@ -1513,1478 +1156,15 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
 +#ifndef _externcallbackfunc_hxx
 +#define _externcallbackfunc_hxx
 +
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
++#include <cppunit/callbackfunc_fktptr.h>
 +
 +// these pointers have they origin in 'tresregister.cxx'
 +extern FktPtr_CallbackDispatch pCallbackFunc;
 +
-+//# extern FktPtr_TestResult_startTest  pTestResult_StartTest;
-+//# extern FktPtr_TestResult_addFailure pTestResult_AddFailure;
-+//# extern FktPtr_TestResult_addError   pTestResult_AddError;
-+//# extern FktPtr_TestResult_endTest    pTestResult_EndTest;
-+//# extern FktPtr_TestResult_addInfo    pTestResult_AddInfo;
-+
-+// these pointers have they origin in 'tresregister.cxx'
-+// extern FktPtr_TestResult_Starter  pTestResult_Starter;
-+
-+//# extern FktPtr_TestResult_startTest  pTestResult_StartTest;
-+//# extern FktPtr_TestResult_addFailure pTestResult_AddFailure;
-+//# extern FktPtr_TestResult_addError   pTestResult_AddError;
-+//# extern FktPtr_TestResult_endTest    pTestResult_EndTest;
-+//# extern FktPtr_TestResult_addInfo    pTestResult_AddInfo;
-+//# 
-+//# extern FktPtr_TestResult_enterNode  pTestResult_EnterNode;
-+//# extern FktPtr_TestResult_leaveNode  pTestResult_LeaveNode;
-+//# 
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: externcallbackfunc.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/joblist.hxx	2008-12-10 20:46:06.643901729 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/joblist.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,99 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef CPPUNIT_JOBLIST_HXX
-+#define CPPUNIT_JOBLIST_HXX
-+
-+#include <vector>
-+#include <string>
-+#include <hash_map>
-+#include "sal/types.h"
-+
-+// #include <cppunit/nocopy.hxx>
-+
-+/*
-+  struct eqstr
-+  {
-+  bool operator()( std::string const & s1, std::string const& s2 ) const 
-+  {
-+  return ( s1 == s2 );
-+  }
-+  };
-+*/
-+
-+/*
-+  struct hashstr
-+  {
-+  sal_uInt32 operator()( std::string const & str ) const 
-+  {
-+  return str.hashCode();
-+  }
-+  };
-+*/
-+typedef std::hash_map< std::string, int > HashMap;
-+
-+// typedef std::vector<std::string> StringList;
-+
-+#define JOB_UNKNOWN   0
-+#define JOB_NOT_FOUND 1
-+#define JOB_PASSED    2
-+#define JOB_FAILED    3
-+#define JOB_ACCESS    4
-+
-+#define JOB_EXCLUDE_LIST 0x1000
-+#define JOB_ONLY_LIST    0x1001
-+
-+typedef sal_Int16 JobType;
-+
-+class JobList /* : NOCOPY */
-+{
-+    HashMap m_aJobList;
-+    char** ppsJobList;
-+
-+    // returns true if the given List contains unxlngi or unxsols or wntmsci...
-+    bool isInCurrentEnvironment(std::string const& _sString);
-+    std::string trim(std::string const& _sStringToTrim);
-+
-+public:
-+    JobList();
-+    ~JobList();
-+
-+    bool readfile(std::string const& _sFilename, JobType _nJobType);
-+    const char** getList() const {return (const char**)ppsJobList;}
-+
-+    int getJobListEntry(std::string const& _sIndexName);
-+    void setJobListEntry(std::string const& _sIndexName, int _nValue);
-+
-+    int size() {return m_aJobList.size();}
-+    HashMap const& getHashMap() {return m_aJobList;}
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit: joblist.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/nocopy.hxx	2008-12-10 20:46:06.720535461 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/nocopy.hxx	2008-02-27 17:08:42.000000000 +0100
-@@ -1 +1,13 @@
--dummy
-+#ifndef NOCOPY_HXX
-+#define NOCOPY_HXX
-+
-+// prevent illegal copies
-+class NOCOPY
-+{
-+	NOCOPY(NOCOPY const&);
-+	NOCOPY& operator=(NOCOPY const&);
-+public:
-+	NOCOPY(){}
-+};
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: nocopy.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/portability/config-auto.h	2008-12-10 20:46:06.802507987 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/portability/config-auto.h	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,64 @@
--dummy
-+#ifndef _INCLUDE_CPPUNIT_CONFIG_AUTO_H
-+#define _INCLUDE_CPPUNIT_CONFIG_AUTO_H 1
-+ 
-+/* include/cppunit/config-auto.h. Generated automatically at end of configure. */
-+/* config/config.h.  Generated automatically by configure.  */
-+/* config/config.h.in.  Generated automatically from configure.in by autoheader.  */
-+
-+/* define if library uses std::string::compare(string,pos,n) */
-+#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
-+#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST  1 
-+#endif
-+
-+/* define if the library defines sstream */
-+#ifndef CPPUNIT_HAVE_SSTREAM
-+#define CPPUNIT_HAVE_SSTREAM 1 
-+#endif
-+
-+/* Define if you have the <cmath> header file. */
-+#ifndef CPPUNIT_HAVE_CMATH 
-+#define CPPUNIT_HAVE_CMATH  1 
-+#endif
-+
-+/* Define if you have the <dlfcn.h> header file. */
-+#ifndef CPPUNIT_HAVE_DLFCN_H 
-+#define CPPUNIT_HAVE_DLFCN_H  1 
-+#endif
-+
-+/* define to 1 if the compiler implements namespaces */
-+#ifndef CPPUNIT_HAVE_NAMESPACES 
-+#define CPPUNIT_HAVE_NAMESPACES  1 
-+#endif
-+
-+/* define if the compiler supports Run-Time Type Identification */
-+#ifndef CPPUNIT_HAVE_RTTI 
-+#define CPPUNIT_HAVE_RTTI  0 
-+#endif
-+
-+/* define if the compiler has stringstream */
-+#ifndef CPPUNIT_HAVE_SSTREAM
-+#define CPPUNIT_HAVE_SSTREAM 1
-+#endif
-+
-+/* Define if you have the <strstream> header file. */
-+#ifndef CPPUNIT_HAVE_STRSTREAM 
-+#define CPPUNIT_HAVE_STRSTREAM  1 
-+#endif
-+
-+/* Name of package */
-+#ifndef CPPUNIT_PACKAGE 
-+#define CPPUNIT_PACKAGE  "cppunit" 
-+#endif
-+
-+/* Define to 1 to use type_info::name() for class names */
-+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
-+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
-+#endif
-+
-+/* Version number of package */
-+#ifndef CPPUNIT_VERSION 
-+#define CPPUNIT_VERSION  "1.8.0" 
-+#endif
-+ 
-+/* _INCLUDE_CPPUNIT_CONFIG_AUTO_H */
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/portability: config-auto.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/portability/config-bcb5.h	2008-12-10 20:46:05.287223886 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/portability/config-bcb5.h	2008-02-27 17:15:52.000000000 +0100
-@@ -1 +1,48 @@
--dummy
-+#ifndef _INCLUDE_CPPUNIT_CONFIG_BCB5_H
-+#define _INCLUDE_CPPUNIT_CONFIG_BCB5_H 1
-+
-+#define HAVE_CMATH 1
-+ 
-+/* include/cppunit/config-bcb5.h. Manually adapted from 
-+   include/cppunit/config-auto.h */
-+
-+/* define if library uses std::string::compare(string,pos,n) */
-+#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
-+#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST  1 
-+#endif
-+
-+/* Define if you have the <dlfcn.h> header file. */
-+#ifdef CPPUNIT_HAVE_DLFCN_H 
-+#undef CPPUNIT_HAVE_DLFCN_H 
-+#endif
-+
-+/* define to 1 if the compiler implements namespaces */
-+#ifndef CPPUNIT_HAVE_NAMESPACES 
-+#define CPPUNIT_HAVE_NAMESPACES  1 
-+#endif
-+
-+/* define if the compiler supports Run-Time Type Identification */
-+#ifndef CPPUNIT_HAVE_RTTI 
-+#define CPPUNIT_HAVE_RTTI  1 
-+#endif
-+
-+/* Define to 1 to use type_info::name() for class names */
-+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
-+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
-+#endif
-+
-+#define CPPUNIT_HAVE_SSTREAM 1
-+
-+/* Name of package */
-+#ifndef CPPUNIT_PACKAGE 
-+#define CPPUNIT_PACKAGE  "cppunit" 
-+#endif
-+
-+/* Version number of package */
-+#ifndef CPPUNIT_VERSION 
-+#define CPPUNIT_VERSION  "1.5.5" 
-+#endif
-+ 
-+ 
-+/* _INCLUDE_CPPUNIT_CONFIG_BCB5_H */
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/portability: config-bcb5.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/portability/config-msvc6.h	2008-12-10 20:46:05.392326519 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/portability/config-msvc6.h	2008-02-27 17:15:40.000000000 +0100
-@@ -1 +1,62 @@
--dummy
-+#ifndef _INCLUDE_CPPUNIT_CONFIG_MSVC6_H
-+#define _INCLUDE_CPPUNIT_CONFIG_MSVC6_H 1
-+
-+#define HAVE_CMATH 1
-+ 
-+/* include/cppunit/config-msvc6.h. Manually adapted from 
-+   include/cppunit/config-auto.h */
-+
-+/* define if library uses std::string::compare(string,pos,n) */
-+#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
-+#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
-+#endif
-+
-+/* Define if you have the <dlfcn.h> header file. */
-+#ifdef CPPUNIT_HAVE_DLFCN_H 
-+#undef CPPUNIT_HAVE_DLFCN_H 
-+#endif
-+
-+/* define to 1 if the compiler implements namespaces */
-+#ifndef CPPUNIT_HAVE_NAMESPACES 
-+#define CPPUNIT_HAVE_NAMESPACES  1 
-+#endif
-+
-+#ifndef CPPUNIT_HAVE_RTTI 
-+#define CPPUNIT_HAVE_RTTI  0
-+#endif
-+
-+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
-+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
-+#endif
-+
-+#define CPPUNIT_HAVE_SSTREAM 1
-+
-+/* Name of package */
-+#ifndef CPPUNIT_PACKAGE 
-+#define CPPUNIT_PACKAGE  "cppunit" 
-+#endif
-+
-+#undef CPPUNIT_API
-+
-+// define CPPUNIT_DLL_BUILD when building CppUnit dll.
-+#ifdef CPPUNIT_BUILD_DLL
-+#define CPPUNIT_API __declspec(dllexport)
-+#endif
-+
-+// define CPPUNIT_DLL when linking to CppUnit dll.
-+#ifdef CPPUNIT_DLL
-+#define CPPUNIT_API __declspec(dllimport)
-+#endif
-+
-+#ifdef CPPUNIT_API
-+#undef CPPUNIT_NEED_DLL_DECL
-+#define CPPUNIT_NEED_DLL_DECL 1
-+#endif
-+
-+#if _MSC_VER > 1000     // VC++
-+#pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
-+#endif // _MSC_VER > 1000
-+
-+ 
-+/* _INCLUDE_CPPUNIT_CONFIG_MSVC6_H */
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/portability: config-msvc6.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/SynchronizedObject.h	2008-12-10 20:46:04.893658092 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/SynchronizedObject.h	2008-02-27 17:14:06.000000000 +0100
-@@ -1 +1,82 @@
--dummy
-+#ifndef CPPUNIT_SYNCHRONIZEDOBJECT_H
-+#define CPPUNIT_SYNCHRONIZEDOBJECT_H
-+
-+#include <cppunit/Portability.h>
-+#include <cppunit/nocopy.hxx>
-+
-+namespace CppUnit
-+{
-+
-+/*! \brief Base class for synchronized object.
-+ *
-+ * Synchronized object are object which members are used concurrently by mutiple
-+ * threads.
-+ *
-+ * This class define the class SynchronizationObject which must be subclassed
-+ * to implement an actual lock.
-+ *
-+ * Each instance of this class holds a pointer on a lock object.
-+ *
-+ * See src/msvc6/MfcSynchronizedObject.h for an example.
-+ */
-+class CPPUNIT_API SynchronizedObject
-+{
-+public:
-+  /*! \brief Abstract synchronization object (mutex)
-+   */
-+  class SynchronizationObject
-+  {
-+    public:
-+      SynchronizationObject() {}
-+      virtual ~SynchronizationObject() {}
-+
-+      virtual void lock() {}
-+      virtual void unlock() {}
-+  };
-+
-+  /*! Constructs a SynchronizedObject object.
-+   */
-+  SynchronizedObject( SynchronizationObject *syncObject =0 );
-+
-+  /// Destructor.
-+  virtual ~SynchronizedObject();
-+
-+protected:
-+  /*! \brief Locks a synchronization object in the current scope.
-+   */
-+    class ExclusiveZone : NOCOPY
-+  {
-+    SynchronizationObject *m_syncObject;
-+
-+  public:
-+    ExclusiveZone( SynchronizationObject *syncObject ) 
-+        : m_syncObject( syncObject ) 
-+    { 
-+      m_syncObject->lock(); 
-+    }
-+
-+    ~ExclusiveZone() 
-+    { 
-+      m_syncObject->unlock (); 
-+    }
-+  };
-+
-+  virtual void setSynchronizationObject( SynchronizationObject *syncObject );
-+
-+protected:
-+  SynchronizationObject *m_syncObject;
-+
-+private:
-+  /// Prevents the use of the copy constructor.
-+  SynchronizedObject( const SynchronizedObject &copy );
-+
-+  /// Prevents the use of the copy operator.
-+  void operator =( const SynchronizedObject &copy );
-+};
-+
-+
-+
-+} //  namespace CppUnit
-+
-+
-+#endif  // CPPUNIT_SYNCHRONIZEDOBJECT_H
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: SynchronizedObject.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestListener.h	2008-12-10 20:46:04.938237839 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestListener.h	2008-02-27 17:14:38.000000000 +0100
-@@ -1 +1,62 @@
--dummy
-+#ifndef CPPUNIT_TESTLISTENER_H    // -*- C++ -*-
-+#define CPPUNIT_TESTLISTENER_H
-+
-+#include <cppunit/Portability.h>
-+
-+
-+namespace CppUnit {
-+
-+class Exception;
-+class Test;
-+class TestFailure;
-+
-+
-+/*! \brief Listener for test progress and result.
-+ * \ingroup TrackingTestExecution
-+ *
-+ * Implementing the Observer pattern a TestListener may be registered
-+ * to a TestResult to obtain information on the testing progress. Use
-+ * specialized sub classes of TestListener for text output
-+ * (TextTestProgressListener). Do not use the Listener for the test
-+ * result output, use a subclass of Outputter instead.
-+ *
-+ * The test framework distinguishes between failures and errors.
-+ * A failure is anticipated and checked for with assertions. Errors are
-+ * unanticipated problems signified by exceptions that are not generated
-+ * by the framework.
-+ *
-+ * \see TestResult
-+ */
-+class CPPUNIT_API TestListener
-+{
-+public:
-+  virtual ~TestListener() {}
-+  
-+  /// Called when just before a TestCase is run.
-+	virtual void startTest( Test *test ) =0 ;
-+
-+  /*! Called when a failure occurs while running a test.
-+   * \see TestFailure.
-+   * \warning \a failure is a temporary object that is destroyed after the 
-+   *          method call. Use TestFailure::clone() to create a duplicate.
-+   */
-+	virtual void addFailure( const TestFailure &failure ) =0;
-+
-+  /// Called just after a TestCase was run (even if a failure occured).
-+	virtual void endTest( Test *test ) =0;
-+
-+	// additional info
-+	virtual void addInfo(Test *test, const char*) =0;
-+	
-+	// info in which node we are
-+	// helper functions to create tree structures
-+    // old: virtual void enterNode( const char* ) =0;
-+    // old: virtual void leaveNode( const char* ) =0;
-+};
-+
-+
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_TESTLISTENER_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestListener.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestResult.h	2008-12-10 20:46:05.070889564 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestResult.h	2008-02-27 17:13:08.000000000 +0100
-@@ -1 +1,123 @@
--dummy
-+#ifndef CPPUNIT_TESTRESULT_H
-+#define CPPUNIT_TESTRESULT_H
-+
-+#include <cppunit/Portability.h>
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( push )
-+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
-+#endif
-+#endif
-+
-+#include <cppunit/result/SynchronizedObject.h>
-+#include <vector>
-+#include <string>
-+#include <deque>
-+//!io #include <iostream>
-+
-+#include "cppunit/result/optionhelper.hxx"
-+#include "cppunit/TestFailure.h"
-+
-+class Outputter;
-+namespace CppUnit {
-+
-+class Exception;
-+class Test;
-+// class TestFailure;
-+class TestListener;
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+  template class CPPUNIT_API std::deque<TestListener *>;
-+#endif
-+
-+/*! \brief Manages TestListener.
-+ * \ingroup TrackingTestExecution
-+ *
-+ * A single instance of this class is used when running the test. It is usually
-+ * created by the test runner (TestRunner).
-+ *
-+ * This class shouldn't have to be inherited from. Use a TestListener
-+ * or one of its subclasses to be informed of the ongoing tests.
-+ * Use a Outputter to receive a test summary once it has finished
-+ *
-+ * TestResult supplies a template method 'setSynchronizationObject()'
-+ * so that subclasses can provide mutual exclusion in the face of multiple
-+ * threads.  This can be useful when tests execute in one thread and
-+ * they fill a subclass of TestResult which effects change in another 
-+ * thread.  To have mutual exclusion, override setSynchronizationObject()
-+ * and make sure that you create an instance of ExclusiveZone at the 
-+ * beginning of each method.
-+ *
-+ * \see Test, TestListener, TestResultCollector, Outputter.
-+ */
-+class CPPUNIT_API TestResult : protected SynchronizedObject
-+{
-+protected:
-+	OptionHelper m_aOptionHelper;
-+
-+public:
-+  TestResult( GetOpt & _aOptions, SynchronizationObject *syncObject = 0 );
-+  virtual ~TestResult();
-+
-+  virtual void addListener( TestListener *listener );
-+  virtual void removeListener( TestListener *listener );
-+
-+  virtual void reset();
-+  virtual void stop();
-+
-+  virtual bool shouldStop() const;
-+
-+  virtual void startTest( Test *test );
-+  virtual void addError( Test *test, Exception *e, ErrorType::num eType=ErrorType::ET_ERROR);
-+  virtual void addFailure( Test *test, Exception *e );
-+  virtual void endTest( Test *test );
-+
-+    // LLA: additionals
-+  virtual void addInfo(Test *test, const char *sInfo);
-+
-+  virtual void enterNode(const char* Node);
-+  virtual void leaveNode(const char* Node);
-+  virtual std::string getNodeName();
-+
-+  // if true, execution is allowed.
-+  virtual bool isAllowedToExecute(std::string const & sName);
-+  bool isOnlyShowJobs() {return m_aOptionHelper.isOnlyShowJobs();}
-+  bool isOptionWhereAmI();
-+    
-+  virtual void print(Outputter &);
-+  void setExitValue(int _nValue) {m_nExitValue = _nValue;}
-+  int getExitValue() {return m_nExitValue;}
-+    
-+protected:
-+  void addFailure( const TestFailure &failure );
-+  
-+protected:
-+  typedef std::deque<TestListener *> TestListeners;
-+  TestListeners m_listeners;
-+  bool m_stop;
-+
-+    // this vector is used to expand the test name with a current node name
-+    std::vector<std::string> m_aCurrentNodeNames;
-+
-+    //# std::vector<std::string> m_aNodes;
-+
-+private: 
-+  TestResult( const TestResult &other );
-+  TestResult &operator =( const TestResult &other );
-+  int m_nExitValue;
-+};
-+
-+
-+} // namespace CppUnit
-+
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( pop )
-+#endif
-+#endif
-+
-+#endif // CPPUNIT_TESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestResult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestResultCollector.h	2008-12-10 20:46:05.024473262 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestResultCollector.h	2008-02-27 17:14:48.000000000 +0100
-@@ -1 +1,165 @@
--dummy
-+#ifndef CPPUNIT_TESTRESULTCOLLECTOR_H
-+#define CPPUNIT_TESTRESULTCOLLECTOR_H
-+
-+#include <cppunit/Portability.h>
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( push )
-+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
-+#endif
-+#endif
-+
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestSucessListener.h>
-+#include <deque>
-+#include <vector>
-+
-+namespace CppUnit
-+{
-+
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+  template class CPPUNIT_API std::deque<TestFailure *>;
-+  template class CPPUNIT_API std::deque<Test *>;
-+#endif
-+
-+
-+/*! \brief Collects test result.
-+ * \ingroup WritingTestResult
-+ * \ingroup BrowsingCollectedTestResult
-+ * 
-+ * A TestResultCollector is a TestListener which collects the results of executing 
-+ * a test case. It is an instance of the Collecting Parameter pattern.
-+ *
-+ * The test framework distinguishes between failures and errors.
-+ * A failure is anticipated and checked for with assertions. Errors are
-+ * unanticipated problems signified by exceptions that are not generated
-+ * by the framework.
-+ * \see TestListener, TestFailure.
-+ */
-+
-+class OneStringContainer
-+{
-+	std::string m_sName;
-+protected:
-+	OneStringContainer() {}
-+public:
-+	OneStringContainer(std::string const& _sName)
-+			:m_sName(_sName){}
-+	std::string getString() const {return m_sName;}
-+    virtual ~OneStringContainer(){}
-+};
-+
-+// -----------------------------------------------------------------------------
-+class TestEnvelope : public OneStringContainer
-+{
-+	Test* m_pTest;
-+public:
-+	TestEnvelope():m_pTest(NULL){}
-+	
-+	TestEnvelope(Test* _pTest, std::string const& _sName)
-+			: OneStringContainer(_sName),
-+              m_pTest(_pTest)
-+		{}
-+
-+	Test* getTest() {return m_pTest;}
-+    virtual ~TestEnvelope(){}
-+    
-+};
-+
-+// -----------------------------------------------------------------------------
-+class TestInfo : public TestEnvelope
-+{
-+public:
-+	TestInfo(Test* _pTest, std::string const& _sName)
-+			:TestEnvelope(_pTest, _sName)
-+		{}
-+};
-+
-+// -----------------------------------------------------------------------------
-+class TestFailureEnvelope : public OneStringContainer
-+{
-+	TestFailure* m_pTestFailure;
-+public:
-+	TestFailureEnvelope():m_pTestFailure(NULL){}
-+
-+	TestFailureEnvelope(TestFailure* _pTestFailure, std::string const& _sName)
-+			:OneStringContainer(_sName),
-+             m_pTestFailure(_pTestFailure)
-+		{}
-+
-+	TestFailure* getTestFailure() {return m_pTestFailure;}
-+    virtual ~TestFailureEnvelope(){}
-+    
-+};
-+// -----------------------------------------------------------------------------
-+
-+class CPPUNIT_API TestResultCollector : public TestSucessListener
-+{
-+    TestResult* m_pResult;
-+public:
-+	typedef std::deque<TestFailureEnvelope *> TestFailures;
-+	typedef std::deque<TestEnvelope *> Tests;
-+	typedef std::vector<TestInfo *> TestInfos;
-+
-+
-+  /*! Constructs a TestResultCollector object.
-+   */
-+  TestResultCollector( TestResult *_pResult, SynchronizationObject *syncObject = 0 );
-+
-+  /// Destructor.
-+  virtual ~TestResultCollector();
-+
-+  void startTest( Test *test );
-+  void endTest( Test *test );
-+	
-+  void addFailure( const TestFailure &failure );
-+
-+  virtual void reset();
-+
-+  virtual int runTests() const;
-+  virtual int testErrors() const;
-+  virtual int testFailures() const;
-+  virtual int testFailuresTotal() const;
-+
-+  virtual const TestFailures& failures() const;
-+  virtual const Tests &tests() const;
-+  virtual std::string getInfo(Test*);
-+
-+  virtual void addInfo(Test *test, const char *sInfo);
-+
-+    // virtual void enterNode(const char* Node);
-+    // virtual void leaveNode(const char* Node);
-+
-+protected:
-+  Tests        m_tests;
-+  TestFailures m_failures;
-+  TestInfos    m_aInfos;
-+
-+  int m_testErrors;
-+
-+    // this vector is used to expand the test name with a current node name
-+    // std::vector<std::string> m_aCurrentNodeNames;
-+    // std::string getNodeName();
-+private:
-+  /// Prevents the use of the copy constructor.
-+  TestResultCollector( const TestResultCollector &copy );
-+
-+  /// Prevents the use of the copy operator.
-+  void operator =( const TestResultCollector &copy );
-+};
-+
-+
-+
-+} //  namespace CppUnit
-+
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( pop )
-+#endif
-+#endif
-+
-+
-+#endif  // CPPUNIT_TESTRESULTCOLLECTOR_H
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestResultCollector.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestSucessListener.h	2008-12-10 20:46:05.161106554 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestSucessListener.h	2008-02-27 17:14:16.000000000 +0100
-@@ -1 +1,40 @@
--dummy
-+#ifndef CPPUNIT_TESTSUCESSLISTENER_H
-+#define CPPUNIT_TESTSUCESSLISTENER_H
-+
-+#include <cppunit/result/SynchronizedObject.h>
-+#include <cppunit/result/TestListener.h>
-+
-+
-+namespace CppUnit
-+{
-+
-+/*! \brief TestListener that checks if any test case failed.
-+ * \ingroup TrackingTestExecution
-+ */
-+class CPPUNIT_API TestSucessListener : public TestListener,
-+                                       public SynchronizedObject
-+{
-+public:
-+  /*! Constructs a TestSucessListener object.
-+   */
-+  TestSucessListener( SynchronizationObject *syncObject = 0 );
-+
-+  /// Destructor.
-+  virtual ~TestSucessListener();
-+
-+  virtual void reset();
-+
-+  void addFailure( const TestFailure &failure );
-+
-+  /// Returns whether the entire test was successful or not.
-+  virtual bool wasSuccessful() const;
-+
-+private:
-+  bool m_sucess;
-+};
-+
-+
-+} //  namespace CppUnit
-+
-+
-+#endif  // CPPUNIT_TESTSUCESSLISTENER_H
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestSucessListener.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TextTestResult.h	2008-12-10 20:46:05.242583534 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TextTestResult.h	2008-02-27 17:14:28.000000000 +0100
-@@ -1 +1,62 @@
--dummy
-+#ifndef CPPUNIT_TEXTTESTRESULT_H
-+#define CPPUNIT_TEXTTESTRESULT_H
-+
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestResultCollector.h>
-+#include <ostream>
-+
-+class GetOpt;
-+namespace CppUnit {
-+
-+class SourceLine;
-+class Exception;
-+class Test;
-+
-+/*! \brief Holds printable test result (DEPRECATED).
-+ * \ingroup TrackingTestExecution
-+ * 
-+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
-+ */
-+class CPPUNIT_API TextTestResult : public TestResult
-+/*									   public TestResultCollector*/
-+{
-+	TestResultCollector m_aResulter;
-+public:
-+  TextTestResult(GetOpt& _aOptions);
-+
-+  virtual void addFailure( const TestFailure &failure );
-+  virtual void startTest( Test *test );
-+  virtual void endTest( Test *test );
-+
-+  virtual void print( std::ostream &stream );
-+protected:
-+    
-+  virtual void printFailures( std::ostream &stream );
-+  virtual void printHeader( std::ostream &stream );
-+
-+  virtual void printFailure( TestFailure *failure,
-+                             int failureNumber,
-+                             std::ostream &stream );
-+  virtual void printFailureListMark( int failureNumber,
-+                                     std::ostream &stream );
-+  virtual void printFailureTestName( TestFailure *failure,
-+                                     std::ostream &stream );
-+  virtual void printFailureType( TestFailure *failure,
-+                                 std::ostream &stream );
-+  virtual void printFailureLocation( SourceLine sourceLine,
-+                                     std::ostream &stream );
-+  virtual void printFailureDetail( Exception *thrownException,
-+                                   std::ostream &stream );
-+  virtual void printFailureWarning( std::ostream &stream );
-+  virtual void printStatistics( std::ostream &stream );
-+};
-+
-+/** insertion operator for easy output */
-+std::ostream &operator <<( std::ostream &stream, 
-+                           TextTestResult &result );
-+
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_TEXTTESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TextTestResult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/callbackfunc.h	2008-12-10 20:46:06.881445744 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/callbackfunc.h	2008-02-27 17:15:00.000000000 +0100
-@@ -1 +1,25 @@
--dummy
-+#ifndef _callbackfunc_h
-+#define _callbackfunc_h
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+	// this is the entry point from the DLL back to the executable.
-+    sal_Int32 CallbackDispatch(int x, ...);
-+
-+//# void TestResult_startTest(hTestResult _pResult, hTest _pTest);
-+//# void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException );
-+//# void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException );
-+//# void TestResult_endTest( hTestResult _pResult, hTest _pTest );
-+//# bool TestResult_shouldStop(hTestResult _pResult);
-+//# void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo );
-+//# 
-+//# void TestResult_enterNode( hTestResult _pResult, const char* _sInfo );
-+//# void TestResult_leaveNode( hTestResult _pResult, const char* _sInfo );
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: callbackfunc.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/emacsTestResult.hxx	2008-12-10 20:46:06.924792880 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/emacsTestResult.hxx	2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,82 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef cppunit_emacstestresult_h
-+#define cppunit_emacstestresult_h
-+
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestResultCollector.h>
-+#include <ostream>
-+#include "testshl/getopt.hxx"
-+
-+class Outputter;
-+namespace CppUnit {
-+
-+class SourceLine;
-+class Exception;
-+class Test;
-+
-+/*! \brief Holds printable test result (DEPRECATED).
-+ * \ingroup TrackingTestExecution
-+ * 
-+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
-+ */
-+    class CPPUNIT_API emacsTestResult : public TestResult
-+	
-+/* ,public TestResultCollector*/
-+    {
-+        GetOpt & m_aOptions;
-+        // OptionHelper m_aOptionHelper;
-+        TestResultCollector m_aResulter;
-+        
-+    public:
-+        emacsTestResult(GetOpt & _aOptions);
-+        
-+        // virtual void addFailure( const TestFailure &failure );
-+        // virtual void startTest( Test *test );
-+        // virtual void endTest( Test *test );
-+        
-+        virtual void print( Outputter &stream );
-+        
-+    protected:
-+        virtual void printHeader( Outputter &stream );
-+        // virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo);
-+        virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName );
-+    };
-+    
-+/** insertion operator for easy output */
-+//    std::ostream &operator <<( std::ostream &stream, 
-+//                               emacsTestResult &result );
-+    
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_testshlTESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: emacsTestResult.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/log.hxx	2008-12-10 20:46:07.004030154 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/log.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,106 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __QADEV_REGSCAN_LOG_HXX__
-+#define __QADEV_REGSCAN_LOG_HXX__
-+
-+#include <time.h>
-+#include	<rtl/ustring.hxx>
-+#include	<rtl/strbuf.hxx>
-+#include	<sal/types.h>
-+#include	<osl/thread.h>
-+#include	<osl/file.hxx>
-+
-+#include <cppunit/nocopy.hxx>
-+
-+//!io #include <iostream>
-+#include <vector>
-+
-+// using namespace std;
-+
-+
-+/**
-+ * Log derives the interface of the ::osl::File class ( is-a relation ).
-+ * Its members (has-a relation) are the (full qualified)name of the log
-+ * and an OStringBuffer which represents the content of the logfile.
-+ * It provides the functionality of easy-to-use open and write logs
-+ */
-+//: Log
-+class Log : NOCOPY {
-+
-+    ::osl::File*            m_logfile;          // fileobject
-+    rtl::OUString         m_logurl;           // url of log
-+	rtl::OStringBuffer	m_buf;              // content of log
-+
-+    Log();
-+
-+public:
-+
-+	//> c'tor
-+	/**
-+	 * constructors argument is a full qualified UNC path
-+	 * @param OUString logfile ( full qualified UNC path )
-+	 */
-+    Log( const rtl::OUString& logURL )
-+            : m_logfile( new ::osl::File( logURL ))
-+			, m_logurl(logURL)
-+    {} ///< c'tor
-+
-+    //> d'tor
-+    virtual ~Log()
-+        {
-+            m_logfile->close();
-+            delete( m_logfile );
-+        } ///< d'tor
-+
-+	//> inline methods
-+	// returns a reference to name instance
-+    inline rtl::OUString getLogURL() { return m_logurl; }
-+    inline rtl::OString getName() { return rtl::OUStringToOString(
-+                                    m_logurl, RTL_TEXTENCODING_ASCII_US  ); }
-+	///< inline methods
-+
-+	// open logfile for overwrite (default) or append
-+	::osl::FileBase::RC open( sal_Bool append = sal_False );
-+	::osl::FileBase::RC close() { return m_logfile->close(); }
-+
-+
-+	// write methods without (default) or with echo on display
-+	::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False );
-+	::osl::FileBase::RC write( const rtl::OString& buf,
-+													sal_Bool v = sal_False );
-+	//! ::osl::FileBase::RC write( rtl::OStringBuffer& buf,
-+	//! 												sal_Bool v = sal_False );
-+	::osl::FileBase::RC write( const rtl::OUString& buf,
-+							rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US,
-+												 sal_Bool v = sal_False   );
-+
-+}; ///:~ Log
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: log.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/optionhelper.hxx	2008-12-10 20:46:07.084399993 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/optionhelper.hxx	2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,98 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef optionhelper_hxx
-+#define optionhelper_hxx
-+
-+#include <string>
-+
-+#include <sal/types.h>
-+
-+#include "cppunit/nocopy.hxx"
-+#include "testshl/getopt.hxx"
-+#include "cppunit/joblist.hxx"
-+
-+// -----------------------------------------------------------------------------
-+
-+typedef std::vector<rtl::OString> OStringList;
-+
-+//!? Better: OptionHelper
-+class OptionHelper : NOCOPY
-+{
-+    GetOpt & m_aOption;
-+    JobList     m_aJobOnlyList;
-+    JobList     m_aJobExcludeList;
-+    OStringList m_aJobFilter;
-+    
-+    std::string m_sProjectId;
-+    std::string m_sBuildId;
-+    
-+    std::string getProjectId() const;
-+    std::string getBuildId() const;
-+    std::string createDateTag(std::string const& _sProjectId, std::string const& _sBuildId);
-+    
-+    void handleJobs();
-+public:
-+    OptionHelper(GetOpt & _aOption)
-+            :m_aOption(_aOption)
-+        {
-+            if (m_aOption.hasOpt("-projectid"))
-+                m_sProjectId = m_aOption.getOpt("-projectid");
-+            
-+            if (m_aOption.hasOpt("-buildid"))
-+                m_sBuildId = m_aOption.getOpt("-buildid");
-+
-+			handleJobs();
-+        }
-+    
-+    static std::string integerToAscii(sal_Int32 nValue);
-+    static std::string twoDigits(std::string const& _sValue);
-+
-+    std::string createDateTag();
-+    bool showErrors();
-+    bool showTests();
-+
-+    JobList getJobOnlyList() {return m_aJobOnlyList;}
-+    JobList getJobExcludeList() {return m_aJobExcludeList;}
-+    
-+    bool isAllowedToExecute(std::string const& _sNode, std::string const& _sName);
-+
-+    bool isOnlyShowJobs() {return m_aOption.hasOpt("-onlyshowjobs") == sal_True ? true : false;}
-+	GetOpt& getOptions() {return m_aOption;}
-+	bool isVerbose() {return m_aOption.hasOpt("-verbose") == sal_True ? true : false;} 
-+    bool isOptionWhereAmI() {return m_aOption.hasOpt("-whereami") == sal_True ? true : false;}
-+};
-+
-+// -----------------------------------------------------------------------------
-+
-+
-+#endif
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: optionhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/outputter.hxx	2008-12-10 20:46:07.186579135 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/outputter.hxx	2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,85 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+//
-+
-+#ifndef outputter_hxx
-+#define outputter_hxx
-+
-+#include <string>
-+#include <ostream>
-+#include <memory>
-+#include "testshl/log.hxx"
-+#include <sal/types.h>
-+#include "cppunit/nocopy.hxx"
-+
-+// #include <fstream>
-+
-+class Outputter : NOCOPY
-+{
-+    std::auto_ptr<Log> m_pLog;
-+    std::ostream* m_pStream;
-+
-+    void writeToAll(const sal_Char* _pStr);
-+public:
-+    class endl
-+    {
-+        char c;
-+    public:
-+        endl():c('\0'){}
-+    };
-+public:
-+    Outputter(Log * _pLog )
-+            :m_pLog(_pLog),
-+             m_pStream(NULL) {}
-+    
-+    Outputter(std::ostream& _aStream)
-+            :m_pLog(NULL),
-+             m_pStream(&_aStream) {}
-+
-+    ~Outputter();
-+
-+    void write(const sal_Char*);
-+    void write(std::string const&);
-+    void write(sal_Int32);
-+    // void write(double);
-+};
-+
-+Outputter& operator <<( Outputter &stream, const sal_Char* );
-+Outputter& operator <<( Outputter &stream, std::string const& );
-+Outputter& operator <<( Outputter &stream, sal_Int32 );
-+// Outputter& operator <<( Outputter &stream, double );
-+
-+Outputter& operator <<( Outputter &stream, Outputter::endl const&);
-+
-+// Outputter& operator <<( Outputter &stream, const char* );
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: outputter.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/testshlTestResult.h	2008-12-10 20:46:07.267386761 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/testshlTestResult.h	2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,72 @@
--dummy
-+#ifndef cppunit_testshltestresult_h
-+#define cppunit_testshltestresult_h
-+
-+#include <map>
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestResultCollector.h>
-+#include <ostream>
-+#include "testshl/getopt.hxx"
-+
-+class Outputter;
-+
-+namespace CppUnit {
-+
-+class SourceLine;
-+class Exception;
-+class Test;
-+
-+struct ltstr
-+{
-+    bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const
-+        {
-+            return p1 < p2;
-+        }
-+};
-+typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList;
-+
-+
-+/*! \brief Holds printable test result (DEPRECATED).
-+ * \ingroup TrackingTestExecution
-+ * 
-+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
-+ */
-+    class CPPUNIT_API testshlTestResult : public TestResult
-+	
-+/* ,public TestResultCollector*/
-+	{
-+		GetOpt & m_aOptions;
-+		// OptionHelper m_aOptionHelper;
-+		TestResultCollector m_aResulter;
-+		
-+	public:
-+		testshlTestResult(GetOpt & _aOptions);
-+		virtual ~testshlTestResult();
-+		
-+		// virtual void addFailure( const TestFailure &failure );
-+		// virtual void startTest( Test *test );
-+		// virtual void endTest( Test *test );
-+		
-+		virtual void print( Outputter &stream );
-+		
-+	protected:
-+		virtual void printHeader( Outputter &stream );
-+
-+		void printLines(Outputter &stream, HashMap & _aJobList);
-+		void printFailedTests(Outputter &stream, TestPtrList &aFailedTests);
-+		void printTestLines(Outputter &stream, TestPtrList &aFailedTests);
-+		void printUnknownLines(Outputter &stream, HashMap & _aJobList);
-+
-+		virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo);
-+		virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName );
-+		virtual void printUnknownLine( Outputter &stream, std::string const& _sTestName);
-+    };
-+    
-+/** insertion operator for easy output */
-+    Outputter &operator <<( Outputter &stream, 
-+							testshlTestResult &result );
-+    
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_testshlTESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: testshlTestResult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/signaltest.h	2008-12-10 20:46:07.349658445 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/signaltest.h	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,65 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SIGNALTEST_H
-+#define SIGNALTEST_H
-+
-+#include <string>
-+#include "cppunit/Test.h"
-+#include <cppunit/autoregister/htestresult.h>
-+
-+namespace CppUnit 
-+{
-+	
-+class CPPUNIT_API SignalTest : public Test
-+{
-+public:
-+
-+    SignalTest( std::string const& Name );
-+	
-+    ~SignalTest();
-+    
-+    virtual void run(hTestResult pResult);
-+    virtual int countTestCases() const;
-+    std::string getName() const;
-+    std::string toString() const;
-+
-+private:
-+    SignalTest( const SignalTest &other );
-+    SignalTest &operator=( const SignalTest &other );
-+    
-+private:
-+    const std::string m_sName;
-+};
-+ 
-+} // namespace CppUnit
-+
-+
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: signaltest.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/simpleheader.hxx	2008-12-10 20:46:07.425092111 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/simpleheader.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,45 @@
+--- misc/cppunit-1.8.0/include/cppunit/tagvalues.hxx	2009-09-14 08:43:30.609375000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/tagvalues.hxx	2009-09-12 15:14:27.812500000 +0200
+@@ -1 +1,94 @@
 -dummy
 +/*************************************************************************
 + *
@@ -3016,124 +1196,10 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: signaltest.h.dummy.
 + *
 + ************************************************************************/
 +
-+#ifndef CPPUNIT_SIMPLEHEADER_HXX
-+#define CPPUNIT_SIMPLEHEADER_HXX
-+
-+// This file contains only the cppunit header files, for simplification.
-+
-+#include <cppunit/TestFixture.h>
-+#include <cppunit/TestCaller.h>
-+#include <cppunit/TestSuite.h>
-+#include <cppunit/TestAssert.h>
-+#include <cppunit/autoregister/registertestfunction.h>
-+#include <cppunit/extensions/HelperMacros.h>
-+#include <cppunit/additionalfunc.hxx>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: simpleheader.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/stringhelper.hxx	2008-12-10 20:46:07.500255274 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/stringhelper.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,42 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef STRINGHELPER_HXX
-+#define STRINGHELPER_HXX
-+
-+#include <rtl/ustring.hxx>
-+#include <rtl/string.hxx>
-+
-+inline void operator <<= (rtl::OString& _rAsciiString, const rtl::OUString& _rUnicodeString)
-+{
-+	_rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
-+}
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: stringhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/taghelper.hxx	2008-12-10 20:46:07.588895546 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/taghelper.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,91 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef TAGHELPER_HXX
-+#define TAGHELPER_HXX
-+
-+#include <map>
-+#include <sal/types.h>
-+#include <cppunit/nocopy.hxx>
-+
-+/* Tags are a general mechanism of extensible data arrays for parameter
-+ * specification and property inquiry. In practice, tags are used in arrays,
-+ * or chain of arrays.
-+ *
-+ */
-+
-+typedef sal_IntPtr Tag;
-+typedef sal_IntPtr TagData;
++#ifndef TAGVALUES_H
++#define TAGVALUES_H
 +
-+//# struct TagItem
-+//# {
-+//#     Tag     ti_Tag;     /* identifies the type of data */
-+//#     TagData ti_Data;    /* type-specific data          */
-+//# };
++typedef unsigned long Tag;
 +
 +/* constants for Tag.ti_Tag, control tag values */
 +#define TAG_DONE   (Tag(0L))     /* terminates array of TagItems. ti_Data unused */
@@ -3147,95 +1213,29 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: stringhelper.hxx.dummy.
 +/* differentiates user tags from control tags */
 +#define TAG_USER   (Tag(1L<<31))
 +
-+// -----------------------------------------------------------------------------
-+class TagHelper /* : NOCOPY */
-+{
-+    typedef std::map<Tag, TagData> TagItems;
-+    TagItems m_aTagItems;
-+
-+public:
-+    TagHelper(){}
-+    void insert(Tag _nTag, TagData _nData)
-+    {
-+        m_aTagItems[_nTag] = _nData;
-+    }
-+    // const TagItems& get() const { return m_aTagItems; }
-+
-+    TagData GetTagData(Tag _aTagValue, TagData _aDefaultValue = 0 /* NULL */) const
-+    {
-+        TagItems::const_iterator it = m_aTagItems.find(_aTagValue);
-+        if (it != m_aTagItems.end())
-+            return (*it).second;
-+        else
-+            return _aDefaultValue;
-+    }
-+};
-+
-+#endif
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit: taghelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/tagvalues.hxx	2008-12-10 20:46:07.672788513 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/tagvalues.hxx	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,81 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef TAGVALUES_H
-+#define TAGVALUES_H
-+
-+#include <cppunit/taghelper.hxx>
 +
 +#define TAG_TYPE           (Tag(TAG_USER | (0x01L)))
 +
 +#define TAG_RESULT (TAG_USER | 0x100)
-+                          
++
 +#define RESULT_START       (Tag(TAG_RESULT | (0x02L)))
 +#define TAG_RESULT_PTR     (Tag(TAG_RESULT | (0x03L)))
 +#define TAG_TEST_PTR       (Tag(TAG_RESULT | (0x04L)))
-+                           
++
 +#define RESULT_END         (Tag(TAG_RESULT | (0x05L)))
-+                           
++
 +#define RESULT_ADD_FAILURE (Tag(TAG_RESULT | (0x06L)))
 +#define RESULT_ADD_ERROR   (Tag(TAG_RESULT | (0x07L)))
-+                           
++
 +#define TAG_EXCEPTION      (Tag(TAG_RESULT | (0x08L)))
-+                           
++
 +#define RESULT_ADD_INFO    (Tag(TAG_RESULT | (0x09L)))
 +#define TAG_INFO           (Tag(TAG_RESULT | (0x0aL)))
-+                           
++
 +#define RESULT_ENTER_NODE  (Tag(TAG_RESULT | (0x0bL)))
 +#define RESULT_LEAVE_NODE  (Tag(TAG_RESULT | (0x0cL)))
 +#define TAG_NODENAME       (Tag(TAG_RESULT | (0x0dL)))
-+                           
++
 +#define RESULT_SHOULD_STOP (Tag(TAG_RESULT | (0x0eL)))
 +
 +
@@ -3257,13 +1257,12 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: taghelper.hxx.dummy.
 +#define DO_NOT_EXECUTE 666
 +#define GO_EXECUTE 1
 +
-+typedef sal_Int32 ReturnValue;
++typedef long ReturnValue;
 +
 +#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy.
---- misc/cppunit-1.8.0/include/makefile.mk	2008-12-10 20:46:08.530624271 +0100
-+++ misc/build/cppunit-1.8.0/include/makefile.mk	2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,52 @@
+--- misc/cppunit-1.8.0/makefile.mk	2009-09-12 15:20:48.343750000 +0200
++++ misc/build/cppunit-1.8.0/makefile.mk	2009-09-12 14:15:35.328125000 +0200
+@@ -1 +1,33 @@
 -dummy
 +#*************************************************************************
 +#
@@ -3284,998 +1283,6 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy.
 +# only, as published by the Free Software Foundation.
 +#
 +# OpenOffice.org is distributed in the hope that it will be useful,
-+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+PRJ=..
-+# PRJINC=..
-+
-+PRJNAME=cppunit
-+TARGET=inc
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+# --- Files --------------------------------------------------------
-+# --- Targets -------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-+.IF "$(ENABLE_PCH)"!=""
-+ALLTAR : \
-+	$(SLO)$/precompiled.pch \
-+	$(SLO)$/precompiled_ex.pch
-+
-+.ENDIF			# "$(ENABLE_PCH)"!=""
-+
-Nur in misc/build/cppunit-1.8.0/include: makefile.mk.dummy.
---- misc/cppunit-1.8.0/include/testshl/autoregisterhelper.hxx	2008-12-10 20:46:07.771638742 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/autoregisterhelper.hxx	2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,65 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef AUTOREGISTER_HXX
-+#define AUTOREGISTER_HXX
-+
-+#include <vector>
-+#include <rtl/ustring.hxx>
-+
-+#include <cppunit/autoregister/testfunc.h>
-+
-+#include "dynamicregister.hxx"
-+#include "getopt.hxx"
-+
-+typedef std::vector<FktPtr> FunctionList;
-+
-+// -----------------------------------------------------------------------------
-+class JobList;
-+class AutomaticRegisterHelper : public DynamicLibraryHelper
-+{
-+    FunctionList m_aFunctionList;
-+    bool m_bLoadLibraryOK;
-+    // GetOpt & m_aOptions; // use getOptions() instead!
-+
-+public:
-+    AutomaticRegisterHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions/* , JobList * _pJobList = NULL */ );
-+
-+    // FunctionList getFunctions(){return m_aFunctionList;}
-+    void CallAll(hTestResult _hResult) const;
-+
-+    /// @return true, if the given DLLName library could load and initialised.
-+    bool isOkToStartTests() const {return m_bLoadLibraryOK;}
-+
-+    virtual ~AutomaticRegisterHelper();
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: autoregisterhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/dynamicregister.hxx	2008-12-10 20:46:07.812458771 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/dynamicregister.hxx	2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,67 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef DYNAMICREGISTER_HXX
-+#define DYNAMICREGISTER_HXX
-+
-+#include <rtl/ustring.hxx>
-+#include <osl/module.hxx>
-+
-+#include "getopt.hxx"
-+#include "cppunit/nocopy.hxx"
-+
-+// -------------------------------------------------
-+
-+class DynamicLibraryHelper : NOCOPY
-+{
-+protected:
-+    osl::Module*  m_pModule;
-+    rtl::OUString m_suDLLName;
-+    GetOpt & m_aOptions;
-+
-+    GetOpt& getOptions() {return m_aOptions;}
-+    
-+public:
-+    DynamicLibraryHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions);
-+    virtual ~DynamicLibraryHelper();
-+
-+private:
-+    void showFilenameIfVerbose();
-+    void realLoadLibrary(rtl::OUString const& _sLibToLoad);
-+    void loadLibraryFromAbsolutePath();
-+    void loadLibraryFromLocalPath();
-+
-+    rtl::OUString m_suAbsolutePathFile;  // file:///D:/foo/bar/library.dll
-+    rtl::OUString m_suAbsolutePath;      // file:///D:/foo/bar
-+    rtl::OUString m_suFilename;          // library.dll
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: dynamicregister.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/filehelper.hxx	2008-12-10 20:46:07.901872218 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/filehelper.hxx	2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,50 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef FILEHELPER_HXX
-+#define FILEHELPER_HXX
-+
-+#include <string>
-+#include <rtl/ustring.hxx>
-+#include <rtl/string.hxx>
-+#include <cppunit/cmdlinebits.hxx>
-+#include "getopt.hxx"
-+
-+namespace FileHelper
-+{
-+	
-+	std::string getTempPath();
-+	rtl::OUString convertPath( rtl::OUString const& _suSysPath );
-+	rtl::OUString convertPath( rtl::OString const& sysPth );
-+	CmdLineBits createFlags( GetOpt & _aOptions );
-+	
-+}
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: filehelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/getopt.hxx	2008-12-10 20:46:07.985642414 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/getopt.hxx	2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,335 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+/*************************************************************************
-+#*    class GetOpt
-+#*
-+#*
-+#*    Implementation    getopt.cxx
-+#*
-+#*    Description: 	class to reflect the commandline options. In addition
-+#*                  it provides functinality to get options from an inifile
-+#*                  ( getIniOptions()), evaluate, test and get options
-+#*                  ( hasOpt(), getOpt() ) and display an usage screen
-+#*                  formated in dependance of the given optionset, as well
-+#*                  as display a status about activ options
-+#*
-+#*
-+#* further descriptions:
-+#*
-+#* the constructor is called with two parameters:
-+#* char* argv[] and char* optionSet[],
-+#* the commandline and the available set of options.
-+#* Valid optionstrings have to start with a minus '-', otherwise it will
-+#* be ignored. Optionstrings consist of one or two arguments divided by a
-+#* comma separator, where the second (optional) argument is a short
-+#* description of the option, called hint. It will be automatically
-+#* formated and displayed in the usage screen if available.
-+#* The first argument of the optionstring can consist of two sections,
-+#* the name and the optional necessity and format.
-+#* The name of the option will be the starting minus followed by a string
-+#* like "-src".
-+#* One section options will be treated as flag (see '-v' option in example).
-+#* The second section consist of '=' or ':' which defines the necessity,
-+#* in combination with a character 's' for string or 'n' for numeric and
-+#* an optional '@' standing for 'vector of'.
-+#* '=' means this option needs an argument, ':' means can take an argument
-+#* followed by 's' is, as mentioned above, a single string paramenter,
-+#* followed by a 's' in combination with '@' means this argument consists
-+#* of one string or a vector of strings separated by commas
-+#*
-+#* an example for an optionset:
-+#*
-+#*	static char* optionSet[] = {
-+#*					"-src=s,    release or version of sources",
-+#*					"-ini=s,    ini file with additional options",
-+#*					"-db=s,  	path of type description database",
-+#*					"-inPth=s,  source path of component descriptions",
-+#*					"-outPth=s, destination path for testcases",
-+#*					"-logPth=s, destination path for logging",
-+#*					"-mdl=s@,   name(s) of module(s) to generate",
-+#*					"-v,        enable verbose screen messages",
-+#*					"-dbg,      enable debug messages",
-+#*					"-h:s,      display help or help on option",
-+#*					"-help:s,   see -h",
-+#*					NULL
-+#*					};
-+#*
-+#*    As seen a GetOpt class object will be created via:
-+#*         GetOpt  myOptions( argv, optionSet );
-+#*
-+*************************************************************************/
-+#ifndef __QADEV_REGSCAN_GETOPT_HXX__
-+#define __QADEV_REGSCAN_GETOPT_HXX__
-+
-+#include	<osl/file.hxx>
-+#include 	<sal/types.h>
-+#include	<rtl/strbuf.hxx>
-+
-+
-+#include	<rtl/string.hxx>
-+
-+// #ifndef __QADEV_REGSCAN_UTIL_HXX__
-+// #include "inc/util.hxx"
-+// #endif
-+
-+
-+#ifdef SOLARIS
-+#include <sys/time.h>
-+#endif
-+
-+#include <iostream>
-+#include <hash_map>
-+// #include "rsexception.hxx"
-+
-+// using namespace std;
-+
-+struct gstr {
-+	sal_Bool operator()( const rtl::OString& oStr1,
-+									const rtl::OString& oStr2 ) const {
-+		return( oStr1 == oStr2 );
-+	}
-+};
-+
-+struct ghstr
-+{
-+	sal_uInt32 operator()( const rtl::OString& str ) const {
-+        return str.hashCode();
-+	}
-+};
-+
-+struct frmt {
-+	sal_uInt32 fCol;
-+	sal_uInt32 sCol;
-+	sal_uInt32 len;
-+};
-+
-+typedef	std::hash_map< rtl::OString, std::vector< rtl::OString >, ghstr, gstr >
-+																optHashMap;
-+
-+typedef frmt sFormat;
-+typedef sal_uInt16 optType;
-+
-+#define OT_INVALID			0x0000
-+#define OT_BOOL				0x0001
-+#define OT_STRING			0x0002
-+#define OT_NUMBER		  	0x0004
-+#define OT_SINGLE		  	0x0010
-+#define OT_MULTI			0x0020
-+#define OT_OPTIONAL			0x0100
-+
-+//: Option
-+class OptDsc {
-+
-+	rtl::OString 	m_name;
-+	rtl::OString	m_hint;
-+	rtl::OString	m_legend;
-+	optType 		m_type;
-+
-+	/**
-+ 	* analysis of optionstring and creation of option description class
-+ 	* @param const rtl::OString& opt = optionstring to analyse
-+ 	* @return void
-+ 	*/
-+	void createOptDsc( const rtl::OString& opt );
-+
-+	/**
-+ 	* splitting of an optionstring and creation of a tokenvector
-+ 	* in dependance of a charset
-+ 	*
-+ 	* @param const rtl::OString& opt  = optionstring to split
-+ 	* @param const rtl::OString& cSet = delimiter charset
-+ 	* @param vector< rtl::OString >& optLine = tokenvector to fill
-+ 	*
-+ 	* @return void
-+ 	*/
-+	void split( const rtl::OString& opt, const rtl::OString& charSet,
-+                    std::vector< rtl::OString >& optLine );
-+
-+	/**
-+	 * private default c'tor, copy c'tor and assignment operator
-+	 * to get compiler errors on dumb effords
-+	 */
-+	OptDsc();
-+	OptDsc( OptDsc& );
-+	OptDsc& operator = ( OptDsc& );
-+
-+public:
-+
-+	//> c'tor
-+	OptDsc( const rtl::OString& opt )
-+			: m_name(),
-+              m_hint(),
-+              m_legend(),
-+              m_type( 0 ) {
-+
-+		createOptDsc( opt );
-+	} ///< c'tor
-+
-+	//> d'tor
-+	~OptDsc(){}
-+
-+	/**
-+	 * returns the name of this option
-+	 * @return rtl::OString&
-+	 */
-+	inline rtl::OString& getName() { return m_name; }
-+	/**
-+	 * returns the hint of this option
-+	 * @return rtl::OString&
-+	 */
-+	inline rtl::OString& getHint() { return m_hint; }
-+	/**
-+	 * returns the legend of this option
-+	 * @return rtl::OString&
-+	 */
-+	inline rtl::OString& getLegend() { return m_legend; }
-+
-+	/**
-+	 * returns the type of this option
-+	 * @return optType
-+	 */
-+	inline optType getType() { return m_type; }
-+
-+
-+	inline sal_Bool isFlag() {
-+		return( ( m_type &~ 0xfffe ) == OT_BOOL ) ? sal_True : sal_False;
-+	}
-+	inline sal_Bool isString() {
-+		return( ( m_type &~ 0xfffd ) == OT_STRING ) ? sal_True : sal_False;
-+	}
-+	inline sal_Bool isNumber() {
-+		return( ( m_type &~ 0xfffb ) == OT_NUMBER ) ? sal_True : sal_False;
-+	}
-+	inline sal_Bool isSingle() {
-+		return( ( m_type &~ 0xffef ) == OT_SINGLE ) ? sal_True : sal_False;
-+	}
-+	inline sal_Bool isMulti() {
-+		return( ( m_type &~ 0xffdf ) == OT_MULTI ) ? sal_True : sal_False;
-+	}
-+	inline sal_Bool isOptional() {
-+		return( ( m_type &~ 0xfeff ) == OT_OPTIONAL ) ? sal_True : sal_False;
-+	}
-+
-+}; ///:~ Option
-+
-+class Exception
-+{
-+	rtl::OString m_sAsciiMessage;
-+public:
-+	Exception();
-+    virtual ~Exception(){}
-+    
-+	Exception(char const* sAsciiMessage);
-+	Exception(rtl::OString const& sAsciiMessage);
-+	
-+	virtual rtl::OUString message() const;
-+	virtual char const* what() const;
-+};
-+
-+class ValueNotFoundException : public Exception
-+{
-+public:
-+	ValueNotFoundException();
-+	ValueNotFoundException(char const* sExit);
-+};
-+
-+//: GetOpt
-+class GetOpt {
-+
-+	rtl::OString 				m_prgname;
-+	rtl::OString				m_vardelim;
-+    std::vector< rtl::OString > 	m_cmdline;
-+    std::vector< rtl::OString > 	m_param;
-+    std::vector< rtl::OString >	m_varvec;
-+    std::vector< OptDsc* >		 	m_optionset;
-+  	optHashMap		 			m_opthash;
-+
-+	//> private methods
-+	void initialize( char* cmdLine[], char const * optSet[] );
-+	void createCmdLineOptions();
-+	sal_uInt32 getMaxNameLength();
-+	sal_uInt32 getMaxLegendLength();
-+	const rtl::OString optDsc2Str( OptDsc* optDsc , sFormat frm );
-+	void tokenize( 	const rtl::OString& opt, const rtl::OString& charSet,
-+				std::vector< rtl::OString >& optLine, sal_Bool strip = sal_True );
-+	///< private methods
-+
-+	GetOpt();
-+	GetOpt( GetOpt& );
-+	GetOpt& operator = ( GetOpt& );
-+
-+public:
-+
-+	//> c'tor
-+	GetOpt( char* cmdLine[], char const * optSet[], rtl::OString varDelim =
-+														rtl::OString( "$" ) )
-+			: m_vardelim( varDelim ) {
-+
-+		initialize( cmdLine, optSet );
-+		createCmdLineOptions();
-+	} ///< c'tor
-+
-+	//> d'tor
-+	~GetOpt();
-+	///< d'tor
-+
-+	//> inline methods
-+	inline std::vector< rtl::OString >* getCmdLine() { return &m_cmdline; }
-+	inline optHashMap* getOptions() { return ( &m_opthash ); }
-+	inline rtl::OString& getName() { return m_prgname; }
-+	inline rtl::OString& getFirstParam() { return *(m_param.begin()); }
-+	inline std::vector< rtl::OString >& getParams() { return m_param; }
-+	rtl::OString& getOpt( const rtl::OString& opt );
-+	void rmvOpt( rtl::OString& opt ) {
-+		m_opthash.erase( opt );
-+	}
-+	inline std::vector< rtl::OString >& getOptVec( const rtl::OString& opt ) {
-+		return m_opthash[ opt ];
-+	}
-+	///< inline methods
-+
-+
-+	sal_Bool exist( rtl::OString& opt );
-+	sal_Bool hasParam( std::vector< rtl::OString >::iterator iter );
-+	sal_Bool hasVars( void );
-+	sal_Bool evaluateOpt( std::vector< rtl::OString >::iterator iter );
-+	OptDsc* getOptDsc( rtl::OString& opt );
-+	sal_Bool hasOpt( const rtl::OString& opt ) const;
-+	::osl::FileBase::RC getIniOptions( rtl::OString iniPth );
-+    void createOpt( rtl::OString& optdsc );
-+	void str2Opt( rtl::OString iOpts );
-+    void addOpt( rtl::OString& opt, sal_Bool evaluate = sal_True );
-+	void replVars( void );
-+	void showUsage( void );
-+	void printStatus( void );
-+
-+}; ///:~ GetOpt
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: getopt.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/log.hxx	2008-12-10 20:46:08.078572827 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/log.hxx	2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,116 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ *************************************************************************
-+
-+      Source Code Control System - Header
-+
-+      $Header$
-+
-+      Source Code Control System - Update
-+
-+*************************************************************************/
-+#ifndef __QADEV_REGSCAN_LOG_HXX__
-+#define __QADEV_REGSCAN_LOG_HXX__
-+
-+#include <time.h>
-+#include	<rtl/ustring.hxx>
-+#include	<rtl/strbuf.hxx>
-+#include	<sal/types.h>
-+#include	<osl/thread.h>
-+#include	<osl/file.hxx>
-+
-+//!io #include <iostream>
-+#include <vector>
-+
-+// using namespace std;
-+
-+
-+/**
-+ * Log derives the interface of the ::osl::File class ( is-a relation ).
-+ * Its members (has-a relation) are the (full qualified)name of the log
-+ * and an OStringBuffer which represents the content of the logfile.
-+ * It provides the functionality of easy-to-use open and write logs
-+ */
-+//: Log
-+class Log {
-+
-+    ::osl::File*            m_logfile;          // fileobject
-+    rtl::OUString         m_logurl;           // url of log
-+	rtl::OStringBuffer	m_buf;              // content of log
-+
-+    Log();
-+
-+public:
-+
-+	//> c'tor
-+	/**
-+	 * constructors argument is a full qualified UNC path
-+	 * @param OUString logfile ( full qualified UNC path )
-+	 */
-+    Log( const rtl::OUString& logURL )
-+            : m_logfile( new ::osl::File( logURL ))
-+			, m_logurl(logURL)
-+    {} ///< c'tor
-+
-+    //> d'tor
-+    virtual ~Log() {
-+        m_logfile->close();
-+        delete( m_logfile );
-+    } ///< d'tor
-+
-+	//> inline methods
-+	// returns a reference to name instance
-+    inline rtl::OUString getLogURL() { return m_logurl; }
-+    inline rtl::OString getName() { return rtl::OUStringToOString(
-+                                    m_logurl, RTL_TEXTENCODING_ASCII_US  ); }
-+	///< inline methods
-+
-+	// open logfile for overwrite (default) or append
-+	::osl::FileBase::RC open( sal_Bool append = sal_False );
-+	::osl::FileBase::RC close() { return m_logfile->close(); }
-+
-+
-+	// write methods without (default) or with echo on display
-+	::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False );
-+	::osl::FileBase::RC write( const rtl::OString& buf,
-+                                   sal_Bool v = sal_False );
-+	// ::osl::FileBase::RC write( rtl::OStringBuffer const& buf,
-+    //                                sal_Bool v = sal_False );
-+	::osl::FileBase::RC write( const rtl::OUString& buf,
-+                                   rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US,
-+                                   sal_Bool v = sal_False   );
-+    
-+}; ///:~ Log
-+
-+Log &operator <<( Log &_aLog, const sal_Char * _sValue );
-+Log &operator <<( Log &_aLog, rtl::OString const& _sValue );
-+Log &operator <<( Log &_aLog, rtl::OUString const& _sValue );
-+// Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue );
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: log.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/tresstatewrapper.h	2008-12-10 20:46:08.171096366 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/tresstatewrapper.h	2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,66 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef TESTSTATEWRAPPER_H
-+#define TESTSTATEWRAPPER_H
-+
-+#ifdef _RTL_TRES_H_
-+#error "This is old code, please remove the include of rtl/tres.h"
-+#endif
-+
-+#include <sal/types.h>
-+#include "cppunit/autoregister/registertestfunction.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+// typedef void* hTestResult;
-+typedef hTestResult rtlTestResult;
-+
-+// -----------------------------------------------------------------------------
-+void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName);
-+void c_rtl_tres_state_end(hTestResult _aResult, const sal_Char* _pName);
-+
-+// -----------------------------------------------------------------------------
-+// the old test state function, which here convert all values for using with the
-+// new testshl tool
-+
-+sal_Bool SAL_CALL c_rtl_tres_state(
-+	hTestResult pResult,
-+	sal_Bool bSuccess,
-+	char const * pTestMsg,
-+	char const * pFuncName);
-+
-+#ifdef __cplusplus
-+}
-+#endif    
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: tresstatewrapper.h.dummy.
---- misc/cppunit-1.8.0/include/testshl/tresstatewrapper.hxx	2008-12-10 20:46:08.253163483 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/tresstatewrapper.hxx	2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,60 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef teststatewrapper_hxx
-+#define teststatewrapper_hxx
-+
-+#include <cppunit/nocopy.hxx>
-+#include <sal/types.h>
-+
-+#include <cppunit/simpleheader.hxx>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+
-+// This is a hack, because it's possible that the testshl directory doesn't exist.
-+#ifdef LOAD_TRESSTATEWRAPPER_LOCAL
-+#include "tresstatewrapper.h"
-+#else
-+#include <testshl/tresstatewrapper.h>
-+#endif
-+
-+// -----------------------------------------------------------------------------
-+// helper class to mark the start off old test code
-+// the name is need in the test result generator
-+class rtl_tres_state_start : NOCOPY
-+{
-+    const sal_Char* m_pName;
-+    hTestResult     m_aResult;
-+public:
-+    rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName);
-+    ~rtl_tres_state_start();
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: tresstatewrapper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/versionhelper.hxx	2008-12-10 20:46:08.329903269 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/versionhelper.hxx	2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,87 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef AUTOREGISTER_HXX
-+#define AUTOREGISTER_HXX
-+
-+#include <stdio.h>
-+#include <vector>
-+#include <ostream>
-+#include <iostream>
-+
-+#include <rtl/ustring.hxx>
-+#include <rtl/string.hxx>
-+
-+#include "dynamicregister.hxx"
-+
-+// -----------------------------------------------------------------------------
-+// ---------------------------------- Version ----------------------------------
-+// -----------------------------------------------------------------------------
-+// extern "C" const struct VersionInfo *GetVersionInfo();
-+
-+// this is a Hack, but at the moment, no change to handle this behaviour better.
-+struct VersionInfo
-+{
-+	const char*	pTime;
-+	const char*	pDate;
-+	const char*	pUpd;
-+	const char*	pMinor;
-+	const char*	pBuild;
-+	const char*	pInpath;
-+};
-+typedef const struct VersionInfo* (*FktGetVersionInfoPtr)();
-+
-+// -----------------------------------------------------------------------------
-+class VersionHelper : public DynamicLibraryHelper
-+{
-+	const VersionInfo *m_pInfo;
-+
-+public:
-+    VersionHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions);
-+//	void print(std::ostream& _aStream);
-+    void printall(FILE*);
-+
-+    rtl::OString getTime() const;
-+    rtl::OString getDate() const;
-+    rtl::OString getUpd() const;
-+    rtl::OString getMinor() const;
-+    rtl::OString getBuild() const;
-+    rtl::OString getInpath() const;
-+
-+    bool isOk() const;
-+};
-+
-+/** insertion operator for easy output */
-+// std::ostream &operator <<( std::ostream &stream, 
-+//                           VersionHelper &version );
-+
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: versionhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/winstuff.hxx	2008-12-10 20:46:08.412541288 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/winstuff.hxx	2008-07-16 14:09:24.000000000 +0200
-@@ -1 +1,44 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef WINSTUFF_HXX
-+#define WINSTUFF_HXX
-+
-+#include <sal/types.h>
-+
-+// Isolated into own compilation unit, to avoid interference with
-+// windows headers
-+void        WinDebugBreak();
-+void        WinSleep( sal_uInt32 sec );
-+sal_uInt32  WinGetCurrentProcessId();
-+void        WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout );
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: winstuff.hxx.dummy.
---- misc/cppunit-1.8.0/makefile.mk	2008-12-10 20:46:08.628149187 +0100
-+++ misc/build/cppunit-1.8.0/makefile.mk	2008-12-09 14:43:50.000000000 +0100
-@@ -1 +1,35 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU Lesser General Public License version 3 for more details
@@ -4289,18 +1296,14 @@ Nur in misc/build/cppunit-1.8.0/include/testshl: winstuff.hxx.dummy.
 +#*************************************************************************
 +
 +target:
-+	cd src$/win32 && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+	cd src$/result && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+	cd src$/cppunit && $(MAKE) $(MFLAGS) $(CALLMACROS)
-Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
++        cd src && $(MAKE) $(MFLAGS) $(CALLMACROS)
 --- misc/cppunit-1.8.0/src/cppunit/Asserter.cpp	2002-03-27 20:04:02.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/Asserter.cpp	2008-02-27 17:21:16.000000000 +0100
-@@ -1,52 +1,76 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/Asserter.cpp	2009-09-12 14:15:35.343750000 +0200
+@@ -1,52 +1,72 @@
  #include <cppunit/Asserter.h>
  #include <cppunit/NotEqualException.h>
--
-+#include <cppunit/stringhelper.hxx>
  
+-
  namespace CppUnit
  {
 -
@@ -4349,7 +1352,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 -              SourceLine sourceLine,
 -              std::string additionalMessage )
 +failIf( bool shouldFail, 
-+        rtl::OUString const& _suMessage, 
++        const char* _suMessage, 
 +        SourceLine const& location )
  {
 -  throw NotEqualException( expected, 
@@ -4358,10 +1361,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 -                           additionalMessage );
 +  if ( shouldFail )
 +  {
-+      rtl::OString sMessage;
-+      sMessage <<= _suMessage;
-+      std::string message;
-+      message = sMessage.getStr();
++      std::string message( _suMessage );
 +      fail( message, location );
 +  }
 +}
@@ -4394,7 +1394,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
    if ( shouldFail )
      failNotEqual( expected, actual, sourceLine, additionalMessage );
 --- misc/cppunit-1.8.0/src/cppunit/Exception.cpp	2001-10-19 20:37:24.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/Exception.cpp	2008-02-27 17:21:46.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/Exception.cpp	2009-09-12 14:15:35.359375000 +0200
 @@ -19,20 +19,19 @@
  
  /// Construct the exception
@@ -4437,7 +1437,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
      m_sourceLine( fileName, lineNumber )
  {
 --- misc/cppunit-1.8.0/src/cppunit/NotEqualException.cpp	2001-10-06 00:27:14.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/NotEqualException.cpp	2008-02-27 17:21:34.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/NotEqualException.cpp	2009-09-12 14:15:35.359375000 +0200
 @@ -3,17 +3,17 @@
  namespace CppUnit {
  
@@ -4482,7 +1482,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
                 lineNumber,
                 fileName ),
 --- misc/cppunit-1.8.0/src/cppunit/SourceLine.cpp	2001-10-06 00:27:14.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/SourceLine.cpp	2008-02-27 17:23:14.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/SourceLine.cpp	2009-09-12 14:15:35.375000000 +0200
 @@ -10,10 +10,10 @@
  }
  
@@ -4499,7 +1499,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
 --- misc/cppunit-1.8.0/src/cppunit/TestAssert.cpp	2001-10-07 21:36:47.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestAssert.cpp	2008-02-27 17:23:24.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/TestAssert.cpp	2009-09-12 14:15:35.390625000 +0200
 @@ -1,4 +1,4 @@
 -#if HAVE_CMATH
 +#ifdef HAVE_CMATH
@@ -4588,8 +1588,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  
  
 --- misc/cppunit-1.8.0/src/cppunit/TestCase.cpp	2002-03-25 23:35:34.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestCase.cpp	2008-02-27 17:21:24.000000000 +0100
-@@ -1,70 +1,141 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/TestCase.cpp	2009-09-12 15:14:46.515625000 +0200
+@@ -1,74 +1,142 @@
 +#include <stdlib.h>
  #include <cppunit/Portability.h>
  #include <typeinfo>
@@ -4598,11 +1598,9 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  #include "cppunit/TestCase.h"
  #include "cppunit/Exception.h"
 -#include "cppunit/TestResult.h"
-+// #include "cppunit/TestResult.h"
- 
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/tagvalues.hxx>
-+#include <cppunit/externcallbackfunc.hxx>
+-
++#include "cppunit/tagvalues.hxx"
++#include "cppunit/externcallbackfunc.hxx"
  
  namespace CppUnit {
  
@@ -4612,22 +1610,72 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 -{ 
 -  return new TestResult; 
 -} 
-+//# CppUnit::TestResult* 
+-
+-
+-/// Run the test and catch any exceptions that are triggered by it 
+-void 
+-TestCase::run( TestResult *result )
+-{
+-  result->startTest(this);
+-
+-  try {
+-	  setUp();
+-
+-	  try {
+-	    runTest();
+-	  }
+-	  catch ( Exception &e ) {
+-	    Exception *copy = e.clone();
+-	    result->addFailure( this, copy );
+-	  }
+-	  catch ( std::exception &e ) {
+-	    result->addError( this, new Exception( e.what() ) );
+-	  }
+-	  catch (...) {
+-	    Exception *e = new Exception( "caught unknown exception" );
+-	    result->addError( this, e );
+-	  }
+-
+-	  try {
+-	    tearDown();
+-	  }
+-	  catch (...) {
+-	    result->addError( this, new Exception( "tearDown() failed" ) );
+-	  }
+-  }
+-  catch (...) {
+-	  result->addError( this, new Exception( "setUp() failed" ) );
+-  }
+-  
+-  result->endTest( this );
+-}
+-
+-
+-/// A default run method 
+-TestResult *
+-TestCase::run()
+-{
+-  TestResult *result = defaultResult();
+-
+-  run (result);
+-  return result;
+-}
++//# CppUnit::TestResult*
 +//# TestCase::defaultResult()
-+//# { 
-+//#   return new TestResult; 
-+//# } 
- 
- 
- /// Run the test and catch any exceptions that are triggered by it 
-+//# void 
++//# {
++//#   return new TestResult;
++//# }
++
++
++/// Run the test and catch any exceptions that are triggered by it
++//# void
 +//# TestCase::run( TestResult *result )
 +//# {
 +//#   result->startTest(this);
-+//# 
++//#
 +//#   try {
 +//# 	  setUp();
-+//# 
++//#
 +//# 	  try {
 +//# 		runTest();
 +//# 	  }
@@ -4642,7 +1690,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 +//# 		Exception *e = new Exception( "caught unknown exception" );
 +//# 		result->addError( this, e );
 +//# 	  }
-+//# 
++//#
 +//# 	  try {
 +//# 		tearDown();
 +//# 	  }
@@ -4653,132 +1701,97 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 +//#   catch (...) {
 +//# 	  result->addError( this, new Exception( "setUp() failed" ) );
 +//#   }
-+//#   
++//#
 +//#   result->endTest( this );
 +//# }
 +//#
 +
- void 
--TestCase::run( TestResult *result )
++void
 +TestCase::run( hTestResult result )
- {
--  result->startTest(this);
--
--  try {
--	  setUp();
-+	Test* pTest = this;
- 
--	  try {
--	    runTest();
--	  }
--	  catch ( Exception &e ) {
--	    Exception *copy = e.clone();
--	    result->addFailure( this, copy );
--	  }
--	  catch ( std::exception &e ) {
--	    result->addError( this, new Exception( e.what() ) );
--	  }
--	  catch (...) {
--	    Exception *e = new Exception( "caught unknown exception" );
--	    result->addError( this, e );
--	  }
--
--	  try {
--	    tearDown();
--	  }
--	  catch (...) {
--	    result->addError( this, new Exception( "tearDown() failed" ) );
--	  }
--  }
--  catch (...) {
--	  result->addError( this, new Exception( "setUp() failed" ) );
--  }
--  
--  result->endTest( this );
++{
++    CppUnit::Test* pTest = this;
++
 +    // if (signalCheck(pTest->getName()) == HAS_SIGNAL)
-+	sal_Int32 nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, result, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE);
++    long nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, result, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE);
 +	if (nValue == DO_NOT_EXECUTE)
 +    {
 +        return;
 +    }
-+    
++
 +	// (pTestResult_StartTest)(result, pTest);
 +    (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE);
 +
-+	try 
++	try
 +	{
 +		setUp();
-+		
-+		try 
++
++		try
 +		{
 +			runTest();
 +			// (pTestResult_AddInfo)(result, pTest, "PASSED");
 +            (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE);
 +		}
-+		catch ( StubException &)
++        catch ( CppUnit::StubException &)
 +		{
 +			(pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "STUB", TAG_DONE );
 +		}
-+		catch ( Exception &e ) 
++        catch ( CppUnit::Exception &e )
 +		{
-+			Exception *copy = e.clone();
++            CppUnit::Exception *copy = e.clone();
 +			// (pTestResult_AddFailure)( result, pTest, copy );
 +			(pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE );
 +		}
-+		catch ( std::exception &e ) 
++		catch ( std::exception &e )
 +		{
 +			// (pTestResult_AddError)( result, pTest, new Exception( e.what() ) );
-+			(pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( e.what() ), TAG_DONE );
++            (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE );
 +		}
-+		catch (...) 
++		catch (...)
 +		{
-+			Exception *e = new Exception( "caught unknown exception" );
++            CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" );
 +			// (pTestResult_AddError)( result, pTest, e );
 +			(pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE );
 +		}
-+		
-+		try 
++
++		try
 +		{
 +			tearDown();
 +		}
-+		catch (...) 
++		catch (...)
 +		{
 +			// (pTestResult_AddError)( result, pTest, new Exception( "tearDown() failed" ) );
-+			(pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "tearDown() failed" ), TAG_DONE );
++            (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( "tearDown() failed" ), TAG_DONE );
 +		}
 +	}
-+	catch (...) 
++	catch (...)
 +	{
 +		// (pTestResult_AddError)( result, pTest, new Exception( "setUp() failed" ) );
-+		(pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "setUp() failed" ), TAG_DONE );
++        (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( "setUp() failed" ), TAG_DONE );
 +	}
-+	
++
 +	// (pTestResult_EndTest)( result, pTest );
 +	(pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE );
- }
- 
--
- /// A default run method 
--TestResult *
--TestCase::run()
--{
--  TestResult *result = defaultResult();
--
--  run (result);
--  return result;
--}
++}
++
++/// A default run method
 +//# TestResult *
 +//# TestCase::run()
 +//# {
 +//#   TestResult *result = defaultResult();
-+//# 
++//#
 +//#   run (result);
 +//#   return result;
 +//# }
  
  
- /// All the work for runTest is deferred to subclasses 
-@@ -77,7 +148,7 @@
+-/// All the work for runTest is deferred to subclasses 
+-void 
++/// All the work for runTest is deferred to subclasses
++void
+ TestCase::runTest()
+ {
+ }
+@@ -77,7 +145,7 @@
  /** Constructs a test case.
   *  \param name the name of the TestCase.
   **/
@@ -4787,8 +1800,49 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
      : m_name(name)
  {
  }
-@@ -133,3 +204,8 @@
-   
+@@ -100,25 +168,25 @@
+ 
+ 
+ /// Returns a count of all the tests executed
+-int 
++int
+ TestCase::countTestCases() const
+-{ 
+-  return 1; 
++{
++  return 1;
+ }
+ 
+ 
+ /// Returns the name of the test case
+-std::string 
++std::string
+ TestCase::getName() const
+-{ 
+-  return m_name; 
++{
++  return m_name;
+ }
+ 
+ 
+ /// Returns the name of the test case instance
+-std::string 
++std::string
+ TestCase::toString() const
+-{ 
++{
+   std::string className;
+ 
+ #if CPPUNIT_USE_TYPEINFO_NAME
+@@ -128,8 +196,13 @@
+   className = "TestCase";
+ #endif
+ 
+-  return className + "." + getName(); 
++  return className + "." + getName();
+ }
+-  
++
  
  } // namespace CppUnit
 +
@@ -4797,8 +1851,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 +// tab-width:4
 +// End:
 --- misc/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp	2002-03-28 16:47:08.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp	2008-02-27 17:22:38.000000000 +0100
-@@ -1,12 +1,20 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp	2009-09-12 15:17:54.093750000 +0200
+@@ -1,12 +1,19 @@
 +#include <stdio.h>
 +#include <stdlib.h>
  #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -4806,7 +1860,6 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 -#include <set>
  
 +#include <set>
-+//!io #include <iostream>
 +#include <sstream>
  
  #if CPPUNIT_USE_TYPEINFO_NAME
@@ -4820,7 +1873,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  
  namespace CppUnit {
  
-@@ -26,15 +34,18 @@
+@@ -26,15 +33,18 @@
  
    static NamedRegistries &getInstance();
  
@@ -4842,7 +1895,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  
    typedef std::set<TestFactory *> Factories;
    Factories m_factoriesToDestroy;
-@@ -44,13 +55,27 @@
+@@ -44,13 +54,27 @@
  
  NamedRegistries::~NamedRegistries()
  {
@@ -4877,7 +1930,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -63,17 +88,55 @@
+@@ -63,17 +87,55 @@
  
  
  TestFactoryRegistry &
@@ -4938,7 +1991,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -91,9 +154,32 @@
+@@ -91,9 +153,32 @@
    return m_destroyedFactories.count( factory ) == 0;
  }
  
@@ -4972,7 +2025,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
      m_name( name )
  {
  }
-@@ -116,26 +202,38 @@
+@@ -116,26 +201,38 @@
    }
  }
  
@@ -5014,7 +2067,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -144,10 +242,23 @@
+@@ -144,10 +241,23 @@
  {
      static int serialNumber = 1;
  
@@ -5024,8 +2077,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 -    registerFactory( ost.str(), factory );
 +    std::string aStr("@Dummy@_");
 +    
-+    sal_Char cBuf[20];
-+    sal_Char *pBuf = cBuf;
++    char cBuf[20];
++    char *pBuf = cBuf;
 +    sprintf(pBuf, "%d", serialNumber++ );
 +    
 +    aStr += std::string(pBuf);
@@ -5042,7 +2095,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -163,6 +274,9 @@
+@@ -163,6 +273,9 @@
  void 
  TestFactoryRegistry::addTestToSuite( TestSuite *suite )
  {
@@ -5053,7 +2106,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
          it != m_factories.end(); 
          ++it )
 --- misc/cppunit-1.8.0/src/cppunit/TestFailure.cpp	2002-02-28 11:57:20.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestFailure.cpp	2008-02-27 17:23:02.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/TestFailure.cpp	2009-09-12 14:15:35.437500000 +0200
 @@ -5,12 +5,12 @@
  namespace CppUnit {
  
@@ -5105,15 +2158,13 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  
  } // namespace CppUnit
 --- misc/cppunit-1.8.0/src/cppunit/TestSuite.cpp	2002-03-24 20:39:55.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestSuite.cpp	2008-02-27 17:24:10.000000000 +0100
-@@ -1,11 +1,15 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/TestSuite.cpp	2009-09-12 15:16:07.265625000 +0200
+@@ -1,11 +1,13 @@
 +#include <stdlib.h>
  #include "cppunit/TestSuite.h"
 -#include "cppunit/TestResult.h"
-+// #include "cppunit/TestResult.h"
-+#include <cppunit/tagvalues.hxx>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/externcallbackfunc.hxx>
++#include "cppunit/tagvalues.hxx"
++#include "cppunit/externcallbackfunc.hxx"
  
  namespace CppUnit {
  
@@ -5125,7 +2176,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  {
  }
  
-@@ -13,7 +17,7 @@
+@@ -13,7 +15,7 @@
  /// Destructor
  TestSuite::~TestSuite()
  { 
@@ -5134,7 +2185,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -21,28 +25,37 @@
+@@ -21,28 +23,37 @@
  void 
  TestSuite::deleteContents()
  {
@@ -5169,8 +2220,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 -  }
 +	// (pTestResult_EnterNode)(result, getName().c_str());
 +	(pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE);
-+	for ( std::vector<Test *>::iterator it = m_tests.begin();
-+		  it != m_tests.end();
++    for ( std::vector<Test *>::const_iterator it = getTests().begin();
++          it != getTests().end();
 +		  ++it )
 +	{
 +		//# if ( result->shouldStop() )
@@ -5188,7 +2239,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -50,14 +63,14 @@
+@@ -50,14 +61,14 @@
  int 
  TestSuite::countTestCases() const
  {
@@ -5211,7 +2262,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -65,7 +78,7 @@
+@@ -65,7 +76,7 @@
  void 
  TestSuite::addTest( Test *test )
  { 
@@ -5220,7 +2271,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -73,7 +86,7 @@
+@@ -73,7 +84,7 @@
  std::string 
  TestSuite::toString() const
  { 
@@ -5229,7 +2280,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
  }
  
  
-@@ -81,16 +94,20 @@
+@@ -81,16 +92,20 @@
  std::string 
  TestSuite::getName() const
  { 
@@ -5252,392 +2303,14 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
 +// Local Variables:
 +// tab-width:4
 +// End:
---- misc/cppunit-1.8.0/src/cppunit/cmdlinebits.cxx	2008-12-10 20:46:08.820775372 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/cmdlinebits.cxx	2008-12-10 20:42:44.000000000 +0100
-@@ -1 +1,144 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#ifdef WNT
-+# define UNDER_WINDOWS_DEBUGGING
-+# include "testshl/winstuff.hxx"
-+#endif /* WNT */
-+
-+#include <stdio.h>
-+#include <cppunit/cmdlinebits.hxx>
-+#include "cppunit/checkboom.hxx"
-+
-+#include <cppunit/autoregister/callbackstructure.h>
-+#include <osl/diagnose.h>
-+#include <rtl/tres.h>
-+#include <cppunit/stringhelper.hxx>
-+
-+extern CallbackStructure aGlobalStructure;
-+
-+sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag );
-+
-+// sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag )
-+// {
-+//     return( ( _nBits & _nFlag ) == _nFlag );
-+// }
-+
-+void CheckBoom(bool bCondition, std::string const& msg)
-+{
-+    (void) msg; // avoid warning
-+	if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) ) 
-+	{ 
-+		/* force an assertion on false state */ 
-+        if ( !bCondition ) {
-+#ifdef UNDER_WINDOWS_DEBUGGING
-+            WinDebugBreak();
-+#else
-+            OSL_ENSURE( false, msg.c_str() ); 
-+#endif
-+        }
-+	} 
-+} 
-+
-+void CheckBoom(bool bCondition, rtl::OUString const& msg)
-+{                                                              
-+	if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) ) 
-+	{ 
-+		/* force an assertion on false state */ 
-+        rtl::OString sMessage;
-+        sMessage <<= msg;
-+        if ( !bCondition ) {
-+#ifdef UNDER_WINDOWS_DEBUGGING
-+            WinDebugBreak();
-+#else
-+            OSL_ENSURE( false, sMessage.getStr() );
-+#endif
-+        }
-+	}
-+}
-+ 
-+const char* getForwardString()
-+{
-+	return aGlobalStructure.psForward;
-+}
-+
-+// -----------------------------------------------------------------------------
-+// ----------------------------- own printf method -----------------------------
-+// -----------------------------------------------------------------------------
-+
-+// bool isVerbose()
-+// {
-+// 	if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_VERBOSE ) ) 
-+// 	{ 
-+//         return true;
-+// 	} 
-+//     return false;
-+// }
-+// 
-+// bool isQuiet()
-+// {
-+// 	if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_QUIET ) ) 
-+// 	{ 
-+//         return true;
-+// 	} 
-+//     return false;
-+// }
-+// 
-+// void impl_t_print(const char* _pFormatStr, va_list &args)
-+// {
-+//     if (! isQuiet())
-+//     {
-+//         printf("# ");
-+//         vprintf(_pFormatStr, args);
-+//     }
-+// }
-+// 
-+// void t_print(const char* _pFormatStr, ...)
-+// {
-+//     va_list  args;
-+//     va_start( args, _pFormatStr );
-+//     impl_t_print(_pFormatStr, args);
-+//     va_end( args );
-+// }
-+// 
-+// void t_print(T_Print_Params _eType, const char* _pFormatStr, ...)
-+// {
-+//     if (_eType == T_VERBOSE && isVerbose())
-+//     {
-+//         // if T_VERBOSE and we should be verbose, print info
-+//         va_list  args;
-+//         va_start( args, _pFormatStr );
-+//         impl_t_print(_pFormatStr, args);
-+//         va_end( args );
-+//     }
-+// }
-Nur in misc/build/cppunit-1.8.0/src/cppunit: cmdlinebits.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/joblist.cxx	2008-12-10 20:46:08.893444692 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/joblist.cxx	2008-12-09 09:03:54.000000000 +0100
-@@ -1 +1,224 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <fstream>
-+#include <rtl/string.hxx>
-+#include "cppunit/joblist.hxx"
-+
-+#define C_SEPARATOR_LIST " \t,;:#"
-+JobList::JobList() 
-+        :ppsJobList(NULL)
-+{}
-+
-+// -----------------------------------------------------------------------------
-+bool JobList::isInCurrentEnvironment(std::string const& _sString)
-+{
-+    int nSpace = 0;
-+    std::string sSearchString = _sString;
-+    bool bEnd = false;
-+    // run through the hole given string, 
-+    std::string sEnv;
-+
-+    do {
-+        nSpace = sSearchString.find_first_of(C_SEPARATOR_LIST);
-+        if (nSpace < 0)
-+        {
-+            sEnv = sSearchString;
-+            bEnd = true;
-+        }
-+        else
-+        {
-+            sEnv = sSearchString.substr(0, nSpace);
-+            sSearchString = sSearchString.substr(nSpace + 1);
-+        }
-+        if (sEnv.length() > 0)
-+        {
-+            // cout << sEnv << endl;
-+#ifdef LINUX
-+            int nLinux = sEnv.find("unxlng");
-+            if (nLinux >= 0)
-+            {
-+                // found unxlng
-+                return true;
-+            }
-+#endif
-+#ifdef SOLARIS
-+            int nSolaris = sEnv.find("unxsol");
-+            if (nSolaris >= 0)
-+            {
-+                // found unxsol
-+                return true;
-+            }            
-+#endif
-+#ifdef WNT
-+            int nWindows = sEnv.find("wnt");
-+            if (nWindows >= 0)
-+            {
-+                // found wnt
-+                return true;
-+            }
-+#endif
-+        }
-+    } while ( !bEnd );
-+    return false;
-+}
-+
-+std::string JobList::trim(std::string const& _sStringToTrim)
-+{
-+    rtl::OString sStr(_sStringToTrim.c_str());
-+    sStr = sStr.trim();
-+    return std::string(sStr.getStr());
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool JobList::readfile(std::string const& _sFilename, JobType _nJobType)
-+{
-+    // StringList aJobList;
-+    m_aJobList.clear();
-+    
-+    std::ifstream in(_sFilename.c_str(), std::ios::in);
-+    
-+    if (!in)
-+    {
-+        // fprintf(stderr, "warning: Can't open job file: %s\n", _sFilename.c_str());
-+        return false;
-+    }
-+    else
-+    {
-+        if (_nJobType == JOB_EXCLUDE_LIST)
-+        {
-+            fprintf(stderr, "warning: There exist a job exclusion list file: %s\n", _sFilename.c_str());
-+        }
-+        
-+        // std::cout << "Check for signal" << std::endl;
-+        std::string sLine;
-+        while (std::getline(in, sLine))
-+        {
-+            if (sLine.size() > 0)
-+            {
-+                char ch = sLine[0];
-+                if (ch != '#' &&
-+                    isspace(ch) == 0)
-+                {
-+                    sLine = trim(sLine);
-+                    
-+                    // m_aJobList.push_back( sLine );
-+                    int nSpace = sLine.find_first_of(C_SEPARATOR_LIST);
-+                    if (nSpace < 0)
-+                    {
-+                        m_aJobList[sLine] = JOB_UNKNOWN;
-+                    }
-+                    else
-+                    {
-+                        // found a separator
-+                        std::string sTest = sLine.substr(0, nSpace);
-+                        std::string sRest = sLine.substr(nSpace + 1);
-+                        if (isInCurrentEnvironment(sRest))
-+                        {
-+                            m_aJobList[sTest] = JOB_UNKNOWN;
-+                        }
-+                    }
-+                }
-+            }
-+        }
-+
-+        // inclusion list
-+/*
-+  int nSize = m_aJobList.size();
-+                
-+  ppsJobList = (char**) malloc((nSize + 1) * sizeof(char*));
-+                
-+  int nIdx = 0;
-+  StringList::const_iterator aItEnd = m_aJobList.end();
-+  for(StringList::const_iterator it = m_aJobList.begin();
-+  it != aItEnd; ++it)
-+  {
-+  std::string sValue = *it;
-+  char* psTestFkt = (char*) malloc(sValue.size() + 1);
-+  strcpy(psTestFkt, sValue.c_str());
-+  ppsJobList[nIdx] = psTestFkt;
-+  ++nIdx;
-+  }
-+        
-+  ppsJobList[nIdx] = NULL;
-+*/
-+    }
-+    return true;
-+}
-+
-+// -----------------------------------------------------------------------------
-+int JobList::getJobListEntry(std::string const& _sIndexName)
-+{
-+    if (m_aJobList.find(_sIndexName) != m_aJobList.end())
-+    {
-+        return m_aJobList[_sIndexName];
-+    }
-+    return JOB_NOT_FOUND;
-+}
-+
-+// -----------------------------------------------------------------------------
-+void JobList::setJobListEntry(std::string const& _sIndexName, int _nValue)
-+{
-+    // if (m_aJobList.find(_sIndexName) == m_aJobList.end())
-+    // {
-+    m_aJobList[_sIndexName] = _nValue;
-+    // }
-+    // else
-+    // {
-+    //  fprintf(stderr, "error: test function '%s' already exist.\n", _sIndexName);
-+    // }
-+}
-+
-+// -----------------------------------------------------------------------------
-+JobList::~JobList()
-+{
-+    int nIdx = 0;
-+    if (ppsJobList)
-+    {
-+        while(ppsJobList[nIdx] != NULL)
-+        {
-+            free(ppsJobList[nIdx]);
-+            ++nIdx;
-+        }
-+        free(ppsJobList);
-+    }
-+}
-+// -----------------------------------------------------------------------------
-+/*
-+  bool JobList::checkFilter(JobList m_aJobFilter, std::string const& _sNodeName, std::string const& _sName)
-+  {
-+  std::string sFilter = m_aJobFilter.m_aJobList.begin();
-+  }
-+*/
-Nur in misc/build/cppunit-1.8.0/src/cppunit: joblist.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/makefile.mk	2008-12-10 20:46:08.970632544 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/makefile.mk	2008-12-10 19:44:52.000000000 +0100
-@@ -1 +1,113 @@
+--- misc/cppunit-1.8.0/src/cppunit/makefile.mk	2009-09-12 15:20:48.515625000 +0200
++++ misc/build/cppunit-1.8.0/src/cppunit/makefile.mk	2009-09-12 14:15:35.468750000 +0200
+@@ -1 +1,90 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
++#
 +# Copyright 2008 by Sun Microsystems, Inc.
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -5690,21 +2363,14 @@ Nur in misc/build/cppunit-1.8.0/src/cppunit: joblist.cxx.dummy.
 +	$(SLO)$/SourceLine.obj \
 +	$(SLO)$/Exception.obj \
 +	$(SLO)$/NotEqualException.obj \
-+	$(SLO)$/TestFailure.obj \
-+	$(SLO)$/joblist.obj \
-+	$(SLO)$/t_print.obj \
-+	$(SLO)$/signaltest.obj
++        $(SLO)$/TestFailure.obj
 +
 +CPPUNIT_STATIC_SOLFILES = \
 +	$(SLO)$/Asserter.obj \
 +	$(SLO)$/TestCase.obj \
 +	$(SLO)$/TestSuite.obj \
 +	$(SLO)$/TestAssert.obj \
-+	$(SLO)$/TestFactoryRegistry.obj \
-+	$(SLO)$/cmdlinebits.obj \
-+	$(SLO)$/tresregister.obj \
-+	$(SLO)$/tresstatewrapper.obj \
-+	$(SLO)$/registertestfunction.obj 
++        $(SLO)$/TestFactoryRegistry.obj
 +
 +
 +SLOFILES = \
@@ -5716,558 +2382,29 @@ Nur in misc/build/cppunit-1.8.0/src/cppunit: joblist.cxx.dummy.
 +LIB1OBJFILES= \
 +	$(SLOFILES)
 +
-+.IF "$(GUI)"=="WNT" 
++.IF "$(GUI)"=="WNT"
 +.IF "$(COM)"=="GCC"
 +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
 +.ENDIF
-+LIB1FILES=$(LB)$/c5t_winstuff.lib
++#LIB1FILES=$(LB)$/c5t_winstuff.lib
 +.ENDIF
 +
 +.IF "$(GUI)" == "UNX"
 +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
 +.ENDIF
 +
-+#-------------------------------------------------------------------------------
-+TARGET2=c5t_no_regallfkt
-+LIB2TARGET= $(LB)$/$(TARGET2).lib
-+LIB2OBJFILES= \
-+	$(CPPUNIT_TESTSHL_SLOFILES)
-+
-+.IF "$(GUI)"=="WNT" 
-+.IF "$(COM)"=="GCC"
-+LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a
-+.ENDIF
-+.ENDIF
-+
-+.IF "$(GUI)" == "UNX"
-+LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a
-+.ENDIF
-+
 +# --- Targets ------------------------------------------------------
 +
 +.INCLUDE :  target.mk
 +
-Nur in misc/build/cppunit-1.8.0/src/cppunit: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/cppunit/registertestfunction.cxx	2008-12-10 20:46:09.058854031 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/registertestfunction.cxx	2008-12-09 09:04:23.000000000 +0100
-@@ -1 +1,60 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+#include <cppunit/simpleheader.hxx>
-+#include <cppunit/additionalfunc.hxx>
-+
-+extern "C" void SAL_CALL testAllRegisteredFunctions(hTestResult _pResult)
-+{
-+	CppUnit::TestFactoryRegistry::testRegistries(_pResult);
-+	// CppUnit::Test* tp = CppUnit::TestFactoryRegistry::getRegistry("rtl_OUString").makeTest();
-+	// tp->run(pResult);
-+}
-+
-+// -----------------------------------------------------------------------------
-+// ---------------------------- RegisterTestFunctions ----------------------------
-+// -----------------------------------------------------------------------------
-+
-+extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr _pFunc)
-+{
-+    if (_pFunc)
-+    {
-+        (_pFunc)(&testAllRegisteredFunctions, "");
-+    }
-+    else
-+    {
-+        // error, FktRegFuncPtr not given
-+    }
-+    RegisterAdditionalFunctions(_pFunc);
-+}
-Nur in misc/build/cppunit-1.8.0/src/cppunit: registertestfunction.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/signaltest.cxx	2008-12-10 20:46:09.119798751 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/signaltest.cxx	2008-12-09 09:04:24.000000000 +0100
-@@ -1 +1,92 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <typeinfo>
-+
-+#include "cppunit/signaltest.h"
-+
-+namespace CppUnit 
-+{
-+
-+/** Constructs a test case for a suite.
-+ *  This TestCase is intended for use by the TestCaller and should not
-+ *  be used by a test case for which run() is called.
-+ **/
-+SignalTest::SignalTest(std::string const& _sName)
-+    : m_sName( _sName )
-+{
-+}
-+
-+
-+/// Destructs a test case
-+SignalTest::~SignalTest()
-+{
-+}
-+
-+
-+/// Returns a count of all the tests executed
-+int 
-+SignalTest::countTestCases() const
-+{ 
-+  return 1; 
-+}
-+
-+/// We never need to start this
-+void SignalTest::run(hTestResult) {}
-+
-+
-+/// Returns the name of the test case
-+std::string 
-+SignalTest::getName() const
-+{ 
-+  return m_sName; 
-+}
-+
-+
-+/// Returns the name of the test case instance
-+std::string 
-+SignalTest::toString() const
-+{ 
-+  std::string className;
-+
-+#if CPPUNIT_USE_TYPEINFO_NAME
-+  const std::type_info& thisClass = typeid( *this );
-+  className = thisClass.name();
-+#else
-+  className = "SignalTest";
-+#endif
-+
-+  return className + "." + getName(); 
-+}
-+ 
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/cppunit: signaltest.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/t_print.cxx	2008-12-10 20:46:09.210907830 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/t_print.cxx	2008-12-09 09:04:23.000000000 +0100
-@@ -1 +1,98 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdio.h>
-+#include <cppunit/cmdlinebits.hxx>
-+#include <rtl/tres.h>
-+#include <osl/mutex.hxx>
-+
-+extern CmdLineBits st_nBits;
-+
-+sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag )
-+{
-+    return( ( _nBits & _nFlag ) == _nFlag );
-+}
-+
-+// -----------------------------------------------------------------------------
-+// ----------------------------- own printf method -----------------------------
-+// -----------------------------------------------------------------------------
-+
-+bool isVerbose()
-+{
-+    if ( isBit( st_nBits, rtl_tres_Flag_VERBOSE ) ) 
-+    { 
-+        return true;
-+    } 
-+    return false;
-+}
-+
-+bool isQuiet()
-+{
-+    if ( isBit( st_nBits, rtl_tres_Flag_QUIET ) ) 
-+    { 
-+        return true;
-+    } 
-+    return false;
-+}
-+
-+// ::osl::Mutex   m_aTPrintMutex;
-+
-+void impl_t_print(const char* _pFormatStr, va_list &args)
-+{
-+    if (! isQuiet())
-+    {
-+        // ::osl::MutexGuard g(m_aTPrintMutex);
-+        printf("# ");
-+        vprintf(_pFormatStr, args);
-+    }
-+}
-+
-+void t_print(const char* _pFormatStr, ...)
-+{
-+    va_list  args;
-+    va_start( args, _pFormatStr );
-+    impl_t_print(_pFormatStr, args);
-+    va_end( args );
-+}
-+
-+void t_print(T_Print_Params _eType, const char* _pFormatStr, ...)
-+{
-+    if (_eType == T_VERBOSE && isVerbose())
-+    {
-+        // if T_VERBOSE and we should be verbose, print info
-+        va_list  args;
-+        va_start( args, _pFormatStr );
-+        impl_t_print(_pFormatStr, args);
-+        va_end( args );
-+    }
-+}
-Nur in misc/build/cppunit-1.8.0/src/cppunit: t_print.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/tresregister.cxx	2008-12-10 20:46:09.288665520 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/tresregister.cxx	2008-12-09 09:04:23.000000000 +0100
-@@ -1 +1,69 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdio.h>
-+#include <sal/types.h>
-+#include <cppunit/autoregister/registerfunc.h>
-+#include <cppunit/autoregister/callbackstructure.h>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+//! is this global CallbackStructure need?
-+CallbackStructure aGlobalStructure;
-+CmdLineBits st_nBits;
-+
-+FktPtr_CallbackDispatch  pCallbackFunc = NULL;
-+
-+// This function is called from the TestShl tool.
-+extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* _pCallback)
-+{
-+	aGlobalStructure = *_pCallback;
-+
-+        st_nBits = aGlobalStructure.nBits;
-+
-+	pCallbackFunc = _pCallback->aCallbackDispatch;
-+	FktRegFuncPtr pFunc = _pCallback->aRegisterFunction;
-+	if (pFunc)
-+	{
-+		RegisterTestFunctions(pFunc);
-+	}
-+	else
-+	{
-+		// error, should be echoed
-+		fprintf(stderr, "error: Callback Structure doesn't contain a test function ptr.\n");
-+	}
-+
-+	// all is done, copy the magic value
-+	// this is only a simple internal invariant check,
-+	// if the called registerAllTestFunctions Function do, what we want.
-+	_pCallback->nMagic2 = _pCallback->nMagic;
-+}
-Nur in misc/build/cppunit-1.8.0/src/cppunit: tresregister.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/tresstatewrapper.cxx	2008-12-10 20:46:09.345773546 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/tresstatewrapper.cxx	2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,168 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+// this functions build the wrapper, to handle old function calls to rtl_tres_state
-+// IMPORTANT: Due to the fact that rtl_tres_state is in the sal.lib 
-+// you have to rename rtl_tres_state to c_rtl_tres_state
-+//
-+// return c_rtl_tres_state
-+// (
-+// 	   hRtlTestResult,
-+// 	   pData->length == 0 &&
-+// 	   ! *pData->buffer,
-+// 	   "New OString containing no characters",
-+// 	   "ctor_001"
-+// )
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include "cppunit/Test.h"
-+#include "cppunit/autoregister/htestresult.h"
-+#include "cppunit/autoregister/callbackfunc_fktptr.h"
-+#include "cppunit/TestAssert.h"
-+
-+#define LOAD_TRESSTATEWRAPPER_LOCAL
-+#include "testshl/tresstatewrapper.hxx"
-+#undef LOAD_TRESSTATEWRAPPER_LOCAL
-+
-+#include "cppunit/tagvalues.hxx"
-+#include "cppunit/externcallbackfunc.hxx"
-+
-+// -----------------------------------------------------------------------------
-+// Wrapper class for the CppUnit::Test, because the new TestResult
-+// expect a CppUnit::Test interface
-+
-+class WrappedTest : public CppUnit::Test
-+{
-+	std::string m_sName;
-+public:
-+	WrappedTest(std::string const& _sName)
-+			:m_sName(_sName){}
-+	
-+    virtual                       ~WrappedTest () {}
-+    virtual void                  run (hTestResult /*pResult*/){}
-+    virtual int                   countTestCases () const {return 1;}
-+    virtual std::string           getName () const {return m_sName;}
-+    virtual std::string           toString () const {return "WrappedTest";}
-+};
-+
-+// -----------------------------------------------------------------------------
-+rtl_tres_state_start::rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName)
-+        :m_pName(_pName),
-+         m_aResult(_aResult)
-+{
-+    // (pTestResult_EnterNode)(m_aResult, m_pName);
-+    (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE);
-+}
-+rtl_tres_state_start::~rtl_tres_state_start()
-+{
-+    // (pTestResult_LeaveNode)(m_aResult, m_pName);
-+    (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE);
-+}
-+
-+// --------------------------------- C-Wrapper ---------------------------------
-+typedef std::vector<rtl_tres_state_start*> rtl_tres_states;
-+rtl_tres_states m_StateStack;
-+
-+extern "C" void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName)
-+{
-+    rtl_tres_state_start* pState = new rtl_tres_state_start(_aResult, _pName);
-+    m_StateStack.push_back(pState);
-+}
-+
-+extern "C" void c_rtl_tres_state_end(hTestResult, const sal_Char*)
-+{
-+    rtl_tres_state_start* pState = m_StateStack.back();
-+
-+    delete pState;
-+    m_StateStack.pop_back();
-+}
-+// -----------------------------------------------------------------------------
-+// -----------------------------------------------------------------------------
-+// -----------------------------------------------------------------------------
-+
-+// -----------------------------------------------------------------------------
-+// ------------------------- Wrapper for rtl_tres_state -------------------------
-+// -----------------------------------------------------------------------------
-+
-+sal_Bool SAL_CALL c_rtl_tres_state(
-+    hTestResult pResult,
-+    sal_Bool bSuccess,
-+    char const * pTestMsg,
-+    char const * pFuncName)
-+{
-+    CppUnit::Test* pTest = new WrappedTest(pFuncName);
-+    
-+    sal_Int32 nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, pResult, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE);
-+    if (nValue == DO_NOT_EXECUTE)
-+    {
-+        return false;
-+    }
-+
-+    // This code is copied from CppUnit::TestCase and less adapted, to work with the
-+    // old test code.
-+    // (pTestResult_StartTest)(pResult, pTest);
-+    (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE);
-+    
-+    try 
-+    {
-+        CPPUNIT_ASSERT_MESSAGE( pTestMsg, bSuccess ? true : false );
-+        // (pTestResult_AddInfo)(pResult, pTest, "#PASSED#");
-+        (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE);
-+    }
-+    catch ( CppUnit::Exception &e ) 
-+    {
-+        CppUnit::Exception *copy = e.clone();
-+        // (pTestResult_AddFailure)( pResult, pTest, copy );
-+        (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE );
-+    }
-+    catch ( std::exception &e ) 
-+    {
-+        //(pTestResult_AddError)( pResult, pTest, new CppUnit::Exception( e.what() ) );
-+        (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE );
-+    }
-+    catch (...) 
-+    {
-+        CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" );
-+        // (pTestResult_AddError)( pResult, pTest, e );
-+        (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE );
-+    }
-+    
-+
-+    // (pTestResult_EndTest)( pResult, pTest );
-+    (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE );
-+    
-+    return bSuccess;
-+}
-+
-Nur in misc/build/cppunit-1.8.0/src/cppunit: tresstatewrapper.cxx.dummy.
---- misc/cppunit-1.8.0/src/makefile.mk	2008-12-10 20:46:08.706925653 +0100
-+++ misc/build/cppunit-1.8.0/src/makefile.mk	2008-12-09 08:57:10.000000000 +0100
-@@ -1 +1,35 @@
+--- misc/cppunit-1.8.0/src/makefile.mk	2009-09-12 15:20:48.421875000 +0200
++++ misc/build/cppunit-1.8.0/src/makefile.mk	2009-09-12 14:15:35.484375000 +0200
+@@ -1 +1,33 @@
 -dummy
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
++#
 +# Copyright 2008 by Sun Microsystems, Inc.
 +#
 +# OpenOffice.org - a multi-platform office productivity suite
@@ -6296,3535 +2433,4 @@ Nur in misc/build/cppunit-1.8.0/src/cppunit: tresstatewrapper.cxx.dummy.
 +#*************************************************************************
 +
 +target:
-+	cd cppunit && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+	cd result && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+	cd win32 && $(MAKE) $(MFLAGS) $(CALLMACROS)
-Nur in misc/build/cppunit-1.8.0/src: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/result/SynchronizedObject.cpp	2008-12-10 20:46:05.438373643 +0100
-+++ misc/build/cppunit-1.8.0/src/result/SynchronizedObject.cpp	2008-02-27 17:26:28.000000000 +0100
-@@ -1 +1,35 @@
--dummy
-+#include <cppunit/result/SynchronizedObject.h>
-+
-+
-+namespace CppUnit
-+{
-+
-+
-+
-+
-+SynchronizedObject::SynchronizedObject( SynchronizationObject *syncObject )
-+    : m_syncObject( syncObject == 0 ? new SynchronizationObject() : 
-+                                      syncObject )
-+{
-+}
-+
-+
-+SynchronizedObject::~SynchronizedObject()
-+{
-+  delete m_syncObject;
-+}
-+
-+
-+/** Accept a new synchronization object for protection of this instance
-+ * TestResult assumes ownership of the object
-+ */
-+void 
-+SynchronizedObject::setSynchronizationObject( SynchronizationObject *syncObject )
-+{ 
-+  delete m_syncObject; 
-+  m_syncObject = syncObject; 
-+}
-+
-+
-+} //  namespace CppUnit
-+
-Nur in misc/build/cppunit-1.8.0/src/result: SynchronizedObject.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TestResult.cpp	2008-12-10 20:46:05.577200921 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TestResult.cpp	2008-12-10 20:42:45.000000000 +0100
-@@ -1 +1,261 @@
--dummy
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/TestListener.h>
-+#include "testshl/getopt.hxx"
-+#include <cppunit/result/TestResult.h>
-+#include <algorithm>
-+#include "cppunit/result/outputter.hxx"
-+#include <cppunit/Test.h>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+namespace CppUnit {
-+
-+/// Construct a TestResult
-+TestResult::TestResult( GetOpt &_pOptions, SynchronizationObject *syncObject )
-+    : SynchronizedObject( syncObject ),
-+      m_aOptionHelper(_pOptions),
-+      m_nExitValue(0)
-+{
-+  reset();
-+}
-+
-+
-+/// Destroys a test result
-+TestResult::~TestResult()
-+{
-+}
-+
-+
-+/** Resets the result for a new run.
-+ *
-+ * Clear the previous run result.
-+ */
-+void 
-+TestResult::reset()
-+{
-+  ExclusiveZone zone( m_syncObject ); 
-+  m_stop = false;
-+}
-+
-+
-+/** Adds an error to the list of errors. 
-+ *  The passed in exception
-+ *  caused the error
-+ */
-+void 
-+TestResult::addError( Test *test, 
-+                      Exception *e, ErrorType::num _eType )
-+{ 
-+  TestFailure aTestFailure( test, e, _eType );
-+  addFailure( aTestFailure );
-+}
-+
-+
-+/** Adds a failure to the list of failures. The passed in exception
-+ * caused the failure.
-+ */
-+void 
-+TestResult::addFailure( Test *test, Exception *e )
-+{ 
-+  TestFailure aTestFailure( test, e, ErrorType::ET_FAILURE );
-+  addFailure( aTestFailure );
-+}
-+
-+
-+/** Called to add a failure to the list of failures.
-+ */
-+void 
-+TestResult::addFailure( const TestFailure &failure )
-+{
-+  ExclusiveZone zone( m_syncObject ); 
-+
-+  // LLA: 
-+  // this set the global returnvalue, due to the fact, there occurs a failure, we have to return a non zero value
-+  // at the moment this seams to be a good place.
-+  setExitValue(1);
-+  
-+  for ( TestListeners::iterator it = m_listeners.begin();
-+        it != m_listeners.end(); 
-+        ++it )
-+  {
-+	  TestListener *pListener = *it;
-+	  pListener->addFailure( failure );
-+  }
-+}
-+
-+
-+/// Informs the result that a test will be started.
-+void 
-+TestResult::startTest( Test *test )
-+{ 
-+  ExclusiveZone zone( m_syncObject ); 
-+  if (m_aOptionHelper.isVerbose())
-+  {
-+      std::string aStr;
-+      if (test)
-+      {
-+          aStr = getNodeName();
-+          aStr += ".";
-+          aStr += test->getName();
-+      }
-+      // fprintf(stderr, "Start test: %s\n", aStr.c_str());
-+      t_print( T_VERBOSE, "Start test: %s\n", aStr.c_str());
-+  }
-+  
-+  for ( TestListeners::iterator it = m_listeners.begin();
-+        it != m_listeners.end(); 
-+        ++it )
-+  {
-+	  TestListener *pListener = *it;
-+	  pListener->startTest( test );
-+  }
-+}
-+
-+  
-+/// Informs the result that a test was completed.
-+void 
-+TestResult::endTest( Test *test )
-+{ 
-+  ExclusiveZone zone( m_syncObject ); 
-+  for ( TestListeners::iterator it = m_listeners.begin();
-+        it != m_listeners.end(); 
-+        ++it )
-+  {
-+	  TestListener *pListener = *it;
-+	  pListener->endTest( test );
-+  }
-+}
-+
-+
-+/// Returns whether testing should be stopped
-+bool 
-+TestResult::shouldStop() const
-+{ 
-+  ExclusiveZone zone( m_syncObject );
-+  return m_stop; 
-+}
-+
-+
-+/// Stop testing
-+void 
-+TestResult::stop()
-+{ 
-+  ExclusiveZone zone( m_syncObject );
-+  m_stop = true; 
-+}
-+
-+
-+void 
-+TestResult::addListener( TestListener *listener )
-+{
-+  ExclusiveZone zone( m_syncObject ); 
-+  m_listeners.push_back( listener );
-+}
-+
-+
-+void 
-+TestResult::removeListener ( TestListener *listener )
-+{
-+  ExclusiveZone zone( m_syncObject ); 
-+#if defined(_MSC_VER) && (_MSC_VER >=1400)
-+  m_listeners.erase( remove( m_listeners.begin(), 
-+#else
-+  m_listeners.erase( std::remove( m_listeners.begin(), 
-+#endif
-+                                  m_listeners.end(), 
-+                                  listener ),
-+                     m_listeners.end());
-+}
-+
-+void
-+TestResult::addInfo(Test *test, const char* _aStr)
-+{
-+	ExclusiveZone zone( m_syncObject ); 
-+	for ( TestListeners::iterator it = m_listeners.begin();
-+		  it != m_listeners.end(); 
-+		  ++it )
-+	{
-+		TestListener *pListener = *it;
-+		pListener->addInfo( test, _aStr );
-+	}
-+}
-+
-+// old: void
-+// old: TestResult::enterNode(const char* _aStr)
-+// old: {
-+// old:         ExclusiveZone zone( m_syncObject ); 
-+// old:         for ( TestListeners::iterator it = m_listeners.begin();
-+// old:                   it != m_listeners.end(); 
-+// old:                   ++it )
-+// old:         {
-+// old:                 TestListener *pListener = *it;
-+// old:                 pListener->enterNode( _aStr );
-+// old:         }
-+// old: }
-+// old: 
-+// old: void
-+// old: TestResult::leaveNode(const char* _aStr)
-+// old: {
-+// old:         ExclusiveZone zone( m_syncObject ); 
-+// old: 
-+// old:         for ( TestListeners::iterator it = m_listeners.begin();
-+// old:                   it != m_listeners.end(); 
-+// old:                   ++it )
-+// old:         {
-+// old:                 TestListener *pListener = *it;
-+// old:                 pListener->leaveNode( _aStr );
-+// old:         }
-+// old: }
-+
-+void TestResult::enterNode(const char* _sNode)
-+{
-+	ExclusiveZone zone( m_syncObject );
-+	m_aCurrentNodeNames.push_back(std::string(_sNode));
-+}
-+
-+void TestResult::leaveNode(const char* /*_sNode*/)
-+{
-+	ExclusiveZone zone( m_syncObject );
-+	std::string sBack = m_aCurrentNodeNames.back();
-+	m_aCurrentNodeNames.pop_back();
-+	
-+	// due to a -Wall warning, comment out.
-+	// if (sBack != std::string(_sNode))
-+	// {
-+	//     volatile int dummy = 0;
-+	//     // problem?!
-+	// }
-+}
-+
-+std::string TestResult::getNodeName()
-+{
-+	std::string sName;
-+	for (std::vector<std::string>::const_iterator it = m_aCurrentNodeNames.begin();
-+		 it != m_aCurrentNodeNames.end();
-+		 ++it)
-+	{
-+		if (sName.size() != 0)
-+		{
-+			sName += ".";
-+		}
-+		sName += *it;
-+	}
-+	return sName;
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool TestResult::isAllowedToExecute(std::string const& _sName)
-+{
-+	return m_aOptionHelper.isAllowedToExecute(getNodeName(), _sName);
-+}
-+// -----------------------------------------------------------------------------
-+bool TestResult::isOptionWhereAmI()
-+{
-+    return m_aOptionHelper.isOptionWhereAmI();
-+}
-+
-+// -----------------------------------------------------------------------------
-+void TestResult::print(Outputter&)
-+{
-+}
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: TestResult.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TestResultCollector.cpp	2008-12-10 20:46:05.532229436 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TestResultCollector.cpp	2008-02-27 17:25:50.000000000 +0100
-@@ -1 +1,147 @@
--dummy
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/TestResultCollector.h>
-+
-+
-+namespace CppUnit
-+{
-+
-+
-+TestResultCollector::TestResultCollector( TestResult* _pResult, SynchronizationObject *syncObject )
-+        : TestSucessListener( syncObject ),
-+          m_pResult(_pResult),
-+          m_testErrors(0)
-+{
-+  reset();
-+}
-+
-+
-+TestResultCollector::~TestResultCollector()
-+{
-+	TestFailures::iterator itFailure = m_failures.begin();
-+	while ( itFailure != m_failures.end() )
-+	{
-+		TestFailureEnvelope *pEnvelope = *itFailure++;
-+		TestFailure *pFailure = pEnvelope->getTestFailure();
-+		delete pFailure;
-+	}
-+}
-+
-+
-+void 
-+TestResultCollector::reset()
-+{
-+  TestSucessListener::reset();
-+
-+  ExclusiveZone zone( m_syncObject ); 
-+  m_testErrors = 0;
-+  m_tests.clear();
-+  m_failures.clear();
-+}
-+
-+
-+void 
-+TestResultCollector::startTest( Test *test )
-+{
-+  ExclusiveZone zone (m_syncObject); 
-+  
-+  m_tests.push_back( new TestEnvelope(test, m_pResult->getNodeName()) );
-+}
-+
-+void 
-+TestResultCollector::endTest( Test * )
-+{
-+	// ExclusiveZone zone (m_syncObject); 
-+	// Nothing!
-+}
-+
-+
-+void 
-+TestResultCollector::addFailure( const TestFailure &failure )
-+{
-+  TestSucessListener::addFailure( failure );
-+
-+  ExclusiveZone zone( m_syncObject ); 
-+  if ( failure.isError() )
-+    ++m_testErrors;
-+  m_failures.push_back( new TestFailureEnvelope(failure.clone(), m_pResult->getNodeName()) );
-+}
-+
-+
-+/// Gets the number of run tests.
-+int 
-+TestResultCollector::runTests() const
-+{ 
-+  ExclusiveZone zone( m_syncObject ); 
-+  return m_tests.size(); 
-+}
-+
-+
-+/// Gets the number of detected errors (uncaught exception).
-+int 
-+TestResultCollector::testErrors() const
-+{ 
-+  ExclusiveZone zone( m_syncObject );
-+  return m_testErrors;
-+}
-+
-+
-+/// Gets the number of detected failures (failed assertion).
-+int 
-+TestResultCollector::testFailures() const
-+{ 
-+  ExclusiveZone zone( m_syncObject ); 
-+  return m_failures.size() - m_testErrors;
-+}
-+
-+
-+/// Gets the total number of detected failures.
-+int 
-+TestResultCollector::testFailuresTotal() const
-+{
-+  ExclusiveZone zone( m_syncObject ); 
-+  return m_failures.size();
-+}
-+
-+
-+/// Returns a the list failures (random access collection).
-+const TestResultCollector::TestFailures & 
-+TestResultCollector::failures() const
-+{ 
-+  ExclusiveZone zone( m_syncObject );
-+  return m_failures; 
-+}
-+
-+
-+const TestResultCollector::Tests &
-+TestResultCollector::tests() const
-+{
-+  ExclusiveZone zone( m_syncObject );
-+  return m_tests;
-+}
-+
-+void TestResultCollector::addInfo(Test *_pTest, const char* _sInfo)
-+{
-+	ExclusiveZone zone( m_syncObject );
-+	m_aInfos.push_back(new TestInfo(_pTest, _sInfo));
-+}
-+
-+std::string TestResultCollector::getInfo(Test *_pTest)
-+{
-+	for (TestInfos::const_iterator it = m_aInfos.begin();
-+		 it != m_aInfos.end();
-+		 ++it)
-+	{
-+		TestInfo *pInfo   = *it;
-+		Test *pTest       = pInfo->getTest();
-+		if (pTest == _pTest)
-+		{
-+			std::string sInfo = pInfo->getString();
-+			return sInfo;
-+		}
-+	}
-+	return std::string();
-+}
-+
-+
-+} //  namespace CppUnit
-+
-Nur in misc/build/cppunit-1.8.0/src/result: TestResultCollector.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TestSucessListener.cpp	2008-12-10 20:46:05.660884351 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TestSucessListener.cpp	2008-02-27 17:26:16.000000000 +0100
-@@ -1 +1,46 @@
--dummy
-+#include <cppunit/result/TestSucessListener.h>
-+
-+
-+
-+namespace CppUnit
-+{
-+
-+
-+TestSucessListener::TestSucessListener( SynchronizationObject *syncObject )
-+    : SynchronizedObject( syncObject )
-+    , m_sucess( true )
-+{
-+}
-+
-+
-+TestSucessListener::~TestSucessListener()
-+{
-+}
-+
-+
-+void 
-+TestSucessListener::reset()
-+{
-+  ExclusiveZone zone( m_syncObject );
-+  m_sucess = true;
-+}
-+
-+
-+void 
-+TestSucessListener::addFailure( const TestFailure & )
-+{
-+  ExclusiveZone zone( m_syncObject );
-+  m_sucess = false;
-+}
-+
-+
-+bool 
-+TestSucessListener::wasSuccessful() const
-+{
-+  ExclusiveZone zone( m_syncObject );
-+  return m_sucess;
-+}
-+
-+
-+} //  namespace CppUnit
-+
-Nur in misc/build/cppunit-1.8.0/src/result: TestSucessListener.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TextTestResult.cpp	2008-12-10 20:46:05.742386241 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TextTestResult.cpp	2008-02-27 17:24:56.000000000 +0100
-@@ -1 +1,191 @@
--dummy
-+#include <cppunit/Exception.h>
-+#include <cppunit/NotEqualException.h>
-+#include <cppunit/Test.h>
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/TextTestResult.h>
-+// #include <TextTestResult.h>
-+//!io #include <iostream>
-+
-+namespace CppUnit {
-+
-+
-+TextTestResult::TextTestResult(GetOpt& _aOptions)
-+        :TestResult(_aOptions),
-+		 m_aResulter(this)
-+{
-+	addListener( &m_aResulter );
-+}
-+
-+
-+void 
-+TextTestResult::addFailure( const TestFailure &failure )
-+{
-+	TestResult::addFailure( failure );
-+	// std::cerr << ( failure.isError() ? "E" : "F" );
-+	if (failure.isError())
-+		fprintf(stderr, "E");
-+	else
-+		fprintf(stderr, "F");
-+}
-+
-+
-+void 
-+TextTestResult::startTest( Test *test )
-+{
-+	TestResult::startTest (test);
-+	// std::cerr << ".";
-+	fprintf(stderr, ".");
-+}
-+
-+void TextTestResult::endTest( Test *test )
-+{
-+	TestResult::endTest (test);
-+}
-+
-+
-+void 
-+TextTestResult::printFailures( std::ostream &stream )
-+{
-+	TestResultCollector::TestFailures::const_iterator itFailure = m_aResulter.failures().begin();
-+	int failureNumber = 1;
-+	while ( itFailure != m_aResulter.failures().end() ) 
-+	{
-+		stream  <<  std::endl;
-+		TestFailure *pFailure= (*itFailure++)->getTestFailure();
-+		printFailure( pFailure, failureNumber++, stream );
-+  }
-+}
-+
-+
-+void 
-+TextTestResult::printFailure( TestFailure *failure,
-+                              int failureNumber,
-+                              std::ostream &stream )
-+{
-+  printFailureListMark( failureNumber, stream );
-+  stream << ' ';
-+  printFailureTestName( failure, stream );
-+  stream << ' ';
-+  printFailureType( failure, stream );
-+  stream << ' ';
-+  printFailureLocation( failure->sourceLine(), stream );
-+  stream << std::endl;
-+  printFailureDetail( failure->thrownException(), stream );
-+  stream << std::endl;
-+}
-+
-+
-+void 
-+TextTestResult::printFailureListMark( int failureNumber,
-+                                      std::ostream &stream )
-+{
-+  stream << failureNumber << ")";
-+}
-+
-+
-+void 
-+TextTestResult::printFailureTestName( TestFailure *failure,
-+                                      std::ostream &stream )
-+{
-+	Test* pTest = failure->failedTest();
-+	stream << "test: " << pTest->getName();
-+}
-+
-+
-+void 
-+TextTestResult::printFailureType( TestFailure *failure,
-+                                  std::ostream &stream )
-+{
-+  stream << "("
-+         << (failure->isError() ? "E" : "F")
-+         << ")";
-+}
-+
-+
-+void 
-+TextTestResult::printFailureLocation( SourceLine sourceLine,
-+                                      std::ostream &stream )
-+{
-+  if ( !sourceLine.isValid() )
-+    return;
-+
-+  stream << "line: " << sourceLine.lineNumber()
-+         << ' ' << sourceLine.fileName();
-+}
-+
-+
-+void 
-+TextTestResult::printFailureDetail( Exception *thrownException,
-+                                    std::ostream &stream )
-+{
-+  if ( thrownException->isInstanceOf( NotEqualException::type() ) )
-+  {
-+    NotEqualException *e = (NotEqualException*)thrownException;
-+    stream << "expected: " << e->expectedValue() << std::endl
-+           << "but was:  " << e->actualValue();
-+    if ( !e->additionalMessage().empty() )
-+    {
-+      stream  << std::endl;
-+      stream  <<  "additional message:"  <<  std::endl
-+              <<  e->additionalMessage();
-+    }
-+  }
-+  else
-+  {
-+    stream << " \"" << thrownException->what() << "\"";
-+  }
-+}
-+
-+
-+void 
-+TextTestResult::print( std::ostream& stream ) 
-+{
-+  printHeader( stream );
-+  stream << std::endl;
-+  printFailures( stream );
-+}
-+
-+
-+void 
-+TextTestResult::printHeader( std::ostream &stream )
-+{
-+	if (m_aResulter.wasSuccessful ())
-+		stream << std::endl << "OK (" << m_aResulter.runTests () << " tests)" 
-+			   << std::endl;
-+	else
-+	{
-+		stream << std::endl;
-+		printFailureWarning( stream );
-+		printStatistics( stream );
-+	}
-+}
-+
-+
-+void 
-+TextTestResult::printFailureWarning( std::ostream &stream )
-+{
-+  stream  << "!!!FAILURES!!!" << std::endl;
-+}
-+
-+
-+void 
-+TextTestResult::printStatistics( std::ostream &stream )
-+{
-+  stream  << "Test Results:" << std::endl;
-+
-+  stream  <<  "Run:  "  <<  m_aResulter.runTests()
-+          <<  "   Failures: "  <<  m_aResulter.testFailures()
-+          <<  "   Errors: "  <<  m_aResulter.testErrors()
-+          <<  std::endl;
-+}
-+
-+
-+std::ostream &
-+operator <<( std::ostream &stream, 
-+             TextTestResult &result )
-+{ 
-+  result.print (stream); return stream; 
-+}
-+
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: TextTestResult.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/emacsTestResult.cxx	2008-12-10 20:46:09.419267625 +0100
-+++ misc/build/cppunit-1.8.0/src/result/emacsTestResult.cxx	2008-12-09 09:06:11.000000000 +0100
-@@ -1 +1,193 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+
-+#include <map>
-+#include <cppunit/Exception.h>
-+#include <cppunit/NotEqualException.h>
-+#include <cppunit/Test.h>
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/emacsTestResult.hxx>
-+// #include <TextTestResult.h>
-+//!io #include <iostream>
-+#include <string>
-+
-+#include <rtl/string.hxx>
-+#include "cppunit/result/outputter.hxx"
-+
-+namespace CppUnit {
-+
-+    emacsTestResult::emacsTestResult(GetOpt & _aOptions)
-+            :TestResult(_aOptions),
-+			 m_aOptions(_aOptions),
-+             m_aResulter(this)
-+    {
-+        addListener( &m_aResulter );
-+    }
-+
-+    //# struct ltstr
-+    //# {
-+    //#     bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const
-+    //#         {
-+    //#             return p1 < p2;
-+    //#         }
-+    //# };
-+    //# typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList;
-+
-+    void 
-+    emacsTestResult::print( Outputter& stream ) 
-+    {
-+        printHeader( stream );
-+        // stream << std::endl;
-+        // printFailures( stream );
-+    
-+        // TestPtrList aFailedTests;
-+    
-+        for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin();
-+             it2 != m_aResulter.failures().end();
-+             ++it2)
-+        {
-+            TestFailureEnvelope *pEnvelop = *it2;
-+            TestFailure *pFailure = pEnvelop->getTestFailure();
-+            std::string sNodeName = pEnvelop->getString();
-+        
-+            // aFailedTests[ pFailure->failedTest() ] = true;
-+        
-+            printFailureLine(stream, pFailure, sNodeName);
-+        }
-+    
-+        // only errors are from interest here
-+        //# for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin();
-+        //#      it != m_aResulter.tests().end();
-+        //#      ++it)
-+        //# {
-+        //#     TestEnvelope *pEnvelop = *it;
-+        //#     Test* pTest = pEnvelop->getTest();
-+        //#     std::string sNodeName = pEnvelop->getString();
-+        //# 
-+        //#     if (aFailedTests.find(pTest) == aFailedTests.end())
-+        //#     {
-+        //#         std::string sInfo = m_aResulter.getInfo(pTest);
-+        //#         printTestLine(stream, pTest, sNodeName, sInfo);
-+        //#     }
-+        //# }
-+        stream << "Test #PASSED#" << Outputter::endl();
-+    }
-+
-+
-+    void 
-+    emacsTestResult::printHeader( Outputter &stream )
-+    {
-+	std::string sDate(m_aOptionHelper.createDateTag());
-+	stream << sDate << Outputter::endl();
-+    }
-+
-+    void
-+    emacsTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName)
-+    {
-+	std::string aName;
-+	aName += _sNodeName;
-+	aName += ".";
-+	aName += _pFailure->failedTestName();
-+
-+	SourceLine aLine = _pFailure->sourceLine();
-+	sal_Int32 nLine = -1;
-+	std::string sFilename;
-+	if (aLine.isValid())
-+	{
-+            nLine = aLine.lineNumber();
-+            sFilename = aLine.fileName();
-+	}
-+	
-+	Exception  *pExp  = _pFailure->thrownException();
-+	std::string sWhat;
-+	if (pExp)
-+	{
-+            sWhat = pExp->what();
-+	}
-+	
-+	stream << sFilename;
-+	stream << ":";
-+	stream << nLine;
-+	stream << ":";
-+        
-+	stream << aName;
-+	stream << ";#FAILED#";
-+	// ErrorType::num eErr = _pFailure->getErrorType();
-+	//# if (isErr)
-+        //#     stream << "FAILED#;";
-+	//# else
-+        //#     stream << "ERROR#;";
-+
-+	stream << sWhat;
-+	stream << Outputter::endl();
-+    }
-+
-+    //# void 
-+    //# emacsTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo)
-+    //# {
-+    //#     std::string aName;
-+    //#     aName += _sNodeName;
-+    //#     aName += ".";
-+    //#     aName += _pTest->getName();
-+    //# 
-+    //#     stream << aName;
-+    //#     stream << ";";
-+    //#     stream << _sInfo << "#";
-+    //#     stream << "OK#";
-+    //#     stream << std::endl;
-+    //# }
-+
-+
-+//# void 
-+//# emacsTestResult::printStatistics( Outputter &stream )
-+//# {
-+//# 	stream  << "Test Results:" << std::endl;
-+//# 	
-+//# 	stream  <<  "Run:  "  <<  runTests()
-+//# 			<<  "   Failures: "  <<  testFailures()
-+//# 			<<  "   Errors: "  <<  testErrors()
-+//# 			<<  std::endl;
-+//# }
-+
-+
-+    Outputter &
-+    operator <<( Outputter &stream, 
-+                 emacsTestResult &result )
-+    { 
-+        result.print (stream); return stream; 
-+    }
-+
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: emacsTestResult.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/log.cxx	2008-12-10 20:46:09.499346711 +0100
-+++ misc/build/cppunit-1.8.0/src/result/log.cxx	2008-12-10 20:42:45.000000000 +0100
-@@ -1 +1,125 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include "testshl/log.hxx"
-+
-+// #include <hash_map>
-+// #include <list>
-+// #include <set>
-+
-+using namespace std;
-+
-+::osl::FileBase::RC Log::open( sal_Bool append ) {
-+
-+	::osl::FileBase::RC ret;
-+
-+	if ( ! append ) {
-+        ret = ::osl::File::remove( m_logurl );
-+	}
-+
-+    if( m_logfile->open( OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) {
-+        ret = m_logfile->open( OpenFlag_Write | OpenFlag_Create );
-+	}
-+	else  {
-+        ret = m_logfile->setPos( Pos_End, 0 );
-+	}
-+	return ret;
-+}
-+
-+::osl::FileBase::RC Log::write( const sal_Char* buf, sal_Bool v ) {
-+	sal_uInt64 uBytes=0;
-+    sal_uInt32 len = 0;
-+    const sal_Char* ptr = buf;
-+
-+    if( ptr ) {
-+        while( *ptr++ ) len++;
-+    }
-+
-+	if ( v ) {
-+		// cout << buf << flush;
-+		printf("%s", buf);
-+	}
-+    return m_logfile->write( buf, len , uBytes );
-+}
-+
-+::osl::FileBase::RC Log::write( const rtl::OString& buf, sal_Bool v  ) {
-+	sal_uInt64 uBytes=0;
-+	if ( v ) {
-+		// cout << buf.getStr() << flush;
-+		printf("%s", buf.getStr());
-+	}
-+    return m_logfile->write( buf.getStr(), buf.getLength(), uBytes );
-+}
-+/*
-+// LLA: due to a problem with sal/OUStingBuffer getLength() which isn't const, this
-+// is so not compilable.
-+::osl::FileBase::RC Log::write( rtl::OStringBuffer const& buf, sal_Bool v  ) {
-+	sal_uInt64 uBytes=0;
-+	if ( v ) {
-+		cout << buf.getStr() << flush;
-+	}
-+    return m_logfile->write( buf.getStr(), buf.getLength(), uBytes );
-+}
-+*/
-+::osl::FileBase::RC Log::write( const rtl::OUString& buf,
-+									rtl_TextEncoding tenc, sal_Bool v  ) {
-+	sal_uInt64 uBytes=0;
-+	if ( ! tenc ) {
-+		tenc = RTL_TEXTENCODING_ASCII_US;
-+	}
-+	rtl::OStringBuffer osbuf(
-+							rtl::OUStringToOString( buf, tenc ).getStr() );
-+
-+	if ( v ) {
-+		// cout << osbuf.getStr() << flush;
-+		printf("%s", osbuf.getStr());		
-+	}
-+    return m_logfile->write( osbuf.getStr(), osbuf.getLength(), uBytes );
-+}
-+
-+Log &operator <<( Log &_aLog, const sal_Char * _sValue )
-+{ 
-+	_aLog.write(_sValue); return _aLog;
-+}
-+Log &operator <<( Log &_aLog, rtl::OString const& _sValue )
-+{ 
-+	_aLog.write(_sValue); return _aLog;
-+}
-+Log &operator <<( Log &_aLog, rtl::OUString const& _sValue )
-+{ 
-+	_aLog.write(_sValue); return _aLog;
-+}
-+//! Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue )
-+//! { 
-+//! 	_aLog.write(_sValue); return _aLog;
-+//! }
-Nur in misc/build/cppunit-1.8.0/src/result: log.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/makefile.mk	2008-12-10 20:46:09.542019008 +0100
-+++ misc/build/cppunit-1.8.0/src/result/makefile.mk	2008-12-10 20:23:07.000000000 +0100
-@@ -1 +1,88 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+# $Revision$
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..$/..
-+INCEXT=..$/..$/include
-+# INCEXT=$(SOLARSRC)$/cppunit/$/$(INPATH)/$/misc$/build$/cppunit-1.8.0$/include
-+# PRJ=..$/..
-+# PRJINC=..$/..
-+
-+
-+PRJNAME=cppunit
-+TARGET=c5t_testresult
-+LIBTARGET=NO
-+ENABLE_EXCEPTIONS=TRUE
-+# ENABLE_RTTI=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+# CXXFILES = \
-+# 		  querytemplate.cxx	\
-+# 		  stringhelper.cxx
-+
-+# ENVCFLAGSCXX+=-DCPPUNIT_BUILD_DLL
-+SLOFILES = \
-+	$(SLO)$/SynchronizedObject.obj \
-+	$(SLO)$/TestResult.obj \
-+	$(SLO)$/TestResultCollector.obj \
-+	$(SLO)$/TestSucessListener.obj \
-+	$(SLO)$/emacsTestResult.obj \
-+	$(SLO)$/log.obj \
-+	$(SLO)$/optionhelper.obj \
-+	$(SLO)$/outputter.obj \
-+	$(SLO)$/signal.obj \
-+	$(SLO)$/testshlTestResult.obj \
-+	$(SLO)$/treswrapper.obj 
-+
-+# currently unused
-+# 	$(SLO)$/TextTestResult.obj
-+
-+LIB1TARGET= $(LB)$/$(TARGET).lib
-+LIB1OBJFILES=  $(SLOFILES)
-+
-+.IF "$(GUI)"=="WNT" 
-+.IF "$(COM)"=="GCC"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+.ENDIF
-+
-+.IF "$(GUI)" == "UNX"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-Nur in misc/build/cppunit-1.8.0/src/result: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/result/optionhelper.cxx	2008-12-10 20:46:09.615952197 +0100
-+++ misc/build/cppunit-1.8.0/src/result/optionhelper.cxx	2008-12-09 09:06:14.000000000 +0100
-@@ -1 +1,317 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include "cppunit/result/optionhelper.hxx"
-+// #include <sstream>
-+// #include <string>
-+#include <osl/time.h>
-+#include "cppunit/cmdlinebits.hxx"
-+
-+// -----------------------------------------------------------------------------
-+
-+namespace 
-+{
-+    void split( const rtl::OString& opt,
-+                const rtl::OString& _sSeparator,
-+                OStringList& optLine )
-+    {
-+        optLine.clear();
-+        // const sal_Int32 cSetLen = cSet.getLength();
-+        sal_Int32 index = 0;
-+        sal_Int32 oldIndex = 0;
-+                
-+        // sal_Int32 i;
-+        // sal_Int32 j = 0;
-+        while ( opt.getLength() > 0)
-+        {
-+            // for ( i = 0; i < cSetLen; i++ ) 
-+            // {
-+            index = opt.indexOf( _sSeparator, oldIndex);
-+            if( index != -1 ) 
-+            {
-+                optLine.push_back( opt.copy( oldIndex, index - oldIndex ) );
-+                oldIndex = index + _sSeparator.getLength();
-+            }
-+            // }
-+            else // if (index == -1)
-+            {
-+                optLine.push_back( opt.copy( oldIndex ) );
-+                break;
-+            }
-+        }
-+    } ///< split
-+        
-+    bool match(OStringList const& _aFilter, OStringList const& _aName)
-+    {
-+        OStringList::const_iterator aFilterIter = _aFilter.begin();
-+        OStringList::const_iterator aValueIter = _aName.begin();
-+                
-+        bool bMatch = false;
-+                
-+        while (aFilterIter != _aFilter.end() && aValueIter != _aName.end())
-+        {
-+            rtl::OString sFilter = *aFilterIter;
-+            rtl::OString sName   = *aValueIter;
-+                        
-+            if (sFilter == sName)
-+            {
-+                bMatch = true;
-+                ++aFilterIter;
-+                ++aValueIter;
-+            }
-+            else if (sFilter == "*")
-+            {
-+                bMatch = true;
-+                break;
-+            }
-+            else
-+            {
-+                // Filter does not match
-+                bMatch = false;
-+                break;
-+            }
-+        }
-+        return bMatch;
-+    }
-+}
-+
-+/* static */
-+std::string OptionHelper::integerToAscii(sal_Int32 nValue)
-+{
-+    sal_Char cBuf[30];
-+    sal_Char *pBuf = cBuf;
-+    sprintf(pBuf, "%d", static_cast<int>(nValue));
-+//#     std::ostringstream sBuf;
-+//#     sBuf << nValue;
-+//    rtl::OString sStr;
-+//    sStr = rtl::OString::valueOf(nValue);
-+    return std::string(pBuf);
-+}
-+
-+/* static */
-+// if a given String is less then 2 char, add a "0" in front.
-+std::string OptionHelper::twoDigits(std::string const& _sValue)
-+{
-+    std::string sBack;
-+    if (_sValue.length() == 0)
-+    {
-+        sBack = "00";
-+    }
-+    else if (_sValue.length() == 1)
-+    {
-+        sBack = "0";
-+        sBack += _sValue;
-+    }
-+    else
-+    {
-+        sBack = _sValue;
-+    }
-+    return sBack;
-+}
-+
-+
-+std::string OptionHelper::createDateTag(std::string const& _sProjectId, std::string const& _sBuildId)
-+{
-+    TimeValue tmv_system;
-+    TimeValue tmv_local;
-+    oslDateTime dt;
-+    osl_getSystemTime( &tmv_system );
-+    osl_getLocalTimeFromSystemTime(&tmv_system, &tmv_local);
-+    osl_getDateTimeFromTimeValue( &tmv_local, &dt );
-+
-+    sal_Int32 nYear = dt.Year;
-+    sal_Int32 nMonth = dt.Month;
-+    sal_Int32 nDay = dt.Day;
-+
-+    std::string sDate;
-+    sDate = "# Current Time: ";
-+    sDate += std::string(twoDigits(integerToAscii(dt.Hours)));
-+    sDate += ":";
-+    sDate += std::string(twoDigits(integerToAscii(dt.Minutes)));
-+    sDate += ":";
-+    sDate += std::string(twoDigits(integerToAscii(dt.Seconds)));
-+    sDate += "\n";
-+
-+    sDate += "[";
-+
-+    // sDate += rtl::OString::valueOf(nYear);
-+    sDate.append(integerToAscii(nYear));
-+    sDate += ".";
-+    if (nMonth < 10)
-+        sDate += "0";
-+    // sDate += rtl::OString::valueOf(nMonth);
-+    sDate.append(integerToAscii(nMonth));
-+    sDate += ".";
-+    if (nDay < 10)
-+        sDate += "0";
-+    // sDate += rtl::OString::valueOf(nDay);
-+    sDate += std::string(integerToAscii(nDay));
-+    sDate += "/";
-+    sDate += _sProjectId;
-+    sDate += "/";
-+    sDate += _sBuildId;
-+    sDate += "]";
-+
-+    return sDate;
-+}
-+
-+//# rtl::OString createDateTag()
-+//# {
-+//#     TimeValue tmv;
-+//#     oslDateTime dt;
-+//#     osl_getSystemTime( &tmv );
-+//#     osl_getDateTimeFromTimeValue( &tmv, &dt );
-+//# 
-+//#     sal_Int32 nYear = dt.Year;
-+//#     sal_Int32 nMonth = dt.Month;
-+//#     sal_Int32 nDay = dt.Day;
-+//# 
-+//#     rtl::OString sDate("[");
-+//#     sDate += rtl::OString::valueOf(nYear);
-+//#     sDate += ".";
-+//#     if (nMonth < 10)
-+//#             sDate += "0";
-+//#     sDate += rtl::OString::valueOf(nMonth);
-+//#     sDate += ".";
-+//#     if (nDay < 10)
-+//#             sDate += "0";
-+//#     sDate += rtl::OString::valueOf(nDay);
-+//#     sDate += "//]";
-+//# 
-+//#     return sDate;
-+//# }
-+
-+std::string OptionHelper::createDateTag()
-+{
-+    return createDateTag(m_sProjectId, m_sBuildId);
-+}
-+
-+bool OptionHelper::showErrors()
-+{
-+    bool bRetValue = true; // default, show all
-+    if (m_aOption.hasOpt("-noerrors"))
-+    {
-+        bRetValue = false;
-+    }
-+    return bRetValue;
-+}
-+
-+bool OptionHelper::showTests()
-+{
-+    bool bRetValue = true; // default, show all
-+    if (m_aOption.hasOpt("-onlyerrors"))
-+    {
-+        bRetValue = false;
-+    }
-+    return bRetValue;
-+}
-+
-+// Check which parameter is given for handle the jobs.
-+// If no parameter is given, all jobs (tests) will run through
-+void OptionHelper::handleJobs()
-+{
-+    // load job file, the file contains the functions which we only want to test.
-+    if (m_aOption.hasOpt("-jobexclude"))
-+    {
-+        rtl::OString sJobFile = m_aOption.getOpt("-jobexclude");        
-+        m_aJobExcludeList.readfile(sJobFile.getStr(), JOB_EXCLUDE_LIST);
-+    }
-+    
-+    if (m_aOption.hasOpt("-jobonly"))
-+    {
-+        rtl::OString sJobFile = m_aOption.getOpt("-jobonly");
-+        m_aJobOnlyList.readfile(sJobFile.getStr(), JOB_ONLY_LIST);
-+    }
-+
-+    // 
-+    if (m_aOption.hasOpt("-jobfilter"))
-+    {
-+        rtl::OString sJobFilter = m_aOption.getOpt("-jobfilter");
-+        split(sJobFilter, ".", m_aJobFilter);
-+    }
-+}
-+
-+// -----------------------------------------------------------------------------
-+// Here will be decide, if a job/test will execute or not.
-+// therefore exist some lists, in which stay all jobs (positive list) or a list (negative list) which jobs should not execute
-+// or if only specific jobs should execute by a given filter
-+
-+bool OptionHelper::isAllowedToExecute(std::string const& _sNodeName, std::string const& _sName)
-+{
-+    std::string sJobName = _sNodeName + "." + _sName;
-+    // t_print(T_VERBOSE, "Jobname %s\n", sJobName.c_str());
-+    if (isOnlyShowJobs())                        // true, if parameter -onlyshowjob
-+    {
-+        m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
-+        return false;
-+    }
-+    
-+    if (m_aJobOnlyList.size())                   // >0 if parameter -jobonly
-+    {
-+        if (m_aJobOnlyList.getJobListEntry(sJobName) != JOB_NOT_FOUND)
-+        {
-+            // job entry found, mark as accessed
-+            m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
-+            return true;
-+        }
-+        return false;
-+    }
-+    else if (m_aJobFilter.size() > 0)            // >0 if parameter -jobfilter
-+    {
-+        OStringList aSplitName;
-+        split(sJobName.c_str(), ".", aSplitName);
-+        if (! match(m_aJobFilter, aSplitName))
-+        {
-+            t_print(T_VERBOSE, "job: '%s' filtered by [-jobfilter]\n", sJobName.c_str());
-+            return false;
-+        }
-+    }
-+    else if (m_aJobExcludeList.size() > 0)       // >0 if parameter -jobexclude
-+    {
-+        if (m_aJobExcludeList.getJobListEntry(sJobName) != JOB_NOT_FOUND)
-+        {
-+            // job entry found, this job should not executed, so return false
-+            t_print(T_VERBOSE, "job: '%s' filtered by [-jobexclude]\n", sJobName.c_str());
-+            return false;
-+        }
-+        // m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
-+        return true;
-+    }
-+    else
-+    {
-+        //! not handled yet
-+    }
-+        
-+    return true;
-+}
-+
-Nur in misc/build/cppunit-1.8.0/src/result: optionhelper.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/outputter.cxx	2008-12-10 20:46:09.657356434 +0100
-+++ misc/build/cppunit-1.8.0/src/result/outputter.cxx	2008-12-09 09:06:18.000000000 +0100
-@@ -1 +1,106 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+//
-+#include <string>
-+#include <sal/types.h>
-+#include "cppunit/result/outputter.hxx"
-+
-+// -----------------------------------------------------------------------------
-+
-+Outputter::~Outputter()
-+{
-+    // delete m_pLog;
-+}
-+
-+void Outputter::writeToAll(const sal_Char* _sCharStr)
-+{
-+    // std::cout << _sCharStr;
-+    if (m_pStream)
-+    {
-+        *m_pStream << _sCharStr;
-+    }
-+    if (m_pLog.get())
-+    {
-+        m_pLog->write(_sCharStr);
-+    }
-+}
-+
-+void Outputter::write(const sal_Char* _sCharStr)
-+{
-+    writeToAll(_sCharStr);
-+}
-+
-+void Outputter::write(std::string const& _sStr)
-+{
-+    writeToAll(_sStr.c_str());
-+}
-+
-+void Outputter::write(sal_Int32 _nValue)
-+{
-+    sal_Char cBuf[20];
-+    sal_Char* pBuf = cBuf;
-+    sprintf(pBuf, "%d", SAL_STATIC_CAST(int, _nValue));
-+    writeToAll(pBuf);
-+}
-+
-+// -----------------------------------------------------------------------------
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, const sal_Char* _sValue)
-+{
-+    _aStreamWrapper.write(_sValue);
-+    return _aStreamWrapper;
-+}
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, std::string const& _sValue)
-+{
-+    _aStreamWrapper.write(_sValue);
-+    return _aStreamWrapper;
-+}
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, sal_Int32 _nValue)
-+{
-+    _aStreamWrapper.write(_nValue);
-+    return _aStreamWrapper;
-+}
-+
-+//# Outputter& operator <<( Outputter &_aStreamWrapper, double )
-+//# {
-+//#     return _aStreamWrapper;
-+//# }
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, Outputter::endl const&)
-+{
-+    _aStreamWrapper.write("\n");
-+    return _aStreamWrapper;
-+}
-Nur in misc/build/cppunit-1.8.0/src/result: outputter.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/signal.cxx	2008-12-10 20:46:09.750401577 +0100
-+++ misc/build/cppunit-1.8.0/src/result/signal.cxx	2008-12-10 20:42:46.000000000 +0100
-@@ -1 +1,998 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#if (defined UNX) || (defined OS2)
-+#include <signal.h>
-+#include <errno.h>
-+#endif
-+
-+#include <fstream>
-+#include <vector>
-+#include <hash_map>
-+
-+#include <rtl/tres.h>
-+#include <rtl/string.hxx>
-+
-+#include "testshl/autoregisterhelper.hxx"
-+#include "testshl/getopt.hxx"
-+#include "signal.hxx"
-+#include <cppunit/tagvalues.hxx>
-+#include <unistd.h>
-+#include "testshl/filehelper.hxx"
-+#include <cppunit/result/TestResult.h>
-+#include "cppunit/signaltest.h"
-+#include "cppunit/Exception.h"
-+
-+#ifdef WNT
-+#include "testshl/winstuff.hxx"
-+#endif
-+
-+// typedef std::vector<std::string> StringList;
-+// StringList sCurrentNodeName;
-+CppUnit::TestResult *pTestResult = NULL;
-+std::string sSignalFile;
-+
-+typedef	std::hash_map< std::string, int > HashMap;
-+HashMap m_aSignalHash;
-+bool bSignalsCached = false;
-+bool bDoNotTouchSignalFile = false;
-+
-+// -----------------------------------------------------------------------------
-+
-+// return 'true' if signalfile doesn't exist.
-+// else 'false'
-+bool existsSignalFile(std::string const& _sSignalFilename)
-+{
-+    FILE* pFile = fopen(_sSignalFilename.c_str(), "r");
-+    if (!pFile)
-+    {
-+        return false;
-+    }
-+    fprintf(stderr, "'%s' exists.\n", _sSignalFilename.c_str());
-+    fclose(pFile);
-+    return true;
-+}
-+
-+// -----------------------------------------------------------------------------
-+void createEmptySignalFile(std::string const& _sSignalFilename)
-+{
-+    FILE* pFile = fopen(_sSignalFilename.c_str(), "w");
-+    if (!pFile)
-+    {
-+        fprintf(stderr, "error: Could not create signal helper file %s for signal info.\n", _sSignalFilename.c_str());
-+    }
-+    else
-+    {
-+        fprintf(pFile, "# This is an auto generated helper file for signal handling.\n");
-+        fprintf(pFile, "# An entry start by '#' is a comment.\n");
-+        fprintf(pFile, "# All other are test functions which have abort, before this line is removed.\n");
-+        fprintf(pFile, "# So you have to check this functions by hand.\n");
-+        
-+        fclose(pFile);
-+    }
-+}
-+
-+// -----------------------------------------------------------------------------
-+/** get Current PID.
-+*/
-+inline ::rtl::OUString getCurrentPID(  )
-+{
-+        //~ Get current PID and turn it into OUString;
-+        sal_uInt32 nPID = 0;
-+#ifdef WNT
-+        nPID = WinGetCurrentProcessId();
-+#else
-+        nPID = getpid();
-+#endif
-+        return ( ::rtl::OUString::valueOf( static_cast<long>(nPID ) ) );
-+}
-+// -----------------------------------------------------------------------------
-+static std::string integerToAscii(sal_uInt32 nValue)
-+{
-+    sal_Char cBuf[30];
-+    sal_Char *pBuf = cBuf;
-+    sprintf(pBuf, "%d", static_cast<unsigned int>(nValue));
-+    return std::string(pBuf);
-+}
-+void my_sleep(int sec);
-+
-+// -----------------------------------------------------------------------------
-+void setSignalFilename(GetOpt & opt)
-+{
-+    if (opt.hasOpt("-dntsf") || opt.hasOpt("-donottouchsignalfile"))
-+    {
-+        // special feature, for debugging, so the signal file will not manipulate.
-+        // but create, if no one exist.
-+        bDoNotTouchSignalFile = true;
-+    }
-+    
-+    if (opt.hasOpt("-sf") || opt.hasOpt("-signalfile"))
-+    {
-+        if (opt.hasOpt("-sf"))
-+        {
-+            sSignalFile = opt.getOpt("-sf");
-+        }
-+        else if (opt.hasOpt("-signalfile"))
-+        {
-+            sSignalFile = opt.getOpt("-signalfile");
-+        }
-+	}
-+    else
-+    {
-+        std::string sPath;
-+        // std::string sPath(FileHelper::getTempPath());
-+        std::string sFilename("signalfile");
-+        std::string sFilenameExt(".txt");
-+        bool bCanQuitLoop = true;
-+        do
-+        {
-+            
-+// #ifdef WNT
-+//         sPath += "\\";
-+// #endif
-+// #ifdef UNX
-+//         sPath += "/";
-+// #endif
-+            sPath = sFilename;
-+            // BUG: i72675
-+            // add "_12345" where 12345 is the current process ID
-+        
-+            TimeValue aTimeValue;
-+            osl_getSystemTime(&aTimeValue);
-+            
-+            sPath += "_";
-+            sPath += integerToAscii(aTimeValue.Seconds);
-+            // rtl::OUString suPID = getCurrentPID();
-+            // rtl::OString sPID = rtl::OUStringToOString(suPID, RTL_TEXTENCODING_ASCII_US);
-+            // sPath += sPID.getStr();
-+            sPath += sFilenameExt;
-+            bCanQuitLoop = true;
-+            if (existsSignalFile(sPath))
-+            {
-+                // there is already a signal file, wait a second, choose an other one.
-+                my_sleep(1);
-+                bCanQuitLoop = false;
-+            }
-+        }
-+        while (!(bCanQuitLoop));
-+
-+        sSignalFile = sPath;
-+        fprintf(stderr, "Use default signal file name '%s'\n", sSignalFile.c_str());
-+    }
-+
-+    if (opt.hasOpt("-dnrmsf"))
-+    {
-+        fprintf(stderr, "'Don't remove signal file' (-dnrmsf) is set.\n");
-+    }
-+    else
-+    {
-+        if (bDoNotTouchSignalFile == true)
-+        {
-+            fprintf(stderr, "warning: 'Don't touch signal file' parameter (-dntsf) is set, will not remove existing signal file.\n");
-+        }
-+        else
-+        {
-+            // remove signalfile
-+            createEmptySignalFile(sSignalFile);
-+        }
-+    }
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool doNotTouchSignalFile() { return bDoNotTouchSignalFile; }
-+
-+// -----------------------------------------------------------------------------
-+std::string buildTestFunctionName(std::string const& _sName)
-+{
-+    std::string sName;
-+    if (pTestResult)
-+    {
-+        sName = pTestResult->getNodeName();
-+        sName += ".";
-+    }
-+    
-+/*
-+    for (StringList::const_iterator it = sCurrentNodeName.begin();
-+         it != sCurrentNodeName.end();
-+         ++it)
-+    {
-+        sName += *it;
-+        sName += ".";
-+    }
-+*/    
-+    sName += _sName;
-+
-+    return sName;
-+}
-+// -----------------------------------------------------------------------------
-+// old: void executionPushName(std::string const& _sName)
-+// old: {
-+// old:     sCurrentNodeName.push_back(_sName);
-+// old: }
-+// old: void executionPopName()
-+// old: {
-+// old:     sCurrentNodeName.pop_back();
-+// old: }
-+// old: 
-+
-+// -----------------------------------------------------------------------------
-+// ------------------------------ Signal Handling ------------------------------
-+// -----------------------------------------------------------------------------
-+
-+// std::string sLastTestFunctionName;
-+
-+std::string getSignalName(sal_Int32 nSignalNo);
-+// -----------------------------------------------------------------------------
-+
-+std::string getSignalFilename()
-+{
-+    return sSignalFile;
-+}
-+
-+// -----------------------------------------------------------------------------
-+// void storeNoSignal(std::string const& _sTestName)
-+// {
-+    // sLastTestFunctionName = buildTestFunctionName(_sTestName);
-+    // std::ofstream out(getSignalFilename().c_str(), std::ios::out);
-+    // out << NO_SIGNAL << std::endl;               // no signal!
-+// }
-+
-+void markSignalAsAlreadyDone(sal_Int32 _nSignalNo)
-+{
-+    // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app);
-+	FILE *out = fopen(getSignalFilename().c_str(), "a");
-+    if (out != NULL)
-+    {
-+//#         out << "# the previous test function creates signal: " 
-+//#             << getSignalName(_nSignalNo) 
-+//#             << " (" 
-+//#             << _nSignalNo 
-+//#             << ")" << std::endl;
-+//#         // out << sLastTestFunctionName << std::endl;               // SIGNAL!
-+
-+		fprintf(out, "# the previous test function creates signal: %s(%d)\n", getSignalName(_nSignalNo).c_str(), SAL_STATIC_CAST(int, _nSignalNo));
-+		// fprintf(out, "%s\n", sLastTestFunctionName );
-+		fclose(out);
-+    }
-+    else
-+    {
-+        fprintf(stderr, "error: Can't write signal info to file %s \n", getSignalFilename().c_str());
-+    }
-+}
-+
-+// -----------------------------------------------------------------------------
-+
-+Signal hasSignaled(std::string const& _sTestName)
-+{
-+    // BACK:  true: signal
-+    //       false: nothing
-+
-+	if (bSignalsCached == true)
-+	{
-+
-+		if (m_aSignalHash.find(buildTestFunctionName(_sTestName)) != m_aSignalHash.end())
-+		{
-+			return HAS_SIGNAL;
-+		}
-+		return NO_SIGNAL;
-+	}
-+	
-+    std::ifstream in(getSignalFilename().c_str(), std::ios::in);
-+
-+    // std::cout << "Check for signal" << std::endl;
-+    std::string sLine, sLastLine;
-+    while (std::getline(in, sLine))
-+    {
-+        // std::cout << sTest << std::endl;
-+		char ch = sLine[0];
-+		if (isspace(ch) == 0 &&
-+			sLine.size() > 0)
-+		{
-+			if (ch == '#')
-+			{
-+				if (sLastLine.size() > 0)
-+				{
-+					rtl::OString aStrLine(sLine.c_str());
-+					sal_Int32 nIdx = aStrLine.indexOf("(") + 1;
-+					sal_Int32 nIdx2 = aStrLine.indexOf(")");
-+					sal_Int32 nSignalNo = 0;
-+					if (nIdx > 0 && nIdx2 > 0)
-+					{
-+						rtl::OString sSignalNo = aStrLine.copy(nIdx, nIdx2 - nIdx);
-+						nSignalNo = sSignalNo.toInt32();
-+						m_aSignalHash[sLastLine] = nSignalNo;
-+					}
-+					sLastLine.clear();
-+				}
-+			}
-+			else
-+			{
-+				// if (sTest == buildTestFunctionName(_sTestName))
-+				m_aSignalHash[sLine] = 1;
-+				sLastLine = sLine;
-+				// return HAS_SIGNAL;
-+			}
-+		}
-+	}
-+	
-+	bSignalsCached = true;
-+	return hasSignaled(_sTestName);
-+    // return NO_SIGNAL;
-+}
-+
-+#ifdef UNX
-+
-+// -----------------------------------------------------------------------------
-+
-+void release_signal_Handling();
-+
-+//# void signalFunction(int value)
-+//# {
-+//#     std::cout << "Signal caught: (" << value << "), please restart." << std::endl;
-+//#     markSignalAsAlreadyDone();
-+//# 
-+//#     release_signal_Handling();
-+//#         std::cout.flush();
-+//#     abort();
-+//# }
-+
-+// -----------------------------------------------------------------------------
-+extern "C" void SignalHandlerFunction(int _nSignalNo, siginfo_t *, void*)
-+{
-+    // std::cout << "Signal caught: " << getSignalName(_nSignalNo) << " (" << _nSignalNo << "), please restart." << std::endl;
-+	fprintf(stderr, "Signal caught %s(%d)\n", getSignalName(_nSignalNo).c_str(), _nSignalNo);
-+    markSignalAsAlreadyDone(_nSignalNo);
-+
-+    release_signal_Handling();
-+    // std::cout.flush();
-+    abort();
-+}
-+
-+// -----------------------------------------------------------------------------
-+// This is a copy of the osl/signal.c code
-+#define ACT_IGNORE      1
-+#define ACT_ABORT       2
-+#define ACT_EXIT        3
-+#define ACT_SYSTEM      4
-+#define ACT_HIDE        5
-+
-+extern "C" {
-+static struct SignalAction
-+{
-+    int Signal;
-+    int Action;
-+    void (*Handler)(int);
-+} Signals[] =
-+{
-+    { SIGHUP,    ACT_IGNORE, NULL },    /* hangup */
-+    { SIGINT,    ACT_EXIT,   NULL },    /* interrupt (rubout) */
-+    { SIGQUIT,   ACT_ABORT,  NULL },    /* quit (ASCII FS) */
-+    { SIGILL,    ACT_SYSTEM,  NULL },    /* illegal instruction (not reset when caught) */
-+/* changed from ACT_ABOUT to ACT_SYSTEM to try and get collector to run*/
-+    { SIGTRAP,   ACT_ABORT,  NULL },    /* trace trap (not reset when caught) */
-+#if ( SIGIOT != SIGABRT )
-+    { SIGIOT,    ACT_ABORT,  NULL },    /* IOT instruction */
-+#endif 
-+//      { SIGABRT,   ACT_ABORT,  NULL },    /* used by abort, replace SIGIOT in the future */
-+#ifdef SIGEMT   
-+    { SIGEMT,    ACT_SYSTEM,  NULL },    /* EMT instruction */
-+/* changed from ACT_ABORT to ACT_SYSTEM to remove handler*/
-+/* SIGEMT may also be used by the profiler - so it is probably not a good
-+   plan to have the new handler use this signal*/
-+#endif  
-+    { SIGFPE,    ACT_ABORT,  NULL },    /* floating point exception */
-+    { SIGKILL,   ACT_SYSTEM, NULL },    /* kill (cannot be caught or ignored) */
-+    { SIGBUS,    ACT_ABORT,  NULL },    /* bus error */
-+    { SIGSEGV,   ACT_ABORT,  NULL },    /* segmentation violation */
-+#ifdef SIGSYS
-+    { SIGSYS,    ACT_ABORT,  NULL },    /* bad argument to system call */
-+#endif
-+    { SIGPIPE,   ACT_HIDE,   NULL },    /* write on a pipe with no one to read it */
-+    { SIGALRM,   ACT_EXIT,   NULL },    /* alarm clock */
-+    { SIGTERM,   ACT_EXIT,   NULL },    /* software termination signal from kill */
-+    { SIGUSR1,   ACT_SYSTEM, NULL },    /* user defined signal 1 */
-+    { SIGUSR2,   ACT_SYSTEM, NULL },    /* user defined signal 2 */
-+    { SIGCHLD,   ACT_SYSTEM, NULL },    /* child status change */
-+#ifdef SIGPWR
-+    { SIGPWR,    ACT_IGNORE, NULL },    /* power-fail restart */
-+#endif
-+    { SIGWINCH,  ACT_IGNORE, NULL },    /* window size change */
-+    { SIGURG,    ACT_EXIT,   NULL },    /* urgent socket condition */
-+#ifdef SIGPOLL
-+    { SIGPOLL,   ACT_EXIT,   NULL },    /* pollable event occured */
-+#endif
-+    { SIGSTOP,   ACT_SYSTEM, NULL },    /* stop (cannot be caught or ignored) */
-+    { SIGTSTP,   ACT_SYSTEM, NULL },    /* user stop requested from tty */
-+    { SIGCONT,   ACT_SYSTEM, NULL },    /* stopped process has been continued */
-+    { SIGTTIN,   ACT_SYSTEM, NULL },    /* background tty read attempted */
-+    { SIGTTOU,   ACT_SYSTEM, NULL },    /* background tty write attempted */
-+    { SIGVTALRM, ACT_EXIT,   NULL },    /* virtual timer expired */
-+    { SIGPROF,   ACT_SYSTEM,   NULL },    /* profiling timer expired */
-+/*Change from ACT_EXIT to ACT_SYSTEM for SIGPROF is so that profiling signals do
-+  not get taken by the new handler - the new handler does not pass on context 
-+  information which causes 'collect' to crash. This is a way of avoiding
-+  what looks like a bug in the new handler*/
-+    { SIGXCPU,   ACT_ABORT,  NULL },    /* exceeded cpu limit */
-+    { SIGXFSZ,   ACT_ABORT,  NULL }     /* exceeded file size limit */
-+};
-+}
-+
-+const int NoSignals = sizeof(Signals) / sizeof(struct SignalAction);
-+
-+#endif /* UNX */
-+
-+// -----------------------------------------------------------------------------
-+void init_signal_Handling(CppUnit::TestResult *_pResult)
-+{
-+    pTestResult = _pResult;
-+#ifdef UNX
-+  
-+//    signal(SIGSEGV, signalFunction);
-+    // signal(SIGSEGV, signalFunction);
-+    // signal(SIGFPE, signalFunction);
-+
-+//    signal(1, signalFunction);
-+    // struct sigaction action, oldaction;
-+    // action.sa_sigaction = signalFunction2;
-+    // action.sa_flags     = SA_ONESHOT /* | SA_SIGINFO */;
-+
-+    struct sigaction act;
-+    struct sigaction oact;
-+
-+    // act.sa_handler = SignalHandlerFunction;
-+    act.sa_flags     = SA_RESTART;
-+    // act.sa_flags     = SA_ONESHOT /* | SA_SIGINFO */;
-+    act.sa_sigaction = SignalHandlerFunction;
-+    
-+    sigfillset(&(act.sa_mask));
-+
-+    /* Initialize the rest of the signals */
-+    for (int i = 0; i < NoSignals; i++) 
-+    {
-+        if (Signals[i].Action != ACT_SYSTEM)
-+        {
-+            if (Signals[i].Action == ACT_HIDE)
-+            {
-+                struct sigaction ign;
-+                
-+                ign.sa_handler = SIG_IGN;
-+                ign.sa_flags   = 0;
-+                sigemptyset(&ign.sa_mask);
-+                
-+                if (sigaction(Signals[i].Signal, &ign, &oact) == 0)
-+                    Signals[i].Handler = oact.sa_handler;
-+                else
-+                    Signals[i].Handler = SIG_DFL;
-+            }
-+            else
-+                if (sigaction(Signals[i].Signal, &act, &oact) == 0)
-+                    Signals[i].Handler = oact.sa_handler;
-+                else
-+                    Signals[i].Handler = SIG_DFL;
-+        }
-+    }
-+#endif
-+
-+    // ------------ signal helper file must exist -----------------
-+    FILE* pFile = fopen(getSignalFilename().c_str(), "r");
-+    if (!pFile)
-+    {
-+        createEmptySignalFile( getSignalFilename() );
-+    }
-+    else
-+    {
-+        fclose(pFile);
-+    }    
-+}
-+
-+// -----------------------------------------------------------------------------
-+void release_signal_Handling()
-+{
-+    // frees all signals
-+#ifdef UNX
-+	int i;
-+	struct sigaction act;
-+
-+	act.sa_flags   = 0;
-+	sigemptyset(&(act.sa_mask));
-+
-+	/* Initialize the rest of the signals */
-+	for (i = NoSignals - 1; i >= 0; i--)
-+	{
-+		if (Signals[i].Action != ACT_SYSTEM)
-+		{
-+			act.sa_handler = Signals[i].Handler;
-+			
-+			sigaction(Signals[i].Signal, &act, NULL);
-+		}
-+	}
-+#endif
-+}
-+
-+// -----------------------------------------------------------------------------
-+Signal signalCheck(CppUnit::TestResult* _pResult, std::string const& _sTestName)
-+{
-+    // BACK: HAS_SIGNAL: the test has already done and signaled
-+    if (hasSignaled(_sTestName) == HAS_SIGNAL)
-+    {
-+        // std::cout << "The Test '" << buildTestFunctionName(_sTestName) << "' is marked as signaled." << std::endl;
-+        std::string sTestFunctionName = buildTestFunctionName(_sTestName);
-+		fprintf(stderr, "The Test '%s' is marked as signaled.\n", sTestFunctionName.c_str());
-+		if (_pResult)
-+		{
-+			CppUnit::SignalTest *pTest = new CppUnit::SignalTest(_sTestName);
-+			
-+			std::string sErrorText = "Function is marked as signaled: ";
-+			sal_Int32 nSignalNo = m_aSignalHash[sTestFunctionName];
-+			sErrorText += getSignalName(nSignalNo);
-+			sErrorText += " (";
-+			sErrorText += OptionHelper::integerToAscii(nSignalNo);
-+			sErrorText += ")";
-+			
-+			_pResult->addError(pTest, new CppUnit::SignalException(sErrorText), ErrorType::ET_SIGNAL);
-+		}
-+        return HAS_SIGNAL;
-+    }
-+    
-+    // storeNoSignal(_sTestName);
-+    return NO_SIGNAL;
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool copyFile(std::string const& _sFrom, std::string const& _sTo)
-+{
-+    bool bRetValue = false;
-+	const int MAXBUFSIZE = 1024;
-+	char buff[MAXBUFSIZE];
-+	FILE *in = fopen(_sFrom.c_str(), "r");
-+    if (in == NULL)
-+    {
-+        fprintf(stderr, "error: Can't open file %s for read to copy.\n", _sFrom.c_str());
-+        bRetValue = false;
-+    }
-+    else
-+    {
-+		FILE *out = fopen(_sTo.c_str(), "w");
-+		if (out == NULL)
-+		{
-+			fclose(in);
-+			fprintf(stderr, "error: Can't open file %s for write to copy.\n", _sTo.c_str());
-+			bRetValue = false;
-+		}
-+        else
-+		{
-+			int nRealGot = 0;
-+			while(!feof(in))
-+			{
-+				nRealGot = fread(buff, sizeof(char), MAXBUFSIZE, in);
-+				if (nRealGot > 0)
-+				{
-+					fwrite(buff, sizeof(char), nRealGot, out);
-+				}
-+			}
-+			bRetValue = true;
-+			fclose(out);
-+			fclose(in);
-+		}
-+	}
-+    return bRetValue;
-+}
-+
-+// -----------------------------------------------------------------------------
-+void signalStartTest(std::string const& _sName)
-+{
-+    if (doNotTouchSignalFile()) return;
-+
-+    // fprintf(stderr, "### signalStartTest!\n");
-+    // due to the fact, that functions are vicious, we write the name first.
-+    // if it isn't vivious, than we removed it.
-+    std::string sNewName = getSignalFilename();
-+    sNewName += ".bak";
-+    if (copyFile(getSignalFilename(), sNewName))
-+    {
-+        // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app);
-+		FILE *out = fopen(getSignalFilename().c_str(), "a");
-+        if (out != NULL)
-+        {
-+            // out << buildTestFunctionName(_sName) << std::endl;
-+			fprintf(out, "%s\n", buildTestFunctionName(_sName).c_str());
-+			fclose(out);
-+        }
-+		else
-+        {
-+			fprintf(stderr, "error: Can't open file %s for append.\n", getSignalFilename().c_str());
-+		}
-+    }
-+    else
-+    {
-+		fprintf(stderr, "error: Can't copy signal helper from file %s to file %s, %d\n", getSignalFilename().c_str(), sNewName.c_str(), errno);
-+    }
-+}
-+
-+// -----------------------------------------------------------------------------
-+void signalEndTest()
-+{
-+    if (doNotTouchSignalFile()) return;
-+
-+    // fprintf(stderr, "### signalEndTest!\n");
-+    if (0 != remove(getSignalFilename().c_str()))
-+    {
-+        fprintf(stderr, "error: Can't delete file %s\n", getSignalFilename().c_str());
-+    }
-+    else
-+    {
-+        std::string sNewName = getSignalFilename();
-+        sNewName += ".bak";
-+        if (0 != rename(sNewName.c_str(), getSignalFilename().c_str()))
-+        {
-+            fprintf(stderr, "error: Can't rename file %s to file %s errno: %d\n", sNewName.c_str(), getSignalFilename().c_str(), errno);
-+        }
-+    }
-+}
-+
-+// -----------------------------------------------------------------------------
-+void removeSignalFile(GetOpt & opt)
-+{
-+    // fprintf(stderr, "### remove signal file: '%s'\n", sSignalFile.c_str());
-+    if (opt.hasOpt("-dnrmsf"))
-+    {
-+        return;
-+    }
-+    if (bDoNotTouchSignalFile == true)
-+    {
-+        return;
-+    }
-+    remove(getSignalFilename().c_str());
-+}
-+
-+// -----------------------------------------------------------------------------
-+
-+sal_Int32 SignalHandlerA( TagHelper const& _aTagItems )
-+{
-+    sal_Int32 nRetValue = 0;
-+    TagData nTagType     = _aTagItems.GetTagData(TAG_TYPE, 0);
-+// LLA: unused 
-+//    hTestResult hResult  = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ );
-+//    CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult;
-+    
-+    try
-+    {
-+        switch(nTagType)
-+        {
-+        // old: case SIGNAL_PUSH_NAME:
-+        // old: {
-+        // old: 	const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+        // old: 	if (sName != NULL)
-+        // old: 		signalPushName(sName);
-+        // old: 	break;
-+        // old: }
-+        // old: 		
-+        // old: case SIGNAL_POP_NAME:
-+        // old: 	signalPopName();
-+        // old: 	break;
-+                        
-+        // old: case SIGNAL_CHECK:
-+        // old: {
-+        // old:     const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+        // old:     if (sName != NULL)
-+        // old:     {
-+        // old:         nRetValue = signalCheck(sName);
-+        // old:     }
-+        // old:     break;
-+        // old: }
-+
-+        // old: case INIT_SIGNAL_HANDLING:
-+        // old:     init_signal_Handling();
-+        // old:     break;
-+        // old: 
-+        // old: case RELEASE_SIGNAL_HANDLING:
-+        // old:     release_signal_Handling();
-+        // old:     break;
-+
-+        case SIGNAL_START_TEST:
-+        {
-+            // fprintf(stderr, "### SIGNAL_START_TEST!\n");
-+            const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+            if (sName != NULL)
-+            {
-+                signalStartTest(sName);
-+            }
-+            break;
-+        }
-+                
-+        case SIGNAL_END_TEST:
-+        {
-+            // fprintf(stderr, "### SIGNAL_END_TEST!\n");
-+            const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+            if (sName != NULL)
-+            {
-+                signalEndTest();
-+            }
-+            break;
-+        }
-+                
-+        default:
-+            fprintf(stderr, "error: SignalHandlerA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType));
-+            fflush(stderr);
-+            // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/);
-+        }
-+    }
-+    catch (std::exception &e)
-+    {
-+        fprintf(stderr, "error: SignalHandlerA: Exception caught: %s\n", e.what());
-+        fflush(stderr);
-+        // throw e;
-+    }
-+        
-+    return nRetValue;
-+}
-+// -----------------------------------------------------------------------------
-+// This a little bit more abstract code, could be easier to modify or expand.
-+ 
-+sal_Int32 CheckExecution(CppUnit::TestResult* _pResult, std::string const& _sName)
-+{
-+    // more checks in the corresponding job lists
-+	if (_pResult)
-+	{
-+		if (! _pResult->isAllowedToExecute(_sName))
-+		{
-+			return DO_NOT_EXECUTE;
-+		}
-+	}
-+
-+    // Check if the given test should be executed.
-+    if (signalCheck(_pResult, _sName) == HAS_SIGNAL)
-+    {
-+        return DO_NOT_EXECUTE;
-+    }
-+    
-+    return GO_EXECUTE;
-+}
-+
-+// -----------------------------------------------------------------------------
-+sal_Int32 ExecutionA( TagHelper const& _aTagItems )
-+{
-+    sal_Int32 nRetValue = 0;
-+    TagData nTagType     = _aTagItems.GetTagData(TAG_TYPE, 0);
-+    hTestResult hResult  = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ );
-+    CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult;
-+
-+    try
-+    {
-+        switch(nTagType)
-+        {
-+        case EXECUTION_CHECK:
-+        {
-+            const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+            if (sName)
-+            {
-+                nRetValue = CheckExecution(pResult, sName);
-+                if (nRetValue == GO_EXECUTE)
-+                {
-+                    if (pResult && pResult->isOptionWhereAmI())
-+                    {
-+                        printf("# This is: %s\n", buildTestFunctionName(sName).c_str());
-+                    }
-+                }
-+            }
-+  
-+            break;
-+        }
-+                
-+        // old: case EXECUTION_PUSH_NAME:
-+        // old: {
-+        // old:     const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+        // old:     if (sName != NULL)
-+        // old:         executionPushName(sName);
-+        // old:     break;
-+        // old: }
-+        // old: 
-+        // old: case EXECUTION_POP_NAME:
-+        // old:     executionPopName();
-+        // old:     break;
-+
-+        case INIT_TEST:
-+            init_signal_Handling(pResult);
-+            break;
-+        
-+        case RELEASE_TEST:
-+            release_signal_Handling();
-+            break;
-+
-+        default:
-+            fprintf(stderr, "ExceptionA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType));
-+            break;
-+        }
-+    }
-+    catch (std::exception &e)
-+    {
-+        fprintf(stderr, "ExecutionA: exception caught: %s\n", e.what());
-+        fflush(stderr);
-+        // throw e;
-+    }
-+    return nRetValue;
-+}
-+
-+// -----------------------------------------------------------------------------
-+std::string getSignalName(sal_Int32 nSignalNo)
-+{
-+    std::string sValue;
-+#ifdef UNX
-+    switch(nSignalNo)
-+    {
-+    case SIGHUP:
-+        sValue = "SIGHUP";
-+        break;
-+
-+    case SIGINT:
-+        sValue = "SIGINT";
-+        break;
-+
-+    case SIGQUIT:
-+        sValue = "SIGQUIT";
-+        break;
-+
-+    case SIGILL:
-+        sValue = "SIGILL";
-+        break;
-+
-+    case SIGTRAP:
-+        sValue = "SIGTRAP";
-+        break;
-+
-+#if ( SIGIOT != SIGABRT )
-+    case SIGIOT:
-+        sValue = "SIGIOT";
-+        break;
-+#endif 
-+//      case SIGABRT:
-+#ifdef SIGEMT   
-+    case SIGEMT:
-+        sValue = "SIGEMT";
-+        break;
-+#endif  
-+    case SIGFPE:
-+        sValue = "SIGFPE";
-+        break;
-+
-+    case SIGKILL:
-+        sValue = "SIGKILL";
-+        break;
-+
-+    case SIGBUS:
-+        sValue = "SIGBUS";
-+        break;
-+
-+    case SIGSEGV:
-+        sValue = "SIGSEGV";
-+        break;
-+
-+#ifdef SIGSYS
-+    case SIGSYS:
-+        sValue = "SIGSYS";
-+        break;
-+#endif
-+    case SIGPIPE:
-+        sValue = "SIGPIPE";
-+        break;
-+
-+    case SIGALRM:
-+        sValue = "SIGALRM";
-+        break;
-+
-+    case SIGTERM:
-+        sValue = "SIGTERM";
-+        break;
-+
-+    case SIGUSR1:
-+        sValue = "SIGUSR1";
-+        break;
-+
-+    case SIGUSR2:
-+        sValue = "SIGUSR2";
-+        break;
-+
-+    case SIGCHLD:
-+        sValue = "SIGCHLD";
-+        break;
-+
-+#ifdef SIGPWR
-+    case SIGPWR:
-+        sValue = "SIGPWR";
-+        break;
-+#endif
-+    case SIGWINCH:
-+        sValue = "SIGWINCH";
-+        break;
-+
-+    case SIGURG:
-+        sValue = "SIGURG";
-+        break;
-+
-+#ifdef SIGPOLL
-+    case SIGPOLL:
-+        sValue = "SIGPOLL";
-+        break;
-+#endif
-+    case SIGSTOP:
-+        sValue = "SIGSTOP";
-+        break;
-+
-+    case SIGTSTP:
-+        sValue = "SIGTSTP";
-+        break;
-+
-+    case SIGCONT:
-+        sValue = "SIGCONT";
-+        break;
-+
-+    case SIGTTIN:
-+        sValue = "SIGTTIN";
-+        break;
-+
-+    case SIGTTOU:
-+        sValue = "SIGTTOU";
-+        break;
-+
-+    case SIGVTALRM:
-+        sValue = "SIGVTALRM";
-+        break;
-+
-+    case SIGPROF:
-+        sValue = "SIGPROF";
-+        break;
-+
-+    case SIGXCPU:
-+        sValue = "SIGXCPU";
-+        break;
-+
-+    case SIGXFSZ:
-+        sValue = "SIGXFSZ";
-+        break;
-+
-+    default:
-+        sValue = "Unhandled Signal.";
-+    }
-+#else
-+    (void) nSignalNo; // unused
-+#endif
-+    return sValue;
-+}
-+
-+// The following sets variables for GNU EMACS
-+// Local Variables:
-+// tab-width:4
-+// End:
-Nur in misc/build/cppunit-1.8.0/src/result: signal.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/signal.hxx	2008-12-10 20:46:09.813916116 +0100
-+++ misc/build/cppunit-1.8.0/src/result/signal.hxx	2008-07-07 08:14:56.000000000 +0200
-@@ -1 +1,42 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SIGNAL_HXX
-+#define SIGNAL_HXX
-+
-+#include <sal/types.h>
-+
-+#define HAS_SIGNAL 1
-+#define NO_SIGNAL  0
-+
-+typedef sal_Int32 Signal;
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/src/result: signal.hxx.dummy.
---- misc/cppunit-1.8.0/src/result/testshlTestResult.cxx	2008-12-10 20:46:09.880238139 +0100
-+++ misc/build/cppunit-1.8.0/src/result/testshlTestResult.cxx	2008-12-09 09:06:11.000000000 +0100
-@@ -1 +1,428 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+
-+#include <map>
-+#include <cppunit/Exception.h>
-+#include <cppunit/NotEqualException.h>
-+#include <cppunit/Test.h>
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/testshlTestResult.h>
-+// #include <TextTestResult.h>
-+//!io #include <iostream>
-+#include <string>
-+
-+#include <rtl/string.hxx>
-+#include "cppunit/result/outputter.hxx"
-+
-+namespace CppUnit {
-+
-+    testshlTestResult::testshlTestResult(GetOpt & _aOptions)
-+            :TestResult(_aOptions),
-+			 m_aOptions(_aOptions),
-+             // m_aOptionHelper(_aOptions),
-+             m_aResulter(this)
-+    {
-+        addListener( &m_aResulter );
-+    }
-+
-+    testshlTestResult::~testshlTestResult()
-+    {
-+    }
-+    
-+//# void 
-+//# testshlTestResult::addFailure( const TestFailure &failure )
-+//# {
-+//# 	// TestResultCollector::addFailure( failure );
-+//# 	// std::cerr << ( failure.isError() ? "E" : "F" );
-+//# 	m_aResulter.addFailure(failure);
-+//# }
-+//# 
-+//# 
-+//# void 
-+//# testshlTestResult::startTest( Test *test )
-+//# {
-+//# 	// TestResultCollector::startTest (test);
-+//# 	m_aResulter.startTest(test);
-+//# 	// std::cerr << ".";
-+//# }
-+//# 
-+//# void testshlTestResult::endTest( Test *test )
-+//# {
-+//# }
-+
-+// -----------------------------------------------------------------------------
-+
-+//# void 
-+//# testshlTestResult::printFailures( Outputter &stream )
-+//# {
-+//#   TestFailures::const_iterator itFailure = failures().begin();
-+//#   int failureNumber = 1;
-+//#   while ( itFailure != failures().end() ) 
-+//#   {
-+//# 	  stream  <<  std::endl;
-+//# 	  printFailure( *itFailure++, failureNumber++, stream );
-+//#   }
-+//# }
-+//# 
-+//# 
-+//# void 
-+//# testshlTestResult::printFailure( TestFailure *failure,
-+//# 							  int failureNumber,
-+//# 							  std::ostream &stream )
-+//# {
-+//#   printFailureListMark( failureNumber, stream );
-+//#   stream << ' ';
-+//#   printFailureTestName( failure, stream );
-+//#   stream << ' ';
-+//#   printFailureType( failure, stream );
-+//#   stream << ' ';
-+//#   printFailureLocation( failure->sourceLine(), stream );
-+//#   stream << std::endl;
-+//#   printFailureDetail( failure->thrownException(), stream );
-+//#   stream << std::endl;
-+//# }
-+//# 
-+//# 
-+//# void 
-+//# testshlTestResult::printFailureListMark( int failureNumber,
-+//# 									  std::ostream &stream )
-+//# {
-+//# 	stream << failureNumber << ")";
-+//# }
-+//# 
-+//# 
-+//# void 
-+//# testshlTestResult::printFailureTestName( TestFailure *failure,
-+//# 									  std::ostream &stream )
-+//# {
-+//# 	Test* pTest = failure->failedTest();
-+//# 	stream << "test: " << pTest->getName();
-+//# }
-+//# 
-+//# 
-+//# void 
-+//# testshlTestResult::printFailureType( TestFailure *failure,
-+//# 								  std::ostream &stream )
-+//# {
-+//# 	stream << "("
-+//# 		 << (failure->isError() ? "E" : "F")
-+//# 		 << ")";
-+//# }
-+//# 
-+//# 
-+//# void 
-+//# testshlTestResult::printFailureLocation( SourceLine sourceLine,
-+//# 									  std::ostream &stream )
-+//# {
-+//# 	if ( !sourceLine.isValid() )
-+//# 		return;
-+//# 	
-+//# 	stream << "line: " << sourceLine.lineNumber()
-+//# 		   << ' ' << sourceLine.fileName();
-+//# }
-+//# 
-+//# 
-+//# void 
-+//# testshlTestResult::printFailureDetail( Exception *thrownException,
-+//# 									std::ostream &stream )
-+//# {
-+//# 	if ( thrownException->isInstanceOf( NotEqualException::type() ) )
-+//# 	{
-+//# 		NotEqualException *e = (NotEqualException*)thrownException;
-+//# 		stream << "expected: " << e->expectedValue() << std::endl
-+//# 			   << "but was:  " << e->actualValue();
-+//# 		if ( !e->additionalMessage().empty() )
-+//# 		{
-+//# 			stream  << std::endl;
-+//# 			stream  <<  "additional message:"  <<  std::endl
-+//# 					<<  e->additionalMessage();
-+//# 		}
-+//# 	}
-+//# 	else
-+//# 	{
-+//# 		stream << " \"" << thrownException->what() << "\"";
-+//# 	}
-+//# }
-+
-+
-+// LLA: output format:
-+// Header
-+// # -- BEGIN
-+// Error lines
-+// No error lines
-+// unknown lines
-+// # -- END
-+// Text 'Test #PASSED#' or 'Errors only'
-+
-+void 
-+testshlTestResult::print( Outputter& stream ) 
-+{
-+    printHeader( stream );
-+    // stream << std::endl;
-+    // printFailures( stream );
-+    
-+    bool bPassed = false;
-+	if (isOnlyShowJobs())
-+	{
-+        JobList jl(m_aOptionHelper.getJobOnlyList());
-+		HashMap aJobList = jl.getHashMap();
-+		printLines(stream, aJobList);
-+	}
-+	else
-+	{
-+        stream << "# -- BEGIN:" << Outputter::endl();
-+
-+		TestPtrList aFailedTests;
-+    
-+		// List of failures
-+		printFailedTests(stream, aFailedTests);
-+	
-+		if (! m_aOptionHelper.getOptions().hasOpt("-onlyerrors"))
-+		{
-+		// List of well done tests
-+		printTestLines(stream, aFailedTests);
-+
-+		// List of unknown Tests
-+        JobList jl(m_aOptionHelper.getJobOnlyList());
-+		HashMap aJobList = jl.getHashMap();
-+		printUnknownLines(stream, aJobList);
-+		
-+            bPassed = true;
-+        }
-+        stream << "# -- END:" << Outputter::endl();
-+
-+        if (bPassed)
-+        {
-+		stream << "Test #PASSED#" << Outputter::endl();
-+        }
-+        
-+        if (m_aOptionHelper.getOptions().hasOpt("-onlyerrors"))
-+        {
-+			stream << "Errors only." << Outputter::endl();
-+		}
-+	}
-+}
-+
-+// -----------------------------------------------------------------------------
-+void
-+testshlTestResult::printLines(Outputter &stream, HashMap & _aJobList)
-+{
-+	int nCount = _aJobList.size();
-+	if (nCount != 0)
-+	{
-+		for (HashMap::const_iterator it = _aJobList.begin();
-+			 it != _aJobList.end();
-+			 ++it)
-+		{
-+			std::string aKey = (*it).first;
-+			if (_aJobList[aKey] == JOB_ACCESS)
-+			{
-+				stream << aKey;
-+				stream << Outputter::endl();
-+			}
-+		}
-+	}
-+}
-+
-+void 
-+testshlTestResult::printFailedTests(Outputter &stream, TestPtrList &aFailedTests)
-+{
-+    for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin();
-+         it2 != m_aResulter.failures().end();
-+         ++it2)
-+    {
-+        TestFailureEnvelope *pEnvelop = *it2;
-+        TestFailure *pFailure = pEnvelop->getTestFailure();
-+        std::string sNodeName = pEnvelop->getString();
-+        
-+        aFailedTests[ pFailure->failedTest() ] = true;
-+        
-+        printFailureLine(stream, pFailure, sNodeName);
-+    }
-+}
-+
-+void
-+testshlTestResult::printTestLines(Outputter &stream, TestPtrList &aFailedTests)
-+{
-+    for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin();
-+         it != m_aResulter.tests().end();
-+         ++it)
-+    {
-+        TestEnvelope *pEnvelop = *it;
-+        Test* pTest = pEnvelop->getTest();
-+        std::string sNodeName = pEnvelop->getString();
-+        
-+        if (aFailedTests.find(pTest) == aFailedTests.end())
-+        {
-+            std::string sInfo = m_aResulter.getInfo(pTest);
-+            printTestLine(stream, pTest, sNodeName, sInfo);
-+        }
-+    }
-+}
-+
-+void 
-+testshlTestResult::printUnknownLines(Outputter &stream, HashMap & _aJobList)
-+{
-+	int nCount = _aJobList.size();
-+	if (nCount != 0)
-+	{
-+		for (HashMap::const_iterator it = _aJobList.begin();
-+			 it != _aJobList.end();
-+			 ++it)
-+		{
-+			std::string aKey = (*it).first;
-+			if (_aJobList[aKey] == JOB_UNKNOWN)
-+			{
-+				printUnknownLine(stream, aKey);
-+			}
-+		}
-+	}
-+}
-+
-+void 
-+testshlTestResult::printHeader( Outputter &stream )
-+{
-+	std::string sDate(m_aOptionHelper.createDateTag());
-+	if (isOnlyShowJobs())
-+	{
-+            stream << "# This is an automatically generated job file." << Outputter::endl();
-+            stream << "# ";
-+    }
-+    else
-+    {
-+        stream << sDate << Outputter::endl();
-+    }
-+}
-+
-+void
-+testshlTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName)
-+{
-+	std::string aName;
-+	aName += _sNodeName;
-+	aName += ".";
-+	aName += _pFailure->failedTestName();
-+
-+	SourceLine aLine = _pFailure->sourceLine();
-+	sal_Int32 nLine = -1;
-+	std::string sFilename;
-+	if (aLine.isValid())
-+	{
-+		nLine = aLine.lineNumber();
-+		sFilename = aLine.fileName();
-+	}
-+	
-+	Exception  *pExp  = _pFailure->thrownException();
-+	std::string sWhat;
-+	if (pExp)
-+	{
-+		sWhat = pExp->what();
-+	}
-+	
-+	ErrorType::num eErr = _pFailure->getErrorType();
-+	
-+	stream << aName;
-+	stream << ";";
-+
-+	if (eErr == ErrorType::ET_FAILURE)
-+		stream << "FAILED";
-+
-+	else if (eErr == ErrorType::ET_ERROR)
-+		stream << "ERROR";
-+
-+	else if (eErr == ErrorType::ET_SIGNAL)
-+		stream << "SIGNAL";
-+
-+	else
-+		stream << "UNKNOWN";
-+
-+	stream << "#FAILED#";
-+
-+	stream << sWhat;
-+	stream << Outputter::endl();
-+}
-+
-+void 
-+testshlTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo)
-+{
-+	std::string aName;
-+	aName += _sNodeName;
-+	aName += ".";
-+	aName += _pTest->getName();
-+
-+	stream << aName;
-+	stream << ";";
-+	stream << _sInfo << "#";
-+	if (_sInfo == "PASSED")
-+	{
-+		stream << "OK#";
-+	}
-+	else
-+	{
-+		stream << "FAILED#";
-+	}
-+	stream << Outputter::endl();
-+}
-+
-+void 
-+testshlTestResult::printUnknownLine( Outputter &stream, std::string const& _sTestName)
-+{
-+	stream << _sTestName;
-+	stream << ";";
-+	stream << "UNKNOWN#";
-+	stream << "FAILED#";
-+	stream << Outputter::endl();
-+}
-+
-+//# void 
-+//# testshlTestResult::printStatistics( Outputter &stream )
-+//# {
-+//# 	stream  << "Test Results:" << std::endl;
-+//# 	
-+//# 	stream  <<  "Run:  "  <<  runTests()
-+//# 			<<  "   Failures: "  <<  testFailures()
-+//# 			<<  "   Errors: "  <<  testErrors()
-+//# 			<<  std::endl;
-+//# }
-+
-+
-+Outputter &
-+operator <<( Outputter &stream, 
-+             testshlTestResult &result )
-+{ 
-+	result.print (stream); return stream; 
-+}
-+
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: testshlTestResult.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/treswrapper.cxx	2008-12-10 20:46:09.979665912 +0100
-+++ misc/build/cppunit-1.8.0/src/result/treswrapper.cxx	2008-12-09 09:06:10.000000000 +0100
-@@ -1 +1,261 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <cstdarg>
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <sal/types.h>
-+#include <cppunit/Test.h>
-+#include "cppunit/autoregister/htestresult.h"
-+#include "cppunit/autoregister/callbackfunc_fktptr.h"
-+#include "cppunit/result/callbackfunc.h"
-+#include "cppunit/result/TestResult.h"
-+
-+#include <cppunit/tagvalues.hxx>
-+
-+namespace 
-+{
-+    void TestResult_startTest(hTestResult _pResult, hTest _pTest)
-+    {        
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
-+
-+        std::string sName = pTest->getName();
-+        CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_START_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE);
-+
-+        pResult->startTest(pTest);
-+    }
-+	
-+    void TestResult_endTest( hTestResult _pResult, hTest _pTest )
-+    {
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
-+        pResult->endTest(pTest);
-+
-+        std::string sName = pTest->getName();
-+        CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_END_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE);
-+    }
-+	
-+// -----------------------------------------------------------------------------
-+
-+    void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException )
-+    {
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
-+        CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
-+        pResult->addFailure(pTest, pException);
-+    }
-+	
-+    void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException )
-+    {
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
-+        CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
-+        pResult->addError(pTest, pException);
-+    }
-+	
-+    sal_Int32 TestResult_shouldStop(hTestResult _pResult)
-+    {
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        return pResult->shouldStop() == true ? 1 : 0;
-+    }
-+	
-+// -----------------------------------------------------------------------------
-+    void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo )
-+    {
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
-+        // CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
-+        pResult->addInfo(pTest, _sInfo);
-+    }
-+// -----------------------------------------------------------------------------
-+    void TestResult_enterNode( hTestResult _pResult, const char* _sNode )
-+    {
-+        // signalPushName(getName());
-+        // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_PUSH_NAME, TAG_RESULT_PTR, _pResult, TAG_NODENAME, _sNode, TAG_DONE);
-+
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        // CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
-+        // CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
-+        pResult->enterNode(_sNode);
-+    }
-+    void TestResult_leaveNode( hTestResult _pResult, const char* _sNode )
-+    {
-+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+        // CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
-+        // CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
-+        pResult->leaveNode(_sNode);
-+
-+        // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_POP_NAME, TAG_RESULT_PTR, _pResult, TAG_DONE);
-+    }
-+	
-+// -----------------------------------------------------------------------------
-+    sal_Int32 TestResult_StarterA(TagHelper const& _aTagItems)
-+    {
-+        sal_Int32 nRetValue = 0;
-+        TagData nTagType     = _aTagItems.GetTagData(TAG_TYPE, 0);
-+        hTestResult pResult  = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */);
-+        CppUnit::Test* pTest = (CppUnit::Test*) _aTagItems.GetTagData(TAG_TEST_PTR, 0 /* NULL */);
-+		
-+        try
-+        {
-+            switch(nTagType)
-+            {
-+            case RESULT_START:
-+                TestResult_startTest(pResult, pTest);
-+                break;
-+				
-+            case RESULT_END:
-+                TestResult_endTest(pResult, pTest);
-+                break;
-+				
-+            case RESULT_ADD_FAILURE:
-+            {
-+                hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0);
-+                TestResult_addFailure(pResult, pTest, pException);
-+                break;
-+            }
-+			
-+            case RESULT_ADD_ERROR:
-+            {
-+                hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0);
-+                TestResult_addError(pResult, pTest, pException);
-+                break;
-+            }
-+			
-+            case RESULT_ADD_INFO:
-+            {
-+                const char* pInfo = (const char* ) _aTagItems.GetTagData(TAG_INFO, 0);
-+                TestResult_addInfo(pResult, pTest, pInfo);
-+                break;
-+            }
-+			
-+            case RESULT_ENTER_NODE:
-+            {
-+                const char* pNode = (const char* )_aTagItems.GetTagData(TAG_NODENAME, 0);
-+                TestResult_enterNode(pResult, pNode);
-+                break;
-+            }
-+			
-+            case RESULT_LEAVE_NODE:
-+            {
-+                const char* pNode = (const char* ) _aTagItems.GetTagData(TAG_NODENAME, 0);
-+                TestResult_leaveNode(pResult, pNode);
-+                break;
-+            }
-+			
-+            case RESULT_SHOULD_STOP:
-+                nRetValue = TestResult_shouldStop(pResult);
-+                break;
-+				
-+            default:
-+                fprintf(stderr, "TestResult_StarterA: Can't handle the tag type %8x\n", SAL_STATIC_CAST(int, nTagType));
-+                fflush(stderr);
-+                // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/);
-+            }
-+        }
-+        catch (std::exception &e)
-+        {
-+            fprintf(stderr, "TestResult_StarterA: Exception caught: %s\n", e.what());
-+            // throw e;
-+        }
-+	
-+        return nRetValue;
-+    }
-+} // namespace anonymous
-+
-+// --------------------------------- Prototypes ---------------------------------
-+
-+sal_Int32 SignalHandlerA( TagHelper const& _aTagItems );
-+sal_Int32 ExecutionA( TagHelper const& _aTagItems );
-+
-+// -----------------------------------------------------------------------------
-+sal_Int32 CallbackDispatch(int x, ...)
-+{
-+    (void) x; // avoid warning
-+
-+    // The idea behind TagItems are from the Amiga OS.
-+    // Due to the fact that the following code does not find my ok
-+    // I decide to wrote a simple helper
-+    //
-+    // struct TagItem *tags = (struct TagItem *)&x + 1;
-+	
-+    TagHelper aTagItems;
-+
-+	// the following code could also be in a #define, so other functions could 
-+	// use this, but at the moment this function a the only one.
-+	
-+	// FILL_TAGS(aTagItems, x);
-+    std::va_list  args;
-+    va_start( args, x );
-+    Tag nTag;
-+    do
-+    {
-+        nTag = va_arg(args, Tag);
-+        if (nTag != TAG_DONE)
-+        {
-+            TagData nValue = va_arg(args, TagData);
-+            // printf("Tag: %8x Value:%8x\n", nTag, nValue);
-+            aTagItems.insert(nTag, nValue);
-+        }
-+    } while (nTag != TAG_DONE);
-+
-+    va_end   ( args );
-+
-+	// FILL_TAGS:END
-+
-+	// printf(".\n");
-+
-+    sal_Int32 nRetValue = 0;
-+    Tag nPreTag = aTagItems.GetTagData(TAG_TYPE);
-+    if ( (nPreTag & TAG_RESULT) == TAG_RESULT)
-+    {
-+        nRetValue = TestResult_StarterA( aTagItems );
-+    }
-+    else if ((nPreTag & TAG_SIGNAL) == TAG_SIGNAL)
-+    {
-+        nRetValue = SignalHandlerA(aTagItems);
-+    }
-+    else if (( nPreTag & TAG_EXECUTION) == TAG_EXECUTION)
-+    {
-+        nRetValue = ExecutionA(aTagItems);
-+    }
-+    else
-+    {
-+        fprintf(stderr, "CallbackDispatch: First tag is unknown %8x\n", SAL_STATIC_CAST(int, nPreTag));
-+        // unknown TAG_TYPE
-+    }
-+    return nRetValue;
-+}
-+
-Nur in misc/build/cppunit-1.8.0/src/result: treswrapper.cxx.dummy.
---- misc/cppunit-1.8.0/src/win32/makefile.mk	2008-12-10 20:46:10.024158685 +0100
-+++ misc/build/cppunit-1.8.0/src/win32/makefile.mk	2008-12-10 19:45:23.000000000 +0100
-@@ -1 +1,67 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+# $Revision$
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+PRJ=..$/..$/..$/..$/..$/..
-+INCEXT=..$/..$/include
-+# PRJ=..$/..
-+# PRJINC=..
-+
-+PRJNAME=cppunit
-+TARGET=c5t_winstuff
-+LIBTARGET=NO
-+ENABLE_EXCEPTIONS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE :  settings.mk
-+
-+# ------------------------------------------------------------------
-+
-+SLOFILES = \
-+		$(SLO)$/winstuff.obj
-+
-+#-------------------------------------------------------------------------------
-+# This is a static lib
-+LIB1TARGET= $(LB)$/$(TARGET).lib
-+LIB1OBJFILES= \
-+	$(SLOFILES)
-+
-+.IF "$(GUI)"=="WNT" 
-+.IF "$(COM)"=="GCC"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+.ENDIF
-+
-+.IF "$(GUI)" == "UNX"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-Nur in misc/build/cppunit-1.8.0/src/win32: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/win32/winstuff.cxx	2008-12-10 20:46:10.106772548 +0100
-+++ misc/build/cppunit-1.8.0/src/win32/winstuff.cxx	2008-12-10 20:42:44.000000000 +0100
-@@ -1 +1,143 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#ifdef WIN32
-+#include "testshl/winstuff.hxx"
-+
-+#if defined _MSC_VER
-+#pragma warning(push, 1)
-+#endif
-+#include <windows.h>
-+#if defined _MSC_VER
-+#pragma warning(pop)
-+#endif 
-+#include <MAPIWin.h>
-+
-+void WinDebugBreak()
-+{
-+    // forward to WinAPI. Note that the whole story is simply to
-+    // disentangle OOo headers from Windows headers (which are largely
-+    // incompatible, due to name clashes and macro mess-ups)
-+    DebugBreak();
-+}
-+
-+void WinSleep( sal_uInt32 sec )
-+{
-+    Sleep(sec * 1000);
-+}
-+
-+sal_uInt32 WinGetCurrentProcessId()
-+{
-+    return GetCurrentProcessId();
-+}
-+
-+#define TA_FAILED 0
-+#define TA_SUCCESS_CLEAN 1
-+#define TA_SUCCESS_KILL 2
-+#define TA_SUCCESS_16 3
-+
-+   // Declare Callback Enum Functions.
-+bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam );
-+
-+/*----------------------------------------------------------------
-+   DWORD WINAPI TerminateApp( DWORD dwPID, DWORD dwTimeout )
-+
-+   Purpose:
-+      Shut down a 32-Bit Process (or 16-bit process under Windows 95)
-+
-+   Parameters:
-+      dwPID
-+         Process ID of the process to shut down.
-+
-+      dwTimeout
-+         Wait time in milliseconds before shutting down the process.
-+
-+   Return Value:
-+      TA_FAILED - If the shutdown failed.
-+      TA_SUCCESS_CLEAN - If the process was shutdown using WM_CLOSE.
-+      TA_SUCCESS_KILL - if the process was shut down with
-+         TerminateProcess().
-+      NOTE:  See header for these defines.
-+   ----------------------------------------------------------------*/ 
-+void WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout )
-+{
-+    HANDLE   hProc;
-+    DWORD   dwRet;
-+    
-+    // If we can't open the process with PROCESS_TERMINATE rights,
-+    // then we give up immediately.
-+    hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, false,
-+                        dwPID);
-+    
-+    if(hProc == NULL)
-+        return;
-+    
-+    // TerminateAppEnum() posts WM_CLOSE to all windows whose PID
-+    // matches your process's.
-+    EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM) dwPID);
-+    
-+    // Wait on the handle. If it signals, great. If it times out,
-+    // then you kill it.
-+    if (WaitForSingleObject(hProc, dwTimeout) != WAIT_OBJECT_0)
-+        dwRet= (TerminateProcess(hProc,0) ? TA_SUCCESS_KILL : TA_FAILED);
-+    else
-+        dwRet = TA_SUCCESS_CLEAN;
-+    
-+    CloseHandle(hProc);
-+}
-+
-+bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam )
-+{
-+    DWORD dwID;
-+    
-+    GetWindowThreadProcessId(hwnd, &dwID);
-+    
-+    if(dwID == (DWORD)lParam)
-+    {
-+        PostMessage(hwnd, WM_CLOSE, 0, 0);
-+    }
-+    
-+    return true;
-+}
-+#else
-+
-+// this file is only need within Windows.
-+// due to the fact that empty files don't create libraries
-+// we store one function in it.
-+int WinStuffDummy_this_function_will_never_need()
-+{
-+    return 42; // we need some code
-+}
-+
-+#endif /* WIN32 */
-+
-Nur in misc/build/cppunit-1.8.0/src/win32: winstuff.cxx.dummy.
++        cd cppunit && $(MAKE) $(MFLAGS) $(CALLMACROS)
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 8f636569d8b2..3836e6905e9a 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,84 +42,20 @@ TARGET=so_cppunit
 
 TARFILE_NAME=cppunit-1.8.0
 
-MOVED_FILES=\
- include$/cppunit$/result$/SynchronizedObject.h \
- include$/cppunit$/result$/TestListener.h \
- include$/cppunit$/result$/TestResultCollector.h \
- include$/cppunit$/result$/TestResult.h \
- include$/cppunit$/result$/TestSucessListener.h \
- include$/cppunit$/result$/TextTestResult.h \
- include$/cppunit$/portability$/config-bcb5.h \
- include$/cppunit$/portability$/config-msvc6.h \
- src$/result$/SynchronizedObject.cpp \
- src$/result$/TestResultCollector.cpp \
- src$/result$/TestResult.cpp \
- src$/result$/TestSucessListener.cpp \
- src$/result$/TextTestResult.cpp
-
 ADDITIONAL_FILES=\
- $(MOVED_FILES) \
- include$/cppunit$/additionalfunc.hxx \
- include$/cppunit$/autoregister$/callbackfunc_fktptr.h  \
- include$/cppunit$/autoregister$/callbackstructure.h \
- include$/cppunit$/autoregister$/htestresult.h \
- include$/cppunit$/autoregister$/registerfunc.h \
- include$/cppunit$/autoregister$/registertestfunction.h \
- include$/cppunit$/autoregister$/testfunc.h \
- include$/cppunit$/checkboom.hxx \
- include$/cppunit$/cmdlinebits.hxx \
- include$/cppunit$/externcallbackfunc.hxx \
- include$/cppunit$/joblist.hxx \
- include$/cppunit$/nocopy.hxx \
- include$/cppunit$/portability$/config-auto.h \
- include$/cppunit$/result$/callbackfunc.h \
- include$/cppunit$/result$/emacsTestResult.hxx \
- include$/cppunit$/result$/log.hxx \
- include$/cppunit$/result$/optionhelper.hxx \
- include$/cppunit$/result$/outputter.hxx \
- include$/cppunit$/result$/testshlTestResult.h \
- include$/cppunit$/signaltest.h \
- include$/cppunit$/simpleheader.hxx \
- include$/cppunit$/stringhelper.hxx \
- include$/cppunit$/taghelper.hxx \
+ include$/cppunit$/config-auto.h \
  include$/cppunit$/tagvalues.hxx \
- include$/testshl$/autoregisterhelper.hxx \
- include$/testshl$/dynamicregister.hxx \
- include$/testshl$/filehelper.hxx \
- include$/testshl$/getopt.hxx \
- include$/testshl$/log.hxx \
- include$/testshl$/tresstatewrapper.h \
- include$/testshl$/tresstatewrapper.hxx \
- include$/testshl$/versionhelper.hxx \
- include$/testshl$/winstuff.hxx \
- include$/makefile.mk \
+ include$/cppunit$/callbackfunc_fktptr.h \
+ include$/cppunit$/externcallbackfunc.hxx \
  makefile.mk \
  src$/makefile.mk \
- src$/cppunit$/cmdlinebits.cxx \
- src$/cppunit$/joblist.cxx \
- src$/cppunit$/makefile.mk \
- src$/cppunit$/registertestfunction.cxx \
- src$/cppunit$/signaltest.cxx \
- src$/cppunit$/t_print.cxx \
- src$/cppunit$/tresregister.cxx \
- src$/cppunit$/tresstatewrapper.cxx \
- src$/result$/emacsTestResult.cxx \
- src$/result$/log.cxx \
- src$/result$/makefile.mk \
- src$/result$/optionhelper.cxx \
- src$/result$/outputter.cxx \
- src$/result$/signal.cxx \
- src$/result$/signal.hxx \
- src$/result$/testshlTestResult.cxx \
- src$/result$/treswrapper.cxx \
- src$/win32$/makefile.mk \
- src$/win32$/winstuff.cxx
+ src$/cppunit$/makefile.mk
 
 PATCH_FILES=cppunit-1.8.0-r1.patch
 
 # CONFIGURE_DIR=
 # CONFIGURE_ACTION=
-# 
+#
 # BUILD_DIR=
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 
diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst
index a1cce90ce3d4..f2587dd4c624 100644
--- a/cppunit/prj/build.lst
+++ b/cppunit/prj/build.lst
@@ -1,3 +1,3 @@
-c5t  cppunit   :  sal NULL
+c5t  cppunit   :  soltools stlport NULL
 c5t  cppunit					usr1	- all  c5t_mkout NULL
 c5t  cppunit     				nmake	- all  c5t_make NULL
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 94fa6ac352b5..ff580704f9a4 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -1,73 +1,10 @@
-mkdir: %_DEST%\inc%_EXT%\cppunit
-mkdir: %_DEST%\inc%_EXT%\cppunit\portability
-mkdir: %_DEST%\inc%_EXT%\cppunit\autoregister
-mkdir: %_DEST%\inc%_EXT%\cppunit\extensions
-mkdir: %_DEST%\inc%_EXT%\cppunit\result
-mkdir: %_DEST%\inc%_EXT%\testshl
+mkdir: %_DEST%/inc%_EXT%/cppunit
+mkdir: %_DEST%/inc%_EXT%/cppunit/extensions
 
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Asserter.h %_DEST%\inc%_EXT%/cppunit/Asserter.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Exception.h %_DEST%\inc%_EXT%/cppunit/Exception.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/NotEqualException.h %_DEST%\inc%_EXT%/cppunit/NotEqualException.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Portability.h %_DEST%\inc%_EXT%/cppunit/Portability.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/SourceLine.h %_DEST%\inc%_EXT%/cppunit/SourceLine.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Test.h %_DEST%\inc%_EXT%/cppunit/Test.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestAssert.h %_DEST%\inc%_EXT%/cppunit/TestAssert.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestCaller.h %_DEST%\inc%_EXT%/cppunit/TestCaller.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestCase.h %_DEST%\inc%_EXT%/cppunit/TestCase.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestFailure.h %_DEST%\inc%_EXT%/cppunit/TestFailure.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestFixture.h %_DEST%\inc%_EXT%/cppunit/TestFixture.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestSuite.h %_DEST%\inc%_EXT%/cppunit/TestSuite.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/additionalfunc.hxx %_DEST%\inc%_EXT%/cppunit/additionalfunc.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/callbackfunc_fktptr.h %_DEST%\inc%_EXT%/cppunit/autoregister/callbackfunc_fktptr.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/callbackstructure.h %_DEST%\inc%_EXT%/cppunit/autoregister/callbackstructure.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/htestresult.h %_DEST%\inc%_EXT%/cppunit/autoregister/htestresult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/registerfunc.h %_DEST%\inc%_EXT%/cppunit/autoregister/registerfunc.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/registertestfunction.h %_DEST%\inc%_EXT%/cppunit/autoregister/registertestfunction.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/testfunc.h %_DEST%\inc%_EXT%/cppunit/autoregister/testfunc.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/checkboom.hxx %_DEST%\inc%_EXT%/cppunit/checkboom.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/cmdlinebits.hxx %_DEST%\inc%_EXT%/cppunit/cmdlinebits.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/AutoRegisterSuite.h %_DEST%\inc%_EXT%/cppunit/extensions/AutoRegisterSuite.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/HelperMacros.h %_DEST%\inc%_EXT%/cppunit/extensions/HelperMacros.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestFactory.h %_DEST%\inc%_EXT%/cppunit/extensions/TestFactory.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestFactoryRegistry.h %_DEST%\inc%_EXT%/cppunit/extensions/TestFactoryRegistry.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestSuiteBuilder.h %_DEST%\inc%_EXT%/cppunit/extensions/TestSuiteBuilder.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestSuiteFactory.h %_DEST%\inc%_EXT%/cppunit/extensions/TestSuiteFactory.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TypeInfoHelper.h %_DEST%\inc%_EXT%/cppunit/extensions/TypeInfoHelper.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/externcallbackfunc.hxx %_DEST%\inc%_EXT%/cppunit/externcallbackfunc.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/joblist.hxx %_DEST%\inc%_EXT%/cppunit/joblist.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/nocopy.hxx %_DEST%\inc%_EXT%/cppunit/nocopy.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-auto.h %_DEST%\inc%_EXT%/cppunit/portability/config-auto.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-bcb5.h %_DEST%\inc%_EXT%/cppunit/portability/config-bcb5.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-msvc6.h %_DEST%\inc%_EXT%/cppunit/portability/config-msvc6.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/SynchronizedObject.h %_DEST%\inc%_EXT%/cppunit/result/SynchronizedObject.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestListener.h %_DEST%\inc%_EXT%/cppunit/result/TestListener.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestResult.h %_DEST%\inc%_EXT%/cppunit/result/TestResult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestResultCollector.h %_DEST%\inc%_EXT%/cppunit/result/TestResultCollector.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestSucessListener.h %_DEST%\inc%_EXT%/cppunit/result/TestSucessListener.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TextTestResult.h %_DEST%\inc%_EXT%/cppunit/result/TextTestResult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/callbackfunc.h %_DEST%\inc%_EXT%/cppunit/result/callbackfunc.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/emacsTestResult.hxx %_DEST%\inc%_EXT%/cppunit/result/emacsTestResult.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/log.hxx %_DEST%\inc%_EXT%/cppunit/result/log.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/optionhelper.hxx %_DEST%\inc%_EXT%/cppunit/result/optionhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/outputter.hxx %_DEST%\inc%_EXT%/cppunit/result/outputter.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/testshlTestResult.h %_DEST%\inc%_EXT%/cppunit/result/testshlTestResult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/signaltest.h %_DEST%\inc%_EXT%/cppunit/signaltest.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/simpleheader.hxx %_DEST%\inc%_EXT%/cppunit/simpleheader.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/stringhelper.hxx %_DEST%\inc%_EXT%/cppunit/stringhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/taghelper.hxx %_DEST%\inc%_EXT%/cppunit/taghelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/tagvalues.hxx %_DEST%\inc%_EXT%/cppunit/tagvalues.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/autoregisterhelper.hxx %_DEST%\inc%_EXT%/testshl/autoregisterhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/dynamicregister.hxx %_DEST%\inc%_EXT%/testshl/dynamicregister.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/filehelper.hxx %_DEST%\inc%_EXT%/testshl/filehelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/getopt.hxx %_DEST%\inc%_EXT%/testshl/getopt.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/log.hxx %_DEST%\inc%_EXT%/testshl/log.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/tresstatewrapper.h %_DEST%\inc%_EXT%/testshl/tresstatewrapper.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/tresstatewrapper.hxx %_DEST%\inc%_EXT%/testshl/tresstatewrapper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/versionhelper.hxx %_DEST%\inc%_EXT%/testshl/versionhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/winstuff.hxx %_DEST%\inc%_EXT%/testshl/winstuff.hxx
+../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/*.h %_DEST%/inc%_EXT%/cppunit/*.h
+../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/*.hxx %_DEST%/inc%_EXT%/cppunit/*.hxx
+../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/extensions/*.h %_DEST%/inc%_EXT%/cppunit/extensions/*.h
 
-
-..\%__SRC%\lib\cppunit.lib %_DEST%\lib%_EXT%\cppunit.lib
-..\%__SRC%\lib\c5t_*.lib %_DEST%\lib%_EXT%\c5t_*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+../%__SRC%/lib/cppunit.lib %_DEST%/lib%_EXT%/cppunit.lib
+../%__SRC%/lib/*.a %_DEST%/lib%_EXT%/*.a
 
diff --git a/crashrep/source/unx/res.cxx b/crashrep/source/unx/res.cxx
index 63910d606a09..54968bb2259d 100755
--- a/crashrep/source/unx/res.cxx
+++ b/crashrep/source/unx/res.cxx
@@ -28,13 +28,6 @@
  *
  ************************************************************************/
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
-
 #include <interface.hxx>
 #include <cstdio>
 #include <hash_map>
@@ -49,7 +42,7 @@ static string getResFileName( const char* progname )
     string aRet = progname;
     size_t pos = aRet.rfind( '/' );
     // FIXME: search PATH if necessary
-    assert( pos != string::npos );
+    OSL_ASSERT( pos != string::npos );
     aRet.erase( pos );
     aRet.append( "/resource/crash_dump.res" );
 
diff --git a/svtools/source/syslocale/makefile.mk b/cui/inc/makefile.mk
index a393c174856f..74e38ff96c51 100644
--- a/svtools/source/syslocale/makefile.mk
+++ b/cui/inc/makefile.mk
@@ -28,21 +28,25 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=svtools
-TARGET=syslocale
+PRJ=..
+
+PRJNAME=cui
+TARGET=inc
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
-SLOFILES = \
-    $(SLO)$/syslocale.obj
+.INCLUDE :  target.mk
 
-# --- Targets ------------------------------------------------------
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+    $(SLO)$/precompiled.pch \
+    $(SLO)$/precompiled_ex.pch
+    
+.ENDIF			# "$(ENABLE_PCH)"!=""
 
-.INCLUDE :  target.mk
diff --git a/sandbox/com/sun/star/lib/sandbox/Disposable.java b/cui/inc/pch/precompiled_cui.cxx
index fdf44cd2c567..2dcd495e1647 100644
--- a/sandbox/com/sun/star/lib/sandbox/Disposable.java
+++ b/cui/inc/pch/precompiled_cui.cxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Disposable.java,v $
+ * $RCSfile: precompiled_svx.cxx,v $
  * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
@@ -28,9 +28,5 @@
  *
  ************************************************************************/
 
-package com.sun.star.lib.sandbox;
-
-public interface Disposable {
-    void dispose();
-}
+#include "precompiled_cui.hxx"
 
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
new file mode 100644
index 000000000000..1704b8281d86
--- /dev/null
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -0,0 +1,968 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: precompiled_svx.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:08.279739
+#if 0
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "avmedia/mediaitem.hxx"
+#include "avmedia/mediawindow.hxx"
+#include "basegfx/matrix/b2dhommatrix.hxx"
+#include "basegfx/numeric/ftools.hxx"
+#include "basegfx/point/b2dpoint.hxx"
+#include "basegfx/point/b3dpoint.hxx"
+#include "basegfx/polygon/b2dlinegeometry.hxx"
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include "basegfx/polygon/b2dpolygontools.hxx"
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "basegfx/polygon/b2dpolypolygontools.hxx"
+#include "basegfx/polygon/b3dpolygon.hxx"
+#include "basegfx/polygon/b3dpolypolygon.hxx"
+#include "basegfx/polygon/b3dpolypolygontools.hxx"
+#include "basegfx/range/b2drange.hxx"
+#include "basegfx/vector/b2dvector.hxx"
+#include "basegfx/vector/b3dvector.hxx"
+#include "basic/basmgr.hxx"
+#include "basic/sbmod.hxx"
+#include "basic/sbuno.hxx"
+#include "basic/sbx.hxx"
+#include "basic/sbxvar.hxx"
+#include "boost/scoped_ptr.hpp"
+#include "boost/shared_ptr.hpp"
+#include "boost/spirit/core.hpp"
+#include "bootstrp/sstring.hxx"
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleEventObject.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp"
+#include "com/sun/star/accessibility/TextSegment.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleAction.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventListener.hpp"
+#include "com/sun/star/accessibility/XAccessibleImage.hpp"
+#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleSelection.hpp"
+#include "com/sun/star/accessibility/XAccessibleStateSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleTable.hpp"
+#include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp"
+#include "com/sun/star/accessibility/XAccessibleValue.hpp"
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FocusChangeReason.hpp"
+#include "com/sun/star/awt/FontDescriptor.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontType.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/FontWidth.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/GradientStyle.hpp"
+#include "com/sun/star/awt/Key.hpp"
+#include "com/sun/star/awt/KeyEvent.hpp"
+#include "com/sun/star/awt/KeyModifier.hpp"
+#include "com/sun/star/awt/LineEndFormat.hpp"
+#include "com/sun/star/awt/PosSize.hpp"
+#include "com/sun/star/awt/RasterOperation.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/ScrollBarOrientation.hpp"
+#include "com/sun/star/awt/SimpleFontMetric.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/TextAlign.hpp"
+#include "com/sun/star/awt/VisualEffect.hpp"
+#include "com/sun/star/awt/WindowAttribute.hpp"
+#include "com/sun/star/awt/WindowDescriptor.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/awt/XCheckBox.hpp"
+#include "com/sun/star/awt/XComboBox.hpp"
+#include "com/sun/star/awt/XControl.hpp"
+#include "com/sun/star/awt/XControlContainer.hpp"
+#include "com/sun/star/awt/XControlModel.hpp"
+#include "com/sun/star/awt/XDevice.hpp"
+#include "com/sun/star/awt/XFocusListener.hpp"
+#include "com/sun/star/awt/XFont.hpp"
+#include "com/sun/star/awt/XGraphics.hpp"
+#include "com/sun/star/awt/XImageConsumer.hpp"
+#include "com/sun/star/awt/XItemListener.hpp"
+#include "com/sun/star/awt/XLayoutConstrains.hpp"
+#include "com/sun/star/awt/XListBox.hpp"
+#include "com/sun/star/awt/XMouseListener.hpp"
+#include "com/sun/star/awt/XProgressMonitor.hpp"
+#include "com/sun/star/awt/XTabController.hpp"
+#include "com/sun/star/awt/XTabControllerModel.hpp"
+#include "com/sun/star/awt/XTextListener.hpp"
+#include "com/sun/star/awt/XToolkit.hpp"
+#include "com/sun/star/awt/XVclWindowPeer.hpp"
+#include "com/sun/star/awt/XWindow.hpp"
+#include "com/sun/star/awt/XWindowListener.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyValues.hdl"
+#include "com/sun/star/beans/PropertyValues.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XIntrospection.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart/ChartAxisArrangeOrderType.hpp"
+#include "com/sun/star/container/ContainerEvent.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/container/XContainer.hpp"
+#include "com/sun/star/container/XContainerListener.hpp"
+#include "com/sun/star/container/XContainerQuery.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XIdentifierContainer.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XIndexReplace.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/container/XSet.hpp"
+#include "com/sun/star/datatransfer/DataFlavor.hpp"
+#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp"
+#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/document/EventObject.hpp"
+#include "com/sun/star/document/UpdateDocMode.hpp"
+#include "com/sun/star/document/XActionLockable.hpp"
+#include "com/sun/star/document/XBinaryStreamResolver.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEmbeddedObjectResolver.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventListener.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XExporter.hpp"
+#include "com/sun/star/document/XFilter.hpp"
+#include "com/sun/star/document/XGraphicObjectResolver.hpp"
+#include "com/sun/star/document/XImporter.hpp"
+#include "com/sun/star/document/XLinkTargetSupplier.hpp"
+#include "com/sun/star/document/XMimeTypeInfo.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CameraGeometry.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/ColorMode.hpp"
+#include "com/sun/star/drawing/ConnectionType.hpp"
+#include "com/sun/star/drawing/ConnectorType.hpp"
+#include "com/sun/star/drawing/DashStyle.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameter.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegment.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/MeasureKind.hpp"
+#include "com/sun/star/drawing/MeasureTextHorzPos.hpp"
+#include "com/sun/star/drawing/MeasureTextVertPos.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonFlags.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextAdjust.hpp"
+#include "com/sun/star/drawing/TextAnimationDirection.hpp"
+#include "com/sun/star/drawing/TextAnimationKind.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/TextureKind.hpp"
+#include "com/sun/star/drawing/TextureMode.hpp"
+#include "com/sun/star/drawing/TextureProjectionMode.hpp"
+#include "com/sun/star/drawing/XGluePointsSupplier.hpp"
+#include "com/sun/star/drawing/XShapeDescriptor.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/ElementModes.hpp"
+#include "com/sun/star/embed/EmbedMisc.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/EntryInitModes.hpp"
+#include "com/sun/star/embed/NoVisualAreaSizeException.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedObjectFactory.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XInsertObjectDialog.hpp"
+#include "com/sun/star/embed/XLinkageSupport.hpp"
+#include "com/sun/star/embed/XStorage.hpp"
+#include "com/sun/star/embed/XTransactedObject.hpp"
+#include "com/sun/star/form/DatabaseDeleteEvent.hpp"
+#include "com/sun/star/form/DatabaseParameterEvent.hpp"
+#include "com/sun/star/form/ErrorEvent.hpp"
+#include "com/sun/star/form/FormButtonType.hpp"
+#include "com/sun/star/form/FormComponentType.hpp"
+#include "com/sun/star/form/ListSourceType.hpp"
+#include "com/sun/star/form/NavigationBarMode.hpp"
+#include "com/sun/star/form/TabulatorCycle.hpp"
+#include "com/sun/star/form/XBoundComponent.hpp"
+#include "com/sun/star/form/XBoundControl.hpp"
+#include "com/sun/star/form/XConfirmDeleteBroadcaster.hpp"
+#include "com/sun/star/form/XConfirmDeleteListener.hpp"
+#include "com/sun/star/form/XDatabaseParameterBroadcaster2.hpp"
+#include "com/sun/star/form/XDatabaseParameterListener.hpp"
+#include "com/sun/star/form/XForm.hpp"
+#include "com/sun/star/form/XFormComponent.hpp"
+#include "com/sun/star/form/XFormController.hpp"
+#include "com/sun/star/form/XFormControllerListener.hpp"
+#include "com/sun/star/form/XFormsSupplier.hpp"
+#include "com/sun/star/form/XFormsSupplier2.hpp"
+#include "com/sun/star/form/XGrid.hpp"
+#include "com/sun/star/form/XGridColumnFactory.hpp"
+#include "com/sun/star/form/XGridFieldDataSupplier.hpp"
+#include "com/sun/star/form/XGridPeer.hpp"
+#include "com/sun/star/form/XImageProducerSupplier.hpp"
+#include "com/sun/star/form/XLoadListener.hpp"
+#include "com/sun/star/form/XLoadable.hpp"
+#include "com/sun/star/form/XReset.hpp"
+#include "com/sun/star/form/XResetListener.hpp"
+#include "com/sun/star/form/binding/XBindableValue.hpp"
+#include "com/sun/star/form/binding/XListEntrySink.hpp"
+#include "com/sun/star/form/binding/XValueBinding.hpp"
+#include "com/sun/star/form/submission/XSubmissionSupplier.hpp"
+#include "com/sun/star/form/validation/XFormComponentValidityListener.hpp"
+#include "com/sun/star/form/validation/XValidatableFormComponent.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/DispatchInformation.hpp"
+#include "com/sun/star/frame/FeatureStateEvent.hpp"
+#include "com/sun/star/frame/FrameSearchFlag.hpp"
+#include "com/sun/star/frame/XComponentLoader.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchInformationProvider.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterception.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XFrameActionListener.hpp"
+#include "com/sun/star/frame/XFrames.hpp"
+#include "com/sun/star/frame/XFramesSupplier.hpp"
+#include "com/sun/star/frame/XInterceptorInfo.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XModuleManager.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousDispatch.hpp"
+#include "com/sun/star/frame/status/ClipboardFormats.hpp"
+#include "com/sun/star/frame/status/FontHeight.hpp"
+#include "com/sun/star/frame/status/ItemStatus.hpp"
+#include "com/sun/star/frame/status/LeftRightMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMarginScale.hpp"
+#include "com/sun/star/gallery/GalleryItemType.hpp"
+#include "com/sun/star/gallery/XGalleryItem.hpp"
+#include "com/sun/star/gallery/XGalleryTheme.hpp"
+#include "com/sun/star/gallery/XGalleryThemeProvider.hpp"
+#include "com/sun/star/graphic/XGraphic.hpp"
+#include "com/sun/star/graphic/XGraphicProvider.hpp"
+#include "com/sun/star/graphic/XGraphicRenderer.hpp"
+#include "com/sun/star/i18n/CharacterIteratorMode.hdl"
+#include "com/sun/star/i18n/CharacterIteratorMode.hpp"
+#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include "com/sun/star/i18n/ForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/InputSequenceCheckMode.hpp"
+#include "com/sun/star/i18n/KCharacterType.hpp"
+#include "com/sun/star/i18n/ScriptType.hdl"
+#include "com/sun/star/i18n/ScriptType.hpp"
+#include "com/sun/star/i18n/TextConversionOption.hdl"
+#include "com/sun/star/i18n/TextConversionOption.hpp"
+#include "com/sun/star/i18n/TextConversionType.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+#include "com/sun/star/i18n/UnicodeScript.hpp"
+#include "com/sun/star/i18n/UnicodeType.hdl"
+#include "com/sun/star/i18n/WordType.hpp"
+#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/i18n/XExtendedInputSequenceChecker.hpp"
+#include "com/sun/star/i18n/XExtendedTextConversion.hpp"
+#include "com/sun/star/i18n/XForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/XTextConversion.hpp"
+#include "com/sun/star/inspection/XObjectInspector.hpp"
+#include "com/sun/star/inspection/XObjectInspectorModel.hpp"
+#include "com/sun/star/io/IOException.hpp"
+#include "com/sun/star/io/XActiveDataControl.hpp"
+#include "com/sun/star/io/XActiveDataSink.hpp"
+#include "com/sun/star/io/XActiveDataSource.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XInputStreamProvider.hpp"
+#include "com/sun/star/io/XMarkableStream.hpp"
+#include "com/sun/star/io/XObjectInputStream.hpp"
+#include "com/sun/star/io/XObjectOutputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/io/XPersistObject.hpp"
+#include "com/sun/star/io/XSeekable.hdl"
+#include "com/sun/star/io/XStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/ServiceNotRegisteredException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceDisplayName.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/linguistic2/ConversionDictionaryType.hpp"
+#include "com/sun/star/linguistic2/ConversionDirection.hdl"
+#include "com/sun/star/linguistic2/ConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/DictionaryEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryType.hpp"
+#include "com/sun/star/linguistic2/SpellFailure.hpp"
+#include "com/sun/star/linguistic2/XAvailableLocales.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionary.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/XDictionary.hpp"
+#include "com/sun/star/linguistic2/XDictionary1.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEntry.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEventListener.hpp"
+#include "com/sun/star/linguistic2/XDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XDictionaryListEventListener.hpp"
+#include "com/sun/star/linguistic2/XHyphenatedWord.hpp"
+#include "com/sun/star/linguistic2/XHyphenator.hpp"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hdl"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hpp"
+#include "com/sun/star/linguistic2/XMeaning.hpp"
+#include "com/sun/star/linguistic2/XPossibleHyphens.hpp"
+#include "com/sun/star/linguistic2/XSpellAlternatives.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker1.hpp"
+#include "com/sun/star/linguistic2/XSupportedLocales.hpp"
+#include "com/sun/star/linguistic2/XThesaurus.hpp"
+#include "com/sun/star/media/XPlayer.hpp"
+#include "com/sun/star/media/ZoomLevel.hpp"
+#include "com/sun/star/plugin/PluginDescription.hpp"
+#include "com/sun/star/plugin/XPluginManager.hpp"
+#include "com/sun/star/reflection/XIdlClass.hpp"
+#include "com/sun/star/reflection/XIdlMethod.hpp"
+#include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp"
+#include "com/sun/star/reflection/XProxyFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
+#include "com/sun/star/script/ScriptEvent.hpp"
+#include "com/sun/star/script/ScriptEventDescriptor.hpp"
+#include "com/sun/star/script/XEventAttacherManager.hpp"
+#include "com/sun/star/script/XInvocation.hpp"
+#include "com/sun/star/script/XLibraryContainer.hpp"
+#include "com/sun/star/script/XScriptListener.hpp"
+#include "com/sun/star/script/XTypeConverter.hpp"
+#include "com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp"
+#include "com/sun/star/script/browse/BrowseNodeTypes.hpp"
+#include "com/sun/star/script/browse/XBrowseNode.hpp"
+#include "com/sun/star/script/browse/XBrowseNodeFactory.hpp"
+#include "com/sun/star/script/provider/ScriptErrorRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptExceptionRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptFrameworkErrorType.hpp"
+#include "com/sun/star/script/provider/XScriptProvider.hpp"
+#include "com/sun/star/script/provider/XScriptProviderSupplier.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/sdb/ParametersRequest.hpp"
+#include "com/sun/star/sdb/RowChangeAction.hpp"
+#include "com/sun/star/sdb/RowChangeEvent.hpp"
+#include "com/sun/star/sdb/SQLContext.hpp"
+#include "com/sun/star/sdb/SQLErrorEvent.hpp"
+#include "com/sun/star/sdb/XColumn.hpp"
+#include "com/sun/star/sdb/XColumnUpdate.hpp"
+#include "com/sun/star/sdb/XCompletedConnection.hpp"
+#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp"
+#include "com/sun/star/sdb/XQueriesSupplier.hpp"
+#include "com/sun/star/sdb/XResultSetAccess.hpp"
+#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp"
+#include "com/sun/star/sdb/XRowSetApproveListener.hpp"
+#include "com/sun/star/sdb/XRowSetSupplier.hpp"
+#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp"
+#include "com/sun/star/sdb/XSQLErrorListener.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposer.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp"
+#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp"
+#include "com/sun/star/sdbc/ColumnValue.hpp"
+#include "com/sun/star/sdbc/DataType.hpp"
+#include "com/sun/star/sdbc/ResultSetConcurrency.hpp"
+#include "com/sun/star/sdbc/ResultSetType.hpp"
+#include "com/sun/star/sdbc/XConnection.hpp"
+#include "com/sun/star/sdbc/XDataSource.hpp"
+#include "com/sun/star/sdbc/XDatabaseMetaData.hpp"
+#include "com/sun/star/sdbc/XPreparedStatement.hpp"
+#include "com/sun/star/sdbc/XResultSet.hpp"
+#include "com/sun/star/sdbc/XResultSetUpdate.hpp"
+#include "com/sun/star/sdbc/XRow.hpp"
+#include "com/sun/star/sdbc/XRowSet.hpp"
+#include "com/sun/star/sdbc/XRowSetListener.hpp"
+#include "com/sun/star/sdbc/XStatement.hpp"
+#include "com/sun/star/sdbcx/Privilege.hpp"
+#include "com/sun/star/sdbcx/XColumnsSupplier.hpp"
+#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp"
+#include "com/sun/star/sdbcx/XDeleteRows.hpp"
+#include "com/sun/star/sdbcx/XRowLocate.hpp"
+#include "com/sun/star/sdbcx/XTablesSupplier.hpp"
+#include "com/sun/star/security/XDocumentDigitalSignatures.hpp"
+#include "com/sun/star/style/BreakType.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/GraphicLocation.hpp"
+#include "com/sun/star/style/LineSpacing.hpp"
+#include "com/sun/star/style/LineSpacingMode.hpp"
+#include "com/sun/star/style/NumberingType.hpp"
+#include "com/sun/star/style/PageStyleLayout.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/TabStop.hpp"
+#include "com/sun/star/style/VerticalAlignment.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/table/BorderLine.hpp"
+#include "com/sun/star/table/CellAddress.hpp"
+#include "com/sun/star/table/CellContentType.hpp"
+#include "com/sun/star/table/CellHoriJustify.hpp"
+#include "com/sun/star/table/CellOrientation.hpp"
+#include "com/sun/star/table/CellRangeAddress.hpp"
+#include "com/sun/star/table/CellVertJustify.hpp"
+#include "com/sun/star/table/ShadowFormat.hpp"
+#include "com/sun/star/table/ShadowLocation.hpp"
+#include "com/sun/star/table/TableBorder.hpp"
+#include "com/sun/star/table/TableOrientation.hpp"
+#include "com/sun/star/task/XInteractionHandler.hpp"
+#include "com/sun/star/task/XStatusIndicator.hpp"
+#include "com/sun/star/task/XStatusIndicatorFactory.hpp"
+#include "com/sun/star/text/CharacterCompressionType.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FilenameDisplayFormat.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/GraphicCrop.hpp"
+#include "com/sun/star/text/HoriOrientation.hpp"
+#include "com/sun/star/text/RelOrientation.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/TextContentAnchorType.hpp"
+#include "com/sun/star/text/VertOrientation.hpp"
+#include "com/sun/star/text/WrapTextMode.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XDefaultNumberingProvider.hpp"
+#include "com/sun/star/text/XNumberingFormatter.hpp"
+#include "com/sun/star/text/XNumberingTypeInfo.hpp"
+#include "com/sun/star/text/XRubySelection.hpp"
+#include "com/sun/star/text/XSimpleText.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextContent.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextField.hdl"
+#include "com/sun/star/text/XTextField.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/text/XTextRangeCompare.hpp"
+#include "com/sun/star/text/XTextRangeMover.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/NameClash.hpp"
+#include "com/sun/star/ucb/NumberedSortingInfo.hpp"
+#include "com/sun/star/ucb/TransferInfo.hpp"
+#include "com/sun/star/ucb/XAnyCompare.hpp"
+#include "com/sun/star/ucb/XAnyCompareFactory.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentAccess.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XSimpleFileAccess.hpp"
+#include "com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp"
+#include "com/sun/star/ui/ImageType.hpp"
+#include "com/sun/star/ui/ItemStyle.hpp"
+#include "com/sun/star/ui/ItemType.hpp"
+#include "com/sun/star/ui/UIElementType.hpp"
+#include "com/sun/star/ui/XImageManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfiguration.hpp"
+#include "com/sun/star/ui/XUIConfigurationListener.hpp"
+#include "com/sun/star/ui/XUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfigurationPersistence.hpp"
+#include "com/sun/star/ui/XUIConfigurationStorage.hpp"
+#include "com/sun/star/ui/XUIElement.hpp"
+#include "com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp"
+#include "com/sun/star/ui/dialogs/ListboxControlActions.hpp"
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerListener.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerNotifier.hpp"
+#include "com/sun/star/ui/dialogs/XFilePreview.hpp"
+#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/XAggregation.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/util/Date.hpp"
+#include "com/sun/star/util/DateTime.hpp"
+#include "com/sun/star/util/Language.hpp"
+#include "com/sun/star/util/MeasureUnit.hpp"
+#include "com/sun/star/util/NumberFormat.hpp"
+#include "com/sun/star/util/SearchAlgorithms.hpp"
+#include "com/sun/star/util/SearchFlags.hpp"
+#include "com/sun/star/util/SearchOptions.hpp"
+#include "com/sun/star/util/SearchResult.hpp"
+#include "com/sun/star/util/SortField.hpp"
+#include "com/sun/star/util/SortFieldType.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCancellable.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XFlushable.hpp"
+#include "com/sun/star/util/XLocalizedAliases.hpp"
+#include "com/sun/star/util/XModeChangeBroadcaster.hpp"
+#include "com/sun/star/util/XModeChangeListener.hpp"
+#include "com/sun/star/util/XModeSelector.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XModifyBroadcaster.hpp"
+#include "com/sun/star/util/XModifyListener.hpp"
+#include "com/sun/star/util/XNumberFormatTypes.hpp"
+#include "com/sun/star/util/XNumberFormats.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XNumberFormatter.hpp"
+#include "com/sun/star/util/XTextSearch.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/util/logging/LogLevel.hpp"
+#include "com/sun/star/util/logging/XLogger.hpp"
+#include "com/sun/star/view/XSelectionChangeListener.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+#include "com/sun/star/xforms/XFormsSupplier.hpp"
+#include "com/sun/star/xforms/XFormsUIHelper1.hpp"
+#include "com/sun/star/xforms/XModel.hpp"
+#include "com/sun/star/xforms/XSubmission.hpp"
+#include "com/sun/star/xml/AttributeData.hpp"
+#include "com/sun/star/xml/dom/DOMException.hpp"
+#include "com/sun/star/xml/dom/XDocument.hpp"
+#include "com/sun/star/xml/dom/XNode.hpp"
+#include "com/sun/star/xml/dom/events/XEventListener.hpp"
+#include "com/sun/star/xml/dom/events/XEventTarget.hpp"
+#include "com/sun/star/xml/sax/InputSource.hpp"
+#include "com/sun/star/xml/sax/SAXParseException.hpp"
+#include "com/sun/star/xml/sax/XAttributeList.hpp"
+#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include "com/sun/star/xml/sax/XParser.hpp"
+#include "comphelper/accessibleeventnotifier.hxx"
+#include "comphelper/anytostring.hxx"
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/componentcontext.hxx"
+#include "comphelper/configurationhelper.hxx"
+#include "comphelper/container.hxx"
+#include "comphelper/embeddedobjectcontainer.hxx"
+#include "comphelper/enumhelper.hxx"
+#include "comphelper/implementationreference.hxx"
+#include "comphelper/interaction.hxx"
+#include "comphelper/numbers.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/propertysethelper.hxx"
+#include "comphelper/regpathhelper.hxx"
+#include "comphelper/scopeguard.hxx"
+#include "comphelper/seqstream.hxx"
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/sequenceasvector.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "comphelper/storagehelper.hxx"
+#include "comphelper/types.hxx"
+#include "comphelper/uno3.hxx"
+#include "connectivity/IParseContext.hxx"
+#include "connectivity/dbexception.hxx"
+#include "connectivity/sqlnode.hxx"
+#include "connectivity/sqlparse.hxx"
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/compbase12.hxx"
+#include "cppuhelper/compbase2.hxx"
+#include "cppuhelper/compbase3.hxx"
+#include "cppuhelper/compbase4.hxx"
+#include "cppuhelper/compbase6.hxx"
+#include "cppuhelper/compbase7.hxx"
+#include "cppuhelper/component.hxx"
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase11.hxx"
+#include "cppuhelper/implbase12.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase4.hxx"
+#include "cppuhelper/implbase5.hxx"
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/implbase8.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.h"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "cppuhelper/typeprovider.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakagg.hxx"
+#include "cppuhelper/weakref.hxx"
+#include "i18npool/lang.h"
+#include "i18npool/mslangid.hxx"
+#include "jvmfwk/framework.h"
+#include "linguistic/lngprops.hxx"
+#include "osl/diagnose.h"
+#include "osl/endian.h"
+#include "osl/file.hxx"
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/nlsupport.h"
+#include "osl/process.h"
+#include "osl/security.hxx"
+#include "rsc/rscsfx.hxx"
+#include "rtl/bootstrap.hxx"
+#include "rtl/cipher.h"
+#include "rtl/crc.h"
+#include "rtl/digest.h"
+#include "rtl/locale.h"
+#include "rtl/logfile.hxx"
+#include "rtl/math.hxx"
+#include "rtl/memory.h"
+#include "rtl/tencinfo.h"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+#include "sal/config.h"
+#include "sal/main.h"
+#include "sal/types.h"
+#include "sfx2/bindings.hxx"
+#include "sfx2/ctrlitem.hxx"
+#include "sfx2/dispatch.hxx"
+#include "sfx2/docfilt.hxx"
+#include "sfx2/event.hxx"
+#include "sfx2/frame.hxx"
+#include "sfx2/frmdescr.hxx"
+#include "sfx2/imagemgr.hxx"
+#include "sfx2/imgmgr.hxx"
+#include "sfx2/linkmgr.hxx"
+#include "sfx2/linksrc.hxx"
+#include "sfx2/lnkbase.hxx"
+#include "sfx2/minarray.hxx"
+#include "sfx2/minfitem.hxx"
+#include "sfx2/mnuitem.hxx"
+#include "sfx2/module.hxx"
+#include "sfx2/msg.hxx"
+#include "sfx2/msgpool.hxx"
+#include "sfx2/objface.hxx"
+#include "sfx2/objitem.hxx"
+#include "sfx2/progress.hxx"
+#include "sfx2/querystatus.hxx"
+#include "sfx2/request.hxx"
+#include "sfx2/sfxdefs.hxx"
+#include "sfx2/sfxdlg.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/sfxhtml.hxx"
+#include "sfx2/sfxstatuslistener.hxx"
+#include "sfx2/sfxuno.hxx"
+#include "sfx2/shell.hxx"
+#include "sfx2/srchdefs.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/viewfrm.hxx"
+#include "sot/clsids.hxx"
+#include "sot/exchange.hxx"
+#include "sot/factory.hxx"
+#include "sot/formats.hxx"
+#include <map>
+#include <set>
+#include <slist>
+#include <vector>
+#include "svtools/FilterConfigItem.hxx"
+#include "svtools/accessibilityoptions.hxx"
+#include "svl/adrparse.hxx"
+#include "svtools/apearcfg.hxx"
+#include "svl/brdcst.hxx"
+#include "unotools/cacheoptions.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntwall.hxx"
+#include "svtools/colorcfg.hxx"
+#include "svl/ctloptions.hxx"
+#include "unotools/defaultoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
+#include "svtools/ehdl.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "unotools/fontoptions.hxx"
+#include "svtools/fontsubstconfig.hxx"
+#include "svtools/helpopt.hxx"
+#include "svl/hint.hxx"
+#include "svtools/htmlkywd.hxx"
+#include "svtools/htmltokn.h"
+#include "svtools/imagemgr.hxx"
+#include "svtools/imapcirc.hxx"
+#include "svtools/imapobj.hxx"
+#include "svtools/imappoly.hxx"
+#include "svtools/imaprect.hxx"
+#include "svtools/inetimg.hxx"
+#include "unotools/inetoptions.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/javaoptions.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lngmisc.hxx"
+#include "svtools/localresaccess.hxx"
+#include "svl/lstner.hxx"
+#include "svl/macitem.hxx"
+#include "svtools/menuoptions.hxx"
+#include "svl/metitem.hxx"
+#include "unotools/misccfg.hxx"
+#include "svtools/miscopt.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "unotools/optionsdlg.hxx"
+#include "svtools/parhtml.hxx"
+#include "svtools/parrtf.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "svl/rngitem.hxx"
+#include "svtools/rtfkeywd.hxx"
+#include "svtools/rtfout.hxx"
+#include "svtools/rtftoken.h"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
+#include "svl/sfontitm.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
+#include "svtools/soerr.hxx"
+#include "unotools/sourceviewconfig.hxx"
+#include "unotools/startoptions.hxx"
+#include "svtools/stdmenu.hxx"
+#include "svtools/stringtransfer.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
+#include "svtools/textdata.hxx"
+#include "svtools/transfer.hxx"
+#include "svtools/txtcmp.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
+#include "svtools/unoevent.hxx"
+#include "svtools/unoimap.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
+#include "sys/stat.h"
+#include "sys/types.h"
+#include "toolkit/awt/vclxdevice.hxx"
+#include "toolkit/controls/unocontrol.hxx"
+#include "tools/bigint.hxx"
+#include "tools/color.hxx"
+#include "tools/config.hxx"
+#include "tools/contnr.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/dynary.hxx"
+#include "tools/errcode.hxx"
+#include "tools/errinf.hxx"
+#include "tools/fract.hxx"
+#include "tools/gen.hxx"
+#include "tools/globname.hxx"
+#include "tools/inetdef.hxx"
+#include "tools/line.hxx"
+#include "tools/link.hxx"
+#include "tools/list.hxx"
+#include "tools/multisel.hxx"
+#include "tools/poly.hxx"
+#include "tools/rc.h"
+#include "tools/rc.hxx"
+#include "tools/rcid.h"
+#include "tools/ref.hxx"
+#include "tools/resary.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/rtti.hxx"
+#include "tools/shl.hxx"
+#include "tools/solar.h"
+#include "tools/stack.hxx"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/tenccvt.hxx"
+#include "tools/urlobj.hxx"
+#include "tools/vcompat.hxx"
+#include "tools/vector2d.hxx"
+#include "tools/weakbase.hxx"
+#include "tools/wldcrd.hxx"
+#include "tools/zcodec.hxx"
+#include "ucbhelper/commandenvironment.hxx"
+#include "ucbhelper/configurationkeys.hxx"
+#include "ucbhelper/content.hxx"
+#include "ucbhelper/contentbroker.hxx"
+#include "unicode/ubidi.h"
+#include "uno/lbnames.h"
+#include "uno/mapping.hxx"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include "unotools/accessiblestatesethelper.hxx"
+#include "unotools/bootstrap.hxx"
+#include "unotools/charclass.hxx"
+#include "unotools/collatorwrapper.hxx"
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+#include "unotools/confignode.hxx"
+#include "unotools/configpathes.hxx"
+#include "unotools/configvaluecontainer.hxx"
+#include "unotools/localfilehelper.hxx"
+#include "unotools/processfactory.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "unotools/streamwrap.hxx"
+#include "unotools/textsearch.hxx"
+#include "unotools/transliterationwrapper.hxx"
+#include "unotools/ucbhelper.hxx"
+#include "vcl/abstdlg.hxx"
+#include "vcl/animate.hxx"
+#include "vcl/bitmap.hxx"
+#include "vcl/bitmapex.hxx"
+#include "vcl/bmpacc.hxx"
+#include "vcl/cmdevt.h"
+#include "vcl/configsettings.hxx"
+#include "vcl/controllayout.hxx"
+#include "vcl/cursor.hxx"
+#include "vcl/decoview.hxx"
+#include "vcl/dndhelp.hxx"
+#include "vcl/fldunit.hxx"
+#include "vcl/fntstyle.hxx"
+#include "unotools/fontcvt.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/help.hxx"
+#include "vcl/image.hxx"
+#include "vcl/jobset.hxx"
+#include "vcl/keycodes.hxx"
+#include "vcl/mapmod.hxx"
+#include "vcl/menu.hxx"
+#include "vcl/mnemonic.hxx"
+#include "vcl/pointr.hxx"
+#include "vcl/region.hxx"
+#include "vcl/salbtype.hxx"
+#include "vcl/stdtext.hxx"
+#include "vcl/timer.hxx"
+#include "vcl/unohelp.hxx"
+#include "vcl/unohelp2.hxx"
+#include "vcl/wall.hxx"
+#include "vcl/wintypes.hxx"
+#include "vos/mutex.hxx"
+#include "vos/ref.hxx"
+#include "vos/refernce.hxx"
+#include "vos/thread.hxx"
+#include "vos/xception.hxx"
+#include "xmloff/DashStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/attrlist.hxx"
+#include "xmloff/nmspmap.hxx"
+#include "xmloff/xmlcnimp.hxx"
+#include "xmloff/xmlictxt.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlstyle.hxx"
+#include "xmloff/xmltoken.hxx"
+#include "xmlscript/xmldlg_imexp.hxx"
+//---MARKER---
+#endif
+#endif
diff --git a/cui/prj/build.lst b/cui/prj/build.lst
new file mode 100644
index 000000000000..776d6a6af82e
--- /dev/null
+++ b/cui/prj/build.lst
@@ -0,0 +1,9 @@
+cu	cui	: svx NULL
+cu	cui										usr1	-	all	cui_mkout NULL
+cu	cui\inc									nmake	-	all	cui_inc NULL
+cu	cui\source\options						nmake	-	all	cui_options cui_inc NULL
+cu	cui\source\customize					nmake	-	all	cui_customize cui_inc NULL
+cu	cui\source\dialogs						nmake	-	all	cui_dialogs cui_inc NULL
+cu	cui\source\tabpages						nmake	-	all	cui_tabpages cui_inc NULL
+cu	cui\source\factory						nmake	-	all	cui_factory cui_inc NULL
+cu 	cui\util								nmake	-	all cui_util cui_factory cui_tabpages cui_dialogs cui_customize cui_options NULL
diff --git a/cui/prj/d.lst b/cui/prj/d.lst
new file mode 100755
index 000000000000..ce672717bfff
--- /dev/null
+++ b/cui/prj/d.lst
@@ -0,0 +1,8 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+
diff --git a/svx/source/cui/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e99fe145c09b..8ff50323cc76 100644
--- a/svx/source/cui/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -29,25 +29,27 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 //-----------------------------------------------
 // include own files
 
 #include "acccfg.hxx"
 #include "cfgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #include <sfx2/msg.hxx>
 #include <sfx2/macrconf.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/minfitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
 #include "acccfg.hrc"
 
+#include <svx/svxids.hrc> // SID_CHARMAP, SID_ATTR_SPECIALCHAR
+
 //-----------------------------------------------
 // include interface declarations
 #include <com/sun/star/frame/XFramesSupplier.hpp>
@@ -699,31 +701,31 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
 
 //-----------------------------------------------
 SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet )
-    : SfxTabPage              (pParent, SVX_RES(RID_SVXPAGE_KEYBOARD), aSet)
+    : SfxTabPage              (pParent, CUI_RES(RID_SVXPAGE_KEYBOARD), aSet)
     , m_pMacroInfoItem        ()
     , m_pStringItem        ()
     , m_pFontItem        ()
     , m_pFileDlg              (NULL)
-    , aEntriesBox             (this   , this, SVX_RES(BOX_ACC_ENTRIES   ))
-    , aKeyboardGroup          (this   , SVX_RES(GRP_ACC_KEYBOARD        ))
-    , aOfficeButton           (this   , SVX_RES(RB_OFFICE               ))
-    , aModuleButton           (this   , SVX_RES(RB_MODULE               ))
-    , aChangeButton           (this   , SVX_RES(BTN_ACC_CHANGE          ))
-    , aRemoveButton           (this   , SVX_RES(BTN_ACC_REMOVE          ))
-    , aGroupText              (this   , SVX_RES(TXT_ACC_GROUP           ))
-    , pGroupLBox(new SfxConfigGroupListBox_Impl( this, SVX_RES(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG ))
-    , aFunctionText           (this   , SVX_RES(TXT_ACC_FUNCTION        ))
-    , pFunctionBox(new SfxConfigFunctionListBox_Impl( this, SVX_RES( BOX_ACC_FUNCTION )))
-    , aKeyText                (this   , SVX_RES(TXT_ACC_KEY             ))
-    , aKeyBox                 (this   , SVX_RES(BOX_ACC_KEY             ))
-    , aFunctionsGroup         (this   , SVX_RES(GRP_ACC_FUNCTIONS       ))
-    , aLoadButton             (this   , SVX_RES(BTN_LOAD                ))
-    , aSaveButton             (this   , SVX_RES(BTN_SAVE                ))
-    , aResetButton            (this   , SVX_RES(BTN_RESET               ))
-    , aLoadAccelConfigStr             ( SVX_RES( STR_LOADACCELCONFIG ) )
-    , aSaveAccelConfigStr             ( SVX_RES( STR_SAVEACCELCONFIG ) )
-    , aFilterAllStr                   ( SVX_RES( STR_SFX_FILTERNAME_ALL ) )
-    , aFilterCfgStr                   ( SVX_RES( STR_FILTERNAME_CFG ) )
+    , aEntriesBox             (this   , this, CUI_RES(BOX_ACC_ENTRIES   ))
+    , aKeyboardGroup          (this   , CUI_RES(GRP_ACC_KEYBOARD        ))
+    , aOfficeButton           (this   , CUI_RES(RB_OFFICE               ))
+    , aModuleButton           (this   , CUI_RES(RB_MODULE               ))
+    , aChangeButton           (this   , CUI_RES(BTN_ACC_CHANGE          ))
+    , aRemoveButton           (this   , CUI_RES(BTN_ACC_REMOVE          ))
+    , aGroupText              (this   , CUI_RES(TXT_ACC_GROUP           ))
+    , pGroupLBox(new SfxConfigGroupListBox_Impl( this, CUI_RES(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG ))
+    , aFunctionText           (this   , CUI_RES(TXT_ACC_FUNCTION        ))
+    , pFunctionBox(new SfxConfigFunctionListBox_Impl( this, CUI_RES( BOX_ACC_FUNCTION )))
+    , aKeyText                (this   , CUI_RES(TXT_ACC_KEY             ))
+    , aKeyBox                 (this   , CUI_RES(BOX_ACC_KEY             ))
+    , aFunctionsGroup         (this   , CUI_RES(GRP_ACC_FUNCTIONS       ))
+    , aLoadButton             (this   , CUI_RES(BTN_LOAD                ))
+    , aSaveButton             (this   , CUI_RES(BTN_SAVE                ))
+    , aResetButton            (this   , CUI_RES(BTN_RESET               ))
+    , aLoadAccelConfigStr             ( CUI_RES( STR_LOADACCELCONFIG ) )
+    , aSaveAccelConfigStr             ( CUI_RES( STR_SAVEACCELCONFIG ) )
+    , aFilterAllStr                   ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
+    , aFilterCfgStr                   ( CUI_RES( STR_FILTERNAME_CFG ) )
     , m_bStylesInfoInitialized(sal_False)
     , m_xGlobal               ()
     , m_xModule               ()
diff --git a/svx/source/cui/acccfg.hrc b/cui/source/customize/acccfg.hrc
index 2144af68df35..2144af68df35 100644
--- a/svx/source/cui/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
diff --git a/svx/source/cui/acccfg.src b/cui/source/customize/acccfg.src
index df0e0922da12..4c26725a69d9 100644
--- a/svx/source/cui/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -29,7 +29,7 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
 #include "acccfg.hrc"
 
 #define MASKCOLOR  MaskColor = \
diff --git a/svx/source/cui/cfg.cxx b/cui/source/customize/cfg.cxx
index 5df1e03edb53..4697a957662c 100644
--- a/svx/source/cui/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 #include <stdlib.h>
 #include <time.h>
@@ -62,21 +62,21 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/unohlp.hxx>
 
 #include <algorithm>
 //add
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "cfg.hrc"
 #include "helpid.hrc"
 
 #include "acccfg.hxx"
 #include "cfg.hxx"
 #include "eventdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/processfactory.hxx>
@@ -856,7 +856,7 @@ SvxConfigDialog::SvxConfigDialog(
     Window * pParent, const SfxItemSet* pSet_ )
     :
         SfxTabDialog( pParent,
-            SVX_RES( RID_SVXDLG_CUSTOMIZE ), pSet_ )
+            CUI_RES( RID_SVXDLG_CUSTOMIZE ), pSet_ )
 {
     FreeResource();
 
@@ -1669,25 +1669,25 @@ void SvxDescriptionEdit::SetNewText( const String& _rText )
 SvxConfigPage::SvxConfigPage(
     Window *pParent, const SfxItemSet& rSet )
     :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_MENUS ), rSet ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ),
     bInitialised( FALSE ),
     pCurrentSaveInData( 0 ),
-    aTopLevelSeparator( this, SVX_RES( GRP_MENUS ) ),
-    aTopLevelLabel( this, SVX_RES( FT_MENUS ) ),
-    aTopLevelListBox( this, SVX_RES( LB_MENUS ) ),
-    aNewTopLevelButton( this, SVX_RES( BTN_NEW ) ),
-    aModifyTopLevelButton( this, SVX_RES( BTN_CHANGE ) ),
-    aContentsSeparator( this, SVX_RES( GRP_MENU_SEPARATOR ) ),
-    aContentsLabel( this, SVX_RES( GRP_MENU_ENTRIES ) ),
+    aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ),
+    aTopLevelLabel( this, CUI_RES( FT_MENUS ) ),
+    aTopLevelListBox( this, CUI_RES( LB_MENUS ) ),
+    aNewTopLevelButton( this, CUI_RES( BTN_NEW ) ),
+    aModifyTopLevelButton( this, CUI_RES( BTN_CHANGE ) ),
+    aContentsSeparator( this, CUI_RES( GRP_MENU_SEPARATOR ) ),
+    aContentsLabel( this, CUI_RES( GRP_MENU_ENTRIES ) ),
     aContentsListBox( 0 ),
-    aAddCommandsButton( this, SVX_RES( BTN_ADD_COMMANDS ) ),
-    aModifyCommandButton( this, SVX_RES( BTN_CHANGE_ENTRY ) ),
-    aMoveUpButton( this, SVX_RES( BTN_UP ) ),
-    aMoveDownButton( this, SVX_RES( BTN_DOWN ) ),
-    aSaveInText( this, SVX_RES( TXT_SAVEIN ) ),
-    aSaveInListBox( this, SVX_RES( LB_SAVEIN ) ),
-    aDescriptionLabel( this, SVX_RES( FT_DESCRIPTION ) ),
-    aDescriptionField( this, SVX_RES( ED_DESCRIPTION ) ),
+    aAddCommandsButton( this, CUI_RES( BTN_ADD_COMMANDS ) ),
+    aModifyCommandButton( this, CUI_RES( BTN_CHANGE_ENTRY ) ),
+    aMoveUpButton( this, CUI_RES( BTN_UP ) ),
+    aMoveDownButton( this, CUI_RES( BTN_DOWN ) ),
+    aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
+    aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
+    aDescriptionLabel( this, CUI_RES( FT_DESCRIPTION ) ),
+    aDescriptionField( this, CUI_RES( ED_DESCRIPTION ) ),
     pSelectorDlg( 0 )
 {
     aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
@@ -2293,7 +2293,7 @@ IMPL_LINK( SvxConfigPage, AsyncInfoMsg, String*, pMsg )
     (void)pMsg;
 
     // Asynchronous msg because of D&D
-    InfoBox( this, SVX_RES(
+    InfoBox( this, CUI_RES(
         IBX_MNUCFG_ALREADY_INCLUDED ) ).Execute();
 
     return 0;
@@ -2397,7 +2397,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
     :
     SvxConfigPage( pParent, rSet )
 {
-    aContentsListBox = new SvxMenuEntriesListBox( this, SVX_RES( BOX_ENTRIES ) );
+    aContentsListBox = new SvxMenuEntriesListBox( this, CUI_RES( BOX_ENTRIES ) );
     FreeResource();
 
     PositionContentsListBox();
@@ -2418,7 +2418,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
     aAddCommandsButton.SetClickHdl  (
         LINK( this, SvxMenuConfigPage, AddCommandsHdl ) );
 
-    PopupMenu* pMenu = new PopupMenu( SVX_RES( MODIFY_MENU ) );
+    PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_MENU ) );
     pMenu->SetMenuFlags(
         pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
 
@@ -2426,7 +2426,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
     aModifyTopLevelButton.SetSelectHdl(
         LINK( this, SvxMenuConfigPage, MenuSelectHdl ) );
 
-    PopupMenu* pEntry = new PopupMenu( SVX_RES( MODIFY_ENTRY ) );
+    PopupMenu* pEntry = new PopupMenu( CUI_RES( MODIFY_ENTRY ) );
     pEntry->SetMenuFlags(
         pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
 
@@ -2576,7 +2576,7 @@ bool SvxMenuConfigPage::DeleteSelectedContent()
 short SvxMenuConfigPage::QueryReset()
 {
     String msg =
-        String( SVX_RES( RID_SVXSTR_CONFIRM_MENU_RESET ) );
+        String( CUI_RES( RID_SVXSTR_CONFIRM_MENU_RESET ) );
 
     String saveInName = aSaveInListBox.GetEntry(
         aSaveInListBox.GetSelectEntryPos() );
@@ -2629,11 +2629,11 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
             SvxConfigEntry* pMenuData = GetTopLevelSelection();
 
             String aNewName( stripHotKey( pMenuData->GetName() ) );
-            String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+            String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
             pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
-            pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+            pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
 
             bool ret = pNameDialog->Execute();
 
@@ -2687,11 +2687,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
         case ID_ADD_SUBMENU:
         {
             String aNewName;
-            String aDesc = SVX_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
+            String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
             pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
-            pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
+            pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
 
             bool ret = pNameDialog->Execute();
 
@@ -2733,11 +2733,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
             String aNewName( stripHotKey( pEntry->GetName() ) );
-            String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+            String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
             pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
-            pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+            pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
 
             bool ret = pNameDialog->Execute();
 
@@ -2813,7 +2813,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
             LINK( this, SvxMenuConfigPage, AddFunctionHdl ) );
 
         pSelectorDlg->SetDialogDescription( String(
-            SVX_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ) );
+            CUI_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ) );
     }
 
     // Position the Script Selector over the Add button so it is
@@ -2841,16 +2841,16 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
     Window* pParent, SvxEntries* entries,
     SvxConfigEntry* selection, bool bCreateMenu )
     :
-    ModalDialog( pParent, SVX_RES( MD_MENU_ORGANISER ) ),
-    aMenuNameText( this, SVX_RES( TXT_MENU_NAME ) ),
-    aMenuNameEdit( this, SVX_RES( EDIT_MENU_NAME ) ),
-    aMenuListText( this, SVX_RES( TXT_MENU ) ),
-    aMenuListBox( this, SVX_RES( BOX_MAIN_MENUS ) ),
-    aMoveUpButton( this, SVX_RES( BTN_MENU_UP ) ),
-    aMoveDownButton( this, SVX_RES( BTN_MENU_DOWN ) ),
-    aOKButton( this, SVX_RES( BTN_MENU_ADD ) ),
-    aCloseButton( this, SVX_RES( BTN_MENU_CLOSE ) ),
-    aHelpButton( this, SVX_RES( BTN_MENU_HELP ) ),
+    ModalDialog( pParent, CUI_RES( MD_MENU_ORGANISER ) ),
+    aMenuNameText( this, CUI_RES( TXT_MENU_NAME ) ),
+    aMenuNameEdit( this, CUI_RES( EDIT_MENU_NAME ) ),
+    aMenuListText( this, CUI_RES( TXT_MENU ) ),
+    aMenuListBox( this, CUI_RES( BOX_MAIN_MENUS ) ),
+    aMoveUpButton( this, CUI_RES( BTN_MENU_UP ) ),
+    aMoveDownButton( this, CUI_RES( BTN_MENU_DOWN ) ),
+    aOKButton( this, CUI_RES( BTN_MENU_ADD ) ),
+    aCloseButton( this, CUI_RES( BTN_MENU_CLOSE ) ),
+    aHelpButton( this, CUI_RES( BTN_MENU_HELP ) ),
     bModified( FALSE )
 {
     FreeResource();
@@ -2884,7 +2884,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
     {
         // Generate custom name for new menu
         String prefix =
-            String( SVX_RES( RID_SVXSTR_NEW_MENU ) );
+            String( CUI_RES( RID_SVXSTR_NEW_MENU ) );
 
         OUString newname = generateCustomName( prefix, entries );
         OUString newurl = generateCustomMenuURL( pEntries );
@@ -2939,7 +2939,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
         aMenuNameEdit.Hide();
 
         // change the title
-        SetText( SVX_RES( RID_SVXSTR_MOVE_MENU ) );
+        SetText( CUI_RES( RID_SVXSTR_MOVE_MENU ) );
     }
 
     aMenuListBox.SetSelectHdl(
@@ -3348,7 +3348,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
 {
     SetHelpId( HID_SVX_CONFIG_TOOLBAR );
 
-    aContentsListBox = new SvxToolbarEntriesListBox(this, SVX_RES(BOX_ENTRIES));
+    aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES));
     FreeResource();
     PositionContentsListBox();
     aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR );
@@ -3361,12 +3361,12 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
     aSaveInListBox.SetHelpId( HID_SVX_SAVE_IN );
 
     aTopLevelSeparator.SetText(
-        SVX_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) );
+        CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) );
 
-    aTopLevelLabel.SetText( SVX_RES( RID_SVXSTR_TOOLBAR ) );
-    aModifyTopLevelButton.SetText( SVX_RES( RID_SVXSTR_TOOLBAR ) );
-    aContentsSeparator.SetText( SVX_RES( RID_SVXSTR_TOOLBAR_CONTENT ) );
-    aContentsLabel.SetText( SVX_RES( RID_SVXSTR_COMMANDS ) );
+    aTopLevelLabel.SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
+    aModifyTopLevelButton.SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
+    aContentsSeparator.SetText( CUI_RES( RID_SVXSTR_TOOLBAR_CONTENT ) );
+    aContentsLabel.SetText( CUI_RES( RID_SVXSTR_COMMANDS ) );
 
     aTopLevelListBox.SetSelectHdl(
         LINK( this, SvxToolbarConfigPage, SelectToolbar ) );
@@ -3386,7 +3386,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
     aMoveDownButton.Enable( TRUE );
     aMoveUpButton.Enable( TRUE );
 
-    PopupMenu* pMenu = new PopupMenu( SVX_RES( MODIFY_TOOLBAR ) );
+    PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_TOOLBAR ) );
     pMenu->SetMenuFlags(
         pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
 
@@ -3395,7 +3395,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
         LINK( this, SvxToolbarConfigPage, ToolbarSelectHdl ) );
 
     PopupMenu* pEntry = new PopupMenu(
-        SVX_RES( MODIFY_TOOLBAR_CONTENT ) );
+        CUI_RES( MODIFY_TOOLBAR_CONTENT ) );
     pEntry->SetMenuFlags(
         pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
 
@@ -3516,7 +3516,7 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
              GetTopLevelSelection()->IsDeletable() )
         {
             QueryBox qbox( this,
-                SVX_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
+                CUI_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
 
             if ( qbox.Execute() == RET_YES )
             {
@@ -3571,11 +3571,11 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
         case ID_RENAME:
         {
             String aNewName( stripHotKey( pToolbar->GetName() ) );
-            String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+            String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
             pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
-            pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+            pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
 
             bool ret = pNameDialog->Execute();
 
@@ -3601,7 +3601,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
         case ID_DEFAULT_STYLE:
         {
             QueryBox qbox( this,
-                SVX_RES( QBX_CONFIRM_RESTORE_DEFAULT ) );
+                CUI_RES( QBX_CONFIRM_RESTORE_DEFAULT ) );
 
             if ( qbox.Execute() == RET_YES )
             {
@@ -3662,11 +3662,11 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
             String aNewName( stripHotKey( pEntry->GetName() ) );
-            String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+            String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
             pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
-            pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+            pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
 
             bool ret = pNameDialog->Execute();
 
@@ -4887,7 +4887,7 @@ void SvxToolbarConfigPage::UpdateButtonStates()
 short SvxToolbarConfigPage::QueryReset()
 {
     String msg =
-        String( SVX_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ) );
+        String( CUI_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ) );
 
     String saveInName = aSaveInListBox.GetEntry(
         aSaveInListBox.GetSelectEntryPos() );
@@ -4975,7 +4975,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
     (void)pButton;
 
     String prefix =
-        String( SVX_RES( RID_SVXSTR_NEW_TOOLBAR ) );
+        String( CUI_RES( RID_SVXSTR_NEW_TOOLBAR ) );
 
     OUString aNewName =
         generateCustomName( prefix, GetSaveInData()->GetEntries() );
@@ -5300,14 +5300,14 @@ BOOL SvxToolbarEntriesListBox::NotifyCopying(
 SvxNewToolbarDialog::SvxNewToolbarDialog(
     Window* pWindow, const String& rName )
     :
-    ModalDialog     ( pWindow, SVX_RES( MD_NEW_TOOLBAR ) ),
-    aFtDescription  ( this, SVX_RES( FT_NAME ) ),
-    aEdtName        ( this, SVX_RES( EDT_STRING ) ),
-    aSaveInText     ( this, SVX_RES( TXT_SAVEIN ) ),
-    aBtnOK          ( this, SVX_RES( BTN_OK ) ),
-    aBtnCancel      ( this, SVX_RES( BTN_CANCEL ) ),
-    aBtnHelp        ( this, SVX_RES( BTN_HELP ) ),
-    aSaveInListBox  ( this, SVX_RES( LB_SAVEIN ) )
+    ModalDialog     ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ),
+    aFtDescription  ( this, CUI_RES( FT_NAME ) ),
+    aEdtName        ( this, CUI_RES( EDT_STRING ) ),
+    aSaveInText     ( this, CUI_RES( TXT_SAVEIN ) ),
+    aBtnOK          ( this, CUI_RES( BTN_OK ) ),
+    aBtnCancel      ( this, CUI_RES( BTN_CANCEL ) ),
+    aBtnHelp        ( this, CUI_RES( BTN_HELP ) ),
+    aSaveInListBox  ( this, CUI_RES( LB_SAVEIN ) )
 {
     FreeResource();
 
@@ -5336,16 +5336,16 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
     const uno::Reference< css::ui::XImageManager >& rXImageManager,
     const uno::Reference< css::ui::XImageManager >& rXParentImageManager )
     :
-    ModalDialog          ( pWindow, SVX_RES( MD_ICONSELECTOR ) ),
-    aFtDescription       ( this, SVX_RES( FT_SYMBOLS ) ),
-    aTbSymbol            ( this, SVX_RES( TB_SYMBOLS ) ),
-    aFtNote              ( this, SVX_RES( FT_NOTE ) ),
-    aBtnOK               ( this, SVX_RES( BTN_OK ) ),
-    aBtnCancel           ( this, SVX_RES( BTN_CANCEL ) ),
-    aBtnHelp             ( this, SVX_RES( BTN_HELP ) ),
-    aBtnImport           ( this, SVX_RES( BTN_IMPORT ) ),
-    aBtnDelete           ( this, SVX_RES( BTN_DELETE ) ),
-    aFlSeparator         ( this, SVX_RES( FL_SEPARATOR ) ),
+    ModalDialog          ( pWindow, CUI_RES( MD_ICONSELECTOR ) ),
+    aFtDescription       ( this, CUI_RES( FT_SYMBOLS ) ),
+    aTbSymbol            ( this, CUI_RES( TB_SYMBOLS ) ),
+    aFtNote              ( this, CUI_RES( FT_NOTE ) ),
+    aBtnOK               ( this, CUI_RES( BTN_OK ) ),
+    aBtnCancel           ( this, CUI_RES( BTN_CANCEL ) ),
+    aBtnHelp             ( this, CUI_RES( BTN_HELP ) ),
+    aBtnImport           ( this, CUI_RES( BTN_IMPORT ) ),
+    aBtnDelete           ( this, CUI_RES( BTN_DELETE ) ),
+    aFlSeparator         ( this, CUI_RES( FL_SEPARATOR ) ),
     m_nNextId            ( 0 ),
     m_xImageManager      ( rXImageManager ),
     m_xParentImageManager( rXParentImageManager )
@@ -5638,7 +5638,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton )
 {
     (void)pButton;
 
-    OUString message = String( SVX_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ) );
+    OUString message = String( CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ) );
     bool ret = WarningBox( this, WinBits(WB_OK_CANCEL), message ).Execute();
 
     if ( ret == RET_OK )
@@ -5937,14 +5937,14 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
 SvxIconReplacementDialog :: SvxIconReplacementDialog(
     Window *pWindow, const rtl::OUString& aMessage, bool /*bYestoAll*/ )
     :
-MessBox( pWindow, WB_DEF_YES, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ),  String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
+MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ),  String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
 
 {
     SetImage( WarningBox::GetStandardImage() );
     SetMessText( ReplaceIconName( aMessage ) );
     RemoveButton( 1 );
     AddButton( BUTTON_YES, 2, 0 );
-    AddButton( String( SVX_RES( RID_SVXSTR_YESTOALL ) ), 5, 0 );
+    AddButton( String( CUI_RES( RID_SVXSTR_YESTOALL ) ), 5, 0 );
     AddButton( BUTTON_NO, 3, 0 );
     AddButton( BUTTON_CANCEL, 4, 0 );
 }
@@ -5952,7 +5952,7 @@ MessBox( pWindow, WB_DEF_YES, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM )
 SvxIconReplacementDialog :: SvxIconReplacementDialog(
     Window *pWindow, const rtl::OUString& aMessage )
     :
-MessBox( pWindow, WB_YES_NO_CANCEL, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ),  String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
+MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ),  String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
 {
     SetImage( WarningBox::GetStandardImage() );
     SetMessText( ReplaceIconName( aMessage ));
@@ -5961,7 +5961,7 @@ MessBox( pWindow, WB_YES_NO_CANCEL, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CON
 rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage )
 {
     rtl::OUString name;
-    rtl::OUString message = String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
+    rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
     rtl::OUString placeholder = OUString::createFromAscii( "%ICONNAME" );
     sal_Int32 pos = message.indexOf( placeholder );
     if ( pos != -1 )
@@ -5985,11 +5985,11 @@ USHORT SvxIconReplacementDialog :: ShowDialog()
 SvxIconChangeDialog::SvxIconChangeDialog(
     Window *pWindow, const rtl::OUString& aMessage)
     :
-    ModalDialog            ( pWindow, SVX_RES( MD_ICONCHANGE ) ),
-    aFImageInfo            (this, SVX_RES( FI_INFO ) ),
-    aBtnOK                 (this, SVX_RES(MD_BTN_OK)),
-    aDescriptionLabel      (this, SVX_RES(FTCHGE_DESCRIPTION)),
-    aLineEditDescription   (this, SVX_RES(EDT_ADDR))
+    ModalDialog            ( pWindow, CUI_RES( MD_ICONCHANGE ) ),
+    aFImageInfo            (this, CUI_RES( FI_INFO ) ),
+    aBtnOK                 (this, CUI_RES(MD_BTN_OK)),
+    aDescriptionLabel      (this, CUI_RES(FTCHGE_DESCRIPTION)),
+    aLineEditDescription   (this, CUI_RES(EDT_ADDR))
 {
     FreeResource();
     aFImageInfo.SetImage(InfoBox::GetStandardImage());
diff --git a/svx/source/cui/cfg.hrc b/cui/source/customize/cfg.hrc
index 49c155ef96bf..49c155ef96bf 100644
--- a/svx/source/cui/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
diff --git a/svx/source/cui/cfg.src b/cui/source/customize/cfg.src
index 69f1ccc9c61f..15ac23125668 100644
--- a/svx/source/cui/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "cfg.hrc"
 #include "helpid.hrc"
 
diff --git a/svx/source/cui/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6e1f115ebc53..37b2b9a54ab0 100644
--- a/svx/source/cui/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 #include "cfgutil.hxx"
 
@@ -60,7 +60,7 @@
 #include <basic/sbmod.hxx>
 #include <basic/basmgr.hxx>
 #include <tools/urlobj.hxx>
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
 #include <sfx2/app.hxx>
 #include <sfx2/macrconf.hxx>
 #include <sfx2/minfitem.hxx>
@@ -70,11 +70,11 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/configmgr.hxx>
-#include "svx/dialmgr.hxx"
-#include <svtools/stritem.hxx>
+#include "dialmgr.hxx"
+#include <svl/stritem.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -550,26 +550,26 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
 };
 
 SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
-    Resource(SVX_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
-    m_hdImage(SVX_RES(IMG_HARDDISK)),
-    m_hdImage_hc(SVX_RES(IMG_HARDDISK_HC)),
-    m_libImage(SVX_RES(IMG_LIB)),
-    m_libImage_hc(SVX_RES(IMG_LIB_HC)),
-    m_macImage(SVX_RES(IMG_MACRO)),
-    m_macImage_hc(SVX_RES(IMG_MACRO_HC)),
-    m_docImage(SVX_RES(IMG_DOC)),
-    m_docImage_hc(SVX_RES(IMG_DOC_HC)),
-    m_sMyMacros(String(SVX_RES(STR_MYMACROS))),
-    m_sProdMacros(String(SVX_RES(STR_PRODMACROS))),
-    m_sMacros(String(SVX_RES(STR_BASICMACROS))),
-    m_sDlgMacros(String(SVX_RES(STR_DLG_MACROS))),
-    m_aHumanAppName(String(SVX_RES(STR_HUMAN_APPNAME))),
-    m_aStrGroupStyles(String(SVX_RES(STR_GROUP_STYLES))),
-    m_aScriptType(String(SVX_RES(STR_BASICNAME))),
-    m_collapsedImage(SVX_RES(BMP_COLLAPSED)),
-    m_collapsedImage_hc(SVX_RES(BMP_COLLAPSED_HC)),
-    m_expandedImage(SVX_RES(BMP_EXPANDED)),
-    m_expandedImage_hc(SVX_RES(BMP_EXPANDED_HC))
+    Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
+    m_hdImage(CUI_RES(IMG_HARDDISK)),
+    m_hdImage_hc(CUI_RES(IMG_HARDDISK_HC)),
+    m_libImage(CUI_RES(IMG_LIB)),
+    m_libImage_hc(CUI_RES(IMG_LIB_HC)),
+    m_macImage(CUI_RES(IMG_MACRO)),
+    m_macImage_hc(CUI_RES(IMG_MACRO_HC)),
+    m_docImage(CUI_RES(IMG_DOC)),
+    m_docImage_hc(CUI_RES(IMG_DOC_HC)),
+    m_sMyMacros(String(CUI_RES(STR_MYMACROS))),
+    m_sProdMacros(String(CUI_RES(STR_PRODMACROS))),
+    m_sMacros(String(CUI_RES(STR_BASICMACROS))),
+    m_sDlgMacros(String(CUI_RES(STR_DLG_MACROS))),
+    m_aHumanAppName(String(CUI_RES(STR_HUMAN_APPNAME))),
+    m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
+    m_aScriptType(String(CUI_RES(STR_BASICNAME))),
+    m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
+    m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)),
+    m_expandedImage(CUI_RES(BMP_EXPANDED)),
+    m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC))
 {
     FreeResource();
 }
diff --git a/svx/source/cui/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index dd9e2511b1ea..7f90560d5ab1 100644
--- a/svx/source/cui/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 // include ***************************************************************
 #include <svtools/svmedit.hxx>
@@ -52,13 +52,13 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svtools/eventcfg.hxx>
+#include <unotools/eventcfg.hxx>
 
 #include "headertablistbox.hxx"
 #include "macropg_impl.hxx"
 
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include "eventdlg.hrc"
 #include "helpid.hrc"
 #include "selector.hxx"
@@ -71,21 +71,21 @@ using namespace ::com::sun::star;
 
 SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit ) :
 
-    _SvxMacroTabPage( pParent, SVX_RES(RID_SVXPAGE_EVENTS), rSet ),
-    aSaveInText( this, SVX_RES( TXT_SAVEIN ) ),
-    aSaveInListBox( this, SVX_RES( LB_SAVEIN ) ),
+    _SvxMacroTabPage( pParent, CUI_RES(RID_SVXPAGE_EVENTS), rSet ),
+    aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
+    aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
     bAppConfig  ( TRUE )
 {
-    mpImpl->pStrEvent           = new String( SVX_RES( STR_EVENT ));
-    mpImpl->pAssignedMacro      = new String( SVX_RES( STR_ASSMACRO ));
-    mpImpl->pEventLB            = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ));
-    mpImpl->pAssignFT           = new FixedText( this,  SVX_RES( FT_ASSIGN ));
-    mpImpl->pAssignPB           = new PushButton( this, SVX_RES( PB_ASSIGN ));
-    mpImpl->pDeletePB           = new PushButton( this, SVX_RES( PB_DELETE ));
-    mpImpl->pMacroImg           = new Image( SVX_RES( IMG_MACRO) );
-    mpImpl->pComponentImg       = new Image( SVX_RES( IMG_COMPONENT) );
-    mpImpl->pMacroImg_h         = new Image( SVX_RES( IMG_MACRO_H) );
-    mpImpl->pComponentImg_h     = new Image( SVX_RES( IMG_COMPONENT_H) );
+    mpImpl->pStrEvent           = new String( CUI_RES( STR_EVENT ));
+    mpImpl->pAssignedMacro      = new String( CUI_RES( STR_ASSMACRO ));
+    mpImpl->pEventLB            = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ));
+    mpImpl->pAssignFT           = new FixedText( this,  CUI_RES( FT_ASSIGN ));
+    mpImpl->pAssignPB           = new PushButton( this, CUI_RES( PB_ASSIGN ));
+    mpImpl->pDeletePB           = new PushButton( this, CUI_RES( PB_DELETE ));
+    mpImpl->pMacroImg           = new Image( CUI_RES( IMG_MACRO) );
+    mpImpl->pComponentImg       = new Image( CUI_RES( IMG_COMPONENT) );
+    mpImpl->pMacroImg_h         = new Image( CUI_RES( IMG_MACRO_H) );
+    mpImpl->pComponentImg_h     = new Image( CUI_RES( IMG_COMPONENT_H) );
 
     FreeResource();
 
diff --git a/svx/source/cui/eventdlg.hrc b/cui/source/customize/eventdlg.hrc
index 245ff183313e..6340186d527c 100644
--- a/svx/source/cui/eventdlg.hrc
+++ b/cui/source/customize/eventdlg.hrc
@@ -32,7 +32,7 @@
 
  ////DF temp to figure out what's needed from these
 //DF #include "sfx.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "macropg.hrc"
 
 #define TXT_SAVEIN      10
diff --git a/svx/source/inc/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 37fc58ea7639..37fc58ea7639 100644
--- a/svx/source/inc/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
diff --git a/svx/source/cui/eventdlg.src b/cui/source/customize/eventdlg.src
index 8c16b8f45d56..8c16b8f45d56 100644
--- a/svx/source/cui/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
diff --git a/svx/source/cui/macropg.cxx b/cui/source/customize/macropg.cxx
index bda5aca7372b..2bd9194b219b 100644
--- a/svx/source/cui/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -29,39 +29,31 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 #include <basic/basmgr.hxx>
 
-
 #include "macropg.hxx"
 #include <vcl/msgbox.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
-#ifndef _SV_MEDIT_HXX
+#include <svl/svstdarr.hxx>
 #include <svtools/svmedit.hxx>
-#endif
-#ifndef _EITEM_HXX
-#include <svtools/eitem.hxx>
-#endif
+#include <svl/eitem.hxx>
 #include <tools/diagnose_ex.h>
-
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/macrconf.hxx>
 #include <sfx2/sfxdefs.hxx>
-
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "selector.hxx"
 #include "cfg.hxx"
 #include "macropg.hrc"
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "headertablistbox.hxx"
 #include "macropg_impl.hxx"
-
+#include <svx/dialogs.hrc> // RID_SVXPAGE_MACROASSIGN
 #include <comphelper/namedvaluecollection.hxx>
 
 #include <algorithm>
@@ -181,7 +173,7 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
     maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
     maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
 {
-//  maListBox.SetWindowBits( WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+    maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
 }
 
 _HeaderTabListBox::~_HeaderTabListBox()
@@ -575,7 +567,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
         }
 
         ::rtl::OUString eventURL = h_it->second.second;
-        String displayName( SVX_RES( displayableEvent->nEventResourceID ) );
+        String displayName( CUI_RES( displayableEvent->nEventResourceID ) );
 
         displayName += '\t';
         SvLBoxEntry*    _pE = rListBox.InsertEntry( displayName );
@@ -847,19 +839,19 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa
 }
 
 SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, Reference< container::XNameReplace > xNameReplace, sal_uInt16 nSelectedIndex )
-    : _SvxMacroTabPage( pParent, SVX_RES( RID_SVXPAGE_MACROASSIGN ), rSet )
+    : _SvxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_MACROASSIGN ), rSet )
 {
-    mpImpl->pStrEvent           = new String(                       SVX_RES( STR_EVENT ) );
-    mpImpl->pAssignedMacro      = new String(                       SVX_RES( STR_ASSMACRO ) );
-    mpImpl->pEventLB            = new _HeaderTabListBox( this,      SVX_RES( LB_EVENT ) );
-    mpImpl->pAssignFT           = new FixedText( this,              SVX_RES( FT_ASSIGN ) );
-    mpImpl->pAssignPB           = new PushButton( this,             SVX_RES( PB_ASSIGN ) );
-    mpImpl->pDeletePB           = new PushButton( this,             SVX_RES( PB_DELETE ) );
-    mpImpl->pAssignComponentPB  = new PushButton( this,         SVX_RES( PB_ASSIGN_COMPONENT ) );
-    mpImpl->pMacroImg           = new Image(                        SVX_RES(IMG_MACRO) );
-    mpImpl->pComponentImg       = new Image(                        SVX_RES(IMG_COMPONENT) );
-    mpImpl->pMacroImg_h         = new Image(                        SVX_RES(IMG_MACRO_H) );
-    mpImpl->pComponentImg_h     = new Image(                        SVX_RES(IMG_COMPONENT_H) );
+    mpImpl->pStrEvent           = new String(                       CUI_RES( STR_EVENT ) );
+    mpImpl->pAssignedMacro      = new String(                       CUI_RES( STR_ASSMACRO ) );
+    mpImpl->pEventLB            = new _HeaderTabListBox( this,      CUI_RES( LB_EVENT ) );
+    mpImpl->pAssignFT           = new FixedText( this,              CUI_RES( FT_ASSIGN ) );
+    mpImpl->pAssignPB           = new PushButton( this,             CUI_RES( PB_ASSIGN ) );
+    mpImpl->pDeletePB           = new PushButton( this,             CUI_RES( PB_DELETE ) );
+    mpImpl->pAssignComponentPB  = new PushButton( this,         CUI_RES( PB_ASSIGN_COMPONENT ) );
+    mpImpl->pMacroImg           = new Image(                        CUI_RES(IMG_MACRO) );
+    mpImpl->pComponentImg       = new Image(                        CUI_RES(IMG_COMPONENT) );
+    mpImpl->pMacroImg_h         = new Image(                        CUI_RES(IMG_MACRO_H) );
+    mpImpl->pComponentImg_h     = new Image(                        CUI_RES(IMG_COMPONENT_H) );
 
     FreeResource();
 
@@ -927,12 +919,12 @@ IMPL_LINK(AssignComponentDialog, ButtonHandler, Button *, EMPTYARG)
 }
 
 AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL )
-    : ModalDialog( pParent, SVX_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
-    , maMethodLabel( this, SVX_RES( FT_METHOD ) )
-    , maMethodEdit( this, SVX_RES( EDIT_METHOD ) )
-    , maOKButton( this, SVX_RES( RID_PB_OK ) )
-    , maCancelButton( this, SVX_RES( RID_PB_CANCEL ) )
-    , maHelpButton( this, SVX_RES( RID_PB_HELP ) )
+    : ModalDialog( pParent, CUI_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
+    , maMethodLabel( this, CUI_RES( FT_METHOD ) )
+    , maMethodEdit( this, CUI_RES( EDIT_METHOD ) )
+    , maOKButton( this, CUI_RES( RID_PB_OK ) )
+    , maCancelButton( this, CUI_RES( RID_PB_CANCEL ) )
+    , maHelpButton( this, CUI_RES( RID_PB_HELP ) )
     , maURL( rURL )
 {
     FreeResource();
diff --git a/svx/source/cui/macropg.hrc b/cui/source/customize/macropg.hrc
index ccf348d0cee0..ccf348d0cee0 100644
--- a/svx/source/cui/macropg.hrc
+++ b/cui/source/customize/macropg.hrc
diff --git a/svx/source/cui/macropg.src b/cui/source/customize/macropg.src
index 92e1e718ba61..c5db4bab6af7 100644
--- a/svx/source/cui/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -30,8 +30,9 @@
 
 #include <sfx2/sfx.hrc>
 #include "macropg.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
+#include <svx/dialogs.hrc>
 
 #define MASKCOLOR  MaskColor = \
     Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
diff --git a/svx/source/inc/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 0563c2e05151..0563c2e05151 100644
--- a/svx/source/inc/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
diff --git a/svtools/source/items/makefile.mk b/cui/source/customize/makefile.mk
index 651e54bb7e23..f4c9303cc6ba 100644..100755
--- a/svtools/source/items/makefile.mk
+++ b/cui/source/customize/makefile.mk
@@ -1,14 +1,14 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.13 $
+# $Revision: 1.65 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -28,38 +28,40 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-
 PRJ=..$/..
-PRJNAME=svtools
-TARGET=items
+PRJNAME=cui
+TARGET=customize
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=\
-    $(SLO)$/aeitem.obj	\
-    $(SLO)$/eitem.obj	\
-    $(SLO)$/flagitem.obj	\
-    $(SLO)$/globalnameitem.obj	\
-    $(SLO)$/imageitm.obj    \
-    $(SLO)$/intitem.obj	\
-    $(SLO)$/itemdel.obj	\
-    $(SLO)$/macitem.obj	\
-    $(SLO)$/poolcach.obj	\
-    $(SLO)$/ptitem.obj	\
-    $(SLO)$/rectitem.obj	\
-    $(SLO)$/rngitem.obj	\
-    $(SLO)$/stritem.obj	\
-    $(SLO)$/style.obj	\
-    $(SLO)$/szitem.obj	\
-    $(SLO)$/wallitem.obj
+SRS1NAME=customize
+SRC1FILES =  \
+        acccfg.src \
+        cfg.src \
+        eventdlg.src \
+        macropg.src \
+        selector.src \
+
+
+SLOFILES+=\
+        $(SLO)$/acccfg.obj \
+        $(SLO)$/cfg.obj \
+        $(SLO)$/cfgutil.obj \
+        $(SLO)$/eventdlg.obj \
+        $(SLO)$/macropg.obj \
+        $(SLO)$/selector.obj \
+
 
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
diff --git a/svx/source/cui/selector.cxx b/cui/source/customize/selector.cxx
index 83e4aa2b1612..4379c1287d70 100644
--- a/svx/source/cui/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -29,20 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 #include <vcl/help.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <vcl/metric.hxx>
-
 #include "selector.hxx"
-#include <svx/dialmgr.hxx>
-
+#include <dialmgr.hxx>
 #include "selector.hrc"
-#include "fmresids.hrc"
-#include <svx/dialogs.hrc>
-
+#include <svx/fmresids.hrc> // for RID_SVXIMG_...
+#include <svx/dialmgr.hxx>  // for RID_SVXIMG_...
+#include <cuires.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
@@ -55,7 +51,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
@@ -72,7 +67,6 @@
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <com/sun/star/frame/DispatchInformation.hpp>
 #include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -83,7 +77,7 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::container;
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/imagemgr.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
@@ -621,7 +615,7 @@ void SvxConfigGroupListBox_Impl::Init()
                     new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, rootNode );
 
                 String aTitle =
-                    String( SVX_RES( STR_SELECTOR_MACROS ) );
+                    String( CUI_RES( STR_SELECTOR_MACROS ) );
 
                 SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
                 pNewEntry->SetUserData( pInfo );
@@ -1013,21 +1007,21 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
 SvxScriptSelectorDialog::SvxScriptSelectorDialog(
   Window* pParent, BOOL bShowSlots, const Reference< frame::XFrame >& xFrame )
     :
-    ModelessDialog( pParent, SVX_RES( RID_DLG_SCRIPTSELECTOR ) ),
-    aDialogDescription( this, SVX_RES( TXT_SELECTOR_DIALOG_DESCRIPTION ) ),
-    aGroupText( this, SVX_RES( TXT_SELECTOR_CATEGORIES ) ),
-    aCategories( this, SVX_RES( BOX_SELECTOR_CATEGORIES ), bShowSlots, xFrame ),
-    aFunctionText( this, SVX_RES( TXT_SELECTOR_COMMANDS ) ),
-    aCommands( this, SVX_RES( BOX_SELECTOR_COMMANDS ) ),
-    aOKButton( this, SVX_RES( BTN_SELECTOR_OK ) ),
-    aCancelButton( this, SVX_RES( BTN_SELECTOR_CANCEL ) ),
-    aHelpButton( this, SVX_RES( BTN_SELECTOR_HELP ) ),
-    aDescription( this, SVX_RES( GRP_SELECTOR_DESCRIPTION ) ),
-    aDescriptionText( this, SVX_RES( TXT_SELECTOR_DESCRIPTION ) ),
+    ModelessDialog( pParent, CUI_RES( RID_DLG_SCRIPTSELECTOR ) ),
+    aDialogDescription( this, CUI_RES( TXT_SELECTOR_DIALOG_DESCRIPTION ) ),
+    aGroupText( this, CUI_RES( TXT_SELECTOR_CATEGORIES ) ),
+    aCategories( this, CUI_RES( BOX_SELECTOR_CATEGORIES ), bShowSlots, xFrame ),
+    aFunctionText( this, CUI_RES( TXT_SELECTOR_COMMANDS ) ),
+    aCommands( this, CUI_RES( BOX_SELECTOR_COMMANDS ) ),
+    aOKButton( this, CUI_RES( BTN_SELECTOR_OK ) ),
+    aCancelButton( this, CUI_RES( BTN_SELECTOR_CANCEL ) ),
+    aHelpButton( this, CUI_RES( BTN_SELECTOR_HELP ) ),
+    aDescription( this, CUI_RES( GRP_SELECTOR_DESCRIPTION ) ),
+    aDescriptionText( this, CUI_RES( TXT_SELECTOR_DESCRIPTION ) ),
     m_bShowSlots( bShowSlots )
 {
 
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
 
     // If we are showing Slot API commands update labels in the UI, and
     // enable drag'n'drop
@@ -1214,7 +1208,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
 void
 SvxScriptSelectorDialog::SetRunLabel()
 {
-    aOKButton.SetText( String( SVX_RES( STR_SELECTOR_RUN ) ) );
+    aOKButton.SetText( String( CUI_RES( STR_SELECTOR_RUN ) ) );
 }
 
 void
diff --git a/svx/source/cui/selector.hrc b/cui/source/customize/selector.hrc
index 68c87b493593..68c87b493593 100644
--- a/svx/source/cui/selector.hrc
+++ b/cui/source/customize/selector.hrc
diff --git a/svx/source/cui/selector.src b/cui/source/customize/selector.src
index de972cdebc01..3985975fb4cf 100644
--- a/svx/source/cui/selector.src
+++ b/cui/source/customize/selector.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "selector.hrc"
 
 #define MASKCOLOR  MaskColor = \
diff --git a/svx/source/cui/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index 3614c40c1370..9c26dc321f7b 100644
--- a/svx/source/cui/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -29,11 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <SpellAttrib.hxx>
 #include <vcl/font.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/svx/source/cui/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index ac2bb278c594..ac2bb278c594 100644
--- a/svx/source/cui/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
diff --git a/svx/source/cui/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 86dbf966619a..0e69585a4ff4 100644
--- a/svx/source/cui/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
@@ -42,22 +38,18 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
-#ifndef _SCRBAR_HXX //autogen
 #include <vcl/scrbar.hxx>
-#endif
 #include <SpellAttrib.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/undo.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/undo.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svtools/textdata.hxx>
 #include <svtools/filter.hxx>
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
 #include <svx/splwrap.hxx>
 #include <linguistic/lngprops.hxx>
-#ifndef _LINGUISTIC_MISC_HHX_
 #include <linguistic/misc.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -68,22 +60,18 @@
 #include <vcl/help.hxx>
 #include <vcl/graph.hxx>
 #include <osl/file.hxx>
-#include <impgrf.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/impgrf.hxx>
+#include <cuires.hrc>
 #include <helpid.hrc>
 #include "SpellDialog.hrc"
-
-
-
-#include "optitems.hxx"
+#include <svx/optitems.hxx>
 #include <svx/svxenum.hxx>
 #include <svx/SpellDialogChildWindow.hxx>
 #include "SpellDialog.hxx"
-//#include <svx/splwrap.hxx>      // Der Wrapper
-#include "dlgutil.hxx"      // language
-#include <svx/optlingu.hxx>
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
+#include <svx/dlgutil.hxx>
+#include "optlingu.hxx"
+#include <dialmgr.hxx>
+#include <svx/svxerr.hxx>
 #include "treeopt.hxx"
 
 using namespace ::com::sun::star;
@@ -216,43 +204,43 @@ SpellDialog::SpellDialog(
             : SfxModelessDialog (_pBindings,
                                     pChildWindow,
                                     pParent,
-                                    SVX_RES(RID_SVXDLG_SPELLCHECK)),
-
-    aVendorImageFI  ( this , SVX_RES( IMG_VENDOR ) ),
-    aLanguageFT     ( this, SVX_RES( FT_LANGUAGE ) ),
-    aLanguageLB     ( this, SVX_RES( LB_LANGUAGE ) ),
-    aNotInDictFT    ( this, SVX_RES( FT_NOTINDICT ) ),
-    aSentenceED      ( this, SVX_RES( ED_NEWWORD ) ),
-    aSuggestionFT   ( this, SVX_RES( FT_SUGGESTION ) ),
-    aSuggestionLB   ( this, SVX_RES( LB_SUGGESTION ) ),
-
-    aIgnorePB       ( this, SVX_RES( PB_IGNORE ) ),
-    aIgnoreAllPB    ( this, SVX_RES( PB_IGNOREALL ) ),
-    aIgnoreRulePB   ( this, SVX_RES( PB_IGNORERULE ) ),
-    aAddToDictMB    ( this, SVX_RES( MB_ADDTODICT ) ),
-
-    aChangePB       ( this, SVX_RES( PB_CHANGE ) ),
-    aChangeAllPB    ( this, SVX_RES( PB_CHANGEALL ) ),
-    aExplainPB      ( this, SVX_RES( PB_EXPLAIN) ),
-    aAutoCorrPB     ( this, SVX_RES( PB_AUTOCORR ) ),
-
-    aCheckGrammarCB ( this, SVX_RES( CB_CHECK_GRAMMAR ) ),
-
-    aHelpPB         ( this, SVX_RES( PB_HELP ) ),
-    aOptionsPB      ( this, SVX_RES( PB_OPTIONS ) ),
-    aUndoPB         ( this, SVX_RES( PB_UNDO ) ),
-    aClosePB        ( this, SVX_RES( PB_CLOSE ) ),
-    aBackgroundGB   ( this, SVX_RES( GB_BACKGROUND ) ),
-
-    aVendorImage    ( SVX_RES( IMG_DEFAULT_VENDOR ) ),
-    aVendorImageHC  ( SVX_RES( IMG_DEFAULT_VENDOR_HC ) ),
-
-    aResumeST       ( SVX_RES(ST_RESUME )),
+                                    CUI_RES(RID_SVXDLG_SPELLCHECK)),
+
+    aVendorImageFI  ( this , CUI_RES( IMG_VENDOR ) ),
+    aLanguageFT     ( this, CUI_RES( FT_LANGUAGE ) ),
+    aLanguageLB     ( this, CUI_RES( LB_LANGUAGE ) ),
+    aNotInDictFT    ( this, CUI_RES( FT_NOTINDICT ) ),
+    aSentenceED      ( this, CUI_RES( ED_NEWWORD ) ),
+    aSuggestionFT   ( this, CUI_RES( FT_SUGGESTION ) ),
+    aSuggestionLB   ( this, CUI_RES( LB_SUGGESTION ) ),
+
+    aIgnorePB       ( this, CUI_RES( PB_IGNORE ) ),
+    aIgnoreAllPB    ( this, CUI_RES( PB_IGNOREALL ) ),
+    aIgnoreRulePB   ( this, CUI_RES( PB_IGNORERULE ) ),
+    aAddToDictMB    ( this, CUI_RES( MB_ADDTODICT ) ),
+
+    aChangePB       ( this, CUI_RES( PB_CHANGE ) ),
+    aChangeAllPB    ( this, CUI_RES( PB_CHANGEALL ) ),
+    aExplainPB      ( this, CUI_RES( PB_EXPLAIN) ),
+    aAutoCorrPB     ( this, CUI_RES( PB_AUTOCORR ) ),
+
+    aCheckGrammarCB ( this, CUI_RES( CB_CHECK_GRAMMAR ) ),
+
+    aHelpPB         ( this, CUI_RES( PB_HELP ) ),
+    aOptionsPB      ( this, CUI_RES( PB_OPTIONS ) ),
+    aUndoPB         ( this, CUI_RES( PB_UNDO ) ),
+    aClosePB        ( this, CUI_RES( PB_CLOSE ) ),
+    aBackgroundGB   ( this, CUI_RES( GB_BACKGROUND ) ),
+
+    aVendorImage    ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
+    aVendorImageHC  ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
+
+    aResumeST       ( CUI_RES(ST_RESUME )),
     aIgnoreOnceST   ( aIgnorePB.GetText()),
-    aNoSuggestionsST( SVX_RES(ST_NOSUGGESTIONS)),
-    m_sTitleSpelling              ( SVX_RES( ST_SPELLING                        ) ),
-    m_sTitleSpellingGrammar       ( SVX_RES( ST_SPELLING_AND_GRAMMAR            ) ),
-    m_sTitleSpellingGrammarVendor ( SVX_RES( ST_SPELLING_AND_GRAMMAR_VENDORNAME ) ),
+    aNoSuggestionsST( CUI_RES(ST_NOSUGGESTIONS)),
+    m_sTitleSpelling              ( CUI_RES( ST_SPELLING                        ) ),
+    m_sTitleSpellingGrammar       ( CUI_RES( ST_SPELLING_AND_GRAMMAR            ) ),
+    m_sTitleSpellingGrammarVendor ( CUI_RES( ST_SPELLING_AND_GRAMMAR_VENDORNAME ) ),
     aDialogUndoLink( LINK (this, SpellDialog, DialogUndoHdl)),
     bModified( false ),
     bFocusLocked( true ),
diff --git a/svx/source/cui/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc
index f571525a25db..f571525a25db 100644
--- a/svx/source/cui/SpellDialog.hrc
+++ b/cui/source/dialogs/SpellDialog.hrc
diff --git a/svx/source/cui/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index f7cccd5febc2..61ef8b4e6ab2 100644
--- a/svx/source/cui/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "SpellDialog.hrc"
  // pragma ----------------------------------------------------------------
diff --git a/svx/source/cui/charmap.hrc b/cui/source/dialogs/charmap.hrc
index 49dae5c98f06..49dae5c98f06 100644
--- a/svx/source/cui/charmap.hrc
+++ b/cui/source/dialogs/charmap.hrc
diff --git a/svx/source/cui/charmap.src b/cui/source/dialogs/charmap.src
index 8b93fe850887..c8b1030cb328 100644
--- a/svx/source/cui/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -29,10 +29,11 @@
  ************************************************************************/
 
  // include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+
+#include <cuires.hrc>
 #include "charmap.hrc"
 #include "helpid.hrc"
+#include <svx/dialogs.hrc> // for RID_SVXDLG_CHARMAP
 
  // RID_SVXDLG_CHARMAP ----------------------------------------------------
 ModalDialog RID_SVXDLG_CHARMAP
diff --git a/svx/source/cui/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index 161e1e2bf206..4f2ab5677b63 100644
--- a/svx/source/cui/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -29,13 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 #include "commonlingui.hxx"
 
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <vcl/decoview.hxx>
 
 #include "hangulhanjadlg.hrc"
@@ -92,21 +90,21 @@ __EXPORT SvxClickInfoCtr::~SvxClickInfoCtr()
 //=============================================================================
 //-----------------------------------------------------------------------------
 SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent )
-    :Window( _pParent, SVX_RES( RID_SVX_WND_COMMON_LINGU ) )
-    ,aWordText      ( this, SVX_RES( FT_WORD ) )
-    ,aAktWord       ( this, SVX_RES( FT_AKTWORD ) )
-    ,aNewWord       ( this, SVX_RES( FT_NEWWORD ) )
-    ,aNewWordED     ( this, SVX_RES( ED_NEWWORD ) )
-    ,aSuggestionFT  ( this, SVX_RES( FT_SUGGESTION ) )
-    ,aIgnoreBtn     ( this, SVX_RES( BTN_IGNORE ) )
-    ,aIgnoreAllBtn  ( this, SVX_RES( BTN_IGNOREALL ) )
-    ,aChangeBtn     ( this, SVX_RES( BTN_CHANGE ) )
-    ,aChangeAllBtn  ( this, SVX_RES( BTN_CHANGEALL ) )
-    ,aOptionsBtn    ( this, SVX_RES( BTN_OPTIONS ) )
-    ,aStatusText    ( this, SVX_RES( FT_STATUS ) )
-    ,aHelpBtn       ( this, SVX_RES( BTN_SPL_HELP ) )
-    ,aCancelBtn     ( this, SVX_RES( BTN_SPL_CANCEL ) )
-    ,aAuditBox      ( this, SVX_RES( GB_AUDIT ) )
+    :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) )
+    ,aWordText      ( this, CUI_RES( FT_WORD ) )
+    ,aAktWord       ( this, CUI_RES( FT_AKTWORD ) )
+    ,aNewWord       ( this, CUI_RES( FT_NEWWORD ) )
+    ,aNewWordED     ( this, CUI_RES( ED_NEWWORD ) )
+    ,aSuggestionFT  ( this, CUI_RES( FT_SUGGESTION ) )
+    ,aIgnoreBtn     ( this, CUI_RES( BTN_IGNORE ) )
+    ,aIgnoreAllBtn  ( this, CUI_RES( BTN_IGNOREALL ) )
+    ,aChangeBtn     ( this, CUI_RES( BTN_CHANGE ) )
+    ,aChangeAllBtn  ( this, CUI_RES( BTN_CHANGEALL ) )
+    ,aOptionsBtn    ( this, CUI_RES( BTN_OPTIONS ) )
+    ,aStatusText    ( this, CUI_RES( FT_STATUS ) )
+    ,aHelpBtn       ( this, CUI_RES( BTN_SPL_HELP ) )
+    ,aCancelBtn     ( this, CUI_RES( BTN_SPL_CANCEL ) )
+    ,aAuditBox      ( this, CUI_RES( GB_AUDIT ) )
 {
     FreeResource();
 
diff --git a/svx/source/cui/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index d1781e83348f..d1781e83348f 100644
--- a/svx/source/cui/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
diff --git a/svx/source/cui/commonlingui.src b/cui/source/dialogs/commonlingui.src
index c229953ad3c8..1a58a9ef7fa8 100644
--- a/svx/source/cui/commonlingui.src
+++ b/cui/source/dialogs/commonlingui.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "hangulhanjadlg.hrc"
 
diff --git a/svx/source/cui/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 4de8df0e7d7d..83dc06e606a3 100644
--- a/svx/source/cui/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -26,11 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
@@ -43,41 +39,40 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itempool.hxx>
 
 #include <rtl/textenc.h>
 #include <svx/ucsubset.hxx>
 
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include "cuicharmap.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
-#include <fontitem.hxx>
+#include <svx/fontitem.hxx>
 #include "charmap.hrc"
 #include "macroass.hxx"
 
 // class SvxCharacterMap =================================================
 
 SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* pSet ) :
-    SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_CHARMAP ) ),
+    SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_CHARMAP ) ),
     mpCharMapData( 0 )
 {
     SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, FALSE );
     if ( pItem )
         bOne = pItem->GetValue();
 
-    mpCharMapData =  new SvxCharMapData( this, bOne, &DIALOG_MGR() );
+    mpCharMapData =  new SvxCharMapData( this, bOne, &CUI_MGR() );
 
     SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE );
     if ( pCharItem )
         SetChar( pCharItem->GetValue() );
 
-
     SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, FALSE );
     if ( pDisableItem && pDisableItem->GetValue() )
         DisableFontSelection();
@@ -571,7 +566,7 @@ IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG )
 
 #include <sfx2/objsh.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG )
 {
diff --git a/svx/source/cui/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index b0c80f8297ef..7411224a0f93 100644
--- a/svx/source/cui/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -29,43 +29,27 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif // _SVX_FMRESIDS_HRC
 #include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
-
-
 #include <vcl/svapp.hxx>
 #include <tools/shl.hxx>
-#include <svx/dialmgr.hxx>
-
-#include <sfx2/tabdlg.hxx> //add by CHINA001 for SfxItemSet
+#include <dialmgr.hxx>
+#include <sfx2/tabdlg.hxx>
 #include <osl/mutex.hxx>
 #include <sfx2/app.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svtools/filerec.hxx>
-#include "fmsrcimp.hxx"
-#include "fmsrccfg.hxx"
-
-#ifndef _FMSEARCH_HRC
+#include <cuires.hrc>
+#include <svl/filerec.hxx>
+#include <svx/fmsrccfg.hxx>
+#include <svx/fmsrcimp.hxx>
 #include "fmsearch.hrc"
-#endif // _FMSEARCH_HRC
 #include "cuifmsearch.hxx"
-#include "srchdlg.hxx"
-#include <svtools/cjkoptions.hxx>
+#include <svx/srchdlg.hxx>
+#include <svl/cjkoptions.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <comphelper/processfactory.hxx>
-
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::i18n;
@@ -114,39 +98,39 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
 //------------------------------------------------------------------------
 FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext,
     const Link& lnkContextSupplier)
-    :ModalDialog(pParent, SVX_RES(RID_SVXDLG_SEARCHFORM))
-    ,m_flSearchFor              (this, SVX_RES(FL_SEARCHFOR))
-    ,m_rbSearchForText          (this, SVX_RES(RB_SEARCHFORTEXT))
-    ,m_rbSearchForNull          (this, SVX_RES(RB_SEARCHFORNULL))
-    ,m_rbSearchForNotNull       (this, SVX_RES(RB_SEARCHFORNOTNULL))
-    ,m_cmbSearchText            (this, SVX_RES(CMB_SEARCHTEXT))
-    ,m_flWhere                  (this, SVX_RES(FL_WHERE))
-    ,m_ftForm                   (this, SVX_RES(FT_FORM))
-    ,m_lbForm                   (this, SVX_RES(LB_FORM))
-    ,m_rbAllFields              (this, SVX_RES(RB_ALLFIELDS))
-    ,m_rbSingleField            (this, SVX_RES(RB_SINGLEFIELD))
-    ,m_lbField                  (this, SVX_RES(LB_FIELD))
-    ,m_flOptions                (this, SVX_RES(FL_OPTIONS))
-    ,m_ftPosition               (this, SVX_RES(FT_POSITION))
-    ,m_lbPosition               (this, SVX_RES(LB_POSITION))
-    ,m_cbUseFormat              (this, SVX_RES(CB_USEFORMATTER))
-    ,m_cbCase                   (this, SVX_RES(CB_CASE))
-    ,m_cbBackwards              (this, SVX_RES(CB_BACKWARD))
-    ,m_cbStartOver              (this, SVX_RES(CB_STARTOVER))
-    ,m_cbWildCard               (this, SVX_RES(CB_WILDCARD))
-    ,m_cbRegular                (this, SVX_RES(CB_REGULAR))
-    ,m_cbApprox                 (this, SVX_RES(CB_APPROX))
-    ,m_pbApproxSettings         (this, SVX_RES(PB_APPROXSETTINGS))
-    ,m_aHalfFullFormsCJK        (this, SVX_RES(CB_HALFFULLFORMS))
-    ,m_aSoundsLikeCJK           (this, SVX_RES(CB_SOUNDSLIKECJK))
-    ,m_aSoundsLikeCJKSettings   (this, SVX_RES(PB_SOUNDSLIKESETTINGS))
-    ,m_flState                  (this, SVX_RES(FL_STATE))
-    ,m_ftRecordLabel            (this, SVX_RES(FT_RECORDLABEL))
-    ,m_ftRecord                 (this, SVX_RES(FT_RECORD))
-    ,m_ftHint                   (this, SVX_RES(FT_HINT))
-    ,m_pbSearchAgain            (this, SVX_RES(PB_SEARCH))
-    ,m_pbClose                  (this, SVX_RES(1))
-    ,m_pbHelp                   (this, SVX_RES(1))
+    :ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM))
+    ,m_flSearchFor              (this, CUI_RES(FL_SEARCHFOR))
+    ,m_rbSearchForText          (this, CUI_RES(RB_SEARCHFORTEXT))
+    ,m_rbSearchForNull          (this, CUI_RES(RB_SEARCHFORNULL))
+    ,m_rbSearchForNotNull       (this, CUI_RES(RB_SEARCHFORNOTNULL))
+    ,m_cmbSearchText            (this, CUI_RES(CMB_SEARCHTEXT))
+    ,m_flWhere                  (this, CUI_RES(FL_WHERE))
+    ,m_ftForm                   (this, CUI_RES(FT_FORM))
+    ,m_lbForm                   (this, CUI_RES(LB_FORM))
+    ,m_rbAllFields              (this, CUI_RES(RB_ALLFIELDS))
+    ,m_rbSingleField            (this, CUI_RES(RB_SINGLEFIELD))
+    ,m_lbField                  (this, CUI_RES(LB_FIELD))
+    ,m_flOptions                (this, CUI_RES(FL_OPTIONS))
+    ,m_ftPosition               (this, CUI_RES(FT_POSITION))
+    ,m_lbPosition               (this, CUI_RES(LB_POSITION))
+    ,m_cbUseFormat              (this, CUI_RES(CB_USEFORMATTER))
+    ,m_cbCase                   (this, CUI_RES(CB_CASE))
+    ,m_cbBackwards              (this, CUI_RES(CB_BACKWARD))
+    ,m_cbStartOver              (this, CUI_RES(CB_STARTOVER))
+    ,m_cbWildCard               (this, CUI_RES(CB_WILDCARD))
+    ,m_cbRegular                (this, CUI_RES(CB_REGULAR))
+    ,m_cbApprox                 (this, CUI_RES(CB_APPROX))
+    ,m_pbApproxSettings         (this, CUI_RES(PB_APPROXSETTINGS))
+    ,m_aHalfFullFormsCJK        (this, CUI_RES(CB_HALFFULLFORMS))
+    ,m_aSoundsLikeCJK           (this, CUI_RES(CB_SOUNDSLIKECJK))
+    ,m_aSoundsLikeCJKSettings   (this, CUI_RES(PB_SOUNDSLIKESETTINGS))
+    ,m_flState                  (this, CUI_RES(FL_STATE))
+    ,m_ftRecordLabel            (this, CUI_RES(FT_RECORDLABEL))
+    ,m_ftRecord                 (this, CUI_RES(FT_RECORD))
+    ,m_ftHint                   (this, CUI_RES(FT_HINT))
+    ,m_pbSearchAgain            (this, CUI_RES(PB_SEARCH))
+    ,m_pbClose                  (this, CUI_RES(1))
+    ,m_pbHelp                   (this, CUI_RES(1))
     ,m_sSearch                  ( m_pbSearchAgain.GetText() )
     ,m_sCancel                  ( Button::GetStandardText( BUTTON_CANCEL ) )
     ,m_pPreSearchFocus( NULL )
@@ -295,7 +279,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI
         RID_STR_SEARCH_WHOLE
     };
     for ( size_t i=0; i<sizeof(nResIds)/sizeof(nResIds[0]); ++i )
-        m_lbPosition.InsertEntry( String( SVX_RES( nResIds[i] ) ) );
+        m_lbPosition.InsertEntry( String( CUI_RES( nResIds[i] ) ) );
     m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE);
 
     // die Feld-Listbox
@@ -434,7 +418,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, m_pSearchEngine->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS );
+            AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() );
             DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
             aDlg->Execute(); //CHINA001 aDlg.Execute();
 
@@ -503,7 +487,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
     // Richtung -> weiterreichen und Checkbox-Text fuer StartOver neu setzen
     else if (pBox == &m_cbBackwards)
     {
-        m_cbStartOver.SetText( String( SVX_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
+        m_cbStartOver.SetText( String( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
         m_pSearchEngine->SetDirection(!bChecked);
     }
     // Aehnlichkeitssuche oder regulaerer Ausdruck
@@ -797,7 +781,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
         case FmSearchProgress::STATE_PROGRESS:
             if (pProgress->bOverflow)
             {
-                String sHint( SVX_RES( m_cbBackwards.IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
+                String sHint( CUI_RES( m_cbBackwards.IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
                 m_ftHint.SetText( sHint );
                 m_ftHint.Invalidate();
             }
@@ -807,7 +791,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
             break;
 
         case FmSearchProgress::STATE_PROGRESS_COUNTING:
-            m_ftHint.SetText(SVX_RESSTR(RID_STR_SEARCH_COUNTING));
+            m_ftHint.SetText(CUI_RESSTR(RID_STR_SEARCH_COUNTING));
             m_ftHint.Invalidate();
 
             m_ftRecord.SetText(String::CreateFromInt32(pProgress->nCurrentRecord));
@@ -825,7 +809,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
             sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR == pProgress->aSearchState)
                 ? RID_SVXERR_SEARCH_GENERAL_ERROR
                 : RID_SVXERR_SEARCH_NORECORD;
-            ErrorBox(this, SVX_RES(nErrorId)).Execute();
+            ErrorBox(this, CUI_RES(nErrorId)).Execute();
         }
             // KEIN break !
         case FmSearchProgress::STATE_CANCELED:
diff --git a/svx/source/cui/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 3bac445b66e3..426d6fef86ea 100644
--- a/svx/source/cui/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <algorithm>
 #include <ucbhelper/content.hxx>
@@ -41,20 +37,15 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <svtools/pathoptions.hxx>
-#include <avmedia/mediawindow.hxx>
-#include "opengrf.hxx"
-#include "impgrf.hxx"
-#include "gallery1.hxx"
-#include "galtheme.hxx"
-#include "galbrws2.hxx"
-#include "galdlg.hxx"
-#include "cuigaldlg.hxx" //CHINA001
-#include <svtools/pickerhelper.hxx>
-#ifndef _SVX_HELPID_HRC
+#include <unotools/pathoptions.hxx>
+#include <svx/opengrf.hxx>
+#include <svx/impgrf.hxx>
+#include <svx/gallery1.hxx>
+#include <svx/galtheme.hxx>
+#include "cuigaldlg.hxx"
+#include <svl/pickerhelper.hxx>
 #include "helpid.hrc"
-#endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -64,6 +55,9 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
+#include <sfx2/sfxuno.hxx>
+#include "dialmgr.hxx"
+#include "gallery.hrc"
 
 // --------------
 // - Namespaces -
@@ -230,12 +224,12 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
 // ------------------
 
 SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL ) :
-    ModalDialog     ( pParent, GAL_RESID(RID_SVXDLG_GALLERY_SEARCH_PROGRESS ) ),
-    aFtSearchDir    ( this, GAL_RESID( FT_SEARCH_DIR ) ),
-    aFLSearchDir   ( this, GAL_RESID( FL_SEARCH_DIR ) ),
-    aFtSearchType   ( this, GAL_RESID( FT_SEARCH_TYPE ) ),
-    aFLSearchType  ( this, GAL_RESID( FL_SEARCH_TYPE ) ),
-    aBtnCancel      ( this, GAL_RESID( BTN_CANCEL ) ),
+    ModalDialog     ( pParent, CUI_RES(RID_SVXDLG_GALLERY_SEARCH_PROGRESS ) ),
+    aFtSearchDir    ( this, CUI_RES( FT_SEARCH_DIR ) ),
+    aFLSearchDir   ( this, CUI_RES( FL_SEARCH_DIR ) ),
+    aFtSearchType   ( this, CUI_RES( FT_SEARCH_TYPE ) ),
+    aFLSearchType  ( this, CUI_RES( FL_SEARCH_TYPE ) ),
+    aBtnCancel      ( this, CUI_RES( BTN_CANCEL ) ),
     maSearchThread  ( this, (TPGalleryThemeProperties*) pParent, rStartURL )
 {
     FreeResource();
@@ -360,10 +354,10 @@ void SAL_CALL TakeThread::onTerminated()
 // ----------------
 
 TakeProgress::TakeProgress( Window* pWindow ) :
-    ModalDialog     ( pWindow, GAL_RESID( RID_SVXDLG_GALLERY_TAKE_PROGRESS ) ),
-    aFtTakeFile     ( this, GAL_RESID( FT_TAKE_FILE ) ),
-    aFLTakeProgress( this, GAL_RESID( FL_TAKE_PROGRESS ) ),
-    aBtnCancel      ( this, GAL_RESID( BTN_CANCEL ) ),
+    ModalDialog     ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_TAKE_PROGRESS ) ),
+    aFtTakeFile     ( this, CUI_RES( FT_TAKE_FILE ) ),
+    aFLTakeProgress( this, CUI_RES( FL_TAKE_PROGRESS ) ),
+    aBtnCancel      ( this, CUI_RES( BTN_CANCEL ) ),
     maTakeThread    ( this, (TPGalleryThemeProperties*) pWindow, maTakenList )
 
 {
@@ -465,10 +459,10 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
 // ---------------------
 
 ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
-    ModalDialog             ( pWindow, GAL_RESID( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
-    aFtActualizeFile        ( this, GAL_RESID( FT_ACTUALIZE_FILE ) ),
-    aFLActualizeProgress   ( this, GAL_RESID( FL_ACTUALIZE_PROGRESS ) ),
-    aBtnCancel              ( this, GAL_RESID( BTN_CANCEL ) ),
+    ModalDialog             ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
+    aFtActualizeFile        ( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
+    aFLActualizeProgress   ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ),
+    aBtnCancel              ( this, CUI_RES( BTN_CANCEL ) ),
     pTheme                  ( pThm )
 {
     FreeResource();
@@ -546,12 +540,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
 // ---------------
 
 TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
-    ModalDialog ( pParent, GAL_RESID( RID_SVXDLG_GALLERY_TITLE ) ),
-    maOk        ( this, GAL_RESID( BTN_OK ) ),
-    maCancel    ( this, GAL_RESID( BTN_CANCEL ) ),
-    maHelp      ( this, GAL_RESID( BTN_HELP ) ),
-    maFL       ( this, GAL_RESID( FL_TITLE ) ),
-    maEdit      ( this, GAL_RESID( EDT_TITLE ) )
+    ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
+    maOk        ( this, CUI_RES( BTN_OK ) ),
+    maCancel    ( this, CUI_RES( BTN_CANCEL ) ),
+    maHelp      ( this, CUI_RES( BTN_HELP ) ),
+    maFL       ( this, CUI_RES( FL_TITLE ) ),
+    maEdit      ( this, CUI_RES( EDT_TITLE ) )
 {
     FreeResource();
     maEdit.SetText( rOldTitle );
@@ -563,19 +557,18 @@ TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
 // -------------------
 
 GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
-            ModalDialog ( pParent, GAL_RESID( RID_SVXDLG_GALLERY_THEMEID ) ),
-            aBtnOk      ( this, GAL_RESID( BTN_OK ) ),
-            aBtnCancel  ( this, GAL_RESID( BTN_CANCEL ) ),
-            aFLId      ( this, GAL_RESID( FL_ID ) ),
-            aLbResName  ( this, GAL_RESID( LB_RESNAME ) ),
+            ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
+            aBtnOk      ( this, CUI_RES( BTN_OK ) ),
+            aBtnCancel  ( this, CUI_RES( BTN_CANCEL ) ),
+            aFLId      ( this, CUI_RES( FL_ID ) ),
+            aLbResName  ( this, CUI_RES( LB_RESNAME ) ),
             pThm        ( _pThm )
 {
     FreeResource();
 
     aLbResName.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "!!! No Id !!!" ) ) );
 
-    for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
-        aLbResName.InsertEntry( String( GAL_RESID( i ) ) );
+    GalleryTheme::InsertAllThemes( aLbResName );
 
     aLbResName.SelectEntryPos( (USHORT) pThm->GetId() );
     aLbResName.GrabFocus();
@@ -597,7 +590,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
 
         if( ( pInfo->GetId() == nId ) && ( pInfo->GetThemeName() != pThm->GetName() ) )
         {
-            String aStr( GAL_RESID( RID_SVXSTR_GALLERY_ID_EXISTS ) );
+            String aStr( CUI_RES( RID_SVXSTR_GALLERY_ID_EXISTS ) );
 
             aStr += String( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
             aStr += pInfo->GetThemeName();
@@ -622,7 +615,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
 // --------------------------
 
 GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet  ) :
-            SfxTabDialog    ( pParent, GAL_RESID( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ),
+            SfxTabDialog    ( pParent, CUI_RES( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ),
             pData           ( _pData )
 {
     FreeResource();
@@ -638,7 +631,7 @@ GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _
     aText += pData->pTheme->GetName();
 
     if( pData->pTheme->IsReadOnly() )
-        aText += String( GAL_RESID( RID_SVXSTR_GALLERY_READONLY ) );
+        aText += String( CUI_RES( RID_SVXSTR_GALLERY_READONLY ) );
 
     SetText( aText );
 }
@@ -658,19 +651,19 @@ void GalleryThemeProperties::PageCreated( USHORT nId, SfxTabPage &rPage )
 // -------------------------
 
 TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ) :
-            SfxTabPage              ( pParent, GAL_RESID( RID_SVXTABPAGE_GALLERY_GENERAL ), rSet ),
-            aFiMSImage              ( this, GAL_RESID( FI_MS_IMAGE ) ),
-            aEdtMSName              ( this, GAL_RESID( EDT_MS_NAME ) ),
-            aFlMSGeneralFirst       ( this, GAL_RESID( FL_MS_GENERAL_FIRST ) ),
-            aFtMSType               ( this, GAL_RESID( FT_MS_TYPE ) ),
-            aFtMSShowType           ( this, GAL_RESID( FT_MS_SHOW_TYPE ) ),
-            aFtMSPath               ( this, GAL_RESID( FT_MS_PATH ) ),
-            aFtMSShowPath           ( this, GAL_RESID( FT_MS_SHOW_PATH ) ),
-            aFtMSContent            ( this, GAL_RESID( FT_MS_CONTENT ) ),
-            aFtMSShowContent        ( this, GAL_RESID( FT_MS_SHOW_CONTENT ) ),
-            aFlMSGeneralSecond      ( this, GAL_RESID( FL_MS_GENERAL_SECOND ) ),
-            aFtMSChangeDate         ( this, GAL_RESID( FT_MS_CHANGEDATE ) ),
-            aFtMSShowChangeDate     ( this, GAL_RESID( FT_MS_SHOW_CHANGEDATE ) )
+            SfxTabPage              ( pParent, CUI_RES( RID_SVXTABPAGE_GALLERY_GENERAL ), rSet ),
+            aFiMSImage              ( this, CUI_RES( FI_MS_IMAGE ) ),
+            aEdtMSName              ( this, CUI_RES( EDT_MS_NAME ) ),
+            aFlMSGeneralFirst       ( this, CUI_RES( FL_MS_GENERAL_FIRST ) ),
+            aFtMSType               ( this, CUI_RES( FT_MS_TYPE ) ),
+            aFtMSShowType           ( this, CUI_RES( FT_MS_SHOW_TYPE ) ),
+            aFtMSPath               ( this, CUI_RES( FT_MS_PATH ) ),
+            aFtMSShowPath           ( this, CUI_RES( FT_MS_SHOW_PATH ) ),
+            aFtMSContent            ( this, CUI_RES( FT_MS_CONTENT ) ),
+            aFtMSShowContent        ( this, CUI_RES( FT_MS_SHOW_CONTENT ) ),
+            aFlMSGeneralSecond      ( this, CUI_RES( FL_MS_GENERAL_SECOND ) ),
+            aFtMSChangeDate         ( this, CUI_RES( FT_MS_CHANGEDATE ) ),
+            aFtMSShowChangeDate     ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) )
 {
     FreeResource();
 }
@@ -683,9 +676,9 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 
     GalleryTheme*       pThm = pData->pTheme;
     String              aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) );
-    String              aObjStr( GAL_RESID( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
+    String              aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
     String              aAccess;
-    String              aType( GAL_RESID( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
+    String              aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
     BOOL                bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
 
     aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME );
@@ -698,7 +691,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
         aEdtMSName.Enable();
 
     if( pThm->IsReadOnly() )
-        aType += String( GAL_RESID( RID_SVXSTR_GALLERY_READONLY ) );
+        aType += String( CUI_RES( RID_SVXSTR_GALLERY_READONLY ) );
 
     aFtMSShowType.SetText( aType );
     aFtMSShowPath.SetText( pThm->GetSdgURL().GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
@@ -735,7 +728,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
     else
         nId = RID_SVXBMP_THEME_NORMAL_BIG;
 
-    aFiMSImage.SetImage( Image( Bitmap( GAL_RESID( nId ) ), COL_LIGHTMAGENTA ) );
+    aFiMSImage.SetImage( Image( Bitmap( CUI_RES( nId ) ), COL_LIGHTMAGENTA ) );
 }
 
 // ------------------------------------------------------------------------
@@ -758,15 +751,15 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS
 // ----------------------------
 
 TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) :
-        SfxTabPage          ( pWindow, GAL_RESID( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
-        aBtnSearch          ( this, GAL_RESID(BTN_SEARCH ) ),
-        aBtnTake            ( this, GAL_RESID(BTN_TAKE ) ),
-        aBtnTakeAll         ( this, GAL_RESID(BTN_TAKEALL ) ),
-        aCbxPreview         ( this, GAL_RESID(CBX_PREVIEW ) ),
-        aCbbFileType        ( this, GAL_RESID(CBB_FILETYPE ) ),
-        aLbxFound           ( this, GAL_RESID(LBX_FOUND ) ),
-        aFtFileType         ( this, GAL_RESID(FT_FILETYPE ) ),
-        aWndPreview         ( this, GAL_RESID( WND_BRSPRV ) ),
+        SfxTabPage          ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
+        aBtnSearch          ( this, CUI_RES(BTN_SEARCH ) ),
+        aBtnTake            ( this, CUI_RES(BTN_TAKE ) ),
+        aBtnTakeAll         ( this, CUI_RES(BTN_TAKEALL ) ),
+        aCbxPreview         ( this, CUI_RES(CBX_PREVIEW ) ),
+        aCbbFileType        ( this, CUI_RES(CBB_FILETYPE ) ),
+        aLbxFound           ( this, CUI_RES(LBX_FOUND ) ),
+        aFtFileType         ( this, CUI_RES(FT_FILETYPE ) ),
+        aWndPreview         ( this, CUI_RES( WND_BRSPRV ) ),
         nCurFilterPos       (0),
         nFirstExtFilterPos  (0),
         bEntriesFound       (FALSE),
@@ -795,7 +788,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
     aCbbFileType.EnableDDAutoWidth( sal_False );
     aLbxFound.SetDoubleClickHdl(LINK(this, TPGalleryThemeProperties, DClickFoundHdl));
     aLbxFound.SetSelectHdl(LINK(this, TPGalleryThemeProperties, SelectFoundHdl));
-    aLbxFound.InsertEntry(String(GAL_RESID(RID_SVXSTR_GALLERY_NOFILES)));
+    aLbxFound.InsertEntry(String(CUI_RES(RID_SVXSTR_GALLERY_NOFILES)));
     aLbxFound.Show();
 
     FillFilterList();
@@ -975,7 +968,7 @@ void TPGalleryThemeProperties::FillFilterList()
 #endif
 
     pFilterEntry = new FilterEntry;
-    pFilterEntry->aFilterName = String( GAL_RESID( RID_SVXSTR_GALLERY_ALLFILES ) );
+    pFilterEntry->aFilterName = String( CUI_RES( RID_SVXSTR_GALLERY_ALLFILES ) );
     pFilterEntry->aFilterName = addExtension( pFilterEntry->aFilterName, aExtensions );
     aFilterEntryList.Insert(pFilterEntry, aCbbFileType. InsertEntry( pFilterEntry->aFilterName, 0 ) );
 
@@ -992,7 +985,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG )
     {
         aLastFilterName = aText;
 
-        if( QueryBox( this, WB_YES_NO, String( GAL_RESID( RID_SVXSTR_GALLERY_SEARCH ) ) ).Execute() == RET_YES )
+        if( QueryBox( this, WB_YES_NO, String( CUI_RES( RID_SVXSTR_GALLERY_SEARCH ) ) ).Execute() == RET_YES )
             SearchFiles();
     }
 
@@ -1124,33 +1117,22 @@ void TPGalleryThemeProperties::DoPreview()
 
     if( aString != aPreviewString )
     {
-        Graphic         aGraphic;
         INetURLObject   _aURL( *aFoundList.GetObject( aLbxFound.GetEntryPos( aString ) ) );
-
         bInputAllowed = FALSE;
 
-        if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) )
+        if ( !aWndPreview.SetGraphic( _aURL ) )
+        {
+            GetParent()->LeaveWait();
+            ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
+            GetParent()->EnterWait();
+        }
+        else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) )
         {
-            aGraphic = BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) );
             xMediaPlayer = ::avmedia::MediaWindow::createPlayer( _aURL.GetMainURL( INetURLObject::NO_DECODE ) );
             if( xMediaPlayer.is() )
                 xMediaPlayer->start();
         }
-        else
-        {
-            GraphicFilter*  pFilter = GetGrfFilter();
-            GalleryProgress aProgress( pFilter );
-
-            if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) )
-            {
-                GetParent()->LeaveWait();
-                ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
-                GetParent()->EnterWait();
-            }
-        }
 
-        aWndPreview.SetGraphic( aGraphic );
-        aWndPreview.Invalidate();
         bInputAllowed = TRUE;
         aPreviewString = aString;
     }
@@ -1268,7 +1250,7 @@ IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMP
   }
   else
   {
-      aLbxFound.InsertEntry( String( GAL_RESID( RID_SVXSTR_GALLERY_NOFILES ) ) );
+      aLbxFound.InsertEntry( String( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) );
       aBtnTakeAll.Disable();
       aCbxPreview.Disable();
       bEntriesFound = FALSE;
diff --git a/svx/source/cui/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 830db3ae477a..be2b401320fd 100644
--- a/svx/source/cui/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -29,22 +29,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <tools/shl.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
-
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "cuigrfflt.hxx"
 #include "grfflt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
+#include <svx/dialogs.hrc> // RID_SVX_GRFFILTER_DLG_...
 
 // --------------------
 // - SvxGraphicFilter -
@@ -374,11 +371,11 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId,
     mfScaleX        ( 0.0 ),
     mfScaleY        ( 0.0 ),
     maSizePixel     ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ),
-    maPreview       ( this, SVX_RES( CTL_PREVIEW ) ),
-    maFlParameter   ( this, SVX_RES( FL_PARAMETER ) ),
-    maBtnOK         ( this, SVX_RES( BTN_OK ) ),
-    maBtnCancel     ( this, SVX_RES( BTN_CANCEL ) ),
-    maBtnHelp       ( this, SVX_RES( BTN_HELP ) )
+    maPreview       ( this, CUI_RES( CTL_PREVIEW ) ),
+    maFlParameter   ( this, CUI_RES( FL_PARAMETER ) ),
+    maBtnOK         ( this, CUI_RES( BTN_OK ) ),
+    maBtnCancel     ( this, CUI_RES( BTN_CANCEL ) ),
+    maBtnHelp       ( this, CUI_RES( BTN_HELP ) )
 {
     const Size  aPreviewSize( maPreview.GetOutputSizePixel() );
     Size        aGrfSize( maSizePixel );
@@ -453,12 +450,12 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG )
 
 GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
                                           USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) :
-    GraphicFilterDialog( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
-    maFtWidth   ( this, SVX_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
-    maMtrWidth  ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
-    maFtHeight  ( this, SVX_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
-    maMtrHeight ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ),
-    maCbxEdges  ( this, SVX_RES( DLG_FILTERMOSAIC_CBX_EDGES ) )
+    GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
+    maFtWidth   ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
+    maMtrWidth  ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
+    maFtHeight  ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
+    maMtrHeight ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ),
+    maCbxEdges  ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) )
 {
     FreeResource();
 
@@ -526,10 +523,10 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
                                               BYTE cGreyThreshold, BOOL bInvert ) :
-    GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
-    maFtThreshold   ( this, SVX_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
-    maMtrThreshold  ( this, SVX_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
-    maCbxInvert     ( this, SVX_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) )
+    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
+    maFtThreshold   ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
+    maMtrThreshold  ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
+    maCbxInvert     ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) )
 {
     FreeResource();
 
@@ -590,9 +587,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
                                         USHORT nSepiaPercent ) :
-    GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
-    maFtSepia       ( this, SVX_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
-    maMtrSepia      ( this, SVX_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
+    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
+    maFtSepia       ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
+    maMtrSepia      ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
 {
     FreeResource();
 
@@ -640,9 +637,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
                                           USHORT nPosterCount ) :
-    GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
-    maFtPoster      ( this, SVX_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
-    maNumPoster     ( this, SVX_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
+    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
+    maFtPoster      ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
+    maNumPoster     ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
 {
     FreeResource();
 
@@ -703,9 +700,9 @@ void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt
 
 GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic,
                                           RECT_POINT eLightSource ) :
-    GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
-    maFtLight       ( this, SVX_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ),
-    maCtlLight      ( this, SVX_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource )
+    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
+    maFtLight       ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ),
+    maCtlLight      ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource )
 {
     FreeResource();
 
diff --git a/svx/source/cui/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index b29e202030b4..a73cc0007a6f 100644
--- a/svx/source/cui/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -29,24 +29,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <vcl/settings.hxx>
-#include <svtools/viewoptions.hxx>
-
+#include <unotools/viewoptions.hxx>
 #include "cuihyperdlg.hxx"
-
 #include "hlinettp.hxx"
 #include "hlmailtp.hxx"
 #include "hldoctp.hxx"
 #include "hldocntp.hxx"
-
 #include "hyperdlg.hrc"
+#include <svx/svxids.hrc> // SID_READONLY_MODE
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::frame::XFrame;
@@ -110,7 +104,7 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState,
 |************************************************************************/
 
 SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
-:   IconChoiceDialog( pParent, SVX_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
+:   IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
     maCtrl          ( SID_HYPERLINK_GETLINK, *pBindings, this ),
     mpBindings      ( pBindings ),
     mbReadOnly      ( sal_False ),
@@ -123,26 +117,26 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     String aStrTitle;
     SvxIconChoiceCtrlEntry* pEntry = NULL;
 
-    aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP );
-    aImage = Image( SVX_RES ( RID_SVXBMP_HLINETTP ) );
-    aImageHC = Image( SVX_RES ( RID_SVXBMP_HLINETTP_H ) );
+    aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP );
+    aImage = Image( CUI_RES ( RID_SVXBMP_HLINETTP ) );
+    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLINETTP_H ) );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, aImageHC, SvxHyperlinkInternetTp::Create );
-    pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
-    aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP );
-    aImage = Image( SVX_RES ( RID_SVXBMP_HLMAILTP ) );
-    aImageHC = Image( SVX_RES ( RID_SVXBMP_HLMAILTP_H ) );
+    pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
+    aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP );
+    aImage = Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) );
+    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLMAILTP_H ) );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, aImageHC, SvxHyperlinkMailTp::Create );
-    pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
-    aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP );
-    aImage = Image( SVX_RES ( RID_SVXBMP_HLDOCTP ) );
-    aImageHC = Image( SVX_RES ( RID_SVXBMP_HLDOCTP_H ) );
+    pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
+    aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP );
+    aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCTP ) );
+    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCTP_H ) );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkDocTp::Create );
-    pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
-    aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP );
-    aImage = Image( SVX_RES ( RID_SVXBMP_HLDOCNTP ) );
-    aImageHC = Image( SVX_RES ( RID_SVXBMP_HLDOCNTP_H ) );
+    pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
+    aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP );
+    aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) );
+    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP_H ) );
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create );
-    pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+    pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
 
     // all tab pages set -> create mnemonics
     //  CreateIconTextAutoMnemonics();  #99671# not useful, because this is not what user expects when using mnemonics on the pages
@@ -162,8 +156,8 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     pBindings->Update( SID_READONLY_MODE );
 
     // set OK/Cancel - button
-    GetOKButton().SetText ( SVX_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
-    GetCancelButton().SetText ( SVX_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
+    GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
+    GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
 
     GetOKButton().SetClickHdl    ( LINK ( this, SvxHpLinkDlg, ClickApplyHdl_Impl ) );
     GetCancelButton().SetClickHdl( LINK ( this, SvxHpLinkDlg, ClickCloseHdl_Impl ) );
diff --git a/svx/source/cui/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc
index 00df9f23ee7a..9424d94c1f05 100755
--- a/svx/source/cui/cuiimapdlg.hrc
+++ b/cui/source/dialogs/cuiimapdlg.hrc
@@ -27,12 +27,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 // ImapDlg-Dialoge
-#define RID_SVX_IMAPDLG_START   RID_SVX_IMAP_START
-
-#define RID_SVXDLG_IMAPURL      (RID_SVX_IMAPDLG_START + 2)
 
 #define FT_URLDESCRIPTION       1
 #define FT_URL1                 2
diff --git a/svx/source/cui/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src
index de41ca0d1d55..de41ca0d1d55 100755
--- a/svx/source/cui/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
diff --git a/svx/source/cui/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 966fdecace00..841b9ca59b78 100644
--- a/svx/source/cui/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -29,26 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
-#include <sfx2/sfxsids.hrc>     // SID_ATTR_MACROITEM
+#include <sfx2/sfxsids.hrc>
 #define _ANIMATION
 #include "macroass.hxx"
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
-#include <svtools/urlbmk.hxx>
-
-#include <xoutbmp.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
+#include <svl/urlbmk.hxx>
+#include <svx/xoutbmp.hxx>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include <cuiimapdlg.hrc>
 #include <cuiimapwnd.hxx>
 #include <svx/svdpage.hxx>
@@ -57,7 +52,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/svdpagv.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/xlineit.hxx>
 
@@ -72,21 +67,21 @@
 \************************************************************************/
 
 URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeText, const String& rDescription, const String& rTarget, const String& rName, TargetList& rTargetList )
-: ModalDialog( pWindow, SVX_RES( RID_SVXDLG_IMAPURL ) )
-, maFtURL( this, SVX_RES( FT_URL1 ) )
-, maEdtURL( this, SVX_RES( EDT_URL ) )
-, maFtTarget( this, SVX_RES( FT_TARGET ) )
-, maCbbTargets( this, SVX_RES( CBB_TARGETS ) )
-, maFtName( this, SVX_RES( FT_NAME ) )
-, maEdtName( this, SVX_RES( EDT_NAME ) )
-, maFtAlternativeText( this, SVX_RES( FT_URLDESCRIPTION ) )
-, maEdtAlternativeText( this, SVX_RES( EDT_URLDESCRIPTION ) )
-, maFtDescription( this, SVX_RES( FT_DESCRIPTION ) )
-, maEdtDescription( this, SVX_RES( EDT_DESCRIPTION ) )
-, maFlURL( this, SVX_RES( FL_URL ) )
-, maBtnHelp( this, SVX_RES( BTN_HELP1 ) )
-, maBtnOk( this, SVX_RES( BTN_OK1 ) )
-, maBtnCancel( this, SVX_RES( BTN_CANCEL1 ) )
+: ModalDialog( pWindow, CUI_RES( RID_SVXDLG_IMAPURL ) )
+, maFtURL( this, CUI_RES( FT_URL1 ) )
+, maEdtURL( this, CUI_RES( EDT_URL ) )
+, maFtTarget( this, CUI_RES( FT_TARGET ) )
+, maCbbTargets( this, CUI_RES( CBB_TARGETS ) )
+, maFtName( this, CUI_RES( FT_NAME ) )
+, maEdtName( this, CUI_RES( EDT_NAME ) )
+, maFtAlternativeText( this, CUI_RES( FT_URLDESCRIPTION ) )
+, maEdtAlternativeText( this, CUI_RES( EDT_URLDESCRIPTION ) )
+, maFtDescription( this, CUI_RES( FT_DESCRIPTION ) )
+, maEdtDescription( this, CUI_RES( EDT_DESCRIPTION ) )
+, maFlURL( this, CUI_RES( FL_URL ) )
+, maBtnHelp( this, CUI_RES( BTN_HELP1 ) )
+, maBtnOk( this, CUI_RES( BTN_OK1 ) )
+, maBtnCancel( this, CUI_RES( BTN_CANCEL1 ) )
 {
     FreeResource();
 
diff --git a/svx/source/cui/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index 87affa0bc995..1ca37f425a10 100644
--- a/svx/source/cui/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -29,51 +29,35 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <tools/ref.hxx>
 #include <tools/shl.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
-#include "fmitems.hxx"
 #include <vcl/sound.hxx>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-/*
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
-*/
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include "cuitbxform.hxx"
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif
-#include "fmitems.hxx"
-#ifndef _SVX_FMHELP_HRC
-#include "fmhelp.hrc"
-#endif
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
+#include "fmsearch.hrc"
+
 //========================================================================
 // class FmInputRecordNoDialog
 //========================================================================
 
 FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent)
-    :ModalDialog( pParent, SVX_RES(RID_SVX_DLG_INPUTRECORDNO))
-    ,m_aLabel(this, SVX_RES(1))
-    ,m_aRecordNo(this, SVX_RES(1))
-    ,m_aOk(this, SVX_RES(1))
-    ,m_aCancel(this, SVX_RES(1))
+    :ModalDialog( pParent, CUI_RES(RID_SVX_DLG_INPUTRECORDNO))
+    ,m_aLabel(this, CUI_RES(1))
+    ,m_aRecordNo(this, CUI_RES(1))
+    ,m_aOk(this, CUI_RES(1))
+    ,m_aCancel(this, CUI_RES(1))
 {
     m_aRecordNo.SetMin(1);
     m_aRecordNo.SetMax(0x7FFFFFFF);
diff --git a/svx/source/cui/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 4b50dcbc6dfa..8cf36980decf 100644
--- a/svx/source/cui/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <tools/ref.hxx>
 #include <tools/list.hxx>
@@ -41,12 +37,12 @@
 #include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 #include "dlgname.hxx"
 #include "defdlgname.hxx" //CHINA001
 #include "dlgname.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #define MAX_DESCRIPTION_LINES   ((long)5)
 
@@ -57,12 +53,12 @@
 \************************************************************************/
 
 SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) :
-    ModalDialog     ( pWindow, SVX_RES( RID_SVXDLG_NAME ) ),
-    aFtDescription      ( this, SVX_RES( FT_DESCRIPTION ) ),
-    aEdtName            ( this, SVX_RES( EDT_STRING ) ),
-    aBtnOK              ( this, SVX_RES( BTN_OK ) ),
-    aBtnCancel          ( this, SVX_RES( BTN_CANCEL ) ),
-    aBtnHelp            ( this, SVX_RES( BTN_HELP ) )
+    ModalDialog     ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ),
+    aFtDescription      ( this, CUI_RES( FT_DESCRIPTION ) ),
+    aEdtName            ( this, CUI_RES( EDT_STRING ) ),
+    aBtnOK              ( this, CUI_RES( BTN_OK ) ),
+    aBtnCancel          ( this, CUI_RES( BTN_CANCEL ) ),
+    aBtnHelp            ( this, CUI_RES( BTN_HELP ) )
 {
     FreeResource();
 
@@ -105,13 +101,13 @@ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG)
 SvxObjectNameDialog::SvxObjectNameDialog(
     Window* pWindow,
     const String& rName)
-:   ModalDialog(pWindow, SVX_RES(RID_SVXDLG_OBJECT_NAME)),
-    aFtName(this, SVX_RES(NTD_FT_NAME)),
-    aEdtName(this, SVX_RES(NTD_EDT_NAME)),
-    aFlSeparator(this, SVX_RES(FL_SEPARATOR_A)),
-    aBtnHelp(this, SVX_RES(BTN_HELP)),
-    aBtnOK(this, SVX_RES(BTN_OK)),
-    aBtnCancel(this, SVX_RES(BTN_CANCEL))
+:   ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)),
+    aFtName(this, CUI_RES(NTD_FT_NAME)),
+    aEdtName(this, CUI_RES(NTD_EDT_NAME)),
+    aFlSeparator(this, CUI_RES(FL_SEPARATOR_A)),
+    aBtnHelp(this, CUI_RES(BTN_HELP)),
+    aBtnOK(this, CUI_RES(BTN_OK)),
+    aBtnCancel(this, CUI_RES(BTN_CANCEL))
 {
     FreeResource();
 
@@ -142,15 +138,15 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
     Window* pWindow,
     const String& rTitle,
     const String& rDescription)
-:   ModalDialog(pWindow, SVX_RES(RID_SVXDLG_OBJECT_TITLE_DESC)),
-    aFtTitle(this, SVX_RES(NTD_FT_TITLE)),
-    aEdtTitle(this, SVX_RES(NTD_EDT_TITLE)),
-    aFtDescription(this, SVX_RES(NTD_FT_DESC)),
-    aEdtDescription(this, SVX_RES(NTD_EDT_DESC)),
-    aFlSeparator(this, SVX_RES(FL_SEPARATOR_B)),
-    aBtnHelp(this, SVX_RES(BTN_HELP)),
-    aBtnOK(this, SVX_RES(BTN_OK)),
-    aBtnCancel(this, SVX_RES(BTN_CANCEL))
+:   ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)),
+    aFtTitle(this, CUI_RES(NTD_FT_TITLE)),
+    aEdtTitle(this, CUI_RES(NTD_EDT_TITLE)),
+    aFtDescription(this, CUI_RES(NTD_FT_DESC)),
+    aEdtDescription(this, CUI_RES(NTD_EDT_DESC)),
+    aFlSeparator(this, CUI_RES(FL_SEPARATOR_B)),
+    aBtnHelp(this, CUI_RES(BTN_HELP)),
+    aBtnOK(this, CUI_RES(BTN_OK)),
+    aBtnCancel(this, CUI_RES(BTN_CANCEL))
 {
     FreeResource();
 
@@ -171,11 +167,11 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
 \************************************************************************/
 
 SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) :
-    ModalDialog     ( pWindow, SVX_RES( RID_SVXDLG_MESSBOX ) ),
-    aFtDescription      ( this, SVX_RES( FT_DESCRIPTION ) ),
-    aBtn1               ( this, SVX_RES( BTN_1 ) ),
-    aBtn2               ( this, SVX_RES( BTN_2 ) ),
-    aBtnCancel          ( this, SVX_RES( BTN_CANCEL ) ),
+    ModalDialog     ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ),
+    aFtDescription      ( this, CUI_RES( FT_DESCRIPTION ) ),
+    aBtn1               ( this, CUI_RES( BTN_1 ) ),
+    aBtn2               ( this, CUI_RES( BTN_2 ) ),
+    aBtnCancel          ( this, CUI_RES( BTN_CANCEL ) ),
     aFtImage            ( this )
 {
     FreeResource();
diff --git a/svx/source/cui/dlgname.hrc b/cui/source/dialogs/dlgname.hrc
index 787a5b9bd6df..787a5b9bd6df 100644
--- a/svx/source/cui/dlgname.hrc
+++ b/cui/source/dialogs/dlgname.hrc
diff --git a/svx/source/cui/dlgname.src b/cui/source/dialogs/dlgname.src
index 5647bb347e69..93a2e5979671 100644
--- a/svx/source/cui/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -30,7 +30,7 @@
 
 // include ------------------------------------------------------------------
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "dlgname.hrc"
 
diff --git a/svx/source/inc/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index c9a1de900791..579602ec2b5f 100644
--- a/svx/source/inc/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -30,6 +30,23 @@
 #ifndef _FMSEARCH_HRC
 #define _FMSEARCH_HRC
 
+#include "svl/solar.hrc"
+
+#define RID_SVX_DLG_INPUTRECORDNO                   (RID_FORMS_START + 10)
+#define RID_SVX_DLG_SHOWGRIDCOLUMNS                 (RID_FORMS_START + 11)
+#define RID_SVXDLG_SEARCHFORM                       (RID_FORMS_START + 7)
+#define RID_STR_SEARCH_ANYWHERE                     (RID_FORMS_START +  85)
+#define RID_STR_SEARCH_BEGINNING                    (RID_FORMS_START +  86)
+#define RID_STR_SEARCH_END                          (RID_FORMS_START +  87)
+#define RID_STR_SEARCH_WHOLE                        (RID_FORMS_START +  88)
+#define RID_STR_FROM_TOP                            (RID_FORMS_START +  74)
+#define RID_STR_FROM_BOTTOM                         (RID_FORMS_START +  75)
+#define RID_SVXERR_SEARCH_NORECORD                  (RID_FORMS_START + 8)
+#define RID_SVXERR_SEARCH_GENERAL_ERROR             (RID_FORMS_START + 9)
+#define RID_STR_OVERFLOW_FORWARD                    (RID_FORMS_START +  34)
+#define RID_STR_OVERFLOW_BACKWARD                   (RID_FORMS_START +  35)
+#define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  76)
+
 #define FT_SEARCHTEXT       1
 #define FT_FORM             2
 #define FT_POSITION         3
diff --git a/svx/source/form/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 593baf90c755..83b04a138b0d 100644
--- a/svx/source/form/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -28,9 +28,8 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
 #include "fmsearch.hrc"
-#include "fmhelp.hrc"
+#include "helpid.hrc"
 
 ModalDialog RID_SVXDLG_SEARCHFORM
 {
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
new file mode 100644
index 000000000000..e4db69f6f73d
--- /dev/null
+++ b/cui/source/dialogs/gallery.src
@@ -0,0 +1,482 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: gallery.src,v $
+ * $Revision: 1.79 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <sfx2/sfxsids.hrc>
+#include "helpid.hrc"
+#include "gallery.hrc"
+#include <svx/exthelpid.hrc>
+
+#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+
+TabDialog RID_SVXTABDLG_GALLERY
+{
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+    Text [ en-US ] = "Properties of " ;
+    Moveable = TRUE ;
+    TabControl 1
+    {
+        OutputSize = TRUE ;
+        PageList =
+        {
+            PageItem
+            {
+                Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ;
+                Text [ en-US ] = "General" ;
+            };
+        };
+    };
+};
+
+/******************************************************************************/
+
+TabDialog RID_SVXTABDLG_GALLERYTHEME
+{
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+    Text [ en-US ] = "Properties of " ;
+    Moveable = TRUE ;
+    TabControl 1
+    {
+        OutputSize = TRUE ;
+        PageList =
+        {
+            PageItem
+            {
+                Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ;
+                Text [ en-US ] = "General" ;
+            };
+            PageItem
+            {
+                Identifier = RID_SVXTABPAGE_GALLERYTHEME_FILES ;
+                Text [ en-US ] = "Files" ;
+            };
+        };
+    };
+};
+
+/******************************************************************************/
+
+TabPage RID_SVXTABPAGE_GALLERY_GENERAL
+{
+    HelpId = HID_GALLERY_PROPERTIES_GENERAL;
+    SVLook = TRUE ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT ( 260 , 185 ) ;
+    FixedImage FI_MS_IMAGE
+    {
+        Pos = MAP_APPFONT ( 6 , 6 ) ;
+        Size = MAP_APPFONT ( 20 , 20 ) ;
+    };
+    Edit EDT_MS_NAME
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 60 , 10 ) ;
+        Size = MAP_APPFONT ( 194 , 12 ) ;
+    };
+    FixedLine FL_MS_GENERAL_FIRST
+    {
+        Pos = MAP_APPFONT ( 6 , 36 ) ;
+        Size = MAP_APPFONT ( 248 , 1 ) ;
+    };
+    FixedText FT_MS_TYPE
+    {
+        Pos = MAP_APPFONT ( 6 , 43 ) ;
+        Size = MAP_APPFONT ( 51 , 10 ) ;
+        LeftLabel = TRUE ;
+        Text [ en-US ] = "Type:" ;
+    };
+    FixedText FT_MS_SHOW_TYPE
+    {
+        Pos = MAP_APPFONT ( 60 , 43 ) ;
+        Size = MAP_APPFONT ( 194 , 10 ) ;
+    };
+    FixedText FT_MS_PATH
+    {
+        Pos = MAP_APPFONT ( 6 , 57 ) ;
+        Size = MAP_APPFONT ( 51 , 10 ) ;
+        LeftLabel = TRUE ;
+        Text [ en-US ] = "Location:" ;
+    };
+    FixedText FT_MS_SHOW_PATH
+    {
+        Pos = MAP_APPFONT ( 60 , 57 ) ;
+        Size = MAP_APPFONT ( 194 , 10 ) ;
+    };
+    FixedText FT_MS_CONTENT
+    {
+        Pos = MAP_APPFONT ( 6 , 71 ) ;
+        Size = MAP_APPFONT ( 51 , 10 ) ;
+        LeftLabel = TRUE ;
+        Text [ en-US ] = "Contents:" ;
+    };
+    FixedText FT_MS_SHOW_CONTENT
+    {
+        Pos = MAP_APPFONT ( 60 , 71 ) ;
+        Size = MAP_APPFONT ( 194 , 10 ) ;
+    };
+    FixedLine FL_MS_GENERAL_SECOND
+    {
+        Pos = MAP_APPFONT ( 6 , 91 ) ;
+        Size = MAP_APPFONT ( 248 , 1 ) ;
+    };
+    FixedText FT_MS_CHANGEDATE
+    {
+        Pos = MAP_APPFONT ( 6 , 98 ) ;
+        Size = MAP_APPFONT ( 51 , 10 ) ;
+        LeftLabel = TRUE ;
+        Text [ en-US ] = "Modified:" ;
+    };
+    FixedText FT_MS_SHOW_CHANGEDATE
+    {
+        Pos = MAP_APPFONT ( 60 , 98 ) ;
+        Size = MAP_APPFONT ( 194 , 10 ) ;
+    };
+};
+
+/******************************************************************************/
+
+TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
+{
+    HelpId = HID_GALLERY_BROWSER ;
+    Hide = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 260 , 185 ) ;
+    FixedText FT_FILETYPE
+    {
+        Pos = MAP_APPFONT ( 6 , 8 ) ;
+        Size = MAP_APPFONT ( 48 , 10 ) ;
+        Text [ en-US ] = "~File type" ;
+    };
+    ComboBox CBB_FILETYPE
+    {
+        Pos = MAP_APPFONT ( 57 , 6 ) ;
+        Size = MAP_APPFONT ( 121 , 69 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        AutoSize = TRUE;
+        AutoHScroll = TRUE ;
+    };
+    MultiListBox LBX_FOUND
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 6 , 23  ) ;
+        Size = MAP_APPFONT ( 172 , 156 ) ;
+        TabStop = TRUE ;
+        SimpleMode = TRUE ;
+    };
+    PushButton BTN_SEARCH
+    {
+        Pos = MAP_APPFONT ( 184 , 6  ) ;
+        Size = MAP_APPFONT ( 70 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~Find Files..." ;
+    };
+    PushButton BTN_TAKE
+    {
+        Pos = MAP_APPFONT ( 184 , 24  ) ;
+        Size = MAP_APPFONT ( 70 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~Add" ;
+    };
+    PushButton BTN_TAKEALL
+    {
+        Pos = MAP_APPFONT ( 184 , 42 ) ;
+        Size = MAP_APPFONT ( 70 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "A~dd All" ;
+    };
+    CheckBox CBX_PREVIEW
+    {
+        Pos = MAP_APPFONT ( 184 , 76  ) ;
+        Size = MAP_APPFONT ( 70 , 12 ) ;
+        Text [ en-US ] = "Pr~eview" ;
+    };
+    Window WND_BRSPRV
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 184 , 91 ) ;
+        Size = MAP_APPFONT ( 70 , 88 ) ;
+    };
+    PushButton BTN_MADDIN1
+    {
+        Pos = MAP_APPFONT ( 220 , 63 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "Maddin1" ;
+    };
+    PushButton BTN_MADDIN2
+    {
+        Pos = MAP_APPFONT ( 220 , 80 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "Maddin2" ;
+    };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_TITLE
+{
+    HelpId = HID_GALLERY_TITLE;
+    OutputSize = TRUE ;
+    Border = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 168 , 63 ) ;
+    Text [ en-US ] = "Enter Title" ;
+    Moveable = TRUE ;
+
+    OkButton BTN_OK
+    {
+        DefButton = TRUE ;
+        Pos = MAP_APPFONT ( 112 , 6 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 112 , 23 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+    HelpButton BTN_HELP
+    {
+        Pos = MAP_APPFONT ( 112 , 43 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+
+    FixedLine FL_TITLE
+    {
+        Pos = MAP_APPFONT ( 6 , 6 ) ;
+        Size = MAP_APPFONT ( 100 , 8 ) ;
+        Text [ en-US ] = "Title" ;
+    };
+    Edit EDT_TITLE
+    {
+        HelpId = HID_GALLERY_TITLE_EDIT;
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 18 ) ;
+        Size = MAP_APPFONT ( 88, 12 ) ;
+    };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
+{
+    HelpId = HID_GALLERY_SEARCH ;
+    OutputSize = TRUE ;
+    Border = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 124 , 86 ) ;
+    Text [ en-US ] = "Find" ;
+    Moveable = TRUE ;
+    FixedLine FL_SEARCH_DIR
+    {
+        Pos = MAP_APPFONT ( 6 , 33 ) ;
+        Size = MAP_APPFONT ( 112 , 8 ) ;
+        Text [ en-US ] = "Directory" ;
+    };
+    FixedText FT_SEARCH_DIR
+    {
+        Pos = MAP_APPFONT ( 12 , 44 ) ;
+        Size = MAP_APPFONT ( 100 , 10 ) ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 37 , 66 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+    FixedLine FL_SEARCH_TYPE
+    {
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 112 , 8 ) ;
+        Text [ en-US ] = "File type" ;
+    };
+    FixedText FT_SEARCH_TYPE
+    {
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 100 , 10 ) ;
+    };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
+{
+    HelpId = HID_GALLERY_APPLY ;
+    OutputSize = TRUE ;
+    Border = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 124 , 56 ) ;
+    Text [ en-US ] = "Apply" ;
+    Moveable = TRUE ;
+    FixedLine FL_TAKE_PROGRESS
+    {
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 112 , 8 ) ;
+        Text [ en-US ] = "File" ;
+    };
+    FixedText FT_TAKE_FILE
+    {
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 100 , 10 ) ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 37 , 36 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
+{
+    HelpId = HID_GALLERY_ACTUALIZE;
+    OutputSize = TRUE ;
+    Border = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 124 , 56 ) ;
+    Text [ en-US ] = "Update" ;
+    Moveable = TRUE ;
+    FixedLine FL_ACTUALIZE_PROGRESS
+    {
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 112 , 8 ) ;
+        Text [ en-US ] = "File" ;
+    };
+    FixedText FT_ACTUALIZE_FILE
+    {
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 100 , 10 ) ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 37 , 36 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+};
+
+ModalDialog RID_SVXDLG_GALLERY_THEMEID
+{
+    OutputSize = TRUE ;
+    Border = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 180 , 63 ) ;
+    Text [ en-US ] = "Theme ID" ;
+    Moveable = TRUE ;
+    OkButton BTN_OK
+    {
+        Pos = MAP_APPFONT ( 124 , 6 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = TRUE ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 124 , 23 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+    FixedLine FL_ID
+    {
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 112 , 8 ) ;
+        Text [ en-US ] = "ID";
+    };
+    ListBox LB_RESNAME
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 100 , 60 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        HScroll = TRUE ;
+        VScroll = TRUE ;
+    };
+};
+
+String RID_SVXSTR_GALLERY_NOFILES
+{
+    Text [ en-US ] = "<No Files>" ;
+};
+String RID_SVXSTR_GALLERY_SEARCH
+{
+    Text [ en-US ] = "Do you want to update the file list?" ;
+};
+String RID_SVXSTR_GALLERYPROPS_OBJECT
+{
+    Text [ en-US ] = "Object;Objects" ;
+};
+String RID_SVXSTR_GALLERYPROPS_GALTHEME
+{
+    Text [ en-US ] = "Gallery Theme" ;
+};
+String RID_SVXSTR_GALLERY_READONLY
+{
+    Text [ en-US ] = " (read-only)" ;
+};
+String RID_SVXSTR_GALLERY_ALLFILES
+{
+    Text [ en-US ] = "<All Files>" ;
+};
+String RID_SVXSTR_GALLERY_ID_EXISTS
+{
+    Text [ en-US ] = "This ID already exists..." ;
+};
+
+/******************************************************************************/
+
+Bitmap RID_SVXBMP_THEME_NORMAL_BIG
+{
+    File = "galnorl.bmp" ;
+};
+
+Bitmap RID_SVXBMP_THEME_IMPORTED_BIG
+{
+    File = "galimpl.bmp" ;
+};
+
+Bitmap RID_SVXBMP_THEME_READONLY_BIG
+{
+    File = "galrdol.bmp" ;
+};
+
+Bitmap RID_SVXBMP_THEME_DEFAULT_BIG
+{
+    File = "galdefl.bmp" ;
+};
+
+
diff --git a/svx/source/cui/grfflt.hrc b/cui/source/dialogs/grfflt.hrc
index b04d025d4d13..b04d025d4d13 100644
--- a/svx/source/cui/grfflt.hrc
+++ b/cui/source/dialogs/grfflt.hrc
diff --git a/svx/source/cui/grfflt.src b/cui/source/dialogs/grfflt.src
index ba1398d98b59..c01dc4060b6c 100644
--- a/svx/source/cui/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -29,9 +29,10 @@
  ************************************************************************/
 
 #include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "grfflt.hrc"
+#include <svx/dialogs.hrc>
 
 // --------------------
 // - DLG_FILTERMOSAIC -
diff --git a/svx/source/cui/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 0d0c9348634f..afef3c1edb5f 100644
--- a/svx/source/cui/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -29,45 +29,29 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "hangulhanjadlg.hxx"
-#ifndef SVX_HANGUL_HANJA_DLG_HRC
 #include "hangulhanjadlg.hrc"
-#endif
 #include "commonlingui.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
 #include <algorithm>
 #include <tools/urlobj.hxx>
 #include <vcl/controllayout.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
-//#ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_
-//#include <com/sun/star/frame/XStorable.hpp>
-//#endif
-#ifndef _COM_SUN_STAR_LINGUISTIC2_CONVERSIONDICTIONARYTYPE_HPP_
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
-#ifndef _COM_SUN_STAR_LINGUISTIC2_CONVERSIONDIRECTION_HDL_
 #include <com/sun/star/linguistic2/ConversionDirection.hdl>
-#endif
-#endif
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_I18N_TEXTCONVERSIONOPTION_HDL_
 #include <com/sun/star/i18n/TextConversionOption.hdl>
-#endif
 #include <com/sun/star/util/XFlushable.hpp>
 
 #include <comphelper/processfactory.hxx>
-//#include <ucbhelper/content.hxx>
-
 
 #define HHC HangulHanjaConversion
 #define LINE_CNT        static_cast< USHORT >(2)
@@ -540,28 +524,28 @@ namespace svx
     //=========================================================================
     //-------------------------------------------------------------------------
     HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
-        :ModalDialog( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA ) )
+        :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) )
         ,m_pPlayground( new SvxCommonLinguisticControl( this ) )
-        ,m_aFind            ( m_pPlayground.get(), SVX_RES( PB_FIND ) )
-        ,m_aSuggestions     ( m_pPlayground.get(), SVX_RES( CTL_SUGGESTIONS ) )
-        ,m_aFormat          ( m_pPlayground.get(), SVX_RES( FT_FORMAT ) )
-        ,m_aSimpleConversion( m_pPlayground.get(), SVX_RES( RB_SIMPLE_CONVERSION ) )
-        ,m_aHangulBracketed ( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_BRACKETED ) )
-        ,m_aHanjaBracketed  ( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_BRACKETED ) )
-        ,m_aConversion      ( m_pPlayground.get(), SVX_RES( FT_CONVERSION ) )
-        ,m_aHangulOnly      ( m_pPlayground.get(), SVX_RES( CB_HANGUL_ONLY ) )
-        ,m_aHanjaOnly       ( m_pPlayground.get(), SVX_RES( CB_HANJA_ONLY ) )
-        ,m_aReplaceByChar   ( m_pPlayground.get(), SVX_RES( CB_REPLACE_BY_CHARACTER ) )
+        ,m_aFind            ( m_pPlayground.get(), CUI_RES( PB_FIND ) )
+        ,m_aSuggestions     ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) )
+        ,m_aFormat          ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) )
+        ,m_aSimpleConversion( m_pPlayground.get(), CUI_RES( RB_SIMPLE_CONVERSION ) )
+        ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) )
+        ,m_aHanjaBracketed  ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) )
+        ,m_aConversion      ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) )
+        ,m_aHangulOnly      ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) )
+        ,m_aHanjaOnly       ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) )
+        ,m_aReplaceByChar   ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) )
         ,m_pIgnoreNonPrimary( NULL )
         ,m_bDocumentMode( true )
     {
         // special creation of the 4 pseudo-ruby radio buttons
-        String sSecondaryHangul( SVX_RES( STR_HANGUL ) );
-        String sSecondaryHanja( SVX_RES( STR_HANJA ) );
-        m_pHanjaAbove.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_ABOVE ), sSecondaryHanja, PseudoRubyText::eAbove ) );
-        m_pHanjaBelow.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_BELOW ), sSecondaryHanja, PseudoRubyText::eBelow ) );
-        m_pHangulAbove.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_ABOVE ), sSecondaryHangul, PseudoRubyText::eAbove ) );
-        m_pHangulBelow.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_BELOW ), sSecondaryHangul, PseudoRubyText::eBelow ) );
+        String sSecondaryHangul( CUI_RES( STR_HANGUL ) );
+        String sSecondaryHanja( CUI_RES( STR_HANJA ) );
+        m_pHanjaAbove.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_ABOVE ), sSecondaryHanja, PseudoRubyText::eAbove ) );
+        m_pHanjaBelow.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BELOW ), sSecondaryHanja, PseudoRubyText::eBelow ) );
+        m_pHangulAbove.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_ABOVE ), sSecondaryHangul, PseudoRubyText::eAbove ) );
+        m_pHangulBelow.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BELOW ), sSecondaryHangul, PseudoRubyText::eBelow ) );
 
         // since these 4 buttons are not created within the other members, they have a wrong initial Z-Order
         // correct this
@@ -594,7 +578,7 @@ namespace svx
         // additionall, the playground is not wide enough (in it's default size)
         sal_Int32 nEnlargeWidth = 0;
         {
-            FixedText aBottomAnchor( m_pPlayground.get(), SVX_RES( FT_RESIZE_ANCHOR ) );
+            FixedText aBottomAnchor( m_pPlayground.get(), CUI_RES( FT_RESIZE_ANCHOR ) );
             Point aAnchorPos = aBottomAnchor.GetPosPixel();
 
             nEnlargeWidth = aAnchorPos.X() - m_pPlayground->GetActionButtonsLocation().X();
@@ -1171,19 +1155,19 @@ namespace svx
     }
 
     HangulHanjaOptionsDialog::HangulHanjaOptionsDialog( Window* _pParent )
-        :ModalDialog            ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) )
-        ,m_aUserdefdictFT       ( this, SVX_RES( FT_USERDEFDICT ) )
-        ,m_aDictsLB             ( this, SVX_RES( LB_DICTS ) )
-        ,m_aOptionsFL           ( this, SVX_RES( FL_OPTIONS ) )
-        ,m_aIgnorepostCB        ( this, SVX_RES( CB_IGNOREPOST ) )
-        ,m_aShowrecentlyfirstCB ( this, SVX_RES( CB_SHOWRECENTLYFIRST ) )
-        ,m_aAutoreplaceuniqueCB ( this, SVX_RES( CB_AUTOREPLACEUNIQUE ) )
-        ,m_aNewPB               ( this, SVX_RES( PB_HHO_NEW ) )
-        ,m_aEditPB              ( this, SVX_RES( PB_HHO_EDIT ) )
-        ,m_aDeletePB            ( this, SVX_RES( PB_HHO_DELETE ) )
-        ,m_aOkPB                ( this, SVX_RES( PB_HHO_OK ) )
-        ,m_aCancelPB            ( this, SVX_RES( PB_HHO_CANCEL ) )
-        ,m_aHelpPB              ( this, SVX_RES( PB_HHO_HELP ) )
+        :ModalDialog            ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) )
+        ,m_aUserdefdictFT       ( this, CUI_RES( FT_USERDEFDICT ) )
+        ,m_aDictsLB             ( this, CUI_RES( LB_DICTS ) )
+        ,m_aOptionsFL           ( this, CUI_RES( FL_OPTIONS ) )
+        ,m_aIgnorepostCB        ( this, CUI_RES( CB_IGNOREPOST ) )
+        ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) )
+        ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) )
+        ,m_aNewPB               ( this, CUI_RES( PB_HHO_NEW ) )
+        ,m_aEditPB              ( this, CUI_RES( PB_HHO_EDIT ) )
+        ,m_aDeletePB            ( this, CUI_RES( PB_HHO_DELETE ) )
+        ,m_aOkPB                ( this, CUI_RES( PB_HHO_OK ) )
+        ,m_aCancelPB            ( this, CUI_RES( PB_HHO_CANCEL ) )
+        ,m_aHelpPB              ( this, CUI_RES( PB_HHO_HELP ) )
 
         ,m_pCheckButtonData     ( NULL )
         ,m_xConversionDictionaryList( NULL )
@@ -1272,13 +1256,13 @@ namespace svx
     }
 
     HangulHanjaNewDictDialog::HangulHanjaNewDictDialog( Window* _pParent )
-        :ModalDialog    ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) )
-        ,m_aNewDictFL   ( this, SVX_RES( FL_NEWDICT ) )
-        ,m_aDictNameFT  ( this, SVX_RES( FT_DICTNAME ) )
-        ,m_aDictNameED  ( this, SVX_RES( ED_DICTNAME ) )
-        ,m_aOkBtn       ( this, SVX_RES( PB_NEWDICT_OK ) )
-        ,m_aCancelBtn   ( this, SVX_RES( PB_NEWDICT_ESC ) )
-        ,m_aHelpBtn     ( this, SVX_RES( PB_NEWDICT_HLP ) )
+        :ModalDialog    ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) )
+        ,m_aNewDictFL   ( this, CUI_RES( FL_NEWDICT ) )
+        ,m_aDictNameFT  ( this, CUI_RES( FT_DICTNAME ) )
+        ,m_aDictNameED  ( this, CUI_RES( ED_DICTNAME ) )
+        ,m_aOkBtn       ( this, CUI_RES( PB_NEWDICT_OK ) )
+        ,m_aCancelBtn   ( this, CUI_RES( PB_NEWDICT_ESC ) )
+        ,m_aHelpBtn     ( this, CUI_RES( PB_NEWDICT_HLP ) )
 
         ,m_bEntered     ( false )
     {
@@ -1841,25 +1825,25 @@ namespace svx
     }
 
     HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
-        :ModalDialog            ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) )
-        ,m_aEditHintText        ( SVX_RES( STR_EDITHINT ) )
+        :ModalDialog            ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) )
+        ,m_aEditHintText        ( CUI_RES( STR_EDITHINT ) )
         ,m_rDictList            ( _rDictList )
         ,m_nCurrentDict         ( 0xFFFFFFFF )
         ,m_pSuggestions         ( NULL )
-        ,m_aBookFT              ( this, SVX_RES( FT_BOOK ) )
-        ,m_aBookLB              ( this, SVX_RES( LB_BOOK ) )
-        ,m_aOriginalFT          ( this, SVX_RES( FT_ORIGINAL ) )
-        ,m_aOriginalLB          ( this, SVX_RES( LB_ORIGINAL ) )
-        ,m_aSuggestionsFT       ( this, SVX_RES( FT_SUGGESTIONS ) )
-        ,m_aEdit1               ( this, SVX_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 )
-        ,m_aEdit2               ( this, SVX_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 )
-        ,m_aEdit3               ( this, SVX_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 )
-        ,m_aEdit4               ( this, SVX_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL )
-        ,m_aScrollSB            ( this, SVX_RES( SB_SCROLL ) )
-        ,m_aNewPB               ( this, SVX_RES( PB_HHE_NEW ) )
-        ,m_aDeletePB            ( this, SVX_RES( PB_HHE_DELETE ) )
-        ,m_aHelpPB              ( this, SVX_RES( PB_HHE_HELP ) )
-        ,m_aClosePB             ( this, SVX_RES( PB_HHE_CLOSE ) )
+        ,m_aBookFT              ( this, CUI_RES( FT_BOOK ) )
+        ,m_aBookLB              ( this, CUI_RES( LB_BOOK ) )
+        ,m_aOriginalFT          ( this, CUI_RES( FT_ORIGINAL ) )
+        ,m_aOriginalLB          ( this, CUI_RES( LB_ORIGINAL ) )
+        ,m_aSuggestionsFT       ( this, CUI_RES( FT_SUGGESTIONS ) )
+        ,m_aEdit1               ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 )
+        ,m_aEdit2               ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 )
+        ,m_aEdit3               ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 )
+        ,m_aEdit4               ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL )
+        ,m_aScrollSB            ( this, CUI_RES( SB_SCROLL ) )
+        ,m_aNewPB               ( this, CUI_RES( PB_HHE_NEW ) )
+        ,m_aDeletePB            ( this, CUI_RES( PB_HHE_DELETE ) )
+        ,m_aHelpPB              ( this, CUI_RES( PB_HHE_HELP ) )
+        ,m_aClosePB             ( this, CUI_RES( PB_HHE_CLOSE ) )
         ,m_nTopPos              ( 0 )
         ,m_bModifiedSuggestions ( false )
         ,m_bModifiedOriginal    ( false )
diff --git a/svx/source/cui/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc
index 882d12a4c997..882d12a4c997 100644
--- a/svx/source/cui/hangulhanjadlg.hrc
+++ b/cui/source/dialogs/hangulhanjadlg.hrc
diff --git a/svx/source/cui/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src
index 920f99e03aec..93d58755b14b 100644
--- a/svx/source/cui/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
 #ifndef SVX_HANGUL_HANJA_DLG_HRC
diff --git a/svx/source/cui/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 8ecaf7429edd..0a2dfa9955f5 100644
--- a/svx/source/cui/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include "hldocntp.hxx"
 #include <sfx2/viewfrm.hxx>
@@ -46,8 +42,8 @@
 #include <tools/config.hxx>
 #include <vcl/image.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/dynamicmenuoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/ucbhelper.hxx>
@@ -119,18 +115,18 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri
 |************************************************************************/
 
 SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet)
-:   SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ),
-    maGrpNewDoc     ( this, SVX_RES (GRP_NEWDOCUMENT) ),
-    maRbtEditNow    ( this, SVX_RES (RB_EDITNOW) ),
-    maRbtEditLater  ( this, SVX_RES (RB_EDITLATER) ),
-    maFtPath        ( this, SVX_RES (FT_PATH_NEWDOC) ),
+:   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ),
+    maGrpNewDoc     ( this, CUI_RES (GRP_NEWDOCUMENT) ),
+    maRbtEditNow    ( this, CUI_RES (RB_EDITNOW) ),
+    maRbtEditLater  ( this, CUI_RES (RB_EDITLATER) ),
+    maFtPath        ( this, CUI_RES (FT_PATH_NEWDOC) ),
     maCbbPath       ( this, INET_PROT_FILE ),
-    maBtCreate      ( this, SVX_RES (BTN_CREATE) ),
-    maFtDocTypes    ( this, SVX_RES (FT_DOCUMENT_TYPES) ),
-    maLbDocTypes    ( this, SVX_RES (LB_DOCUMENT_TYPES) )
+    maBtCreate      ( this, CUI_RES (BTN_CREATE) ),
+    maFtDocTypes    ( this, CUI_RES (FT_DOCUMENT_TYPES) ),
+    maLbDocTypes    ( this, CUI_RES (LB_DOCUMENT_TYPES) )
 {
     // Set HC bitmaps and disable display of bitmap names.
-    maBtCreate.SetModeImage( Image( SVX_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtCreate.EnableTextDisplay (FALSE);
 
     InitStdControls();
@@ -323,7 +319,7 @@ BOOL SvxHyperlinkNewDocTp::AskApply()
     sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject );
     if ( !bRet )
     {
-        WarningBox aWarning( this, WB_OK, SVX_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
+        WarningBox aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
         aWarning.Execute();
     }
     return bRet;
@@ -373,7 +369,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
 
                 if( bOk )
                 {
-                    WarningBox aWarning( this, WB_YES_NO, SVX_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
+                    WarningBox aWarning( this, WB_YES_NO, CUI_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
                     bCreate = aWarning.Execute() == BUTTON_YES;
                 }
             }
diff --git a/svx/source/cui/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 34d8ea450e2a..1f4689c33fff 100644
--- a/svx/source/cui/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include "cuihyperdlg.hxx"
 #include <unotools/localfilehelper.hxx>
@@ -58,23 +54,23 @@ sal_Char __READONLY_DATA sHTTPScheme[]    = INET_HTTP_SCHEME;
 |************************************************************************/
 
 SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet)
-    : SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ),
-    maGrpDocument   ( this, SVX_RES (GRP_DOCUMENT) ),
-    maFtPath        ( this, SVX_RES (FT_PATH_DOC) ),
+    : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ),
+    maGrpDocument   ( this, CUI_RES (GRP_DOCUMENT) ),
+    maFtPath        ( this, CUI_RES (FT_PATH_DOC) ),
     maCbbPath       ( this, INET_PROT_FILE ),
-    maBtFileopen    ( this, SVX_RES (BTN_FILEOPEN) ),
-    maGrpTarget     ( this, SVX_RES (GRP_TARGET) ),
-    maFtTarget      ( this, SVX_RES (FT_TARGET_DOC) ),
-    maEdTarget      ( this, SVX_RES (ED_TARGET_DOC) ),
-    maFtURL         ( this, SVX_RES (FT_URL) ),
-    maFtFullURL     ( this, SVX_RES (FT_FULL_URL) ),
-    maBtBrowse      ( this, SVX_RES (BTN_BROWSE) ),
+    maBtFileopen    ( this, CUI_RES (BTN_FILEOPEN) ),
+    maGrpTarget     ( this, CUI_RES (GRP_TARGET) ),
+    maFtTarget      ( this, CUI_RES (FT_TARGET_DOC) ),
+    maEdTarget      ( this, CUI_RES (ED_TARGET_DOC) ),
+    maFtURL         ( this, CUI_RES (FT_URL) ),
+    maFtFullURL     ( this, CUI_RES (FT_FULL_URL) ),
+    maBtBrowse      ( this, CUI_RES (BTN_BROWSE) ),
     mbMarkWndOpen   ( FALSE )
 {
     // Set HC bitmaps and disable display of bitmap names.
-    maBtBrowse.SetModeImage( Image( SVX_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtBrowse.EnableTextDisplay (FALSE);
-    maBtFileopen.SetModeImage( Image( SVX_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    maBtFileopen.SetModeImage( Image( CUI_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtFileopen.EnableTextDisplay (FALSE);
 
     InitStdControls();
diff --git a/svx/source/cui/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 218cc73d8a82..ef0a330f00ef 100644
--- a/svx/source/cui/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -29,14 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/adrparse.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <svl/adrparse.hxx>
 
 #include "hlinettp.hxx"
 #include "hyperdlg.hrc"
@@ -59,27 +56,27 @@ sal_Char __READONLY_DATA sTelnetScheme[] = INET_TELNET_SCHEME;
 
 SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
                                                  const SfxItemSet& rItemSet)
-:   SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_INTERNET ),
+:   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_INTERNET ),
                               rItemSet ) ,
-    maGrpLinkTyp           ( this, SVX_RES (GRP_LINKTYPE) ),
-    maRbtLinktypInternet    ( this, SVX_RES (RB_LINKTYP_INTERNET) ),
-    maRbtLinktypFTP         ( this, SVX_RES (RB_LINKTYP_FTP) ),
-    maRbtLinktypTelnet      ( this, SVX_RES (RB_LINKTYP_TELNET) ),
-    maFtTarget              ( this, SVX_RES (FT_TARGET_HTML) ),
+    maGrpLinkTyp           ( this, CUI_RES (GRP_LINKTYPE) ),
+    maRbtLinktypInternet    ( this, CUI_RES (RB_LINKTYP_INTERNET) ),
+    maRbtLinktypFTP         ( this, CUI_RES (RB_LINKTYP_FTP) ),
+    maRbtLinktypTelnet      ( this, CUI_RES (RB_LINKTYP_TELNET) ),
+    maFtTarget              ( this, CUI_RES (FT_TARGET_HTML) ),
     maCbbTarget             ( this, INET_PROT_HTTP ),
-    maFtLogin               ( this, SVX_RES (FT_LOGIN) ),
-    maEdLogin               ( this, SVX_RES (ED_LOGIN) ),
-    maFtPassword            ( this, SVX_RES (FT_PASSWD) ),
-    maEdPassword            ( this, SVX_RES (ED_PASSWD) ),
-    maCbAnonymous           ( this, SVX_RES (CBX_ANONYMOUS) ),
-    maBtBrowse              ( this, SVX_RES (BTN_BROWSE) ),
-    maBtTarget              ( this, SVX_RES (BTN_TARGET) ),
+    maFtLogin               ( this, CUI_RES (FT_LOGIN) ),
+    maEdLogin               ( this, CUI_RES (ED_LOGIN) ),
+    maFtPassword            ( this, CUI_RES (FT_PASSWD) ),
+    maEdPassword            ( this, CUI_RES (ED_PASSWD) ),
+    maCbAnonymous           ( this, CUI_RES (CBX_ANONYMOUS) ),
+    maBtBrowse              ( this, CUI_RES (BTN_BROWSE) ),
+    maBtTarget              ( this, CUI_RES (BTN_TARGET) ),
     mbMarkWndOpen           ( FALSE )
 {
     // Set HC bitmaps and display display of bitmap names.
-    maBtBrowse.SetModeImage( Image( SVX_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtBrowse.EnableTextDisplay (FALSE);
-    maBtTarget.SetModeImage( Image( SVX_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    maBtTarget.SetModeImage( Image( CUI_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtTarget.EnableTextDisplay (FALSE);
 
     InitStdControls();
diff --git a/svx/source/cui/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 982e79c9d921..389fb20bf48b 100644
--- a/svx/source/cui/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -29,11 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -41,8 +38,8 @@
 
 #include <comphelper/processfactory.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include "hlmailtp.hxx"
 #include "hyperdlg.hrc"
@@ -57,19 +54,19 @@ using namespace ::com::sun::star;
 |************************************************************************/
 
 SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rItemSet)
-:   SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_MAIL ),
+:   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_MAIL ),
                               rItemSet ),
-    maGrpMailNews   ( this, SVX_RES (GRP_MAILNEWS) ),
-    maRbtMail       ( this, SVX_RES (RB_LINKTYP_MAIL) ),
-    maRbtNews       ( this, SVX_RES (RB_LINKTYP_NEWS) ),
-    maFtReceiver    ( this, SVX_RES (FT_RECEIVER) ),
+    maGrpMailNews   ( this, CUI_RES (GRP_MAILNEWS) ),
+    maRbtMail       ( this, CUI_RES (RB_LINKTYP_MAIL) ),
+    maRbtNews       ( this, CUI_RES (RB_LINKTYP_NEWS) ),
+    maFtReceiver    ( this, CUI_RES (FT_RECEIVER) ),
     maCbbReceiver   ( this, INET_PROT_MAILTO ),
-    maBtAdrBook     ( this, SVX_RES (BTN_ADRESSBOOK) ),
-    maFtSubject     ( this, SVX_RES (FT_SUBJECT) ),
-    maEdSubject     ( this, SVX_RES (ED_SUBJECT) )
+    maBtAdrBook     ( this, CUI_RES (BTN_ADRESSBOOK) ),
+    maFtSubject     ( this, CUI_RES (FT_SUBJECT) ),
+    maEdSubject     ( this, CUI_RES (ED_SUBJECT) )
 {
     // Set HC bitmaps and disable display of bitmap names.
-    maBtAdrBook.SetModeImage( Image( SVX_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    maBtAdrBook.SetModeImage( Image( CUI_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtAdrBook.EnableTextDisplay (FALSE);
 
     InitStdControls();
diff --git a/svx/source/cui/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 86dc32c6d720..f5005dbedfd7 100644
--- a/svx/source/cui/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -29,13 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <vcl/wrkwin.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <sfx2/docfile.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -52,7 +49,7 @@
 
 #include <toolkit/unohlp.hxx>
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "hlmarkwn.hrc"
 #include "hlmarkwn.hxx"
 #include "hltpbase.hxx"
@@ -110,10 +107,10 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
         switch( mpParentWnd->mnError )
         {
         case LERR_NOENTRIES :
-            aStrMessage = SVX_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
+            aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
             break;
         case LERR_DOCNOTOPEN :
-            aStrMessage = SVX_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
+            aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
             break;
         }
 
@@ -135,10 +132,10 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
 |************************************************************************/
 
 SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
-:   ModalDialog( (Window*)pParent, SVX_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ),
-    maBtApply( this, SVX_RES (BT_APPLY) ),
-    maBtClose( this, SVX_RES (BT_CLOSE) ),
-    maLbTree ( this, SVX_RES (TLB_MARK) ),
+:   ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ),
+    maBtApply( this, CUI_RES (BT_APPLY) ),
+    maBtClose( this, CUI_RES (BT_CLOSE) ),
+    maLbTree ( this, CUI_RES (TLB_MARK) ),
     mbUserMoved ( FALSE ),
     mbFirst     ( TRUE ),
     mpParent    ( pParent ),
diff --git a/svx/source/inc/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index d79da8b38dd6..d79da8b38dd6 100644
--- a/svx/source/inc/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
diff --git a/svx/source/cui/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src
index 4618ee6c9549..48bf6d40fcb6 100644
--- a/svx/source/cui/hlmarkwn.src
+++ b/cui/source/dialogs/hlmarkwn.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "hlmarkwn.hrc"
 
diff --git a/svx/source/cui/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index b727602255f7..8ee78806ab0e 100644
--- a/svx/source/cui/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -29,28 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sot/formats.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
 #include "hyperdlg.hrc"
-//CHINA001 #ifndef _SVX_TAB_HYPERLINK_HXX
-//CHINA001 #include "hyperdlg.hxx"
-//CHINA001 #endif
 #include "cuihyperdlg.hxx"  //CHINA001
 #include "hltpbase.hxx"
 #include "macroass.hxx"
-
 #include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <cuires.hrc> //CHINA001
 
 using namespace ::ucbhelper;
 
@@ -447,8 +440,8 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( SvxHyperlinkItem* pHyperli
         mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() );
 
     // Form
-    String aStrFormText = SVX_RESSTR( RID_SVXSTR_HYPERDLG_FROM_TEXT );
-    String aStrFormButton = SVX_RESSTR( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
+    String aStrFormText = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FROM_TEXT );
+    String aStrFormButton = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
 
     if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE )
     {
@@ -596,13 +589,13 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
         SfxMacroTabPage *pMacroPage = (SfxMacroTabPage*) aDlg.GetTabPage();
 
         if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSEOVER_OBJECT )
-            pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT1) ),
+            pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT1) ),
                                   SFX_EVENT_MOUSEOVER_OBJECT );
         if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSECLICK_OBJECT )
-            pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT2) ),
+            pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT2) ),
                                   SFX_EVENT_MOUSECLICK_OBJECT);
         if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSEOUT_OBJECT )
-            pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ),
+            pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ),
                                   SFX_EVENT_MOUSEOUT_OBJECT);
 
         // --> PB 2006-01-13 #123474#
diff --git a/svx/source/inc/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc
index 69dae5d1ce57..69dae5d1ce57 100644
--- a/svx/source/inc/hyperdlg.hrc
+++ b/cui/source/dialogs/hyperdlg.hrc
diff --git a/svx/source/dialog/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 9375ac96ba09..4811fa4662e6 100644
--- a/svx/source/dialog/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "hyperdlg.hrc"
 
diff --git a/svx/source/cui/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 5099fdce6af2..95f49308acb4 100644
--- a/svx/source/cui/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -29,28 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <sfx2/app.hxx>
 #include <tools/rc.h>
 #include <tools/shl.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svx/dialmgr.hxx>
+#include <svl/svstdarr.hxx>
+#include <dialmgr.hxx>
 
 #include "iconcdlg.hxx"
 
-#ifndef _SVX_HELPID_HRC
 #include "helpid.hrc"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svtools/viewoptions.hxx>
+#include <cuires.hrc>
+#include <unotools/viewoptions.hxx>
 #include <svtools/apearcfg.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/i18nhelp.hxx>
@@ -324,7 +317,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
     aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN );
     aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN );
     aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) );
-    aResetBtn.SetText( SVX_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) );
+    aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) );
     aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN );
     aOKBtn.Show();
     aCancelBtn.Show();
diff --git a/svx/source/cui/iconcdlg.src b/cui/source/dialogs/iconcdlg.src
index 1594eb43a8c7..83c8b8825aaf 100644
--- a/svx/source/cui/iconcdlg.src
+++ b/cui/source/dialogs/iconcdlg.src
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 String RID_SVXSTR_ICONCHOICEDLG_RESETBUT
 {
diff --git a/svx/source/cui/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index d53c300c79c7..3bbcf25643e0 100644
--- a/svx/source/cui/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -29,11 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
@@ -49,13 +46,13 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
 #include "insdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <svtools/sores.hxx>
 
 #include <stdio.h>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
@@ -67,12 +64,11 @@
 #include <sfx2/frmdescr.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 #include <comphelper/seqstream.hxx>
 
 #include "svuidlg.hrc"
 
-
 #include <osl/file.hxx>
 
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -87,7 +83,7 @@ using namespace ::com::sun::star::ui::dialogs;
 using ::rtl::OUString;
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 
 static String impl_getSvtResString( sal_uInt32 nId )
@@ -215,18 +211,18 @@ SvInsertOleDlg::SvInsertOleDlg
     const Reference < embed::XStorage >& xStorage,
     const SvObjectServerList* pServers
 )
-    : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OLEOBJECT ), xStorage ),
-    aRbNewObject( this, SVX_RES( RB_NEW_OBJECT ) ),
-    aRbObjectFromfile( this, SVX_RES( RB_OBJECT_FROMFILE ) ),
-    aLbObjecttype( this, SVX_RES( LB_OBJECTTYPE ) ),
-    aEdFilepath( this, SVX_RES( ED_FILEPATH ) ),
-    aBtnFilepath( this, SVX_RES( BTN_FILEPATH ) ),
-    aCbFilelink( this, SVX_RES( CB_FILELINK ) ),
-    aGbObject( this, SVX_RES( GB_OBJECT ) ),
-    aOKButton1( this, SVX_RES( 1 ) ),
-    aCancelButton1( this, SVX_RES( 1 ) ),
-    aHelpButton1( this, SVX_RES( 1 ) ),
-    aStrFile( SVX_RES( STR_FILE ) ),
+    : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OLEOBJECT ), xStorage ),
+    aRbNewObject( this, CUI_RES( RB_NEW_OBJECT ) ),
+    aRbObjectFromfile( this, CUI_RES( RB_OBJECT_FROMFILE ) ),
+    aLbObjecttype( this, CUI_RES( LB_OBJECTTYPE ) ),
+    aEdFilepath( this, CUI_RES( ED_FILEPATH ) ),
+    aBtnFilepath( this, CUI_RES( BTN_FILEPATH ) ),
+    aCbFilelink( this, CUI_RES( CB_FILELINK ) ),
+    aGbObject( this, CUI_RES( GB_OBJECT ) ),
+    aOKButton1( this, CUI_RES( 1 ) ),
+    aCancelButton1( this, CUI_RES( 1 ) ),
+    aHelpButton1( this, CUI_RES( 1 ) ),
+    aStrFile( CUI_RES( STR_FILE ) ),
     m_pServers( pServers )
 {
     FreeResource();
@@ -460,15 +456,15 @@ IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG )
 // -----------------------------------------------------------------------
 
 SvInsertPlugInDialog::SvInsertPlugInDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage )
-    : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ),
-    aEdFileurl( this, SVX_RES( ED_FILEURL ) ),
-    aBtnFileurl( this, SVX_RES( BTN_FILEURL ) ),
-    aGbFileurl( this, SVX_RES( GB_FILEURL ) ),
-    aEdPluginsOptions( this, SVX_RES( ED_PLUGINS_OPTIONS ) ),
-    aGbPluginsOptions( this, SVX_RES( GB_PLUGINS_OPTIONS ) ),
-    aOKButton1( this, SVX_RES( 1 ) ),
-    aCancelButton1( this, SVX_RES( 1 ) ),
-    aHelpButton1( this, SVX_RES( 1 ) ),
+    : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ),
+    aEdFileurl( this, CUI_RES( ED_FILEURL ) ),
+    aBtnFileurl( this, CUI_RES( BTN_FILEURL ) ),
+    aGbFileurl( this, CUI_RES( GB_FILEURL ) ),
+    aEdPluginsOptions( this, CUI_RES( ED_PLUGINS_OPTIONS ) ),
+    aGbPluginsOptions( this, CUI_RES( GB_PLUGINS_OPTIONS ) ),
+    aOKButton1( this, CUI_RES( 1 ) ),
+    aCancelButton1( this, CUI_RES( 1 ) ),
+    aHelpButton1( this, CUI_RES( 1 ) ),
     m_pURL(0)
 {
     FreeResource();
@@ -604,18 +600,18 @@ IMPL_LINK( SvInsertAppletDialog, BrowseHdl, PushButton *, EMPTYARG )
 // -----------------------------------------------------------------------
 
 SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage )
-    : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_APPLET ), xStorage ),
-    aFtClassfile( this, SVX_RES( FT_CLASSFILE ) ),
-    aEdClassfile( this, SVX_RES( ED_CLASSFILE ) ),
-    aFtClasslocation( this, SVX_RES( FT_CLASSLOCATION ) ),
-    aEdClasslocation( this, SVX_RES( ED_CLASSLOCATION ) ),
-    aBtnClass( this, SVX_RES( BTN_CLASS ) ),
-    aGbClass( this, SVX_RES( GB_CLASS ) ),
-    aEdAppletOptions( this, SVX_RES( ED_APPLET_OPTIONS ) ),
-    aGbAppletOptions( this, SVX_RES( GB_APPLET_OPTIONS ) ),
-    aOKButton1( this, SVX_RES( 1 ) ),
-    aCancelButton1( this, SVX_RES( 1 ) ),
-    aHelpButton1( this, SVX_RES( 1 ) ),
+    : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), xStorage ),
+    aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ),
+    aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ),
+    aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ),
+    aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ),
+    aBtnClass( this, CUI_RES( BTN_CLASS ) ),
+    aGbClass( this, CUI_RES( GB_CLASS ) ),
+    aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ),
+    aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ),
+    aOKButton1( this, CUI_RES( 1 ) ),
+    aCancelButton1( this, CUI_RES( 1 ) ),
+    aHelpButton1( this, CUI_RES( 1 ) ),
     m_pURL(0)
 {
     FreeResource();
@@ -623,18 +619,18 @@ SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Referenc
 }
 
 SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XEmbeddedObject >& xObj )
-    : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_APPLET ), uno::Reference < embed::XStorage >() ),
-    aFtClassfile( this, SVX_RES( FT_CLASSFILE ) ),
-    aEdClassfile( this, SVX_RES( ED_CLASSFILE ) ),
-    aFtClasslocation( this, SVX_RES( FT_CLASSLOCATION ) ),
-    aEdClasslocation( this, SVX_RES( ED_CLASSLOCATION ) ),
-    aBtnClass( this, SVX_RES( BTN_CLASS ) ),
-    aGbClass( this, SVX_RES( GB_CLASS ) ),
-    aEdAppletOptions( this, SVX_RES( ED_APPLET_OPTIONS ) ),
-    aGbAppletOptions( this, SVX_RES( GB_APPLET_OPTIONS ) ),
-    aOKButton1( this, SVX_RES( 1 ) ),
-    aCancelButton1( this, SVX_RES( 1 ) ),
-    aHelpButton1( this, SVX_RES( 1 ) ),
+    : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), uno::Reference < embed::XStorage >() ),
+    aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ),
+    aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ),
+    aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ),
+    aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ),
+    aBtnClass( this, CUI_RES( BTN_CLASS ) ),
+    aGbClass( this, CUI_RES( GB_CLASS ) ),
+    aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ),
+    aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ),
+    aOKButton1( this, CUI_RES( 1 ) ),
+    aCancelButton1( this, CUI_RES( 1 ) ),
+    aHelpButton1( this, CUI_RES( 1 ) ),
     m_pURL(0)
 {
     m_xObj = xObj;
@@ -679,7 +675,7 @@ short SvInsertAppletDialog::Execute()
                 SetAppletOptions( aList.GetCommands() );
             }
 
-            String aText( SVX_RES( STR_EDIT_APPLET ) );
+            String aText( CUI_RES( STR_EDIT_APPLET ) );
             SetText( aText );
             bOK = TRUE;
         }
@@ -745,31 +741,31 @@ short SvInsertAppletDialog::Execute()
 
 SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
                             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
-    : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_IFRAME ), xStorage )
-    , aFTName ( this, SVX_RES( FT_FRAMENAME ) )
-    , aEDName ( this, SVX_RES( ED_FRAMENAME ) )
-    , aFTURL ( this, SVX_RES( FT_URL ) )
-    , aEDURL ( this, SVX_RES( ED_URL ) )
-    , aBTOpen ( this, SVX_RES(BT_FILEOPEN ) )
-    , aRBScrollingOn ( this, SVX_RES( RB_SCROLLINGON ) )
-    , aRBScrollingOff ( this, SVX_RES( RB_SCROLLINGOFF ) )
-    , aRBScrollingAuto ( this, SVX_RES( RB_SCROLLINGAUTO ) )
-    , aFLScrolling ( this, SVX_RES( GB_SCROLLING ) )
-    , aFLSepLeft( this, SVX_RES( FL_SEP_LEFT ) )
-    , aRBFrameBorderOn ( this, SVX_RES( RB_FRMBORDER_ON ) )
-    , aRBFrameBorderOff ( this, SVX_RES( RB_FRMBORDER_OFF ) )
-    , aFLFrameBorder( this, SVX_RES( GB_BORDER ) )
-    , aFLSepRight( this, SVX_RES( FL_SEP_RIGHT ) )
-    , aFTMarginWidth ( this, SVX_RES( FT_MARGINWIDTH ) )
-    , aNMMarginWidth ( this, SVX_RES( NM_MARGINWIDTH ) )
-    , aCBMarginWidthDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
-    , aFTMarginHeight ( this, SVX_RES( FT_MARGINHEIGHT ) )
-    , aNMMarginHeight ( this, SVX_RES( NM_MARGINHEIGHT ) )
-    , aCBMarginHeightDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
-    , aFLMargin( this, SVX_RES( GB_MARGIN ) )
-    , aOKButton1( this, SVX_RES( 1 ) )
-    , aCancelButton1( this, SVX_RES( 1 ) )
-    , aHelpButton1( this, SVX_RES( 1 ) )
+    : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), xStorage )
+    , aFTName ( this, CUI_RES( FT_FRAMENAME ) )
+    , aEDName ( this, CUI_RES( ED_FRAMENAME ) )
+    , aFTURL ( this, CUI_RES( FT_URL ) )
+    , aEDURL ( this, CUI_RES( ED_URL ) )
+    , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
+    , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
+    , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
+    , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
+    , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
+    , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
+    , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
+    , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
+    , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
+    , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
+    , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
+    , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
+    , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+    , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
+    , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
+    , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+    , aFLMargin( this, CUI_RES( GB_MARGIN ) )
+    , aOKButton1( this, CUI_RES( 1 ) )
+    , aCancelButton1( this, CUI_RES( 1 ) )
+    , aHelpButton1( this, CUI_RES( 1 ) )
 {
     FreeResource();
 
@@ -789,31 +785,31 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
 }
 
 SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, const uno::Reference < embed::XEmbeddedObject >& xObj )
-    : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_IFRAME ), uno::Reference < embed::XStorage >() )
-    , aFTName ( this, SVX_RES( FT_FRAMENAME ) )
-    , aEDName ( this, SVX_RES( ED_FRAMENAME ) )
-    , aFTURL ( this, SVX_RES( FT_URL ) )
-    , aEDURL ( this, SVX_RES( ED_URL ) )
-    , aBTOpen ( this, SVX_RES(BT_FILEOPEN ) )
-    , aRBScrollingOn ( this, SVX_RES( RB_SCROLLINGON ) )
-    , aRBScrollingOff ( this, SVX_RES( RB_SCROLLINGOFF ) )
-    , aRBScrollingAuto ( this, SVX_RES( RB_SCROLLINGAUTO ) )
-    , aFLScrolling ( this, SVX_RES( GB_SCROLLING ) )
-    , aFLSepLeft( this, SVX_RES( FL_SEP_LEFT ) )
-    , aRBFrameBorderOn ( this, SVX_RES( RB_FRMBORDER_ON ) )
-    , aRBFrameBorderOff ( this, SVX_RES( RB_FRMBORDER_OFF ) )
-    , aFLFrameBorder( this, SVX_RES( GB_BORDER ) )
-    , aFLSepRight( this, SVX_RES( FL_SEP_RIGHT ) )
-    , aFTMarginWidth ( this, SVX_RES( FT_MARGINWIDTH ) )
-    , aNMMarginWidth ( this, SVX_RES( NM_MARGINWIDTH ) )
-    , aCBMarginWidthDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
-    , aFTMarginHeight ( this, SVX_RES( FT_MARGINHEIGHT ) )
-    , aNMMarginHeight ( this, SVX_RES( NM_MARGINHEIGHT ) )
-    , aCBMarginHeightDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
-    , aFLMargin( this, SVX_RES( GB_MARGIN ) )
-    , aOKButton1( this, SVX_RES( 1 ) )
-    , aCancelButton1( this, SVX_RES( 1 ) )
-    , aHelpButton1( this, SVX_RES( 1 ) )
+    : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), uno::Reference < embed::XStorage >() )
+    , aFTName ( this, CUI_RES( FT_FRAMENAME ) )
+    , aEDName ( this, CUI_RES( ED_FRAMENAME ) )
+    , aFTURL ( this, CUI_RES( FT_URL ) )
+    , aEDURL ( this, CUI_RES( ED_URL ) )
+    , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
+    , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
+    , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
+    , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
+    , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
+    , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
+    , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
+    , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
+    , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
+    , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
+    , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
+    , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
+    , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+    , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
+    , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
+    , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+    , aFLMargin( this, CUI_RES( GB_MARGIN ) )
+    , aOKButton1( this, CUI_RES( 1 ) )
+    , aCancelButton1( this, CUI_RES( 1 ) )
+    , aHelpButton1( this, CUI_RES( 1 ) )
 {
     FreeResource();
 
@@ -1051,7 +1047,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
     sfx2::FileDialogHelper aFileDlg( WB_OPEN | SFXWB_PASSWORD, String() );
 
     // set the title
-    aFileDlg.SetTitle( OUString( String( SVX_RES( MD_INSERT_OBJECT_IFRAME ) ) ) );
+    aFileDlg.SetTitle( OUString( String( CUI_RES( MD_INSERT_OBJECT_IFRAME ) ) ) );
 
     // show the dialog
     if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/svx/source/cui/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 10b0a5d713a3..270a36202c90 100644
--- a/svx/source/cui/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -29,14 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "insrc.hxx"
 #include "insrc.hrc"
 
@@ -51,18 +48,18 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
 }
 
 SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId )
-    : ModalDialog( pParent, SVX_RES(DLG_INS_ROW_COL) ),
-    aCount( this, SVX_RES( FT_COUNT ) ),
-    aCountEdit( this, SVX_RES( ED_COUNT ) ),
-    aInsFL( this, SVX_RES( FL_INS ) ),
-    aBeforeBtn( this, SVX_RES( CB_POS_BEFORE ) ),
-    aAfterBtn( this, SVX_RES( CB_POS_AFTER ) ),
-    aPosFL( this, SVX_RES( FL_POS ) ),
-    aRow(SVX_RES(STR_ROW)),
-    aCol(SVX_RES(STR_COL)),
-    aOKBtn( this, SVX_RES( BT_OK ) ),
-    aCancelBtn( this, SVX_RES( BT_CANCEL ) ),
-    aHelpBtn( this, SVX_RES( BT_HELP ) ),
+    : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ),
+    aCount( this, CUI_RES( FT_COUNT ) ),
+    aCountEdit( this, CUI_RES( ED_COUNT ) ),
+    aInsFL( this, CUI_RES( FL_INS ) ),
+    aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ),
+    aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ),
+    aPosFL( this, CUI_RES( FL_POS ) ),
+    aRow(CUI_RES(STR_ROW)),
+    aCol(CUI_RES(STR_COL)),
+    aOKBtn( this, CUI_RES( BT_OK ) ),
+    aCancelBtn( this, CUI_RES( BT_CANCEL ) ),
+    aHelpBtn( this, CUI_RES( BT_HELP ) ),
     bColumn( bCol )
 {
     FreeResource();
diff --git a/svx/source/cui/insrc.hrc b/cui/source/dialogs/insrc.hrc
index e07c7cb2f1d5..e07c7cb2f1d5 100644
--- a/svx/source/cui/insrc.hrc
+++ b/cui/source/dialogs/insrc.hrc
diff --git a/svx/source/cui/insrc.src b/cui/source/dialogs/insrc.src
index 6023e94604ef..7d6845c32910 100644
--- a/svx/source/cui/insrc.src
+++ b/cui/source/dialogs/insrc.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "insrc.hrc"
 
 ModalDialog DLG_INS_ROW_COL
diff --git a/svx/source/cui/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index b2e00cf48c0b..106e3b898243 100644
--- a/svx/source/cui/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -29,14 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <linkdlg.hxx>
 #include <vcl/svapp.hxx>
+#include "helpid.hrc"
 
 #include <tools/urlobj.hxx>
 #include <svtools/svmedit.hxx>
@@ -57,10 +54,10 @@
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/objsh.hxx>
 
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #define MAX_FILENAME    18
 #define MAX_LINKNAME    18
@@ -81,37 +78,37 @@ static long nTabs[] =
 
 
 SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, SvLinkManager* pMgr, BOOL bHtml )
-    : ModalDialog( pParent, SVX_RES( MD_UPDATE_BASELINKS ) ),
-    aFtFiles( this, SVX_RES( FT_FILES ) ),
-    aFtLinks( this, SVX_RES( FT_LINKS ) ),
-    aFtType( this, SVX_RES( FT_TYPE ) ),
-    aFtStatus( this, SVX_RES( FT_STATUS ) ),
-    aCancelButton1( this, SVX_RES( 1 ) ),
-    aHelpButton1( this, SVX_RES( 1 ) ),
-    aPbUpdateNow( this, SVX_RES( PB_UPDATE_NOW ) ),
-    aPbOpenSource( this, SVX_RES( PB_OPEN_SOURCE ) ),
-    aPbChangeSource( this, SVX_RES( PB_CHANGE_SOURCE ) ),
-    aPbBreakLink( this, SVX_RES( PB_BREAK_LINK ) ),
-    aFtFiles2( this, SVX_RES( FT_FILES2 ) ),
-    aFtSource2( this, SVX_RES( FT_SOURCE2 ) ),
-    aFtType2( this, SVX_RES( FT_TYPE2 ) ),
-    aFtUpdate( this, SVX_RES( FT_UPDATE ) ),
-    aRbAutomatic( this, SVX_RES( RB_AUTOMATIC ) ),
-    aRbManual( this, SVX_RES( RB_MANUAL ) ),
-    aFtFullFileName( this, SVX_RES( FT_FULL_FILE_NAME ) ),
-    aFtFullSourceName( this, SVX_RES( FT_FULL_SOURCE_NAME ) ),
-    aFtFullTypeName( this, SVX_RES( FT_FULL_TYPE_NAME ) ),
-    aStrAutolink( SVX_RES( STR_AUTOLINK ) ),
-    aStrManuallink( SVX_RES( STR_MANUALLINK ) ),
-    aStrBrokenlink( SVX_RES( STR_BROKENLINK ) ),
-    aStrGraphiclink( SVX_RES( STR_GRAPHICLINK ) ),
-    aStrButtonclose( SVX_RES( STR_BUTTONCLOSE ) ),
-    aStrCloselinkmsg( SVX_RES( STR_CLOSELINKMSG ) ),
-    aStrCloselinkmsgMulti( SVX_RES( STR_CLOSELINKMSG_MULTI ) ),
-    aStrWaitinglink( SVX_RES( STR_WAITINGLINK ) ),
+    : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ),
+    aFtFiles( this, CUI_RES( FT_FILES ) ),
+    aFtLinks( this, CUI_RES( FT_LINKS ) ),
+    aFtType( this, CUI_RES( FT_TYPE ) ),
+    aFtStatus( this, CUI_RES( FT_STATUS ) ),
+    aCancelButton1( this, CUI_RES( 1 ) ),
+    aHelpButton1( this, CUI_RES( 1 ) ),
+    aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ),
+    aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ),
+    aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ),
+    aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ),
+    aFtFiles2( this, CUI_RES( FT_FILES2 ) ),
+    aFtSource2( this, CUI_RES( FT_SOURCE2 ) ),
+    aFtType2( this, CUI_RES( FT_TYPE2 ) ),
+    aFtUpdate( this, CUI_RES( FT_UPDATE ) ),
+    aRbAutomatic( this, CUI_RES( RB_AUTOMATIC ) ),
+    aRbManual( this, CUI_RES( RB_MANUAL ) ),
+    aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ),
+    aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ),
+    aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ),
+    aStrAutolink( CUI_RES( STR_AUTOLINK ) ),
+    aStrManuallink( CUI_RES( STR_MANUALLINK ) ),
+    aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ),
+    aStrGraphiclink( CUI_RES( STR_GRAPHICLINK ) ),
+    aStrButtonclose( CUI_RES( STR_BUTTONCLOSE ) ),
+    aStrCloselinkmsg( CUI_RES( STR_CLOSELINKMSG ) ),
+    aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ),
+    aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ),
     pLinkMgr( NULL ),
     bHtmlMode(bHtml),
-    aTbLinks( this, SVX_RES(TB_LINKS ) )
+    aTbLinks( this, CUI_RES(TB_LINKS ) )
 {
     FreeResource();
 
@@ -224,7 +221,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
 
         String aFileName;
         pLinkMgr->GetDisplayNames( pLink, &sType, &aFileName, pLinkNm, pFilter );
-
+        aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
         FileName().SetText( aFileName );
         SourceName().SetText( sLink );
         TypeName().SetText( sType );
@@ -528,9 +525,9 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
 IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
 {
     USHORT nPos;
-    SvBaseLink* pLink = GetSelEntry( &nPos );
+    GetSelEntry( &nPos );
 
-    if ( pLink != _pLink && _pLink && _pLink->WasLastEditOK() )
+    if( _pLink && _pLink->WasLastEditOK() )
     {
         // JP 09.01.98:
         // StarImpress/Draw tauschen die LinkObjecte selbst aus!
@@ -564,10 +561,6 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
         if( pLinkMgr->GetPersist() )
             pLinkMgr->GetPersist()->SetModified();
     }
-    else if ( pLink == _pLink )
-    {
-        DBG_ERRORFILE( "SvBaseLinksDlg::EndEditHdl(): wrong link" );
-    }
     return 0;
 }
 
@@ -643,6 +636,8 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool
     XubString aTxt = Links().GetEllipsisString( sFileNm, nWidthPixel, TEXT_DRAW_PATHELLIPSIS );
     INetURLObject aPath( sFileNm, INET_PROT_FILE );
     String aFileName = aPath.getName();
+    aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
+
     if( aFileName.Len() > aTxt.Len() )
         aTxt = aFileName;
     else if( aTxt.Search( aFileName, aTxt.Len() - aFileName.Len() ) == STRING_NOTFOUND )
diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk
new file mode 100755
index 000000000000..f7d597a219a1
--- /dev/null
+++ b/cui/source/dialogs/makefile.mk
@@ -0,0 +1,118 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=dialogs
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=dialogs
+SRC1FILES =  \
+        charmap.src \
+        commonlingui.src \
+        cuiimapdlg.src \
+        dlgname.src \
+        fmsearch.src \
+        gallery.src \
+        grfflt.src \
+        hangulhanjadlg.src \
+        hlmarkwn.src \
+        hyperdlg.src \
+        iconcdlg.src \
+        insrc.src \
+        multipat.src \
+        newtabledlg.src \
+        postdlg.src \
+        scriptdlg.src \
+        sdrcelldlg.src \
+        showcols.src \
+        SpellDialog.src \
+        splitcelldlg.src \
+        srchxtra.src \
+        svuidlg.src \
+        tbxform.src \
+        zoom.src \
+
+
+SLOFILES+=\
+        $(SLO)$/commonlingui.obj \
+        $(SLO)$/cuicharmap.obj \
+        $(SLO)$/cuifmsearch.obj \
+        $(SLO)$/cuigaldlg.obj \
+        $(SLO)$/cuigrfflt.obj \
+        $(SLO)$/cuihyperdlg.obj \
+        $(SLO)$/cuiimapwnd.obj \
+        $(SLO)$/cuitbxform.obj \
+        $(SLO)$/dlgname.obj \
+        $(SLO)$/hangulhanjadlg.obj \
+        $(SLO)$/hldocntp.obj \
+        $(SLO)$/hldoctp.obj \
+        $(SLO)$/hlinettp.obj \
+        $(SLO)$/hlmailtp.obj \
+        $(SLO)$/hlmarkwn.obj \
+        $(SLO)$/hltpbase.obj \
+        $(SLO)$/iconcdlg.obj \
+        $(SLO)$/insdlg.obj \
+        $(SLO)$/insrc.obj \
+        $(SLO)$/linkdlg.obj \
+        $(SLO)$/multifil.obj \
+        $(SLO)$/multipat.obj \
+        $(SLO)$/newtabledlg.obj \
+        $(SLO)$/pastedlg.obj \
+        $(SLO)$/plfilter.obj \
+        $(SLO)$/postdlg.obj \
+        $(SLO)$/scriptdlg.obj \
+        $(SLO)$/sdrcelldlg.obj \
+        $(SLO)$/showcols.obj \
+        $(SLO)$/SpellAttrib.obj \
+        $(SLO)$/SpellDialog.obj \
+        $(SLO)$/splitcelldlg.obj \
+        $(SLO)$/srchxtra.obj \
+        $(SLO)$/zoom.obj \
+
+
+.IF "$(GUI)"=="WNT"
+SLOFILES+=$(SLO)$/winpluginlib.obj
+.ENDIF
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/svx/source/cui/multifil.cxx b/cui/source/dialogs/multifil.cxx
index bec7b6d5cafa..8f5eadae306a 100644
--- a/svx/source/cui/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
@@ -44,10 +40,10 @@
 
 #include "multipat.hxx"
 #include "multifil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #include "multipat.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 // #97807# -------------
 #include <com/sun/star/ucb/XContentProvider.hpp>
@@ -67,8 +63,8 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
 
     if ( IsClassPathMode() )
     {
-        aDlg.SetTitle( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
-        aDlg.AddFilter( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+        aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
+        aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
     }
 
     if ( aDlg.Execute() == ERRCODE_NONE )
@@ -135,7 +131,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
 
         if ( bDuplicated ) // #97807# --------------------
         {
-            String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+            String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
             sMsg.SearchAndReplaceAscii( "%1", sInsFile );
             InfoBox( pBtn, sMsg ).Execute();
         }
@@ -177,8 +173,8 @@ SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed ) :
 {
     aAddBtn.SetClickHdl( LINK( this, SvxMultiFileDialog, AddHdl_Impl ) );
     aDelBtn.SetClickHdl( LINK( this, SvxMultiFileDialog, DelHdl_Impl ) );
-    SetText( SVX_RES( RID_SVXSTR_FILE_TITLE ) );
-    aPathFL.SetText( SVX_RES( RID_SVXSTR_FILE_HEADLINE ) );
+    SetText( CUI_RES( RID_SVXSTR_FILE_TITLE ) );
+    aPathFL.SetText( CUI_RES( RID_SVXSTR_FILE_HEADLINE ) );
     aDelBtn.Enable();
 }
 
diff --git a/svx/source/cui/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 49357245b819..6d55f4de9f35 100644
--- a/svx/source/cui/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/debug.hxx>
@@ -42,17 +38,17 @@
 #include <sfx2/filedlghelper.hxx>
 
 #include "multipat.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #include "multipat.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 #include <unotools/localfilehelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
@@ -123,7 +119,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
             }
             else
             {
-                String sMsg( SVX_RES( RID_MULTIPATH_DBL_ERR ) );
+                String sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
                 sMsg.SearchAndReplaceAscii( "%1", sInsPath );
                 InfoBox( this, sMsg ).Execute();
             }
@@ -132,7 +128,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
         {
             if ( LISTBOX_ENTRY_NOTFOUND != aPathLB.GetEntryPos( sInsPath ) )
             {
-                String sMsg( SVX_RES( RID_MULTIPATH_DBL_ERR ) );
+                String sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
                 sMsg.SearchAndReplaceAscii( "%1", sInsPath );
                 InfoBox( this, sMsg ).Execute();
             }
@@ -197,23 +193,23 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG )
 
 SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) :
 
-    ModalDialog( pParent, SVX_RES( RID_SVXDLG_MULTIPATH ) ),
-
-    aPathFL     ( this, SVX_RES( FL_MULTIPATH) ),
-    aPathLB     ( this, SVX_RES( LB_MULTIPATH ) ),
-    aRadioLB    ( this, SVX_RES( LB_RADIOBUTTON ) ),
-    aRadioFT    ( this, SVX_RES( FT_RADIOBUTTON ) ),
-    aAddBtn     ( this, SVX_RES( BTN_ADD_MULTIPATH ) ),
-    aDelBtn     ( this, SVX_RES( BTN_DEL_MULTIPATH ) ),
-    aOKBtn      ( this, SVX_RES( BTN_MULTIPATH_OK ) ),
-    aCancelBtn  ( this, SVX_RES( BTN_MULTIPATH_CANCEL ) ),
-    aHelpButton ( this, SVX_RES( BTN_MULTIPATH_HELP ) ),
+    ModalDialog( pParent, CUI_RES( RID_SVXDLG_MULTIPATH ) ),
+
+    aPathFL     ( this, CUI_RES( FL_MULTIPATH) ),
+    aPathLB     ( this, CUI_RES( LB_MULTIPATH ) ),
+    aRadioLB    ( this, CUI_RES( LB_RADIOBUTTON ) ),
+    aRadioFT    ( this, CUI_RES( FT_RADIOBUTTON ) ),
+    aAddBtn     ( this, CUI_RES( BTN_ADD_MULTIPATH ) ),
+    aDelBtn     ( this, CUI_RES( BTN_DEL_MULTIPATH ) ),
+    aOKBtn      ( this, CUI_RES( BTN_MULTIPATH_OK ) ),
+    aCancelBtn  ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ),
+    aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ),
     pImpl       ( new MultiPath_Impl( bEmptyAllowed ) )
 
 {
     static long aStaticTabs[]= { 2, 0, 12 };
     aRadioLB.SvxSimpleTable::SetTabs( aStaticTabs );
-    String sHeader( SVX_RES( STR_HEADER_PATHS ) );
+    String sHeader( CUI_RES( STR_HEADER_PATHS ) );
     aRadioLB.SetQuickHelpText( sHeader );
     sHeader.Insert( '\t', 0 );
     aRadioLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
@@ -333,8 +329,8 @@ void SvxMultiPathDialog::SetPath( const String& rPath )
 void SvxMultiPathDialog::SetClassPathMode()
 {
     pImpl->bIsClassPathMode = TRUE;
-    SetText( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ));
-    aPathFL.SetText( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) );
+    SetText( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ));
+    aPathFL.SetText( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/inc/multipat.hrc b/cui/source/dialogs/multipat.hrc
index 6ef22855ff8b..6ef22855ff8b 100644
--- a/svx/inc/multipat.hrc
+++ b/cui/source/dialogs/multipat.hrc
diff --git a/svx/source/options/multipat.src b/cui/source/dialogs/multipat.src
index ff7e5d027202..64dc9b412311 100644
--- a/svx/source/options/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -30,7 +30,7 @@
 
 #include "multipat.hrc"
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 // RID_SVXDLG_MULTIPATH --------------------------------------------------
 
diff --git a/svx/source/cui/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index c59be62607cd..6309de2c3b7d 100644
--- a/svx/source/cui/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -29,29 +29,25 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
-#include "svx/dialogs.hrc"
-#include "svx/dialmgr.hxx"
+#include "cuires.hrc"
+#include "dialmgr.hxx"
 #include "newtabledlg.hxx"
 #include "newtabledlg.hrc"
 
 SvxNewTableDialog::SvxNewTableDialog( Window* pParent )
-: ModalDialog( pParent, SVX_RES( RID_SVX_NEWTABLE_DLG ) )
-, maFtColumns( this, SVX_RES( FT_COLUMNS ) )
-, maNumColumns( this, SVX_RES( NF_COLUMNS ) )
-, maFtRows( this, SVX_RES( FT_ROWS ) )
-, maNumRows( this, SVX_RES( NF_ROWS ) )
-, maFlSep( this, SVX_RES( FL_SEP ) )
-, maHelpButton( this, SVX_RES( BTN_HELP ) )
-, maOkButton( this, SVX_RES( BTN_OK ) )
-, maCancelButton( this, SVX_RES( BTN_CANCEL ) )
+: ModalDialog( pParent, CUI_RES( RID_SVX_NEWTABLE_DLG ) )
+, maFtColumns( this, CUI_RES( FT_COLUMNS ) )
+, maNumColumns( this, CUI_RES( NF_COLUMNS ) )
+, maFtRows( this, CUI_RES( FT_ROWS ) )
+, maNumRows( this, CUI_RES( NF_ROWS ) )
+, maFlSep( this, CUI_RES( FL_SEP ) )
+, maHelpButton( this, CUI_RES( BTN_HELP ) )
+, maOkButton( this, CUI_RES( BTN_OK ) )
+, maCancelButton( this, CUI_RES( BTN_CANCEL ) )
 {
     maNumRows.SetValue(2);
     maNumColumns.SetValue(5);
diff --git a/svx/source/cui/newtabledlg.hrc b/cui/source/dialogs/newtabledlg.hrc
index b17631658341..b17631658341 100644
--- a/svx/source/cui/newtabledlg.hrc
+++ b/cui/source/dialogs/newtabledlg.hrc
diff --git a/svx/source/cui/newtabledlg.src b/cui/source/dialogs/newtabledlg.src
index e72756da03db..e02338d6085e 100644
--- a/svx/source/cui/newtabledlg.src
+++ b/cui/source/dialogs/newtabledlg.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include "newtabledlg.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
 
 ModalDialog RID_SVX_NEWTABLE_DLG
 {
diff --git a/svx/source/cui/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index c9ce336448eb..e0892bfca427 100644
--- a/svx/source/cui/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 #include <com/sun/star/embed/Aspects.hpp>
 
 #include <pastedlg.hxx>
@@ -51,23 +47,23 @@
 #include <svtools/sores.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
 
-    : ModalDialog( pParent, SVX_RES( MD_PASTE_OBJECT ) ),
-    aFtSource( this, SVX_RES( FT_SOURCE ) ),
-    aFtObjectSource( this, SVX_RES( FT_OBJECT_SOURCE ) ),
-    aRbPaste( this, SVX_RES( RB_PASTE ) ),
-    aRbPasteLink( this, SVX_RES( RB_PASTE_LINK ) ),
-    aLbInsertList( this, SVX_RES( LB_INSERT_LIST ) ),
-    aCbDisplayAsIcon( this, SVX_RES( CB_DISPLAY_AS_ICON ) ),
-    aPbChangeIcon( this, SVX_RES( PB_CHANGE_ICON ) ),
-    aFlChoice( this, SVX_RES( FL_CHOICE ) ),
-    aOKButton1( this, SVX_RES( 1 ) ),
-    aCancelButton1( this, SVX_RES( 1 ) ),
-    aHelpButton1( this, SVX_RES( 1 ) ),
-    aSObject( SVX_RES( S_OBJECT ) )
+    : ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ),
+    aFtSource( this, CUI_RES( FT_SOURCE ) ),
+    aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
+    aRbPaste( this, CUI_RES( RB_PASTE ) ),
+    aRbPasteLink( this, CUI_RES( RB_PASTE_LINK ) ),
+    aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
+    aCbDisplayAsIcon( this, CUI_RES( CB_DISPLAY_AS_ICON ) ),
+    aPbChangeIcon( this, CUI_RES( PB_CHANGE_ICON ) ),
+    aFlChoice( this, CUI_RES( FL_CHOICE ) ),
+    aOKButton1( this, CUI_RES( 1 ) ),
+    aCancelButton1( this, CUI_RES( 1 ) ),
+    aHelpButton1( this, CUI_RES( 1 ) ),
+    aSObject( CUI_RES( S_OBJECT ) )
 {
     FreeResource();
     SetHelpId( HID_PASTE_DLG );
diff --git a/svx/source/cui/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index 882e4e751e0c..d09cc00d2a34 100644
--- a/svx/source/cui/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <set>
 #include <map>
diff --git a/svx/source/cui/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 1f4d481f4b8e..e695aaafa420 100644
--- a/svx/source/cui/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -29,40 +29,29 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/useroptions.hxx>
 #include <unotools/localedatawrapper.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
+#include <svx/svxids.hrc>   // SID_ATTR_...
+#include <svx/dialogs.hrc>  // RID_SVXDLG_POSTIT
 
 #define _SVX_POSTDLG_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "postdlg.hrc"
-
-
-
-
-
-#include "postattr.hxx"
+#include <svx/postattr.hxx>
 #include "postdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #include "helpid.hrc"
 
@@ -82,20 +71,20 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
                                   BOOL bPrevNext,
                                   BOOL bRedline ) :
 
-    SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_POSTIT ) ),
-
-    aPostItFL       ( this, SVX_RES( FL_POSTIT ) ),
-    aLastEditLabelFT( this, SVX_RES( FT_LASTEDITLABEL ) ),
-    aLastEditFT     ( this, SVX_RES( FT_LASTEDIT ) ),
-    aEditFT         ( this, SVX_RES( FT_EDIT ) ),
-    aEditED         ( this, SVX_RES( ED_EDIT ) ),
-    aAuthorFT       ( this, SVX_RES( FT_AUTHOR) ),
-    aAuthorBtn      ( this, SVX_RES( BTN_AUTHOR ) ),
-    aOKBtn          ( this, SVX_RES( BTN_POST_OK ) ),
-    aCancelBtn      ( this, SVX_RES( BTN_POST_CANCEL ) ),
-    aHelpBtn        ( this, SVX_RES( BTN_POST_HELP ) ),
-    aPrevBtn        ( this, SVX_RES( BTN_PREV ) ),
-    aNextBtn        ( this, SVX_RES( BTN_NEXT ) ),
+    SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_POSTIT ) ),
+
+    aPostItFL       ( this, CUI_RES( FL_POSTIT ) ),
+    aLastEditLabelFT( this, CUI_RES( FT_LASTEDITLABEL ) ),
+    aLastEditFT     ( this, CUI_RES( FT_LASTEDIT ) ),
+    aEditFT         ( this, CUI_RES( FT_EDIT ) ),
+    aEditED         ( this, CUI_RES( ED_EDIT ) ),
+    aAuthorFT       ( this, CUI_RES( FT_AUTHOR) ),
+    aAuthorBtn      ( this, CUI_RES( BTN_AUTHOR ) ),
+    aOKBtn          ( this, CUI_RES( BTN_POST_OK ) ),
+    aCancelBtn      ( this, CUI_RES( BTN_POST_CANCEL ) ),
+    aHelpBtn        ( this, CUI_RES( BTN_POST_HELP ) ),
+    aPrevBtn        ( this, CUI_RES( BTN_PREV ) ),
+    aNextBtn        ( this, CUI_RES( BTN_NEXT ) ),
 
     rSet        ( rCoreSet ),
     pOutSet     ( 0 )
@@ -167,10 +156,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
     aEditED.SetText( aTextStr.ConvertLineEnd() );
 
     if ( !bNew )
-        SetText( SVX_RESSTR( STR_NOTIZ_EDIT ) );
+        SetText( CUI_RESSTR( STR_NOTIZ_EDIT ) );
     else
         // neu anlegen
-        SetText( SVX_RESSTR( STR_NOTIZ_INSERT ) );
+        SetText( CUI_RESSTR( STR_NOTIZ_INSERT ) );
 
     FreeResource();
 }
diff --git a/svx/source/cui/postdlg.hrc b/cui/source/dialogs/postdlg.hrc
index b2b615647438..b2b615647438 100644
--- a/svx/source/cui/postdlg.hrc
+++ b/cui/source/dialogs/postdlg.hrc
diff --git a/svx/source/cui/postdlg.src b/cui/source/dialogs/postdlg.src
index 23dbef26e0a8..02face52b1b5 100644
--- a/svx/source/cui/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -28,10 +28,9 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "postdlg.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT
 
  // RID_SVXDLG_POSTIT -----------------------------------------------------
 ModalDialog RID_SVXDLG_POSTIT
diff --git a/svx/source/cui/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 9c5e9277b3b2..d68792732d7e 100644
--- a/svx/source/cui/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 #include <memory>
 
@@ -38,11 +38,10 @@
 #include <vcl/msgbox.hxx>
 #include <vos/mutex.hxx>
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "scriptdlg.hrc"
-#include "fmresids.hrc"
 #include "scriptdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "selector.hxx"
 
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -488,26 +487,26 @@ void __EXPORT SFTreeListBox::ExpandedHdl()
 // InputDialog ------------------------------------------------------------
 // ----------------------------------------------------------------------------
 InputDialog::InputDialog(Window * pParent, USHORT nMode )
-    : ModalDialog( pParent, SVX_RES( RID_DLG_NEWLIB ) ),
-        aText( this, SVX_RES( FT_NEWLIB ) ),
-        aEdit( this, SVX_RES( ED_LIBNAME ) ),
-        aOKButton( this, SVX_RES( PB_OK ) ),
-        aCancelButton( this, SVX_RES( PB_CANCEL ) )
+    : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ),
+        aText( this, CUI_RES( FT_NEWLIB ) ),
+        aEdit( this, CUI_RES( ED_LIBNAME ) ),
+        aOKButton( this, CUI_RES( PB_OK ) ),
+        aCancelButton( this, CUI_RES( PB_CANCEL ) )
 {
     aEdit.GrabFocus();
     if ( nMode == INPUTMODE_NEWLIB )
     {
-        SetText( String( SVX_RES( STR_NEWLIB ) ) );
+        SetText( String( CUI_RES( STR_NEWLIB ) ) );
     }
     else if ( nMode == INPUTMODE_NEWMACRO )
     {
-        SetText( String( SVX_RES( STR_NEWMACRO ) ) );
-        aText.SetText( String( SVX_RES( STR_FT_NEWMACRO ) ) );
+        SetText( String( CUI_RES( STR_NEWMACRO ) ) );
+        aText.SetText( String( CUI_RES( STR_FT_NEWMACRO ) ) );
     }
     else if ( nMode == INPUTMODE_RENAME )
     {
-        SetText( String( SVX_RES( STR_RENAME ) ) );
-        aText.SetText( String( SVX_RES( STR_FT_RENAME ) ) );
+        SetText( String( CUI_RES( STR_RENAME ) ) );
+        aText.SetText( String( CUI_RES( STR_FT_RENAME ) ) );
     }
     FreeResource();
 
@@ -549,26 +548,26 @@ InputDialog::~InputDialog()
 // ScriptOrgDialog ------------------------------------------------------------
 // ----------------------------------------------------------------------------
 SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language )
-    :    SfxModalDialog( pParent, SVX_RES( RID_DLG_SCRIPTORGANIZER ) ),
-        aScriptsTxt( this, SVX_RES( SF_TXT_SCRIPTS ) ),
-        aScriptsBox( this, SVX_RES( SF_CTRL_SCRIPTSBOX ) ),
-        aRunButton(    this, SVX_RES( SF_PB_RUN ) ),
-        aCloseButton( this, SVX_RES( SF_PB_CLOSE ) ),
-        aCreateButton( this, SVX_RES( SF_PB_CREATE ) ),
-        aEditButton( this, SVX_RES( SF_PB_EDIT ) ),
-        aRenameButton(this, SVX_RES( SF_PB_RENAME ) ),
-        aDelButton(    this, SVX_RES( SF_PB_DEL ) ),
-        aHelpButton( this, SVX_RES( SF_PB_HELP ) ),
+    :    SfxModalDialog( pParent, CUI_RES( RID_DLG_SCRIPTORGANIZER ) ),
+        aScriptsTxt( this, CUI_RES( SF_TXT_SCRIPTS ) ),
+        aScriptsBox( this, CUI_RES( SF_CTRL_SCRIPTSBOX ) ),
+        aRunButton(    this, CUI_RES( SF_PB_RUN ) ),
+        aCloseButton( this, CUI_RES( SF_PB_CLOSE ) ),
+        aCreateButton( this, CUI_RES( SF_PB_CREATE ) ),
+        aEditButton( this, CUI_RES( SF_PB_EDIT ) ),
+        aRenameButton(this, CUI_RES( SF_PB_RENAME ) ),
+        aDelButton(    this, CUI_RES( SF_PB_DEL ) ),
+        aHelpButton( this, CUI_RES( SF_PB_HELP ) ),
         m_sLanguage( language ),
-        m_delErrStr( SVX_RES( RID_SVXSTR_DELFAILED ) ),
-        m_delErrTitleStr( SVX_RES( RID_SVXSTR_DELFAILED_TITLE ) ),
-        m_delQueryStr( SVX_RES( RID_SVXSTR_DELQUERY ) ),
-        m_delQueryTitleStr( SVX_RES( RID_SVXSTR_DELQUERY_TITLE ) ) ,
-        m_createErrStr( SVX_RES ( RID_SVXSTR_CREATEFAILED ) ),
-        m_createDupStr( SVX_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ),
-        m_createErrTitleStr( SVX_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ),
-        m_renameErrStr( SVX_RES ( RID_SVXSTR_RENAMEFAILED ) ),
-        m_renameErrTitleStr( SVX_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
+        m_delErrStr( CUI_RES( RID_SVXSTR_DELFAILED ) ),
+        m_delErrTitleStr( CUI_RES( RID_SVXSTR_DELFAILED_TITLE ) ),
+        m_delQueryStr( CUI_RES( RID_SVXSTR_DELQUERY ) ),
+        m_delQueryTitleStr( CUI_RES( RID_SVXSTR_DELQUERY_TITLE ) ) ,
+        m_createErrStr( CUI_RES ( RID_SVXSTR_CREATEFAILED ) ),
+        m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ),
+        m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ),
+        m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ),
+        m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
 {
 
     // must be a neater way to deal with the strings than as above
@@ -1434,7 +1433,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     if ( type.getLength() != 0 )
     {
         result += ::rtl::OUString::createFromAscii( "\n\n" );
-        result += ::rtl::OUString(String(SVX_RES(RID_SVXSTR_ERROR_TYPE_LABEL)));
+        result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)));
         result += ::rtl::OUString::createFromAscii( " " );
         result += type;
     }
@@ -1442,7 +1441,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     if ( message.getLength() != 0 )
     {
         result += ::rtl::OUString::createFromAscii( "\n\n" );
-        result += ::rtl::OUString(String(SVX_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)));
+        result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)));
         result += ::rtl::OUString::createFromAscii( " " );
         result += message;
     }
@@ -1453,7 +1452,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
 ::rtl::OUString GetErrorMessage(
     const provider::ScriptErrorRaisedException& eScriptError )
 {
-    ::rtl::OUString unformatted = String( SVX_RES( RID_SVXSTR_ERROR_AT_LINE ) );
+    ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) );
 
     ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
     ::rtl::OUString language = unknown;
@@ -1480,12 +1479,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
         {
             line = ::rtl::OUString::valueOf( eScriptError.lineNum );
             unformatted = String(
-                SVX_RES( RID_SVXSTR_ERROR_AT_LINE ) );
+                CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) );
         }
         else
         {
             unformatted = String(
-                SVX_RES( RID_SVXSTR_ERROR_RUNNING ) );
+                CUI_RES( RID_SVXSTR_ERROR_RUNNING ) );
         }
 
     return FormatErrorString(
@@ -1496,7 +1495,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     const provider::ScriptExceptionRaisedException& eScriptException )
 {
     ::rtl::OUString unformatted =
-          String( SVX_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
+          String( CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
 
     ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
     ::rtl::OUString language = unknown;
@@ -1523,12 +1522,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     {
         line = ::rtl::OUString::valueOf( eScriptException.lineNum );
         unformatted = String(
-            SVX_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
+            CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
     }
     else
     {
         unformatted = String(
-            SVX_RES( RID_SVXSTR_EXCEPTION_RUNNING ) );
+            CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING ) );
     }
 
     if ( eScriptException.exceptionType.getLength() != 0 )
@@ -1544,7 +1543,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     const provider::ScriptFrameworkErrorException& sError )
 {
     ::rtl::OUString unformatted = String(
-        SVX_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
+        CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
 
     ::rtl::OUString language =
         ::rtl::OUString::createFromAscii( "UNKNOWN" );
@@ -1565,7 +1564,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     if ( sError.errorType == provider::ScriptFrameworkErrorType::NOTSUPPORTED )
     {
         message = String(
-            SVX_RES(  RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
+            CUI_RES(  RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
         message =  ReplaceString(
             message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
 
@@ -1681,11 +1680,11 @@ IMPL_LINK( SvxScriptErrorDialog, ShowDialog, ::rtl::OUString*, pMessage )
     }
     else
     {
-        message = String( SVX_RES( RID_SVXSTR_ERROR_TITLE ) );
+        message = String( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
     }
 
     MessBox* pBox = new WarningBox( NULL, WB_OK, message );
-    pBox->SetText( SVX_RES( RID_SVXSTR_ERROR_TITLE ) );
+    pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
     pBox->Execute();
 
     if ( pBox ) delete pBox;
diff --git a/svx/source/cui/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index f4a7a75a4416..0079037c7680 100644
--- a/svx/source/cui/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _SCRIPTDLG_HRC
 #define _SCRIPTDLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define SCRIPTDLG_OFFSET        400
 
diff --git a/svx/source/cui/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 3c5b2739abfa..cceca0bc64ff 100644
--- a/svx/source/cui/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "scriptdlg.hrc"
 #include "helpid.hrc"
 
diff --git a/svx/source/cui/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index e543402330bd..a5f8e074758e 100644
--- a/svx/source/cui/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -29,22 +29,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/cjkoptions.hxx>
-#include "flagsdef.hxx"
-#include "svx/dialogs.hrc"
+#include <svl/cjkoptions.hxx>
+#include <svx/flagsdef.hxx>
+#include "cuires.hrc"
 #include "sdrcelldlg.hxx"
-#include "svx/dialmgr.hxx"
+#include "dialmgr.hxx"
 #include "cuitabarea.hxx"
 #include "svx/svdmodel.hxx"
 #include "border.hxx"
+#include <svx/dialogs.hrc> // RID_SVXPAGE_...
 
 SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
-: SfxTabDialog        ( pParent, SVX_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
+: SfxTabDialog        ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
 , mrOutAttrs            ( *pAttr )
 , mpColorTab           ( pModel->GetColorTable() )
 , mpGradientList       ( pModel->GetGradientList() )
diff --git a/svx/source/cui/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src
index 71374302a276..0c721bc11d2b 100644
--- a/svx/source/cui/sdrcelldlg.src
+++ b/cui/source/dialogs/sdrcelldlg.src
@@ -28,7 +28,9 @@
  *
  ************************************************************************/
 
+#include <cuires.hrc>
 #include <svx/dialogs.hrc>
+
 TabDialog RID_SVX_FORMAT_CELLS_DLG
 {
     OutputSize = TRUE ;
diff --git a/svx/source/cui/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 734b59e1f6fe..4b3930a692c1 100644
--- a/svx/source/cui/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -29,16 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "showcols.hxx"
+#include "fmsearch.hrc"
 
-#include "fmresids.hrc"
 #include <tools/shl.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/extract.hxx>
@@ -53,11 +50,11 @@
 DBG_NAME(FmShowColsDialog)
 //--------------------------------------------------------------------------
 FmShowColsDialog::FmShowColsDialog(Window* pParent)
-    :ModalDialog(pParent, SVX_RES(RID_SVX_DLG_SHOWGRIDCOLUMNS))
-    ,m_aList(this, SVX_RES(1))
-    ,m_aLabel(this, SVX_RES(1))
-    ,m_aOK(this, SVX_RES(1))
-    ,m_aCancel(this, SVX_RES(1))
+    :ModalDialog(pParent, CUI_RES(RID_SVX_DLG_SHOWGRIDCOLUMNS))
+    ,m_aList(this, CUI_RES(1))
+    ,m_aLabel(this, CUI_RES(1))
+    ,m_aOK(this, CUI_RES(1))
+    ,m_aCancel(this, CUI_RES(1))
 {
     DBG_CTOR(FmShowColsDialog,NULL);
     m_aList.EnableMultiSelection(sal_True);
diff --git a/svx/source/fmcomp/showcols.src b/cui/source/dialogs/showcols.src
index 0bdeabefb1e7..f22c0e0e3557 100644
--- a/svx/source/fmcomp/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -27,9 +27,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "fmresids.hrc"
-#include <svx/svxids.hrc>
-#include "globlmn.hrc"
+
+#include "fmsearch.hrc"
 
 ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
 {
diff --git a/svx/source/cui/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 82f3b1c9dff5..c6c1f173322c 100644
--- a/svx/source/cui/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -29,39 +29,33 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <sfx2/dispatch.hxx>
-
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-
-#include "svx/dialmgr.hxx"
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include "dialmgr.hxx"
 #include "splitcelldlg.hxx"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
 #include "splitcelldlg.hrc"
 
 SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
-: SvxStandardDialog(pParent, SVX_RES(RID_SVX_SPLITCELLDLG))
-, maCountLbl(this, SVX_RES(FT_COUNT))
-, maCountEdit(this, SVX_RES(ED_COUNT))
-, maCountFL(this, SVX_RES(FL_COUNT))
-, maHorzBox(this, SVX_RES(RB_HORZ))
-, maVertBox(this, SVX_RES(RB_VERT))
-, maPropCB(this, SVX_RES(CB_PROP))
-, maDirFL(this, SVX_RES(FL_DIR))
-, maOKBtn(this, SVX_RES(BT_OK))
-, maCancelBtn(this, SVX_RES(BT_CANCEL))
-, maHelpBtn( this, SVX_RES( BT_HELP ) )
+: SvxStandardDialog(pParent, CUI_RES(RID_SVX_SPLITCELLDLG))
+, maCountLbl(this, CUI_RES(FT_COUNT))
+, maCountEdit(this, CUI_RES(ED_COUNT))
+, maCountFL(this, CUI_RES(FL_COUNT))
+, maHorzBox(this, CUI_RES(RB_HORZ))
+, maVertBox(this, CUI_RES(RB_VERT))
+, maPropCB(this, CUI_RES(CB_PROP))
+, maDirFL(this, CUI_RES(FL_DIR))
+, maOKBtn(this, CUI_RES(BT_OK))
+, maCancelBtn(this, CUI_RES(BT_CANCEL))
+, maHelpBtn( this, CUI_RES( BT_HELP ) )
 , mnMaxVertical( nMaxVertical )
 , mnMaxHorizontal( nMaxHorizontal )
 {
-    maVertBox.SetModeRadioImage(Image(SVX_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST);
-    maHorzBox.SetModeRadioImage(Image(SVX_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST);
+    maVertBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST);
+    maHorzBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST);
     FreeResource();
     maHorzBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
     maPropCB.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
diff --git a/svx/source/cui/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc
index cab8b4ed02ad..cab8b4ed02ad 100644
--- a/svx/source/cui/splitcelldlg.hrc
+++ b/cui/source/dialogs/splitcelldlg.hrc
diff --git a/svx/source/cui/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src
index 17285cecd05f..f33243450e07 100644
--- a/svx/source/cui/splitcelldlg.src
+++ b/cui/source/dialogs/splitcelldlg.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "splitcelldlg.hrc"
 
 ModalDialog RID_SVX_SPLITCELLDLG
diff --git a/svx/source/cui/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 24966c6d4f5d..5b28029920cc 100644
--- a/svx/source/cui/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -29,45 +29,32 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
 #include "srchxtra.hxx"
 #include <tools/rcid.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/objsh.hxx>
-
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#ifndef _SVX_SRCHXTRA_HRC
+#include <cuires.hrc>
 #include "srchxtra.hrc"
-#endif
-#ifndef _SVXITEMS_HRC
-#include <svx/svxitems.hrc>
-#endif
-
-#ifndef _SVX_FLSTITEM_HXX
-
-#include "flstitem.hxx"
-#endif
+#include <svx/svxitems.hrc> // RID_ATTR_BEGIN
+#include <svx/dialmgr.hxx>  // item resources
+#include <svx/flstitem.hxx>
 #include "chardlg.hxx"
 #include "paragrph.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "backgrnd.hxx"
+#include <svx/dialogs.hrc> // RID_SVXPAGE_...
 
 // class SvxSearchFormatDialog -------------------------------------------
 
 SvxSearchFormatDialog::SvxSearchFormatDialog( Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHFORMAT ), &rSet ),
+    SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHFORMAT ), &rSet ),
 
     pFontList( NULL )
 
@@ -153,13 +140,13 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
                                                     SearchAttrItemList& rLst,
                                                     const USHORT* pWhRanges ) :
 
-    ModalDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHATTR )  ),
+    ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHATTR )  ),
 
-    aAttrFL ( this, SVX_RES( FL_ATTR ) ),
-    aAttrLB ( this, SVX_RES( LB_ATTR ) ),
-    aOKBtn  ( this, SVX_RES( BTN_ATTR_OK ) ),
-    aEscBtn ( this, SVX_RES( BTN_ATTR_CANCEL ) ),
-    aHelpBtn( this, SVX_RES( BTN_ATTR_HELP ) ),
+    aAttrFL ( this, CUI_RES( FL_ATTR ) ),
+    aAttrLB ( this, CUI_RES( LB_ATTR ) ),
+    aOKBtn  ( this, CUI_RES( BTN_ATTR_OK ) ),
+    aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
+    aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) ),
 
     rList( rLst )
 
@@ -195,12 +182,13 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
                 }
             }
 
+            // item resources are in svx
             USHORT nResId = nSlot - SID_SVX_START + RID_ATTR_BEGIN;
             SvLBoxEntry* pEntry = NULL;
             ResId aId( nResId, DIALOG_MGR() );
             aId.SetRT( RSC_STRING );
             if ( DIALOG_MGR().IsAvailable( aId ) )
-                pEntry = aAttrLB.SvTreeListBox::InsertEntry( SVX_RESSTR( nResId ) );
+                pEntry = aAttrLB.SvTreeListBox::InsertEntry( CUI_RESSTR( nResId ) );
             else
             {
                 ByteString sError( "no resource for slot id\nslot = " );
@@ -280,20 +268,20 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
     USHORT nShorter,
     USHORT nLonger
 ) :
-    ModalDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHSIMILARITY ) ),
-
-    aFixedLine  ( this, SVX_RES( FL_SIMILARITY ) ),
-    aOtherTxt   ( this, SVX_RES( FT_OTHER ) ),
-    aOtherFld   ( this, SVX_RES( NF_OTHER   ) ),
-    aLongerTxt  ( this, SVX_RES( FT_LONGER ) ),
-    aLongerFld  ( this, SVX_RES( NF_LONGER ) ),
-    aShorterTxt ( this, SVX_RES( FT_SHORTER ) ),
-    aShorterFld ( this, SVX_RES( NF_SHORTER ) ),
-    aRelaxBox   ( this, SVX_RES( CB_RELAX ) ),
-
-    aOKBtn      ( this, SVX_RES( BTN_ATTR_OK ) ),
-    aEscBtn     ( this, SVX_RES( BTN_ATTR_CANCEL ) ),
-    aHelpBtn    ( this, SVX_RES( BTN_ATTR_HELP ) )
+    ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHSIMILARITY ) ),
+
+    aFixedLine  ( this, CUI_RES( FL_SIMILARITY ) ),
+    aOtherTxt   ( this, CUI_RES( FT_OTHER ) ),
+    aOtherFld   ( this, CUI_RES( NF_OTHER   ) ),
+    aLongerTxt  ( this, CUI_RES( FT_LONGER ) ),
+    aLongerFld  ( this, CUI_RES( NF_LONGER ) ),
+    aShorterTxt ( this, CUI_RES( FT_SHORTER ) ),
+    aShorterFld ( this, CUI_RES( NF_SHORTER ) ),
+    aRelaxBox   ( this, CUI_RES( CB_RELAX ) ),
+
+    aOKBtn      ( this, CUI_RES( BTN_ATTR_OK ) ),
+    aEscBtn     ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
+    aHelpBtn    ( this, CUI_RES( BTN_ATTR_HELP ) )
 
 {
     FreeResource();
diff --git a/svx/source/cui/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc
index 870303efd72c..870303efd72c 100644
--- a/svx/source/cui/srchxtra.hrc
+++ b/cui/source/dialogs/srchxtra.hrc
diff --git a/svx/source/cui/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 980b952adc76..bde692af7447 100644
--- a/svx/source/cui/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -29,8 +29,9 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "srchxtra.hrc"
+#include <svx/dialogs.hrc>
 
  // RID_SVXDLG_SEARCHFORMAT -----------------------------------------------
 TabDialog RID_SVXDLG_SEARCHFORMAT
diff --git a/svx/source/cui/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index b4030391e6b5..ba3602fb18bd 100644
--- a/svx/source/cui/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -28,10 +28,8 @@
  *
  ************************************************************************/
 
-#include <svtools/solar.hrc>
-
-#define HID_PASTE_DLG                   (HID_SO2_START +  0)
-#define HID_LINKDLG_TABLB               (HID_SO2_START +  1)
+#include <svl/solar.hrc>
+#include <helpid.hrc>
 
 #define TB_LINKS                32014
 
diff --git a/svx/source/cui/svuidlg.src b/cui/source/dialogs/svuidlg.src
index cc8f2db676ae..cc8f2db676ae 100644
--- a/svx/source/cui/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
diff --git a/svx/source/form/tbxform.src b/cui/source/dialogs/tbxform.src
index 7a3f84fcd300..e19818d51072 100644
--- a/svx/source/form/tbxform.src
+++ b/cui/source/dialogs/tbxform.src
@@ -27,9 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svx/svxids.hrc>
-#include "fmresids.hrc"
-#include "helpid.hrc"
+#include "fmsearch.hrc"
 
 ModalDialog RID_SVX_DLG_INPUTRECORDNO
 {
diff --git a/svx/source/cui/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp
index 0b1fced85b40..0b1fced85b40 100644
--- a/svx/source/cui/winpluginlib.cpp
+++ b/cui/source/dialogs/winpluginlib.cpp
diff --git a/svx/source/cui/zoom.cxx b/cui/source/dialogs/zoom.cxx
index e97448999564..1330f48818f6 100644
--- a/svx/source/cui/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -29,36 +29,32 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
 #include <tools/shl.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/msgbox.hxx>
 
 #define _SVX_ZOOM_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "zoom.hrc"
 
 #include "zoom.hxx"
 #include <svx/zoomitem.hxx>
 #include <svx/viewlayoutitem.hxx>
-#include <svx/dialmgr.hxx>
-#include "zoom_def.hxx"
-
+#include <dialmgr.hxx>
+#include <svx/zoom_def.hxx>
+#include <svx/dialogs.hrc>  // RID_SVXDLG_ZOOM
 #include <layout/layout-pre.hxx>
 
 #if ENABLE_LAYOUT
-#undef SVX_RES
-#define SVX_RES(x) #x
+#undef CUI_RES
+#define CUI_RES(x) #x
 #undef SfxModalDialog
 #define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id )
 #endif /* ENABLE_LAYOUT */
@@ -197,27 +193,27 @@ void SvxZoomDialog::SetSpinSize( USHORT nNewSpin )
 
 SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
 
-    SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_ZOOM ) ),
-
-    aZoomFl         ( this, SVX_RES( FL_ZOOM ) ),
-    aOptimalBtn     ( this, SVX_RES( BTN_OPTIMAL ) ),
-    aWholePageBtn   ( this, SVX_RES( BTN_WHOLE_PAGE ) ),
-    aPageWidthBtn   ( this, SVX_RES( BTN_PAGE_WIDTH ) ),
-    a100Btn         ( this, SVX_RES( BTN_100 ) ),
-    aUserBtn        ( this, SVX_RES( BTN_USER ) ),
-    aUserEdit       ( this, SVX_RES( ED_USER ) ),
-
-    aViewLayoutFl   ( this, SVX_RES( FL_VIEWLAYOUT ) ),
-    aAutomaticBtn   ( this, SVX_RES( BTN_AUTOMATIC ) ),
-    aSingleBtn      ( this, SVX_RES( BTN_SINGLE ) ),
-    aColumnsBtn     ( this, SVX_RES( BTN_COLUMNS ) ),
-    aColumnsEdit    ( this, SVX_RES( ED_COLUMNS ) ),
-    aBookModeChk    ( this, SVX_RES( CHK_BOOK ) ),
-
-    aBottomFl       ( this, SVX_RES( FL_BOTTOM ) ),
-    aOKBtn          ( this, SVX_RES( BTN_ZOOM_OK ) ),
-    aCancelBtn      ( this, SVX_RES( BTN_ZOOM_CANCEL ) ),
-    aHelpBtn        ( this, SVX_RES( BTN_ZOOM_HELP ) ),
+    SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ),
+
+    aZoomFl         ( this, CUI_RES( FL_ZOOM ) ),
+    aOptimalBtn     ( this, CUI_RES( BTN_OPTIMAL ) ),
+    aWholePageBtn   ( this, CUI_RES( BTN_WHOLE_PAGE ) ),
+    aPageWidthBtn   ( this, CUI_RES( BTN_PAGE_WIDTH ) ),
+    a100Btn         ( this, CUI_RES( BTN_100 ) ),
+    aUserBtn        ( this, CUI_RES( BTN_USER ) ),
+    aUserEdit       ( this, CUI_RES( ED_USER ) ),
+
+    aViewLayoutFl   ( this, CUI_RES( FL_VIEWLAYOUT ) ),
+    aAutomaticBtn   ( this, CUI_RES( BTN_AUTOMATIC ) ),
+    aSingleBtn      ( this, CUI_RES( BTN_SINGLE ) ),
+    aColumnsBtn     ( this, CUI_RES( BTN_COLUMNS ) ),
+    aColumnsEdit    ( this, CUI_RES( ED_COLUMNS ) ),
+    aBookModeChk    ( this, CUI_RES( CHK_BOOK ) ),
+
+    aBottomFl       ( this, CUI_RES( FL_BOTTOM ) ),
+    aOKBtn          ( this, CUI_RES( BTN_ZOOM_OK ) ),
+    aCancelBtn      ( this, CUI_RES( BTN_ZOOM_CANCEL ) ),
+    aHelpBtn        ( this, CUI_RES( BTN_ZOOM_HELP ) ),
 
     rSet        ( rCoreSet ),
     pOutSet     ( NULL ),
diff --git a/svx/source/cui/zoom.hrc b/cui/source/dialogs/zoom.hrc
index 70e488c2893e..70e488c2893e 100644
--- a/svx/source/cui/zoom.hrc
+++ b/cui/source/dialogs/zoom.hrc
diff --git a/svx/source/cui/zoom.src b/cui/source/dialogs/zoom.src
index 197d1e2f2959..a27c41d7e1cc 100644
--- a/svx/source/cui/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -28,9 +28,10 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "zoom.hrc"
+#include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM
+
  // RID_SVXDLG_ZOOM -------------------------------------------------------
 ModalDialog RID_SVXDLG_ZOOM
 {
diff --git a/svx/source/cui/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index a0bed1362ee9..b294c3a6ea7d 100644
--- a/svx/source/cui/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include "dlgfact.hxx"
 #include "sal/types.h"
diff --git a/svtools/source/misc/iniprop.cxx b/cui/source/factory/cuiresmgr.cxx
index 16e0e5bc48a7..b46f4bca2f56 100644
--- a/svtools/source/misc/iniprop.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iniprop.cxx,v $
- * $Revision: 1.4 $
+ * $RCSfile: dialmgr.cxx,v $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,19 +29,25 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_cui.hxx"
 
+// include ---------------------------------------------------------------
 
-#include "iniprop.hxx"
+#include <dialmgr.hxx>
+#include <tools/rc.hxx>
+#include <svl/solar.hrc>
+#include <vcl/svapp.hxx>
 
-//-------------------------------------------------------------------------
+static ResMgr* pResMgr=0;
 
-TYPEINIT1(SfxAppIniManagerProperty, ApplicationProperty);
-
-//-------------------------------------------------------------------------
-
-SfxAppIniManagerProperty::~SfxAppIniManagerProperty()
+// struct DialogsResMgr --------------------------------------------------
+ResMgr* CuiResMgr::GetResMgr()
 {
-}
-
+    if ( !pResMgr )
+    {
+        ByteString aName( "cui" );
+        pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() );
+    }
 
+    return pResMgr;
+}
diff --git a/svx/source/cui/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 996d0f63f9e9..10095922f523 100644
--- a/svx/source/cui/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -29,28 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-#include "numfmt.hxx" //add for SvxNumberFormatTabPage
+#include "precompiled_cui.hxx"
 
+#include "align.hxx" //add for SvxAlignmentTabPage
 #include "dlgfact.hxx"
 
-// class ResId
 #include <tools/rc.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
-#include <svx/optimprove.hxx>
-#include "splitcelldlg.hxx"
+#include <cuires.hrc>
 #include <svx/dialogs.hrc>
-#include "fmresids.hrc"
+#include "numfmt.hxx"
+#include "optimprove.hxx"
+#include "splitcelldlg.hxx"
 #include "gallery.hrc"
-//#include "imapdlg.hrc"
-// dialogs and tabpages
 #include "dstribut.hxx"
 #include "cuigaldlg.hxx"
 #include "cuiimapwnd.hxx"
@@ -62,7 +55,6 @@
 #include "treeopt.hxx"
 #include "internationaloptions.hxx"
 #include "labdlg.hxx"
-#include "dstribut.hxx"
 #include "hangulhanjadlg.hxx" //add for HangulHanjaConversionDialog
 #include "showcols.hxx" //add for FmShowColsDialog
 #include "zoom.hxx" //add for SvxZoomDialog
@@ -87,18 +79,16 @@
 #include "connect.hxx" //add for SvxConnectionDialog
 #include "dbregister.hxx" // add for DatabaseRegistrationDialog
 #include "cuioptgenrl.hxx"  //add for SvxGeneralTabPage
-#include <optasian.hxx>
+#include "optasian.hxx"
 #include "insdlg.hxx"
 #include "pastedlg.hxx"
 #include "linkdlg.hxx"
 #include "SpellDialog.hxx"
 #include "cfg.hxx"    //add for SvxConfigDialog
-
 #include "numpages.hxx" // add for
 #include "paragrph.hxx" //add for
 #include "tabstpge.hxx" // add  for
 #include "textattr.hxx" // add for SvxTextAttrPage
-#include "align.hxx" //add for SvxAlignmentTabPage
 #include "backgrnd.hxx" //add for SvxBackgroundTabPage
 #include "border.hxx" //add for SvxBorderTabPage
 #include "chardlg.hxx" //add for SvxCharNamePage,SvxCharEffectsPage,SvxCharPositionPage,SvxCharTwoLinesPage
@@ -220,12 +210,12 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
-//add by CHINA001
+
 const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
-//add by CHINA001
+
 void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
 {
      pDlg->SetInputSet( pInSet );
@@ -240,7 +230,6 @@ String AbstractTabDialog_Impl::GetText() const
     return pDlg->GetText();
 }
 
-// AbstractTabDialog_Impl end
 
 const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const
 {
@@ -257,7 +246,6 @@ String AbstractSfxDialog_Impl::GetText() const
     return pDlg->GetText();
 }
 
-//for SvxDistributeDialog begin
 SvxDistributeHorizontal AbstractSvxDistributeDialog_Impl::GetDistributeHor()const
 {
     return pDlg->GetDistributeHor();
@@ -266,9 +254,7 @@ SvxDistributeVertical AbstractSvxDistributeDialog_Impl::GetDistributeVer()const
 {
     return pDlg->GetDistributeVer();
 }
-//for SvxDistributeDialog end
 
-// for HangulHanjaConversionDialog begin
 void AbstractHangulHanjaConversionDialog_Impl::EndDialog(long nResult)
 {
     pDlg->EndDialog(nResult);
@@ -402,16 +388,11 @@ ULONG AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper
     return pDlg->GetFormat( aHelper, pFormats, pDesc );
 }
 
-// for HangulHanjaConversionDialog end
-// for FmShowColsDialog begin
 void  AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference< ::com::sun::star::container::XIndexContainer>& xCols)
 {
      pDlg->SetColumns(xCols);
 }
 
-//for FmShowColsDialog end
-
-//for SvxZoomDialog begin
 void AbstractSvxZoomDialog_Impl::SetLimits( USHORT nMin, USHORT nMax )
 {
     pDlg->SetLimits( nMin, nMax );
@@ -427,74 +408,31 @@ const SfxItemSet* AbstractSvxZoomDialog_Impl::GetOutputItemSet() const
     return pDlg->GetOutputItemSet();
 }
 
-//for SvxZoomDialog end
-// svx::SvxSpellDialog
-/*-- 04.05.2004 08:26:12---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void AbstractSpellDialog_Impl::SetLanguage( sal_uInt16 nLang )
 {
     pDlg->SetLanguage(nLang);
 }
-/*-- 04.05.2004 08:26:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool AbstractSpellDialog_Impl::Close()
 {
     return pDlg->Close();
 }
-/*-- 04.05.2004 08:26:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  AbstractSpellDialog_Impl::Invalidate()
 {
     pDlg->InvalidateDialog();
 }
-/*-- 04.05.2004 08:26:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Window*     AbstractSpellDialog_Impl::GetWindow()
 {
     return pDlg;
 }
-/*-- 04.05.2004 08:26:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxBindings& AbstractSpellDialog_Impl::GetBindings()
 {
     return pDlg->GetBindings();
 }
-// end svx::SvxSpellDialog
-
-//for SvxSpellCheckDialog begin
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetNewEditWord( const String& _rNew )
-//STRIP001 {
-//STRIP001 return pDlg->SetNewEditWord(_rNew );
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetLanguage( sal_uInt16 nLang )
-//STRIP001 {
-//STRIP001 return pDlg->SetLanguage( nLang );
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::HideAutoCorrect()
-//STRIP001 {
-//STRIP001 return pDlg->HideAutoCorrect();
-//STRIP001 }
-//STRIP001
-//STRIP001 String AbstractSvxSpellCheckDialog_Impl::GetNewEditWord()
-//STRIP001 {
-//STRIP001 return pDlg->GetNewEditWord();
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetNewEditWord( const String& _rNew )
-//STRIP001 {
-//STRIP001 return pDlg->SetNewEditWord( _rNew );
-//STRIP001 }
-//STRIP001
-//for SvxSpellCheckDialog end
-
-//for SearchProgress begin
+
 void AbstractSearchProgress_Impl::Update()
 {
      pDlg->Update();
@@ -518,9 +456,7 @@ PLinkStub   AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl()
 {
     return SearchProgress::LinkStubCleanUpHdl;
 }
-//for SearchProgress end
 
-//for TakeProgress begin
 void AbstractTakeProgress_Impl::Update()
 {
      pDlg->Update();
@@ -540,23 +476,17 @@ PLinkStub   AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl()
 {
     return TakeProgress::LinkStubCleanUpHdl;
 }
-//for TakeProgress end
 
-//for TitleDialog begin
 String AbstractTitleDialog_Impl::GetTitle() const
 {
     return pDlg->GetTitle();
 }
-//for TitleDialog end
 
-//for GalleryIdDialog begin
 ULONG AbstractGalleryIdDialog_Impl::GetId() const
 {
     return pDlg->GetId();
 }
-//for GalleryIdDialog end
 
-//for VclAbstracRefreshableDialog begin
 void VclAbstractRefreshableDialog_Impl::Update()
 {
     pDlg->Update();
@@ -566,9 +496,7 @@ void VclAbstractRefreshableDialog_Impl::Sync()
 {
      pDlg-> Sync();
 }
-//for VclAbstracRefreshableDialog end
 
-//for URLDlg begin
 String AbstractURLDlg_Impl::GetURL() const
 {
     return pDlg->GetURL();
@@ -593,9 +521,6 @@ String AbstractURLDlg_Impl::GetName() const
 {
     return pDlg->GetName();
 }
-//for URLDlg end
-
-// AbstractSvxHlinkDlgMarkWnd_Impl begin
 
 void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( USHORT nFlags )
 {
@@ -647,9 +572,6 @@ USHORT AbstractSvxHlinkDlgMarkWnd_Impl::SetError( USHORT nError)
     return pDlg->SetError(nError);
 }
 
-// AbstractSvxHlinkDlgMarkWnd_Impl end
-
-//for SvxSearchSimilarityDialog begin
 USHORT AbstractSvxSearchSimilarityDialog_Impl::GetOther()
 {
     return pDlg->GetOther();
@@ -669,7 +591,6 @@ BOOL AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
 {
     return pDlg-> IsRelaxed();
 }
-//for SvxSearchSimilarityDialog end
 
 // AbstractSvxTransformTabDialog implementations just forwards everything to the dialog
 void AbstractSvxTransformTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -703,7 +624,6 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link& rL
 {
     pDlg->SetValidateFramePosLink( rLink );
 }
-// AbstractSvxTransformTabDialog end
 
 // AbstractSvxCaptionDialog implementations just forwards everything to the dialog
 void AbstractSvxCaptionDialog_Impl::SetCurPageId( USHORT nId )
@@ -737,16 +657,12 @@ void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link& rLink )
 {
     pDlg->SetValidateFramePosLink( rLink );
 }
-// SvxAbstractCaptionDialog end
 
-//for SvxJSearchOptionsDialog begin
 INT32 AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFlags() const
 {
     return pDlg->GetTransliterationFlags();
 }
-//for SvxJSearchOptionsDialog end
 
-//for FmInputRecordNoDialog begin
 void AbstractFmInputRecordNoDialog_Impl::SetValue(long nNew)
 {
     pDlg->SetValue(nNew);
@@ -756,21 +672,18 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const
 {
     return pDlg->GetValue();
 }
-//for FmInputRecordNoDialog end
 
-//for SvxNewDictionaryDialog begin
 ::Reference<
         ::com::sun::star::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary()
 {
     return pDlg->GetNewDictionary();
 }
-//for SvxNewDictionaryDialog end
 
-//for SvxNameDialog begin
 void AbstractSvxNameDialog_Impl::GetName( String& rName )
 {
     pDlg->GetName( rName );
 }
+
 void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheckImmediately )
 {
     aCheckNameHdl = rLink;
@@ -797,10 +710,6 @@ IMPL_LINK( AbstractSvxNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG )
         return aCheckNameHdl.Call(this);
     return 0;
 }
-//for SvxNameDialog end
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
 
 void AbstractSvxObjectNameDialog_Impl::GetName(String& rName)
 {
@@ -831,9 +740,6 @@ IMPL_LINK(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG)
     return 0;
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-
 void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(String& rTitle)
 {
     pDlg->GetTitle(rTitle);
@@ -844,16 +750,11 @@ void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(String& rDescription)
     pDlg->GetDescription(rDescription);
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-//for SvxMessDialog begin
 void AbstractSvxMessDialog_Impl::SetButtonText( USHORT nBtnId, const String& rNewTxt )
 {
     pDlg->SetButtonText( nBtnId, rNewTxt );
 }
-//for SvxMessDialog end
 
-//for SvxMultiPathDialog begin
 String AbstractSvxMultiPathDialog_Impl::GetPath() const
 {
     return pDlg->GetPath();
@@ -873,9 +774,7 @@ void AbstractSvxMultiPathDialog_Impl::SetTitle( const String& rNewTitle )
 {
     pDlg->SetText( rNewTitle );
 }
-//for SvxMultiPathDialog end
 
-//for SvxMultiFileDialog begin
 String AbstractSvxMultiFileDialog_Impl::GetPath() const
 {
     return pDlg->GetPath();
@@ -915,9 +814,7 @@ void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId )
 {
     pDlg->SetHelpId( nHelpId );
 }
-//for SvxMultiFileDialog end
 
-//for SvxHpLinkDlg begin
 Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
 {
     return (Window *)pDlg;
@@ -927,10 +824,8 @@ sal_Bool AbstractSvxHpLinkDlg_Impl::QueryClose()
 {
     return pDlg->QueryClose();
 }
-//for SvxHpLinkDlg end
 
 
-//for FmSearchDialog begin
 void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link& lnk)
 {
     pDlg->SetFoundHandler(lnk);
@@ -943,14 +838,11 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const String& strField)
 {
     pDlg->SetActiveField(strField);
 }
-//for FmSearchDialog end
 
-//for GraphicFilterDialog begin
 Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY )
 {
     return pDlg->GetFilteredGraphic( rGraphic, fScaleX, fScaleY );
 }
-//for GraphicFilterDialog end
 
 // AbstractSvxAreaTabDialog implementations just forwards everything to the dialog
 void AbstractSvxAreaTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -962,12 +854,12 @@ const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
-//add by CHINA001
+
 const USHORT* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
-//add by CHINA001
+
 void AbstractSvxAreaTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
 {
      pDlg->SetInputSet( pInSet );
@@ -986,9 +878,7 @@ void AbstractSvxAreaTabDialog_Impl::DontDeleteColorTable()
 {
     return pDlg->DontDeleteColorTable();
 }
-// AbstractSvxAreaTabDialog_Impl end
 
-// add SvxPostItDialog begin
 void AbstractSvxPostItDialog_Impl::SetText( const XubString& rStr )
 {
     pDlg->SetText( rStr );
@@ -1062,9 +952,6 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow()
     return (Window *)pDlg;
 }
 
-// SvxPostItDialog end
-
-//--------------------------------------------------------------
 // Create dialogs with simplest interface
 VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId )
 {
@@ -1188,125 +1075,50 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
 // TabDialog that use functionality of the drawing layer
 SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* pParent,
                                             const SfxItemSet* pAttrSet,
-                                            sal_uInt32 nResId,
                                             SdrView* pView,
                                             SdrModel* )
 {
-    SfxTabDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_TEXT :
-            pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
-    return 0;
+    SfxTabDialog* pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView );
+    return new AbstractTabDialog_Impl( pDlg );
 }
 
 //TabDialog that use functionality of the drawing layer and add AnchorTypes  -- for SvxCaptionTabDialog CHINA001
 AbstractSvxCaptionDialog*       AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent,
                                             const SdrView* pView,
-                                            sal_uInt32 nResId,
                                             USHORT nAnchorTypes )
 {
-    SvxCaptionTabDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_CAPTION :
-            pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxCaptionDialog_Impl( pDlg );
-    return 0;
+    SvxCaptionTabDialog* pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes );
+    return new AbstractSvxCaptionDialog_Impl( pDlg );
 }
 
 AbstractSvxDistributeDialog*    AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
-                                            sal_uInt32 nResId,
                                             SvxDistributeHorizontal eHor ,
                                             SvxDistributeVertical eVer)
 {
-    SvxDistributeDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXPAGE_DISTRIBUTE :
-            pDlg = new SvxDistributeDialog( pParent, rAttr, eHor, eVer);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxDistributeDialog_Impl( pDlg );
-    return 0;
+    SvxDistributeDialog* pDlg = new SvxDistributeDialog( pParent, rAttr, eHor, eVer);
+    return new AbstractSvxDistributeDialog_Impl( pDlg );
 }
 
 AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent,
-                                                                                                   HangulHanjaConversion::ConversionDirection _ePrimaryDirection,
-                                                                                                    sal_uInt32 nResId)
+                                                                       HangulHanjaConversion::ConversionDirection _ePrimaryDirection )
 {
-    HangulHanjaConversionDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVX_MDLG_HANGULHANJA :
-            pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
-    return 0;
+    HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection);
+    return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
 }
 
-AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent,  //add for FmShowColsDialog
-                                             sal_uInt32 nResId)
+AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent )
 {
-   FmShowColsDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVX_DLG_SHOWGRIDCOLUMNS :
-            pDlg = new FmShowColsDialog( pParent);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractFmShowColsDialog_Impl( pDlg );
-    return 0;
+    FmShowColsDialog* pDlg = new FmShowColsDialog( pParent);
+    return new AbstractFmShowColsDialog_Impl( pDlg );
 }
 AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent,  //add for SvxZoomDialog
-                                            const SfxItemSet& rCoreSet,
-                                            sal_uInt32 nResId)
+                                            const SfxItemSet& rCoreSet)
 {
-   SvxZoomDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_ZOOM :
-            pDlg = new SvxZoomDialog( pParent, rCoreSet);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxZoomDialog_Impl( pDlg );
-    return 0;
+    SvxZoomDialog* pDlg = new SvxZoomDialog( pParent, rCoreSet);
+    return new AbstractSvxZoomDialog_Impl( pDlg );
 }
 
-/*-- 04.05.2004 08:18:17---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 AbstractSpellDialog *  AbstractDialogFactory_Impl::CreateSvxSpellDialog(
                         Window* pParent,
                         SfxBindings* pBindings,
@@ -1316,61 +1128,23 @@ AbstractSpellDialog *  AbstractDialogFactory_Impl::CreateSvxSpellDialog(
     return new AbstractSpellDialog_Impl(pDlg);
 }
 
-//CHINA001 GalleryDialog start
-VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent,  //add for ActualizeProgress
-                                            GalleryTheme* pThm,
-                                            sal_uInt32 nResId)
+VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm )
 {
-   Dialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS :
-            pDlg = new ActualizeProgress( pParent, pThm);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new VclAbstractRefreshableDialog_Impl( pDlg );
-    return 0;
+   Dialog* pDlg = new ActualizeProgress( pParent, pThm);
+   return new VclAbstractRefreshableDialog_Impl( pDlg );
 }
 
 AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( Window* pParent,  //add for SearchProgress
-                                            const INetURLObject& rStartURL,
-                                            sal_uInt32 nResId)
+                                            const INetURLObject& rStartURL )
 {
-   SearchProgress* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_GALLERY_SEARCH_PROGRESS :
-            pDlg = new SearchProgress( pParent, rStartURL);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSearchProgress_Impl( pDlg );
-    return 0;
+    SearchProgress* pDlg = new SearchProgress( pParent, rStartURL);
+    return new AbstractSearchProgress_Impl( pDlg );
 }
 
-AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Window* pParent,  //add for TakeProgress
-                                            sal_uInt32 nResId)
+AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Window* pParent )
 {
-   TakeProgress* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_GALLERY_TAKE_PROGRESS :
-            pDlg = new TakeProgress( pParent );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractTakeProgress_Impl( pDlg );
-    return 0;
+    TakeProgress* pDlg = new TakeProgress( pParent );
+    return new AbstractTakeProgress_Impl( pDlg );
 }
 
 VclAbstractDialog*
@@ -1422,63 +1196,26 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window
 }
 
 AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent,  //add for TitleDialog
-                                            const String& rOldText,
-                                            sal_uInt32 nResId)
+                                            const String& rOldText)
 {
-   TitleDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_GALLERY_TITLE :
-            pDlg = new TitleDialog( pParent, rOldText);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractTitleDialog_Impl( pDlg );
-    return 0;
+   TitleDialog* pDlg = new TitleDialog( pParent, rOldText);
+   return new AbstractTitleDialog_Impl( pDlg );
 }
 
 AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( Window* pParent,  //add for SvxZoomDialog
-                                            GalleryTheme* pThm,
-                                            sal_uInt32 nResId)
+                                            GalleryTheme* pThm )
 {
-   GalleryIdDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_GALLERY_THEMEID :
-            pDlg = new GalleryIdDialog( pParent, pThm);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractGalleryIdDialog_Impl( pDlg );
-    return 0;
+   GalleryIdDialog* pDlg = new GalleryIdDialog( pParent, pThm);
+   return new AbstractGalleryIdDialog_Impl( pDlg );
 }
 
 VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( Window* pParent,  //add for GalleryThemeProperties
                                             ExchangeData* pData,
-                                            SfxItemSet* pItemSet,
-                                            sal_uInt32 nResId)
+                                            SfxItemSet* pItemSet)
 {
-    Dialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXTABDLG_GALLERYTHEME :
-            pDlg = new GalleryThemeProperties( pParent, pData, pItemSet);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new VclAbstractDialog2_Impl( pDlg );
-    return 0;
+    Dialog* pDlg = new GalleryThemeProperties( pParent, pData, pItemSet);
+    return new VclAbstractDialog2_Impl( pDlg );
 }
-//CHINA001 GalleryDialog end
 
 AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent,  //add for URLDlg
                                             const String& rURL, const String& rAltText, const String& rDescription,
@@ -1488,9 +1225,7 @@ AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent,
     URLDlg* pDlg = new URLDlg( pParent, rURL, rAltText, rDescription, rTarget, rName, rTargetList);
     return new AbstractURLDlg_Impl( pDlg );
 }
-//CHINA001 URLDlg end
 
-//CHINA001 SvxHlinkDlgMarkWnd begin
 AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId )
 {
     SvxHlinkDlgMarkWnd* pDlg=NULL;
@@ -1507,7 +1242,6 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd
         return new AbstractSvxHlinkDlgMarkWnd_Impl( pDlg );
     return 0;
 }
-//CHINA001 SvxHlinkDlgMarkWnd end
 
 SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResId,
                                             Window* pParent,
@@ -1528,9 +1262,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResI
         return new AbstractSfxDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  SvxCharacterMap end
 
-//CHINA001  SvxSearchFormatDialog begin
 SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* pParent,
                                             const SfxItemSet& rSet,
                                             sal_uInt32 nResId)
@@ -1549,31 +1281,15 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p
         return new AbstractTabDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  SvxSearchFormatDialog end
 
-//CHINA001  SvxSearchAttributeDialog begin
 VclAbstractDialog*      AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent,
                                             SearchAttrItemList& rLst,
-                                            const USHORT* pWhRanges,
-                                            sal_uInt32 nResId ) //add for SvxSearchAttributeDialog
+                                            const USHORT* pWhRanges )
 {
-    Dialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_SEARCHATTR :
-            pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new VclAbstractDialog_Impl( pDlg );
-    return 0;
+    Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges);
+    return new VclAbstractDialog_Impl( pDlg );
 }
-//CHINA001  SvxSearchAttributeDialog end
 
-//CHINA001  SvxSearchSimilarityDialog begin
 AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent,
                                                             BOOL bRelax,
                                                             USHORT nOther,
@@ -1585,55 +1301,24 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS
         return new AbstractSvxSearchSimilarityDialog_Impl( pDlg );
     return NULL;
 }
-//CHINA001  SvxSearchSimilarityDialog end
 
-//CHINA001  SvxBorderBackgroundDlg begin
 SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( Window* pParent,
                                             const SfxItemSet& rCoreSet,
-                                            sal_uInt32 nResId,
                                             BOOL bEnableSelector)
 {
-    SfxTabDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_BBDLG :
-            pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
-    return 0;
+    SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
+    return new AbstractTabDialog_Impl( pDlg );
 }
-//CHINA001  SvxBorderBackgroundDlg end
 
-//CHINA001  SvxTransformTabDialog begin
 AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent,
                                                                               const SfxItemSet* pAttr,
                                                                                 const SdrView* pView,
-                                                                                sal_uInt32 nResId,
                                                                                 USHORT nAnchorTypes )
 {
-    SvxTransformTabDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_TRANSFORM :
-            pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes);
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxTransformTabDialog_Impl( pDlg );
-    return 0;
+    SvxTransformTabDialog* pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes);
+    return new AbstractSvxTransformTabDialog_Impl( pDlg );
 }
 
-//CHINA001  SvxTransformTabDialog end
-
-//CHINA001  SchTransformTabDialog begin
 SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( Window* pParent,
                                                                 const SfxItemSet* pAttr,
                                                                 const SdrView* pSdrView,
@@ -1665,51 +1350,21 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W
         return new AbstractTabDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  SchTransformTabDialog end
 
-//CHINA001  SvxJSearchOptionsDialog begin
 AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent,
-                                                            const SfxItemSet& rOptionsSet, USHORT nUniqueId,
-                                                            INT32 nInitialFlags,
-                                                            sal_uInt32 nResId)
+                                                            const SfxItemSet& rOptionsSet,
+                                                            INT32 nInitialFlags)
 {
-    SvxJSearchOptionsDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXPAGE_JSEARCH_OPTIONS :
-            pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nUniqueId, nInitialFlags );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
-    return 0;
+    SvxJSearchOptionsDialog* pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nInitialFlags );
+    return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
 }
-//CHINA001  SvxJSearchOptionsDialog end
 
-//CHINA001  FmInputRecordNoDialog begin
-AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent,
-                                                            sal_uInt32 nResId)
+AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent )
 {
-    FmInputRecordNoDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVX_DLG_INPUTRECORDNO :
-            pDlg = new FmInputRecordNoDialog( pParent );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractFmInputRecordNoDialog_Impl( pDlg );
-    return 0;
+    FmInputRecordNoDialog* pDlg = new FmInputRecordNoDialog( pParent );
+    return new AbstractFmInputRecordNoDialog_Impl( pDlg );
 }
-//CHINA001  FmInputRecordNoDialog end
 
-//CHINA001  SvxNewDictionaryDialog begin
 AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent,
                                             ::Reference< ::com::sun::star::linguistic2::XSpellChecker1 >  &xSpl,
                                             sal_uInt32 nResId )
@@ -1728,9 +1383,7 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction
         return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  SvxNewDictionaryDialog end
 
-//CHINA001  SvxEditDictionaryDialog begin
 VclAbstractDialog*      AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent,
                                             const String& rName,
                                             ::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
@@ -1750,52 +1403,24 @@ VclAbstractDialog*      AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo
         return new VclAbstractDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  SvxEditDictionaryDialog end
 
-//CHINA001  SvxNameDialog begin
 AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( Window* pParent,
-                                    const String& rName, const String& rDesc,
-                                    sal_uInt32 nResId )
+                                    const String& rName, const String& rDesc )
 {
-    SvxNameDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_NAME :
-            pDlg = new SvxNameDialog( pParent, rName, rDesc );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxNameDialog_Impl( pDlg );
-    return 0;
+    SvxNameDialog* pDlg = new SvxNameDialog( pParent, rName, rDesc );
+    return new AbstractSvxNameDialog_Impl( pDlg );
 }
-//CHINA001  SvxNameDialog end
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
 
-AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId)
+AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const String& rName )
 {
-    return ((RID_SVXDLG_OBJECT_NAME == nResId)
-        ? new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName))
-        : NULL);
+    return new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName));
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-
-AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId)
+AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription)
 {
-    return ((RID_SVXDLG_OBJECT_TITLE_DESC == nResId)
-        ? new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription))
-        : NULL);
+    return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription));
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-//CHINA001  SvxMessDialog begin
 AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
                                     const String& rText, const String& rDesc, Image* pImg )
 {
@@ -1813,49 +1438,19 @@ AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window*
         return new AbstractSvxMessDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  SvxMessDialog end
 
-//CHINA001  SvxMultiPathDialog begin
-AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId,
-                                                BOOL bEmptyAllowed )
+AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed )
 {
-    SvxMultiPathDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_MULTIPATH :
-            pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxMultiPathDialog_Impl( pDlg );
-    return 0;
+    SvxMultiPathDialog* pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
+    return new AbstractSvxMultiPathDialog_Impl( pDlg );
 }
-//CHINA001  SvxMultiPathDialog end
 
-//CHINA001  SvxMultiFileDialog begin
-AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId,
-                                                BOOL bEmptyAllowed )
+AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed )
 {
-    SvxMultiFileDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_MULTIPATH :
-            pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxMultiFileDialog_Impl( pDlg );
-    return 0;
+    SvxMultiFileDialog* pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
+    return new AbstractSvxMultiFileDialog_Impl( pDlg );
 }
-//CHINA001  SvxMultiFileDialog end
 
-//CHINA001  SvxHpLinkDlg begin
 AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent,  //add for SvxMultiFileDialog
                                             SfxBindings* pBindings,
                                             sal_uInt32 nResId)
@@ -1874,9 +1469,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p
         return new AbstractSvxHpLinkDlg_Impl( pDlg );
     return 0;
 }
-//CHINA001  SvxHpLinkDlg end
 
-//CHINA001  FmSearchDialog begin
 AbstractFmSearchDialog*  AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
                                                         const String& strInitialText,
                                                         const ::std::vector< String >& _rContexts,
@@ -1889,32 +1482,16 @@ AbstractFmSearchDialog*  AbstractDialogFactory_Impl::CreateFmSearchDialog(Window
     return 0;
 }
 
-//CHINA001 FmSearchDialog end
-
-//CHINA001  GraphicFilterEmboss begin
 AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent,  //add for GraphicFilterEmboss
                                             const Graphic& rGraphic,
                                             RECT_POINT eLightSource,
-                                            sal_uInt32 nResId)
+                                            sal_uInt32)
 {
-    GraphicFilterDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVX_GRFFILTER_DLG_EMBOSS :
-            pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractGraphicFilterDialog_Impl( pDlg );
-    return 0;
+    GraphicFilterDialog* pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
+    return new AbstractGraphicFilterDialog_Impl( pDlg );
 }
-//CHINA001  GraphicFilterEmboss end
 
-//CHINA001  GraphicFilterPoster & GraphicFilterSepia begin
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent,  //add for GraphicFilterPoster & GraphicFilterSepia
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent,
                                             const Graphic& rGraphic,
                                             USHORT nCount,
                                             sal_uInt32 nResId)
@@ -1937,31 +1514,15 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos
         return new AbstractGraphicFilterDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  GraphicFilterPoster & GraphicFilterSepia end
 
-//CHINA001  GraphicFilterSolarize begin
 AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent,  //add for GraphicFilterSolarize
                                             const Graphic& rGraphic,
-                                            BYTE nGreyThreshold, BOOL bInvert,
-                                            sal_uInt32 nResId)
+                                            BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 )
 {
-    GraphicFilterDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVX_GRFFILTER_DLG_SOLARIZE :
-            pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractGraphicFilterDialog_Impl( pDlg );
-    return 0;
+    GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
+    return new AbstractGraphicFilterDialog_Impl( pDlg );
 }
-//CHINA001  GraphicFilterSolarize end
 
-//CHINA001  GraphicFilterMosaic begin
 AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent,  //add for GraphicFilterMosaic
                                             const Graphic& rGraphic,
                                             USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
@@ -1981,51 +1542,24 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMos
         return new AbstractGraphicFilterDialog_Impl( pDlg );
     return 0;
 }
-//CHINA001  GraphicFilterMosaic end
-//CHINA001  SvxAreaTabDialog begin
+
 AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Window* pParent,
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
-                                                            sal_uInt32 nResId,
                                                             const SdrView* pSdrView )
 {
-    SvxAreaTabDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_AREA :
-            pDlg = new SvxAreaTabDialog( pParent, pAttr, pModel,pSdrView );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxAreaTabDialog_Impl( pDlg );
-    return 0;
+    SvxAreaTabDialog* pDlg = new SvxAreaTabDialog( pParent, pAttr, pModel,pSdrView );
+    return new AbstractSvxAreaTabDialog_Impl( pDlg );
 }
-//CHINA001  SvxAreaTabDialog end
-//CHINA001  SvxLineTabDialog begin
+
 SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
                                                                  SdrModel* pModel,
-                                                                 sal_uInt32 nResId,
                                                                  const SdrObject* pObj ,
                                                                 BOOL bHasObj)
 {
-    SfxTabDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_LINE :
-            pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
-    return 0;
+    SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
+    return new AbstractTabDialog_Impl( pDlg );
 }
-//CHINA001  SvxLineTabDialog end
 
 SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
                                                                         const SfxItemSet& rAttr,
@@ -2054,7 +1588,6 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
     return 0;
 }
 
-//CHINA001  SvxMeasureDialog & SvxConnectionDialog begin
 SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
                                                                         const SfxItemSet& rAttr,
                                                                         const SdrView* pView,
@@ -2090,27 +1623,13 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
     return 0;
 }
 
-//CHINA001 SvxPostItDialog begin
 AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent,
                                                                         const SfxItemSet& rCoreSet,
-                                                                        sal_uInt32 nResId,
                                                                         BOOL bPrevNext, BOOL bRedline )
 {
-    SvxPostItDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVXDLG_POSTIT :
-            pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractSvxPostItDialog_Impl( pDlg );
-    return 0;
+    SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline );
+    return new AbstractSvxPostItDialog_Impl( pDlg );
 }
-//CHINA001   SvxPostItDialog end
 
 class SvxMacroAssignDialog : public VclAbstractDialog
 {
@@ -2228,18 +1747,12 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
 
     return 0;
 }
-CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc(USHORT nId )
-{
-        switch ( nId )
-    {
-        case RID_SVXPAGE_DISTRIBUTE:
-            return SvxDistributePage::Create;
-        default:
-            break;
-    }
 
-    return 0;
+CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc()
+{
+    return SvxDistributePage::Create;
 }
+
 DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId )
 {
         switch ( nId )
@@ -2391,3 +1904,4 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind
 {
     return new SvxInsRowColDlg( pParent, bCol, nHelpId );
 }
+
diff --git a/svx/source/cui/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index e52c21fc597a..eb3c7b932597 100644
--- a/svx/source/cui/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -29,21 +29,14 @@
  ************************************************************************/
 #ifndef _CUI_DLGFACT_HXX
 #define _CUI_DLGFACT_HXX
+
 // include ---------------------------------------------------------------
-#include <svx/svxdlg.hxx> //CHINA001 #include <svx/svxdlg.hxx>
+#include <svx/svxdlg.hxx>
 #include <com/sun/star/container/XNameReplace.hpp>
 
 #include "tools/link.hxx"
 #include <com/sun/star/frame/XFrame.hpp>
 
-//#include <sfx2/basedlgs.hxx>
-//#include "dstribut.hxx"
-//#include "cuigaldlg.hxx"
-//#include "cuiimapwnd.hxx"
-//#include "hlmarkwn.hxx"
-//#include "cuicharmap.hxx"
-//#include "srchxtra.hxx"
-
 class SfxTabDialog;
 class SfxModalDialog;
 class Dialog;
@@ -618,7 +611,6 @@ public:
                                             const String *pUserButtonText=0 );
     virtual SfxAbstractTabDialog*       CreateTextTabDialog( Window* pParent,
                                             const SfxItemSet* pAttrSet,
-                                            sal_uInt32 nResId,
                                             SdrView* pView,
                                             SdrModel* pModel=0 ); //add for SvxTextTabDialog
     virtual SfxAbstractTabDialog*       CreateTabItemDialog( Window* pParent,
@@ -626,11 +618,9 @@ public:
                                             sal_uInt32 nResId); //add by CHINA001
     virtual AbstractSvxCaptionDialog*   CreateCaptionDialog( Window* pParent,
                                             const SdrView* pView,
-                                            sal_uInt32 nResId,
                                             USHORT nAnchorTypes = 0 );      //add for SvxCaptionTabDialog CHINA001
     virtual AbstractSvxDistributeDialog*    CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
-                                            sal_uInt32 nResId,
                                             SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
                                             SvxDistributeVertical eVer = SvxDistributeVerticalNone);
     virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
@@ -642,22 +632,17 @@ public:
    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::SvLinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0  );
 
    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog CHINA001
-                                            HangulHanjaConversion::ConversionDirection _ePrimaryDirection,
-                                            sal_uInt32 nResId);
+                                            HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
 
-   virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent,  //add for FmShowColsDialog
-                                             sal_uInt32 nResId);
+   virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent );  //add for FmShowColsDialog
    virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,  //add for SvxZoomDialog
-                                            const SfxItemSet& rCoreSet,
-                                            sal_uInt32 nResId);
+                                            const SfxItemSet& rCoreSet);
    virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
                                             const SfxItemSet& rCoreSet,
-                                            sal_uInt32 nResId,
                                             BOOL bEnableSelector = FALSE) ;
    virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
                                                                 const SfxItemSet* pAttr,
                                                                 const SdrView* pView,
-                                                                sal_uInt32 nResId,
                                                                 USHORT nAnchorTypes = 0) ;
     virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent,  //add for SchTransformTabDialog
                                                                 const SfxItemSet* pAttr,
@@ -675,24 +660,17 @@ public:
 //STRIP001    ::com::sun::star::linguistic2::XSpellChecker1 >  &xChecker,
 //STRIP001    SvxSpellWrapper* pWrapper,
 //STRIP001    sal_uInt32 nResId);
-    virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent,  //add for ActualizeProgress
-                                            GalleryTheme* pThm,
-                                            sal_uInt32 nResId);
-    virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,  //add for SearchProgress
-                                            const INetURLObject& rStartURL,
-                                            sal_uInt32 nResId);
-    virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent,  //add for TakeProgress
-                                            sal_uInt32 nResId);
+    virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm );
+    virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
+                                            const INetURLObject& rStartURL);
+    virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent );
     virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent,  //add for TitleDialog
-                                             const String& rOldText,
-                                            sal_uInt32 nResId);
+                                             const String& rOldText);
     virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent,  //add for SvxZoomDialog
-                                            GalleryTheme* pThm,
-                                            sal_uInt32 nResId);
+                                            GalleryTheme* pThm);
     virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent,  //add for GalleryThemeProperties
                                             ExchangeData* pData,
-                                            SfxItemSet* pItemSet,
-                                            sal_uInt32 nResId);
+                                            SfxItemSet* pItemSet);
     virtual AbstractURLDlg * CreateURLDialog( Window* pParent,  //add for URLDlg
                                             const String& rURL, const String& rAltText, const String& rDescription,
                                             const String& rTarget, const String& rName,
@@ -701,19 +679,16 @@ public:
 
     virtual VclAbstractDialog*      CreateSvxSearchAttributeDialog( Window* pParent,
                                             SearchAttrItemList& rLst,
-                                            const USHORT* pWhRanges,
-                                            sal_uInt32 nResId ); //add for SvxSearchAttributeDialog
+                                            const USHORT* pWhRanges);
     virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
                                                             BOOL bRelax,
                                                             USHORT nOther,
                                                             USHORT nShorter,
                                                             USHORT nLonger); //add for SvxSearchSimilarityDialog
     virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
-                                                            const SfxItemSet& rOptionsSet, USHORT nUniqueId,
-                                                            INT32 nInitialFlags,
-                                                            sal_uInt32 nResId); //add for SvxJSearchOptionsDialog
-    virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent,
-                                                            sal_uInt32 nResId); //add for FmInputRecordNoDialog
+                                                            const SfxItemSet& rOptionsSet,
+                                                            INT32 nInitialFlags);
+    virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent );
     virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 >  &xSpl,
                                             sal_uInt32 nResId ); //add for SvxNewDictionaryDialog
@@ -722,63 +697,52 @@ public:
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
                                             sal_uInt32 nResId);//add for SvxEditDictionaryDialog
     virtual AbstractSvxNameDialog *     CreateSvxNameDialog( Window* pParent,
-                                            const String& rName, const String& rDesc,
-                                            sal_uInt32 nResId ); //add for SvxNameDialog
-
+                                            const String& rName, const String& rDesc );
     // #i68101#
-    virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId);
-    virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId);
+    virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName );
+    virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription);
 
-    virtual AbstractSvxMessDialog *     CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
+    virtual AbstractSvxMessDialog *         CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
                                             const String& rText, const String& rDesc,
                                             Image* pImg = NULL ); //add for SvxMessDialog
-    virtual AbstractSvxMultiPathDialog *    CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId,
-                                                BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
-    virtual AbstractSvxMultiFileDialog *    CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId,
-                                                BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
+    virtual AbstractSvxMultiPathDialog *    CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
+    virtual AbstractSvxMultiFileDialog *    CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
     virtual AbstractSvxHpLinkDlg *          CreateSvxHpLinkDlg (Window* pParent,  //add for SvxHpLink
                                             SfxBindings* pBindings,
                                             sal_uInt32 nResId);
-    virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
+    virtual AbstractFmSearchDialog*         CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
                                                         const String& strInitialText,
                                                         const ::std::vector< String >& _rContexts,
                                                         sal_Int16 nInitialContext,
                                                         const Link& lnkContextSupplier);
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterEmboss (Window* pParent,  //add for GraphicFilterEmboss
                                             const Graphic& rGraphic,
-                                            RECT_POINT eLightSource,
-                                            sal_uInt32 nResId);
+                                            RECT_POINT eLightSource, sal_uInt32 nResId);
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterPosterSepia (Window* pParent,  //add for GraphicFilterPoster & GraphicFilterSepia
                                             const Graphic& rGraphic,
                                             USHORT nCount,
                                             sal_uInt32 nResId);
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterSolarize (Window* pParent,  //add for GraphicFilterSolarize
                                             const Graphic& rGraphic,
-                                            BYTE nGreyThreshold, BOOL bInvert,
-                                            sal_uInt32 nResId);
+                                            BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId);
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterMosaic (Window* pParent,  //add for GraphicFilterMosaic
                                             const Graphic& rGraphic,
-                                            USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
-                                            sal_uInt32 nResId);
+                                            USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId);
     virtual AbstractSvxAreaTabDialog*       CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
-                                                            sal_uInt32 nResId,
                                                             const SdrView* pSdrView = NULL ); //add for SvxAreaTabDialog
     virtual SfxAbstractTabDialog*           CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog
                                                                  SdrModel* pModel,
-                                                                 sal_uInt32 nResId,
                                                                  const SdrObject* pObj = NULL,
                                                                 BOOL bHasObj = TRUE );
     virtual AbstractSvxPostItDialog*        CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
                                                                         const SfxItemSet& rCoreSet,
-                                                                        sal_uInt32 nResId,
                                                                         BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
 
     // For TabPage
     virtual CreateTabPage               GetTabPageCreatorFunc( USHORT nId );
-    virtual CreateSvxDistributePage     GetSvxDistributePageCreatorFunc(USHORT nId );
-
+    virtual CreateSvxDistributePage     GetSvxDistributePageCreatorFunc();
 
     virtual GetTabPageRanges            GetTabPageRangesFunc( USHORT nId );
     virtual DialogGetRanges         GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog
diff --git a/svx/source/cui/init.cxx b/cui/source/factory/init.cxx
index 686b5b068498..de01a2deb1b3 100644
--- a/svx/source/cui/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <vcl/msgbox.hxx>
 #include "cuicharmap.hxx"
diff --git a/cui/source/factory/makefile.mk b/cui/source/factory/makefile.mk
new file mode 100755
index 000000000000..cb374cd26aea
--- /dev/null
+++ b/cui/source/factory/makefile.mk
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=factory
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SLOFILES+=\
+        $(SLO)$/dlgfact.obj \
+        $(SLO)$/cuiexp.obj \
+        $(SLO)$/cuiresmgr.obj \
+        $(SLO)$/init.obj \
+
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/svx/source/cui/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx
index 828341da0e71..828341da0e71 100644
--- a/svx/source/cui/ControlFocusHelper.hxx
+++ b/cui/source/inc/ControlFocusHelper.hxx
diff --git a/svx/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index e7545eaeb6e7..86c41d17452e 100644
--- a/svx/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -49,7 +49,7 @@
 #include <svx/langbox.hxx>
 #include <memory>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/xtextedt.hxx>
 #include <svx/SpellPortions.hxx>
 
diff --git a/svx/source/cui/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 245cc81e89aa..40ce17a36b8c 100644
--- a/svx/source/cui/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -60,7 +60,7 @@
 #include <sfx2/basedlgs.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/minarray.hxx>
 
diff --git a/svx/source/cui/align.hxx b/cui/source/inc/align.hxx
index db907d7d1750..44a11eacccc9 100644
--- a/svx/source/cui/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -32,24 +32,15 @@
 
 // include ---------------------------------------------------------------
 
-
-#ifndef _FIELD_HXX //autogen
+#include <svx/orienthelper.hxx>
 #include <vcl/field.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
 #include <vcl/imagebtn.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <sfx2/tabdlg.hxx>
 #include <svtools/valueset.hxx>
-#include "dialcontrol.hxx"
-#include "wrapfield.hxx"
-#include "orienthelper.hxx"
+#include <svx/dialcontrol.hxx>
+#include <svx/wrapfield.hxx>
 #include <svx/frmdirlbox.hxx>
 
 namespace svx {
diff --git a/svx/source/cui/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index dba6ce826cc3..dba6ce826cc3 100644
--- a/svx/source/cui/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
diff --git a/svx/source/cui/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index e658c2ce0eb0..e658c2ce0eb0 100644
--- a/svx/source/cui/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
diff --git a/svx/source/cui/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index f2d7e25e9bf9..f2d7e25e9bf9 100644
--- a/svx/source/cui/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
diff --git a/svx/source/cui/border.hxx b/cui/source/inc/border.hxx
index e01f2c803ff2..ac7f9245fd49 100644
--- a/svx/source/cui/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -34,39 +34,19 @@
 
 
 #include <svtools/ctrlbox.hxx>
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <svtools/valueset.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/frmsel.hxx>
+
 // forward ---------------------------------------------------------------
 
 class SvxBorderLine;
 class XColorTable;
 
-// class SvxBorderTabPage ------------------------------------------------
-/*
-{k:\svx\prototyp\dialog\border.bmp}
-[Beschreibung]
-TabPage zur Einstellung der Umrandung (Staerke, Farbe, Schatten, ...)
-[Items]
-<SvxBoxItem><SID_ATTR_BORDER_OUTER>
-<SvxBoxInfoItem><SID_ATTR_BORDER_INNER>
-<SvxShadowItem><SID_ATTR_BORDER_SHADOW>
-*/
-
-// Border-Modes for paragraphs, textframes and tables
-//CHINA001 #define SW_BORDER_MODE_PARA  0x01
-//CHINA001 #define SW_BORDER_MODE_TABLE    0x02
-//CHINA001 #define SW_BORDER_MODE_FRAME    0x04
-#include "flagsdef.hxx"//CHINA001
+#include <svx/flagsdef.hxx>
 
 class SvxBorderTabPage : public SfxTabPage
 {
diff --git a/svx/source/cui/cfg.hxx b/cui/source/inc/cfg.hxx
index c52b92ce2a0a..57dc9692f87c 100644
--- a/svx/source/cui/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -54,7 +54,7 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <sfx2/minarray.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vector>
diff --git a/svx/source/cui/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index c19a47495290..87b6bc8a1820 100644
--- a/svx/source/cui/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <vcl/timer.hxx>
 #include <svtools/svtabbx.hxx>
diff --git a/svx/source/cui/chardlg.hxx b/cui/source/inc/chardlg.hxx
index d767d8ddd8f3..d767d8ddd8f3 100644
--- a/svx/source/cui/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
diff --git a/svx/source/cui/connect.hxx b/cui/source/inc/connect.hxx
index d7d0c21e34f4..db344c959e6e 100644
--- a/svx/source/cui/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -32,24 +32,12 @@
 
 // include ---------------------------------------------------------------
 
-#include "connctrl.hxx"
+#include <svx/connctrl.hxx>
 #include <sfx2/tabdlg.hxx>
-
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
-
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <sfx2/basedlgs.hxx>
 
 class SdrView;
diff --git a/svx/source/cui/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index b8544bd98dea..b8544bd98dea 100644
--- a/svx/source/cui/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
diff --git a/svx/source/cui/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 5d8533a7b0b6..2659054c2100 100644
--- a/svx/source/cui/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -36,7 +36,7 @@
 #include <svx/fmsearch.hxx> //CHINA001
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
diff --git a/svx/source/cui/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 62a5b3dc405a..ef285bb85448 100644
--- a/svx/source/cui/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -40,18 +40,16 @@
 #include <vcl/menu.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <svtools/transfer.hxx>
 #include <goodies/grfmgr.hxx>
 #include <sfx2/tabdlg.hxx>
-#include "galctrl.hxx"
-#include "galmisc.hxx"
-#include "galdlg.hxx" //CHINA001
+#include <svx/galctrl.hxx>
+#include <svx/galmisc.hxx>
 #include <com/sun/star/media/XPlayer.hpp>
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
 #include <svtools/dialogclosedlistener.hxx>
+#include <bootstrp/sstring.hxx>
 
 // ------------
 // - Forwards -
diff --git a/svx/source/cui/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 061ada2568d1..061ada2568d1 100644
--- a/svx/source/cui/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
diff --git a/svx/source/cui/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index c2f247f9455c..59b39f55a7fc 100644
--- a/svx/source/cui/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <hlnkitem.hxx>
+#include <svx/hlnkitem.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/cui/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx
index 341223a2dc8d..0e62fab44318 100644
--- a/svx/source/cui/cuiimapwnd.hxx
+++ b/cui/source/inc/cuiimapwnd.hxx
@@ -6,7 +6,7 @@
 #include <vcl/combobox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/menu.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/imap.hxx>
diff --git a/svx/source/cui/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 22ef5481651f..19d21ba5c255 100644
--- a/svx/source/cui/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -32,17 +32,11 @@
 
 // include ---------------------------------------------------------------
 
-#include <optgenrl.hxx>
+#include <svx/optgenrl.hxx>
 #include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 
 // forward ---------------------------------------------------------------
 
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
new file mode 100644
index 000000000000..c054d66c4645
--- /dev/null
+++ b/cui/source/inc/cuires.hrc
@@ -0,0 +1,430 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dialogs.hrc,v $
+ * $Revision: 1.15 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_RESID_HRC
+#define _CUI_REDID_HRC
+
+// include ------------------------------------------------------------------
+
+#include <sfx2/sfx.hrc>
+#include <sfx2/dialogs.hrc>
+
+// Resource-Id's ------------------------------------------------------------
+
+// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
+#define RID_SVX_FIRSTFREE                   305
+
+// Gallery
+#define RID_CUI_GALLERY_START               (RID_SVX_START + 360)
+#define RID_CUI_GALLERY_END                 (RID_SVX_START + 410)
+
+// tab pages
+// used in "dialogs"
+#define RID_SVX_FORMAT_CELLS_DLG            ( RID_SVX_START + 42 )
+
+// used in "tabpages"
+#define RID_SVXDLG_TEXT                     (RID_SVX_START + 183)
+#define RID_SVXDLG_TRANSFORM                (RID_SVX_START +  45)
+#define RID_SVXDLG_LINE                     (RID_SVX_START +  50)
+#define RID_SVXDLG_BBDLG                    (RID_SVX_START +  40)
+#define RID_SVXDLG_CAPTION                  (RID_SVX_START + 151)
+#define RID_SVXDLG_AREA                     (RID_SVX_START +  55)
+#define RID_SVXSTRARY_PAPERSIZE_STD         (RID_SVX_START + 142)
+#define RID_SVXSTRARY_PAPERSIZE_DRAW        (RID_SVX_START + 143)
+#define RID_SVXSTR_TABLE_PRESET_NONE        (RID_SVX_START + 969)
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   (RID_SVX_START + 970)
+#define RID_SVXSTR_TABLE_PRESET_OUTERHORI   (RID_SVX_START + 971)
+#define RID_SVXSTR_TABLE_PRESET_OUTERALL    (RID_SVX_START + 972)
+#define RID_SVXSTR_TABLE_PRESET_OUTERINNER  (RID_SVX_START + 973)
+#define RID_SVXSTR_PARA_PRESET_DIAGONAL     (RID_SVX_START + 974)
+#define RID_SVXSTR_PARA_PRESET_ALL          (RID_SVX_START + 975)
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT    (RID_SVX_START + 976)
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM    (RID_SVX_START + 977)
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT     (RID_SVX_START + 978)
+#define RID_SVXSTR_SHADOW_STYLE_NONE        (RID_SVX_START + 979)
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980)
+#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT    (RID_SVX_START + 981)
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT  (RID_SVX_START + 982)
+#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT     (RID_SVX_START + 983)
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR           (RID_SVX_START + 1113)
+#define RID_SVXSTR_VER_PRESET_ONLYVER           (RID_SVX_START + 1114)
+#define RID_SVXSTR_FRAMEDIR_LTR             (RID_SVX_START + 960)
+#define RID_SVXSTR_FRAMEDIR_RTL             (RID_SVX_START + 961)
+#define RID_SVXSTR_FRAMEDIR_SUPER           (RID_SVX_START + 962)
+#define RID_SVXSTR_PAGEDIR_LTR_HORI         (RID_SVX_START + 965)
+#define RID_SVXSTR_PAGEDIR_RTL_HORI         (RID_SVX_START + 966)
+#define RID_SVXSTR_PAGEDIR_RTL_VERT         (RID_SVX_START + 967)
+#define RID_SVXSTR_PAGEDIR_LTR_VERT         (RID_SVX_START + 968)
+#define RID_STR_EDIT_GRAPHIC                (RID_SVX_START + 509)
+#define RID_SVXIMG_LOAD_H                   (RID_SVX_START + 283)
+#define RID_SVXIMG_SAVE_H                   (RID_SVX_START + 284)
+
+#define RID_SVXSTR_DESC_GRADIENT            (RID_SVX_START + 163)
+#define RID_SVXSTR_ASK_DEL_GRADIENT         (RID_SVX_START + 165)
+#define RID_SVXSTR_ASK_CHANGE_GRADIENT      (RID_SVX_START + 166)
+#define RID_SVXSTR_ASK_DEL_BITMAP           (RID_SVX_START + 171)
+#define RID_SVXSTR_ASK_CHANGE_BITMAP        (RID_SVX_START + 172)
+#define RID_SVXSTR_DESC_NEW_BITMAP          (RID_SVX_START + 168)
+#define RID_SVXSTR_DESC_EXT_BITMAP          (RID_SVX_START + 169)
+#define RID_SVXSTR_DESC_LINESTYLE           (RID_SVX_START + 174)
+#define RID_SVXSTR_ASK_DEL_LINESTYLE        (RID_SVX_START + 176)
+#define RID_SVXSTR_ASK_CHANGE_LINESTYLE     (RID_SVX_START + 177)
+#define RID_SVXSTR_DESC_HATCH               (RID_SVX_START + 232)
+#define RID_SVXSTR_ASK_DEL_HATCH            (RID_SVX_START + 234)
+#define RID_SVXSTR_ASK_CHANGE_HATCH         (RID_SVX_START + 235)
+#define RID_SVXSTR_CHANGE                   (RID_SVX_START + 181)
+#define RID_SVXSTR_ADD                      (RID_SVX_START + 182)
+#define RID_SVXSTR_DESC_COLOR               (RID_SVX_START + 215)
+#define RID_SVXSTR_ASK_DEL_COLOR            (RID_SVX_START + 217)
+#define RID_SVXSTR_ASK_CHANGE_COLOR         (RID_SVX_START + 218)
+#define RID_SVXSTR_TABLE                    (RID_SVX_START + 220)
+#define RID_SVXSTR_WRITE_DATA_ERROR         (RID_SVX_START + 229)
+#define RID_SVXSTR_READ_DATA_ERROR          (RID_SVX_START + 230)
+#define RID_SVXSTR_WARN_TABLE_OVERWRITE     (RID_SVX_START + 231)
+#define RID_SVXSTR_ASK_CHANGE_LINEEND       (RID_SVX_START + 184)
+#define RID_SVXSTR_ASK_DEL_LINEEND          (RID_SVX_START + 219)
+#define RID_SVXSTR_DESC_LINEEND             (RID_SVX_START + 238)
+#define RID_SVXSTR_WARN_NAME_DUPLICATE      (RID_SVX_START + 236)
+
+// autocor
+#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
+#define RID_OFAPAGE_AUTOCORR_OPTIONS    (RID_OFA_START + 102)
+#define RID_OFAPAGE_AUTOFMT_APPLY       (RID_OFA_START + 110)
+#define RID_OFAPAGE_AUTOCORR_REPLACE    (RID_OFA_START + 103)
+#define RID_OFAPAGE_AUTOCORR_EXCEPT     (RID_OFA_START + 104)
+#define RID_OFAPAGE_AUTOCORR_QUOTE      (RID_OFA_START + 109)
+#define RID_OFADLG_PRCNT_SET            (RID_OFA_START + 111)
+
+// options
+#define RID_SVXSTR_DIAGRAM_ROW                              (RID_SVX_START + 1162)
+#define RID_OFAPAGE_CONNPOOLOPTIONS     (RID_OFA_START + 122)
+#define QUERY_DELETE_CONFIRM                    (RID_SVX_START + 1110)
+#define RID_SVXPAGE_JSEARCH_OPTIONS         (RID_SVX_START +  840)
+#define DLG_DOCUMENTLINK                (RID_OFA_START + 124)
+#define STR_LINKEDDOC_DOESNOTEXIST              (RID_SVX_START + 1111)
+#define STR_LINKEDDOC_NO_SYSTEM_FILE                        (RID_SVX_START + 1169)
+#define STR_NAME_CONFLICT                       (RID_SVX_START + 1112)
+#define RID_SVX_FONT_SUBSTITUTION           (RID_SVX_START + 18)
+
+// treeopt
+#define RID_SVXPAGE_COLOR                   (RID_SVX_START +  60)
+#define RID_SVXPAGE_SSO                                 (RID_SVX_START + 251)
+#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE      ( RID_OFA_START + 256 )
+#define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
+#define RID_OFADLG_OPTIONS_TREE         (RID_OFA_START + 115)
+#define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
+#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
+#define RID_RIDER_SLL_SITE              (RID_OFA_START + 100)//?
+#define RID_RIDER_SLL_PERSONAL          (RID_OFA_START + 101)//?
+#define RID_OFADLG_OPTIONS_TREE_HINT    (RID_OFA_START + 118)//?
+
+// options
+#define RID_SVXDLG_WEBCONNECTION_INFO       (RID_SVX_START + 301)
+#define RID_SVXDLG_SECURITY_OPTIONS         (RID_SVX_START + 300)
+#define RID_SVXPAGE_ONLINEUPDATE            (RID_SVX_START + 298)
+#define OFA_TP_MEMORY                   (RID_OFA_START + 250)
+#define RID_SVXPAGE_INET_SECURITY           (RID_SVX_START + 200)
+#define RID_SVXPAGE_INET_SEARCH             (RID_SVX_START + 160)
+#define RID_SVXPAGE_INET_PROXY              (RID_SVX_START + 157)
+#define RID_SVXPAGE_INET_MAIL               (RID_SVX_START + 155)
+#define RID_SVXPAGE_INET_MOZPLUGIN          (RID_SVX_START + 2161)
+#define RID_OFAPAGE_HTMLOPT             (RID_OFA_START + 100)
+#define OFA_TP_LANGUAGES                (RID_OFA_START + 205)
+#define OFA_TP_MISC                     (RID_OFA_START + 200)
+#define OFA_TP_VIEW                     (RID_OFA_START + 202)
+#define RID_OFAPAGE_MSFILTEROPT         (RID_OFA_START + 120)
+#define RID_OFAPAGE_MSFILTEROPT2        (RID_OFA_START + 121)
+#define RID_OFAPAGE_SMARTTAG_OPTIONS    (RID_OFA_START + 125)
+#define RID_SVXPAGE_OPTIONS_CTL             (RID_SVX_START + 252)
+#define RID_SVXPAGE_OPTIONS_JAVA            (RID_SVX_START + 253)
+#define RID_SVXPAGE_ACCESSIBILITYCONFIG     (RID_SVX_START + 250)
+#define RID_SVXPAGE_ASIAN_LAYOUT            (RID_SVX_START + 246)
+#define RID_OPTPAGE_CHART_DEFCOLORS         (RID_SVX_START + 299)
+#define RID_SVXPAGE_COLORCONFIG             (RID_SVX_START + 249)
+#define RID_SVXQB_DELETE_COLOR_CONFIG       (RID_SVX_START + 324)
+#define RID_SVXSTR_COLOR_CONFIG_SAVE1       (RID_SVX_START + 853)
+#define RID_SVXSTR_COLOR_CONFIG_SAVE2       (RID_SVX_START + 854)
+#define RID_SVXSTR_COLOR_CONFIG_DELETE      (RID_SVX_START + 855)
+#define RID_SVXSTR_OPT_DOUBLE_DICTS         (RID_SVX_START + 320)
+#define RID_SVX_MSGBOX_LANGUAGE_RESTART     ( RID_SVX_START +  2 )
+#define RID_SVXERR_OPT_PROXYPORTS           (RID_SVX_START + 224)
+#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE   (RID_SVX_START + 225)
+#define RID_SVXDLG_JAVA_PARAMETER           (RID_SVX_START + 254)
+#define RID_SVXDLG_JAVA_CLASSPATH           (RID_SVX_START + 255)
+#define RID_SVXERR_JRE_NOT_RECOGNIZED       (RID_SVX_START + 256)
+#define RID_SVXERR_JRE_FAILED_VERSION       (RID_SVX_START + 257)
+#define RID_SVX_MSGBOX_JAVA_RESTART         ( RID_SVX_START +  0 )
+#define RID_SVX_MSGBOX_JAVA_RESTART2        ( RID_SVX_START +  1 )
+#define RID_SVXDLG_LNG_ED_NUM_PREBREAK      (RID_SVX_START +  830)
+#define RID_SVXDLG_EDIT_MODULES             (RID_SVX_START +  831)
+#define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
+#define RID_SVXDLG_FILTER_WARNING           (RID_SVX_START + 248)
+#define RID_SVXBMP_LOCK                     (RID_SVX_START + 118)
+#define RID_SVXBMP_LOCK_HC                  (RID_SVX_START + 119)
+#define RID_SVXSTR_READONLY_CONFIG_TIP      (RID_SVX_START + 1026)
+#define RID_SVXQB_CHANGEDATA                (RID_SVX_START + 214)       //?
+#define RID_SVXERR_OPT_DOUBLEPATHS          (RID_SVX_START + 208)       //?
+#define RID_SVXSTR_KEY_AUTOCORRECT_DIR      (RID_SVX_START + 1004)  //?
+#define RID_SVXSTR_KEY_DICTIONARY_PATH      (RID_SVX_START + 1010)//?
+#define RID_SVXSTR_KEY_LINGUISTIC_DIR       (RID_SVX_START + 1016)//?
+#define RID_SVXSTR_KEY_USERCONFIG_PATH      (RID_SVX_START + 1023)//?
+#define RID_SVXSTR_KEY_FILTER_PATH          (RID_SVX_START + 1012)//?
+#define RID_SVXSTR_KEY_ADDINS_PATH          (RID_SVX_START + 1003)//?
+#define RID_SVXSTR_KEY_FAVORITES_DIR        (RID_SVX_START + 1011)//?
+#define RID_SVXSTR_KEY_PLUGINS_PATH         (RID_SVX_START + 1019)//?
+#define RID_SVXSTR_KEY_TEMP_PATH            (RID_SVX_START + 1021)//?
+#define RID_SVXSTR_KEY_STORAGE_DIR          (RID_SVX_START + 1020)//?
+#define RID_SVXSTR_KEY_GALLERY_DIR          (RID_SVX_START + 1013)//?
+#define RID_SVXSTR_KEY_HELP_DIR             (RID_SVX_START + 1015)//?
+#define RID_SVXSTR_KEY_GLOSSARY_PATH        (RID_SVX_START + 1005)//?
+#define RID_SVXSTR_KEY_TEMPLATE_PATH        (RID_SVX_START + 1022)//?
+#define RID_SVXSTR_KEY_MODULES_PATH         (RID_SVX_START + 1017)//?
+#define RID_SVXSTR_KEY_BACKUP_PATH          (RID_SVX_START + 1006)//?
+#define RID_SVXSTR_KEY_PALETTE_PATH         (RID_SVX_START + 1018)//?
+#define RID_SVXSTR_KEY_CONFIG_DIR           (RID_SVX_START + 1009)//?
+#define RID_SVXSTR_KEY_WORK_PATH            (RID_SVX_START + 1024)//?
+#define RID_SVXSTR_KEY_GRAPHICS_PATH        (RID_SVX_START + 1014)//?
+#define RID_SVXSTR_KEY_BASIC_PATH           (RID_SVX_START + 1007)//?
+#define RID_SVXSTR_KEY_BITMAP_PATH          (RID_SVX_START + 1008)//?
+#define RID_SVXSTR_KEY_USERDICTIONARY_DIR   (RID_SVX_START + 1025)//?
+
+// dialogs
+#define RID_SVX_WND_COMMON_LINGU            ( RID_SVX_START +  0 )
+#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB    (RID_SVX_START + 337)
+#define RID_SVXDLG_SEARCHATTR               (RID_SVX_START +  22)
+
+// hyperlink dialog
+#define RID_SVXDLG_NEWHYPERLINK             (RID_SVX_START + 227)
+#define RID_SVXBMP_HLINETTP_H               (RID_SVX_START + 272)
+#define RID_SVXBMP_HLMAILTP_H               (RID_SVX_START + 273)
+#define RID_SVXBMP_HLDOCTP_H                (RID_SVX_START + 274)
+#define RID_SVXBMP_HLDOCNTP_H               (RID_SVX_START + 275)
+#define RID_SVXBMP_HLINETTP                 (RID_SVX_START + 556)
+#define RID_SVXBMP_HLMAILTP                 (RID_SVX_START + 557)
+#define RID_SVXBMP_HLDOCTP                  (RID_SVX_START + 558)
+#define RID_SVXBMP_HLDOCNTP                 (RID_SVX_START + 559)
+#define RID_SVXPAGE_HYPERLINK_INTERNET      (RID_SVX_START + 228)
+#define RID_SVXPAGE_HYPERLINK_MAIL          (RID_SVX_START + 229)
+#define RID_SVXPAGE_HYPERLINK_DOCUMENT      (RID_SVX_START + 230)
+#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT   (RID_SVX_START + 231)
+#define RID_SVXSTR_HYPERDLG_HLINETTP        (RID_SVX_START + 581)
+#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP   (RID_SVX_START + 582)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP        (RID_SVX_START + 583)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP   (RID_SVX_START + 584)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP         (RID_SVX_START + 585)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP    (RID_SVX_START + 586)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP        (RID_SVX_START + 587)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP   (RID_SVX_START + 588)
+#define RID_SVXSTR_HYPDLG_APPLYBUT          (RID_SVX_START + 548)
+#define RID_SVXSTR_HYPDLG_CLOSEBUT          (RID_SVX_START + 549)
+#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME   (RID_SVX_START + 553)
+#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE  (RID_SVX_START +  815)
+#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES  (RID_SVX_START + 800)
+#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
+#define RID_SVXFLOAT_HYPERLINK_MARKWND      (RID_SVX_START + 232)
+#define RID_SVXSTR_HYPDLG_MACROACT1         (RID_SVX_START + 550)
+#define RID_SVXSTR_HYPDLG_MACROACT2         (RID_SVX_START + 551)
+#define RID_SVXSTR_HYPDLG_MACROACT3         (RID_SVX_START + 552)
+#define RID_SVXSTR_HYPERDLG_FORM_BUTTON     (RID_SVX_START +  813)
+#define RID_SVXSTR_HYPERDLG_FROM_TEXT       (RID_SVX_START +  814)
+
+// imap dialog
+#define RID_SVX_IMAPDLG_START               (RID_SVX_START + 100)
+#define RID_SVXDLG_IMAPURL                  (RID_SVX_IMAPDLG_START + 2)
+
+// name dialog
+#define RID_SVXDLG_NAME                     (RID_SVX_START +  62)
+#define RID_SVXDLG_MESSBOX                  (RID_SVX_START +  63)
+#define RID_SVXDLG_OBJECT_NAME              (RID_SVX_START +  64)
+#define RID_SVXDLG_OBJECT_TITLE_DESC        (RID_SVX_START +  67)
+
+// hangulhanja
+#define RID_SVX_MDLG_HANGULHANJA            (RID_SVX_START +  1 )
+#define RID_SVX_MDLG_HANGULHANJA_OPT        ( RID_SVX_START +  4 )
+#define RID_SVX_MDLG_HANGULHANJA_EDIT       ( RID_SVX_START +  5 )
+#define RID_SVX_MDLG_HANGULHANJA_NEWDICT    ( RID_SVX_START +  6 )
+
+// icon choice
+#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT   (RID_SVX_START + 580)
+
+// insert rows&cols
+#define DLG_INS_ROW_COL                     (RID_SVX_START + 156)
+
+// SvxMultiFileDialog
+#define RID_SVXSTR_FILE_TITLE               (RID_SVX_START + 482)
+#define RID_SVXSTR_FILE_HEADLINE            (RID_SVX_START + 483)
+#define RID_SVXSTR_ARCHIVE_TITLE            (RID_SVX_START + 484)
+#define RID_SVXSTR_ARCHIVE_HEADLINE         (RID_SVX_START + 485)
+#define RID_SVXSTR_MULTIFILE_DBL_ERR        (RID_SVX_START + 486)
+
+// multi path dialog
+#define RID_SVXDLG_MULTIPATH                (RID_SVX_START + 201)
+#define RID_MULTIPATH_DBL_ERR               (RID_SVX_START + 207)
+
+// new table dialog
+#define RID_SVX_NEWTABLE_DLG                ( RID_SVX_START + 44 )
+
+// script organizer
+#define RID_DLG_SCRIPTORGANIZER             (RID_SVX_START + 258)
+#define RID_DLG_NEWLIB                      (RID_SVX_START + 290)
+#define RID_SVXSTR_DELQUERY                 (RID_SVX_START + 1027)
+#define RID_SVXSTR_DELQUERY_TITLE           (RID_SVX_START + 1028)
+#define RID_SVXSTR_DELFAILED                (RID_SVX_START + 1029)
+#define RID_SVXSTR_DELFAILEDPERM            (RID_SVX_START + 1030)
+#define RID_SVXSTR_DELFAILED_TITLE          (RID_SVX_START + 1031)
+#define RID_SVXSTR_CREATEFAILED             (RID_SVX_START + 1032)
+#define RID_SVXSTR_CREATEFAILEDPERM         (RID_SVX_START + 1033)
+#define RID_SVXSTR_CREATEFAILEDDUP          (RID_SVX_START + 1034)
+#define RID_SVXSTR_CREATEFAILED_TITLE       (RID_SVX_START + 1035)
+#define RID_SVXSTR_RENAMEFAILED             (RID_SVX_START + 1036)
+#define RID_SVXSTR_RENAMEFAILEDPERM         (RID_SVX_START + 1037)
+#define RID_SVXSTR_RENAMEFAILED_TITLE       (RID_SVX_START + 1038)
+#define RID_SVXSTR_ERROR_TITLE                  (RID_SVX_START + 1100)
+#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED     (RID_SVX_START + 1101)
+#define RID_SVXSTR_ERROR_RUNNING                (RID_SVX_START + 1102)
+#define RID_SVXSTR_EXCEPTION_RUNNING            (RID_SVX_START + 1103)
+#define RID_SVXSTR_ERROR_AT_LINE                (RID_SVX_START + 1104)
+#define RID_SVXSTR_EXCEPTION_AT_LINE            (RID_SVX_START + 1105)
+#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING      (RID_SVX_START + 1106)
+#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE      (RID_SVX_START + 1107)
+#define RID_SVXSTR_ERROR_TYPE_LABEL             (RID_SVX_START + 1108)
+#define RID_SVXSTR_ERROR_MESSAGE_LABEL          (RID_SVX_START + 1109)
+
+// spell check dialog
+#define RID_SVXDLG_SPELLCHECK               (RID_SVX_START +  32)
+
+// split cells
+#define RID_SVX_SPLITCELLDLG                ( RID_SVX_START + 43 )
+
+// searching
+#define RID_SVXDLG_SEARCHSIMILARITY         (RID_SVX_START +  23)
+
+// customize
+
+#define RID_SVXDLG_CUSTOMIZE                (RID_SVX_START + 291)
+#define RID_SVXPAGE_MENUS                   (RID_SVX_START + 292)
+#define RID_SVXPAGE_KEYBOARD                (RID_SVX_START + 293)
+#define RID_SVXPAGE_TOOLBARS                (RID_SVX_START + 294)
+#define RID_SVXPAGE_EVENTS                  (RID_SVX_START + 295)
+#define RID_SVXPAGE_CONFIGGROUPBOX          (RID_SVX_START + 304)
+#define RID_SVXDLG_ASSIGNCOMPONENT          (RID_SVX_START + 297)
+#define RID_DLG_SCRIPTSELECTOR              (RID_SVX_START + 259)
+#define RID_SVXSTR_NEW_MENU                 (RID_SVX_START + 1039)
+#define RID_SVXSTR_NEW_TOOLBAR              (RID_SVX_START + 1040)
+#define RID_SVXSTR_MOVE_MENU                (RID_SVX_START + 1041)
+#define RID_SVXSTR_ADD_SUBMENU                  (RID_SVX_START + 1048)
+#define RID_SVXSTR_SUBMENU_NAME                 (RID_SVX_START + 1049)
+#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
+#define RID_SVXSTR_IMPORT_ICON_ERROR            (RID_SVX_START + 1117)
+#define RID_SVXSTR_DELETE_ICON_CONFIRM                      (RID_SVX_START + 1163) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_WARNING                     (RID_SVX_START + 1164) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_CONFIRM                     (RID_SVX_START + 1165) //added for issue73355
+#define RID_SVXSTR_YESTOALL                                 (RID_SVX_START + 1166) //added for issue73355
+#define RID_SVXSTR_PRODUCTNAME_TOOLBARS         (RID_SVX_START + 1042)
+#define RID_SVXSTR_TOOLBAR                      (RID_SVX_START + 1043)
+#define RID_SVXSTR_TOOLBAR_CONTENT              (RID_SVX_START + 1044)
+#define RID_SVXSTR_COMMANDS                     (RID_SVX_START + 1045)
+#define RID_SVXSTR_COMMAND                      (RID_SVX_START + 1046)
+#define RID_SVXSTR_TOOLBAR_NAME                 (RID_SVX_START + 1047)
+#define RID_SVXSTR_CONFIRM_MENU_RESET           (RID_SVX_START + 1115)
+#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET        (RID_SVX_START + 1116)
+#define RID_SVXSTR_LABEL_NEW_NAME                           (RID_SVX_START + 1135)
+#define RID_SVXSTR_RENAME_MENU                              (RID_SVX_START + 1136)
+#define RID_SVXSTR_RENAME_TOOLBAR                           (RID_SVX_START + 1137)
+#define RID_SVXSTR_EVENT_STARTAPP               (RID_SVX_START + 1051)
+#define RID_SVXSTR_EVENT_CLOSEAPP               (RID_SVX_START + 1052)
+#define RID_SVXSTR_EVENT_NEWDOC                 (RID_SVX_START + 1053)
+#define RID_SVXSTR_EVENT_CLOSEDOC               (RID_SVX_START + 1054)
+#define RID_SVXSTR_EVENT_PREPARECLOSEDOC        (RID_SVX_START + 1055)
+#define RID_SVXSTR_EVENT_OPENDOC                (RID_SVX_START + 1056)
+#define RID_SVXSTR_EVENT_SAVEDOC                (RID_SVX_START + 1057)
+#define RID_SVXSTR_EVENT_SAVEASDOC              (RID_SVX_START + 1058)
+#define RID_SVXSTR_EVENT_SAVEDOCDONE            (RID_SVX_START + 1059)
+#define RID_SVXSTR_EVENT_SAVEASDOCDONE          (RID_SVX_START + 1060)
+#define RID_SVXSTR_EVENT_ACTIVATEDOC            (RID_SVX_START + 1061)
+#define RID_SVXSTR_EVENT_DEACTIVATEDOC          (RID_SVX_START + 1062)
+#define RID_SVXSTR_EVENT_PRINTDOC               (RID_SVX_START + 1063)
+#define RID_SVXSTR_EVENT_MODIFYCHANGED          (RID_SVX_START + 1064)
+#define RID_SVXSTR_EVENT_MAILMERGE              (RID_SVX_START + 1065)
+#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE        (RID_SVX_START + 1066)
+#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067)
+#define RID_SVXSTR_EVENT_ACTIONPERFORMED        (RID_SVX_START + 1068)
+#define RID_SVXSTR_EVENT_CHANGED                (RID_SVX_START + 1069)
+#define RID_SVXSTR_EVENT_TEXTCHANGED            (RID_SVX_START + 1070)
+#define RID_SVXSTR_EVENT_ITEMSTATECHANGED       (RID_SVX_START + 1071)
+#define RID_SVXSTR_EVENT_FOCUSGAINED            (RID_SVX_START + 1072)
+#define RID_SVXSTR_EVENT_FOCUSLOST              (RID_SVX_START + 1073)
+#define RID_SVXSTR_EVENT_KEYTYPED               (RID_SVX_START + 1074)
+#define RID_SVXSTR_EVENT_KEYUP                  (RID_SVX_START + 1075)
+#define RID_SVXSTR_EVENT_MOUSEENTERED           (RID_SVX_START + 1076)
+#define RID_SVXSTR_EVENT_MOUSEDRAGGED           (RID_SVX_START + 1077)
+#define RID_SVXSTR_EVENT_MOUSEMOVED             (RID_SVX_START + 1078)
+#define RID_SVXSTR_EVENT_MOUSEPRESSED           (RID_SVX_START + 1079)
+#define RID_SVXSTR_EVENT_MOUSERELEASED          (RID_SVX_START + 1080)
+#define RID_SVXSTR_EVENT_MOUSEEXITED            (RID_SVX_START + 1081)
+#define RID_SVXSTR_EVENT_APPROVERESETTED        (RID_SVX_START + 1082)
+#define RID_SVXSTR_EVENT_SUBMITTED              (RID_SVX_START + 1083)
+#define RID_SVXSTR_EVENT_BEFOREUPDATE           (RID_SVX_START + 1084)
+#define RID_SVXSTR_EVENT_AFTERUPDATE            (RID_SVX_START + 1085)
+#define RID_SVXSTR_EVENT_LOADED                 (RID_SVX_START + 1086)
+#define RID_SVXSTR_EVENT_RELOADING              (RID_SVX_START + 1087)
+#define RID_SVXSTR_EVENT_RELOADED               (RID_SVX_START + 1088)
+#define RID_SVXSTR_EVENT_UNLOADING              (RID_SVX_START + 1089)
+#define RID_SVXSTR_EVENT_UNLOADED               (RID_SVX_START + 1090)
+#define RID_SVXSTR_EVENT_CONFIRMDELETE          (RID_SVX_START + 1091)
+#define RID_SVXSTR_EVENT_APPROVEROWCHANGE       (RID_SVX_START + 1092)
+#define RID_SVXSTR_EVENT_ROWCHANGE              (RID_SVX_START + 1093)
+#define RID_SVXSTR_EVENT_POSITIONING            (RID_SVX_START + 1094)
+#define RID_SVXSTR_EVENT_POSITIONED             (RID_SVX_START + 1095)
+#define RID_SVXSTR_EVENT_APPROVEPARAMETER       (RID_SVX_START + 1096)
+#define RID_SVXSTR_EVENT_ERROROCCURED           (RID_SVX_START + 1097)
+#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098)
+#define RID_SVXSTR_EVENT_RESETTED               (RID_SVX_START + 1099)
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED                (RID_SVX_START + 1170)
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED                (RID_SVX_START + 1171)
+#define RID_SVXSTR_EVENT_CREATEDOC                          (RID_SVX_START + 1172)
+#define RID_SVXSTR_EVENT_LOADDOCFINISHED                    (RID_SVX_START + 1173)
+#define RID_SVXSTR_EVENT_SAVEDOCFAILED                      (RID_SVX_START + 1174)
+#define RID_SVXSTR_EVENT_SAVEASDOCFAILED                    (RID_SVX_START + 1175)
+#define RID_SVXSTR_EVENT_COPYTODOC                          (RID_SVX_START + 1176)
+#define RID_SVXSTR_EVENT_COPYTODOCDONE                      (RID_SVX_START + 1177)
+#define RID_SVXSTR_EVENT_COPYTODOCFAILED                    (RID_SVX_START + 1178)
+#define RID_SVXSTR_EVENT_VIEWCREATED                        (RID_SVX_START + 1179)
+#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW                   (RID_SVX_START + 1180)
+#define RID_SVXSTR_EVENT_CLOSEVIEW                          (RID_SVX_START + 1181)
+#define RID_SVXSTR_EVENT_TITLECHANGED                       (RID_SVX_START + 1182)
+#define RID_SVXSTR_EVENT_MODECHANGED                        (RID_SVX_START + 1183)
+#define RID_SVXSTR_EVENT_VISAREACHANGED                     (RID_SVX_START + 1184)
+#define RID_SVXSTR_EVENT_STORAGECHANGED                     (RID_SVX_START + 1185)
+#define RID_SVXSTR_EVENT_MAILMERGE_END                      (RID_SVX_START + 1186)
+#define RID_SVXSTR_EVENT_FIELDMERGE                         (RID_SVX_START + 1187)
+#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED                (RID_SVX_START + 1188)
+#define RID_SVXSTR_EVENT_LAYOUT_FINISHED                    (RID_SVX_START + 1189)
+
+#endif
diff --git a/svx/source/cui/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index db701ec95bb1..93c7779d0ee9 100644
--- a/svx/source/cui/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -57,9 +57,9 @@
 #endif
 #include <sfx2/childwin.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/svmedit.hxx>
 #include <sfx2/srchdefs.hxx>
 
@@ -76,7 +76,7 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
 
 public:
     SvxJSearchOptionsDialog( Window *pParent,
-                            const SfxItemSet& rOptionsSet, USHORT nUniqueId,
+                            const SfxItemSet& rOptionsSet,
                             INT32 nInitialFlags  );
     virtual ~SvxJSearchOptionsDialog();
 
diff --git a/svx/source/cui/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index cba81c8c096f..cba81c8c096f 100644
--- a/svx/source/cui/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
diff --git a/svx/source/cui/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index d82ad9e3d95e..d82ad9e3d95e 100644
--- a/svx/source/cui/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
diff --git a/svx/source/cui/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx
index 1587dd7baaf5..1587dd7baaf5 100644
--- a/svx/source/cui/cuitbxform.hxx
+++ b/cui/source/inc/cuitbxform.hxx
diff --git a/svx/source/cui/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 2e1496a42e1c..00cf4cc911c2 100644
--- a/svx/source/cui/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -34,7 +34,7 @@
 #include "optpath.hxx"
 #include <tools/string.hxx>
 #include <comphelper/stl_types.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "ControlFocusHelper.hxx"
 #include <sfx2/basedlgs.hxx>
 
diff --git a/svx/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx
index 1fcc17b1f41a..1fcc17b1f41a 100644
--- a/svx/inc/defdlgname.hxx
+++ b/cui/source/inc/defdlgname.hxx
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
new file mode 100644
index 000000000000..f4d0ad883470
--- /dev/null
+++ b/cui/source/inc/dialmgr.hxx
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_DIALMGR_HXX
+#define _CUI_DIALMGR_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/resid.hxx>
+
+// forward ---------------------------------------------------------------
+
+class ResMgr;
+struct CuiResMgr
+{
+    static ResMgr*      GetResMgr();
+};
+
+#define CUI_MGR()   (*CuiResMgr::GetResMgr())
+#define CUI_RES(i)      ResId(i,CUI_MGR())
+#define CUI_RESSTR(i)   UniString(ResId(i,CUI_MGR()))
+#define CUI_RESSSTR(i)  String(ResId(i,CUI_MGR()))
+
+#endif
+
diff --git a/svx/source/cui/dlgname.hxx b/cui/source/inc/dlgname.hxx
index ee78927e8931..ee78927e8931 100644
--- a/svx/source/cui/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
diff --git a/svx/source/cui/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 46d6a78115c1..46d6a78115c1 100644
--- a/svx/source/cui/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
new file mode 100644
index 000000000000..abc533e2e921
--- /dev/null
+++ b/cui/source/inc/gallery.hrc
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: gallery.hrc,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include <cuires.hrc>
+
+// Gallery-TabDialoge/-TabPages
+#define RID_SVXTABDLG_GALLERY                   (RID_CUI_GALLERY_START )
+#define RID_SVXTABDLG_GALLERYTHEME              (RID_CUI_GALLERY_START + 2)
+#define RID_SVXDLG_GALLERY_TITLE                (RID_CUI_GALLERY_START + 82)
+
+#define RID_SVXTABPAGE_GALLERY_GENERAL          (RID_CUI_GALLERY_START + 1)
+#define RID_SVXTABPAGE_GALLERYTHEME_FILES       (RID_CUI_GALLERY_START + 4)
+
+// Dialoge
+#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS      (RID_CUI_GALLERY_START + 6)
+#define RID_SVXDLG_GALLERY_TAKE_PROGRESS        (RID_CUI_GALLERY_START + 7)
+#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS   (RID_CUI_GALLERY_START + 8)
+#define RID_SVXDLG_GALLERY_THEMEID              (RID_CUI_GALLERY_START + 9)
+
+// Gallery-Strings
+#define RID_SVXSTR_GALLERY_NOFILES              (RID_CUI_GALLERY_START + 12)
+#define RID_SVXSTR_GALLERY_SEARCH               (RID_CUI_GALLERY_START + 30)
+#define RID_SVXSTR_GALLERYPROPS_OBJECT          (RID_CUI_GALLERY_START + 39)
+#define RID_SVXSTR_GALLERYPROPS_GALTHEME        (RID_CUI_GALLERY_START + 40)
+#define RID_SVXSTR_GALLERY_READONLY             (RID_CUI_GALLERY_START + 43)
+#define RID_SVXSTR_GALLERY_ALLFILES             (RID_CUI_GALLERY_START + 44)
+#define RID_SVXSTR_GALLERY_ID_EXISTS            (RID_CUI_GALLERY_START + 81)
+
+// Images
+#define RID_SVXBMP_THEME_NORMAL_BIG             (RID_CUI_GALLERY_START + 49)
+#define RID_SVXBMP_THEME_IMPORTED_BIG           (RID_CUI_GALLERY_START + 51)
+#define RID_SVXBMP_THEME_READONLY_BIG           (RID_CUI_GALLERY_START + 53)
+#define RID_SVXBMP_THEME_DEFAULT_BIG            (RID_CUI_GALLERY_START + 55)
+
+// lokale Defines
+#define BTN_OK 1
+#define BTN_CANCEL 1
+#define BTN_HELP 1
+
+#define LBX_FOUND 1
+#define BTN_TAKE 5
+#define BTN_SEARCH 4
+#define CBX_PREVIEW 3
+#define FT_FILETYPE 2
+#define CBB_FILETYPE 1
+#define FL_SEARCH_DIR 1
+#define FL_SEARCH_TYPE 2
+#define FT_SEARCH_DIR 1
+#define FT_SEARCH_TYPE 2
+#define FL_TAKE_PROGRESS 1
+#define FT_TAKE_FILE 1
+#define BTN_TAKEALL 1
+#define WND_BRSPRV 1
+#define BTN_MADDIN1 8
+#define BTN_MADDIN2 9
+
+#define FL_ACTUALIZE_PROGRESS 1
+#define FT_ACTUALIZE_FILE 1
+#define FL_ID                  1
+#define LB_RESNAME      1
+#define EDT_TITLE       20
+#define FL_TITLE               21
+
+// Gallery-TabDialog
+#define FI_MS_IMAGE 1
+#define EDT_MS_NAME 1
+#define FL_MS_GENERAL_FIRST 1
+#define FT_MS_TYPE 2
+#define FT_MS_SHOW_TYPE 3
+#define FT_MS_PATH 4
+#define FT_MS_SHOW_PATH 5
+#define FT_MS_CONTENT 6
+#define FT_MS_SHOW_CONTENT 7
+#define FL_MS_GENERAL_SECOND 2
+#define FT_MS_CHANGEDATE 10
+#define FT_MS_SHOW_CHANGEDATE 11
+
+
diff --git a/svx/source/cui/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 58ce4e5a5e63..58ce4e5a5e63 100644
--- a/svx/source/cui/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
diff --git a/svx/source/cui/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 7d637bed048d..6c87b8003479 100644
--- a/svx/source/cui/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -31,9 +31,7 @@
 #define SVX_HANGUL_HANJA_DLG_HXX
 
 #include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/fixed.hxx>
@@ -41,7 +39,7 @@
 #include <svx/checklbx.hxx>
 #include <svx/hangulhanja.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "unolingu.hxx"
+#include <svx/unolingu.hxx>
 #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp>
 #include <svtools/valueset.hxx>
 
diff --git a/svx/source/cui/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 8738327b70bc..8738327b70bc 100755
--- a/svx/source/cui/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
new file mode 100644
index 000000000000..ad0f7ad12a89
--- /dev/null
+++ b/cui/source/inc/helpid.hrc
@@ -0,0 +1,390 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: helpid.hrc,v $
+ * $Revision: 1.78 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_HELPID_HRC
+#define _CUI_HELPID_HRC
+// include ---------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// Help-Ids --------------------------------------------------------------
+
+#define HID_OPTIONS_COLOR                           (HID_CUI_START +   1)
+#define HID_OPTIONS_SAVE                            (HID_CUI_START +   2)
+#define HID_OPTIONS_PATH                            (HID_CUI_START +   3)
+#define HID_OPTIONS_GENERAL                         (HID_CUI_START +   4)
+#define HID_OPTIONS_LINGU                           (HID_CUI_START +   5)
+#define HID_OPTIONS_SPELL                           (HID_CUI_START +   6)
+#define HID_OPTIONS_DICT_NEW                        (HID_CUI_START +   7)
+#define HID_OPTIONS_DICT_EDIT                       (HID_CUI_START +   8)
+#define HID_OPTIONS_INET                            (HID_CUI_START +   9)
+#define HID_OPTIONS_CHART_DEFCOLORS                 (HID_CUI_START +  10)
+#define HID_OPTIONS_CTL                             (HID_CUI_START +  11)
+#define HID_OPTIONS_PROXY                           (HID_CUI_START +  12)
+#define HID_OPTIONS_SEARCH                          (HID_CUI_START +  13)
+#define HID_OPTIONS_MAIL                            (HID_CUI_START +  14)
+#define HID_OPTIONS_ASIAN_LAYOUT                    (HID_CUI_START +  15)
+#define HID_CLB_EDIT_MODULES_DICS                   (HID_CUI_START +  16)
+#define HID_CLB_EDIT_MODULES_MODULES                (HID_CUI_START +  17)
+#define HID_CLB_LINGU_MODULES                       (HID_CUI_START +  18)
+#define HID_CLB_LINGU_OPTIONS                       (HID_CUI_START +  19)
+#define HID_EDIT_MODULES                            (HID_CUI_START +  20)
+#define HID_LNGDLG_NUM_PREBREAK                     (HID_CUI_START +  21)
+#define HID_OPTIONS_COLORCONFIG                     (HID_CUI_START +  22)
+#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME         (HID_CUI_START +  23)
+#define HID_OPTIONS_ACCESSIBILITYCONFIG             (HID_CUI_START +  24)
+#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN       (HID_CUI_START +  25)
+#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME         (HID_CUI_START +  26)
+#define HID_OPTIONS_PATHS_SELECTFOLDER              (HID_CUI_START +  27)
+#define HID_OPTIONS_JAVA                            (HID_CUI_START +  28)
+#define HID_OPTIONS_JAVA_LIST                       (HID_CUI_START +  29)
+#define HID_OPTIONS_JAVA_PARAMETER                  (HID_CUI_START +  30)
+#define HID_OPTIONS_JAVA_CLASSPATH                  (HID_CUI_START +  31)
+#define HID_SVXPAGE_JSEARCH_OPTIONS                 (HID_CUI_START +  32)
+#define HID_SVXDLG_FILTER_WARNING                   (HID_CUI_START +  33)
+#define HID_SVX_OPTIONS_ONLINEUPDATE                (HID_CUI_START +  34)
+#define HID_DLG_SECURITY_OPTIONS                    (HID_CUI_START +  35)
+#define HID_OFADLG_OPTIONS_TREE                     (HID_CUI_START +  36)
+#define HID_OFA_CONNPOOL_DRIVERLIST                 (HID_CUI_START +  37)
+#define UID_OFA_CONNPOOL_DRIVERLIST_BACK            (HID_CUI_START +  38)
+#define HID_OFA_FONT_SUBST_CLB                      (HID_CUI_START +  39)
+#define HID_OFA_TP_MISC                             (HID_CUI_START +  40)
+#define HID_OFA_TP_VIEW                             (HID_CUI_START +  41)
+#define HID_OFA_TP_LANGUAGES                        (HID_CUI_START +  42)
+#define HID_OFA_TP_MEMORY                           (HID_CUI_START +  43)
+#define HID_DBPATH_CTL_PATH                         (HID_CUI_START +  44)
+#define HID_DBPATH_HEADERBAR                        (HID_CUI_START +  45)
+#define HID_OFAPAGE_SMARTTAG_OPTIONS                (HID_CUI_START +  46)
+#define HID_OFAPAGE_MSFLTR2_CLB                     (HID_CUI_START +  47)
+#define HID_OPTPATH_CTL_PATH                        (HID_CUI_START +  48)
+#define HID_OFADLG_TREELISTBOX                      (HID_CUI_START +  49)
+#define HID_DLG_WEBCONNECTION_INFO                  (HID_CUI_START +  50)
+#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST          (HID_CUI_START +  51)
+#define HID_OPTPATH_HEADERBAR                       (HID_CUI_START +  52)
+#define HID_WARN_NAME_DUPLICATE                     (HID_CUI_START +  53)
+#define HID_COLORPAGE_LISTBOX_START                 (HID_CUI_START +  54)
+#define HID_COLORPAGE_DOCCOLOR_LB                   (HID_CUI_START +  54)
+#define HID_COLORPAGE_DOCBOUNDARIES_LB              (HID_CUI_START +  55)
+#define HID_COLORPAGE_APPBACKGROUND_LB              (HID_CUI_START +  56)
+#define HID_COLORPAGE_OBJECTBOUNDARIES_LB           (HID_CUI_START +  57)
+#define HID_COLORPAGE_TABLEBOUNDARIES_LB            (HID_CUI_START +  58)
+#define HID_COLORPAGE_FONTCOLOR_LB                  (HID_CUI_START +  59)
+#define HID_COLORPAGE_LINKS_LB                      (HID_CUI_START +  60)
+#define HID_COLORPAGE_LINKSVISITED_LB               (HID_CUI_START +  61)
+#define HID_COLORPAGE_ANCHOR_LB                     (HID_CUI_START +  62)
+#define HID_COLORPAGE_SPELL_LB                      (HID_CUI_START +  63)
+#define HID_COLORPAGE_WRITERTEXTGRID_LB             (HID_CUI_START +  64)
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB        (HID_CUI_START +  65)
+#define HID_COLORPAGE_WRITERIDXSHADINGS_LB          (HID_CUI_START +  66)
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB         (HID_CUI_START +  67)
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB       (HID_CUI_START +  68)
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB      (HID_CUI_START +  69)
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB    (HID_CUI_START +  70)
+#define HID_COLORPAGE_WRITERPAGEBREAKS_LB           (HID_CUI_START +  71)
+#define HID_COLORPAGE_HTMLSGML_LB                   (HID_CUI_START +  72)
+#define HID_COLORPAGE_HTMLCOMMENT_LB                (HID_CUI_START +  73)
+#define HID_COLORPAGE_HTMLKEYWORD_LB                (HID_CUI_START +  74)
+#define HID_COLORPAGE_HTMLUNKNOWN_LB                (HID_CUI_START +  75)
+#define HID_COLORPAGE_CALCGRID_LB                   (HID_CUI_START +  76)
+#define HID_COLORPAGE_CALCPAGEBREAK_LB              (HID_CUI_START +  77)
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB        (HID_CUI_START +  78)
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB     (HID_CUI_START +  79)
+#define HID_COLORPAGE_CALCDETECTIVE_LB              (HID_CUI_START +  80)
+#define HID_COLORPAGE_CALCDETECTIVEERROR_LB         (HID_CUI_START +  81)
+#define HID_COLORPAGE_CALCREFERENCE_LB              (HID_CUI_START +  82)
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB        (HID_CUI_START +  83)
+#define HID_COLORPAGE_DRAWGRID_LB                   (HID_CUI_START +  84)
+#define HID_COLORPAGE_DRAWDRAWING_LB                (HID_CUI_START +  85)
+#define HID_COLORPAGE_DRAWFILL_LB                   (HID_CUI_START +  86)
+#define HID_COLORPAGE_BASICIDENTIFIER_LB            (HID_CUI_START +  87)
+#define HID_COLORPAGE_BASICCOMMENT_LB               (HID_CUI_START +  88)
+#define HID_COLORPAGE_BASICNUMBER_LB                (HID_CUI_START +  89)
+#define HID_COLORPAGE_BASICSTRING_LB                (HID_CUI_START +  90)
+#define HID_COLORPAGE_BASICOPERATOR_LB              (HID_CUI_START +  91)
+#define HID_COLORPAGE_BASICKEYWORD_LB               (HID_CUI_START +  92)
+#define HID_COLORPAGE_BASICERROR_LB                 (HID_CUI_START +  93)
+#define HID_COLORPAGE_CHECKBOX_START                (HID_CUI_START +  94)
+#define HID_COLORPAGE_DOCCOLOR_CB                   (HID_CUI_START +  94)
+#define HID_COLORPAGE_DOCBOUNDARIES_CB              (HID_CUI_START +  95)
+#define HID_COLORPAGE_APPBACKGROUND_CB              (HID_CUI_START +  96)
+#define HID_COLORPAGE_OBJECTBOUNDARIES_CB           (HID_CUI_START +  97)
+#define HID_COLORPAGE_TABLEBOUNDARIES_CB            (HID_CUI_START +  98)
+#define HID_COLORPAGE_FONTCOLOR_CB                  (HID_CUI_START +  99)
+#define HID_COLORPAGE_LINKS_CB                      (HID_CUI_START + 100)
+#define HID_COLORPAGE_LINKSVISITED_CB               (HID_CUI_START + 101)
+#define HID_COLORPAGE_ANCHOR_CB                     (HID_CUI_START + 102)
+#define HID_COLORPAGE_SPELL_CB                      (HID_CUI_START + 103)
+#define HID_COLORPAGE_WRITERTEXTGRID_CB             (HID_CUI_START + 104)
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB        (HID_CUI_START + 105)
+#define HID_COLORPAGE_WRITERIDXSHADINGS_CB          (HID_CUI_START + 106)
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB         (HID_CUI_START + 107)
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB       (HID_CUI_START + 108)
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB      (HID_CUI_START + 109)
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB    (HID_CUI_START + 110)
+#define HID_COLORPAGE_WRITERPAGEBREAKS_CB           (HID_CUI_START + 111)
+#define HID_COLORPAGE_HTMLSGML_CB                   (HID_CUI_START + 112)
+#define HID_COLORPAGE_HTMLCOMMENT_CB                (HID_CUI_START + 113)
+#define HID_COLORPAGE_HTMLKEYWORD_CB                (HID_CUI_START + 114)
+#define HID_COLORPAGE_HTMLUNKNOWN_CB                (HID_CUI_START + 115)
+#define HID_COLORPAGE_CALCGRID_CB                   (HID_CUI_START + 116)
+#define HID_COLORPAGE_CALCPAGEBREAK_CB              (HID_CUI_START + 117)
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB        (HID_CUI_START + 118)
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB     (HID_CUI_START + 119)
+#define HID_COLORPAGE_CALCDETECTIVE_CB              (HID_CUI_START + 120)
+#define HID_COLORPAGE_CALCDETECTIVEERROR_CB         (HID_CUI_START + 121)
+#define HID_COLORPAGE_CALCREFERENCE_CB              (HID_CUI_START + 122)
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB        (HID_CUI_START + 123)
+#define HID_COLORPAGE_DRAWGRID_CB                   (HID_CUI_START + 124)
+#define HID_COLORPAGE_DRAWDRAWING_CB                (HID_CUI_START + 125)
+#define HID_COLORPAGE_DRAWFILL_CB                   (HID_CUI_START + 126)
+#define HID_COLORPAGE_BASICIDENTIFIER_CB            (HID_CUI_START + 127)
+#define HID_COLORPAGE_BASICCOMMENT_CB               (HID_CUI_START + 128)
+#define HID_COLORPAGE_BASICNUMBER_CB                (HID_CUI_START + 129)
+#define HID_COLORPAGE_BASICSTRING_CB                (HID_CUI_START + 130)
+#define HID_COLORPAGE_BASICOPERATOR_CB              (HID_CUI_START + 131)
+#define HID_COLORPAGE_BASICKEYWORD_CB               (HID_CUI_START + 132)
+#define HID_COLORPAGE_BASICERROR_CB                 (HID_CUI_START + 133)
+#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE          (HID_CUI_START + 134)
+#define HID_SVX_MACRO_LB_EVENT                      (HID_CUI_START + 135)
+#define HID_SVX_CONFIG_EVENT                        (HID_CUI_START + 136)
+#define HID_CONFIG_EVENT_OFFICE_BASED               (HID_CUI_START + 137)
+#define HID_CONFIG_EVENT_DOCUMENT_BASED             (HID_CUI_START + 138)
+#define HID_SELECTOR_DIALOG                         (HID_CUI_START + 139)
+#define HID_SELECTOR_CATEGORIES                     (HID_CUI_START + 140)
+#define HID_SVX_CONFIG_TOOLBAR                      (HID_CUI_START + 141)
+#define HID_SVX_CONFIG_TOOLBAR_CONTENTS             (HID_CUI_START + 142)
+#define HID_SELECTOR_COMMANDS                       (HID_CUI_START + 143)
+#define HID_GALLERY_EDIT_MSNAME                     (HID_CUI_START + 144)
+#define HID_SVX_CONFIG_MENU                         (HID_CUI_START + 145)
+#define HID_SVX_CONFIG_MENU_CONTENTS                (HID_CUI_START + 146)
+#define HID_GALLERY_NEWTHEME_FINDFILES              (HID_CUI_START + 147)
+#define HID_GALLERY_NEWTHEME_ADDFILES               (HID_CUI_START + 148)
+#define HID_HANGULDLG_BUTTON_OPTIONS                (HID_CUI_START + 149)
+#define HID_HANGULDLG_BUTTON_CLOSE                  (HID_CUI_START + 150)
+#define HID_HANGULDLG_BUTTON_IGNORE                 (HID_CUI_START + 151)
+#define HID_HANGULDLG_BUTTON_IGNOREALL              (HID_CUI_START + 152)
+#define HID_HANGULDLG_BUTTON_CHANGE                 (HID_CUI_START + 153)
+#define HID_HANGULDLG_BUTTON_CHANGEALL              (HID_CUI_START + 154)
+#define HID_OFA_FONT_SUBSTITUTION                   (HID_CUI_START + 155)
+#define HID_HANGULDLG_EDIT_NEWWORD                  (HID_CUI_START + 156)
+#define HID_OFA_SUBST_APPLY                         (HID_CUI_START + 157)
+#define HID_OFA_SUBST_DELETE                        (HID_CUI_START + 158)
+#define HID_SPLDLG_BUTTON_CLOSE                     (HID_CUI_START + 159)
+#define HID_SPLDLG_BUTTON_IGNORE                    (HID_CUI_START + 160)
+#define HID_SPLDLG_BUTTON_IGNOREALL                 (HID_CUI_START + 161)
+#define HID_SPLDLG_BUTTON_CHANGE                    (HID_CUI_START + 162)
+#define HID_SPLDLG_BUTTON_CHANGEALL                 (HID_CUI_START + 163)
+#define HID_SPLDLG_BUTTON_EXPLAIN                   (HID_CUI_START + 164)
+#define HID_CHARMAP_CTL_SHOWSET                     (HID_CUI_START + 165)
+#define HID_CHARMAP_CTL_SHOWTEXT                    (HID_CUI_START + 166)
+#define HID_CHARMAP_CTL_SHOWCHAR                    (HID_CUI_START + 167)
+#define HID_DLG_NAME                                (HID_CUI_START + 168)
+#define HID_DLG_MESSBOX                             (HID_CUI_START + 169)
+#define HID_HANGULDLG_SUGGESTIONS                   (HID_CUI_START + 170)
+#define HID_HANGULDLG_SUGGESTIONS_GRID              (HID_CUI_START + 171)
+#define HID_HANGULDLG_SUGGESTIONS_LIST              (HID_CUI_START + 172)
+#define HID_DLG_OBJECT_NAME                         (HID_CUI_START + 173)
+#define HID_DLG_OBJECT_TITLE_DESC                   (HID_CUI_START + 174)
+#define HID_SVX_CONFIG_MENU_ORGANIZER               (HID_CUI_START + 175)
+#define HID_SVX_CONFIG_ICON_SELECTOR                (HID_CUI_START + 176)
+#define HID_SVX_CONFIG_NAME_SUBMENU                 (HID_CUI_START + 177)
+#define HID_SVX_CONFIG_RENAME_MENU                  (HID_CUI_START + 178)
+#define HID_SVX_CONFIG_RENAME_MENU_ITEM             (HID_CUI_START + 179)
+#define HID_SVX_CONFIG_RENAME_TOOLBAR               (HID_CUI_START + 180)
+#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM          (HID_CUI_START + 181)
+#define HID_SVX_NEW_TOOLBAR                         (HID_CUI_START + 182)
+#define HID_SVX_MODIFY_TOOLBAR                      (HID_CUI_START + 183)
+#define HID_SVX_NEW_TOOLBAR_ITEM                    (HID_CUI_START + 184)
+#define HID_SVX_CONFIG_MENU_LISTBOX                 (HID_CUI_START + 185)
+#define HID_SVX_MODIFY_TOOLBAR_ITEM                 (HID_CUI_START + 186)
+#define HID_SVX_SAVE_IN                             (HID_CUI_START + 187)
+#define HID_OPTIONS_MULTIPATH_LIST                  (HID_CUI_START + 188)
+#define HID_FM_DLG_SEARCH                           (HID_CUI_START + 189)
+#define HID_SEARCH_TEXT                             (HID_CUI_START + 190)
+#define HID_SEARCH_ALLFIELDS                        (HID_CUI_START + 191)
+#define HID_GALLERY_PROPERTIES_GENERAL              (HID_CUI_START + 192)
+#define HID_SEARCH_FIELDSELECTION                   (HID_CUI_START + 193)
+#define HID_SEARCH_POSITION                         (HID_CUI_START + 194)
+#define HID_SEARCH_FORMATTER                        (HID_CUI_START + 195)
+#define HID_SEARCH_CASE                             (HID_CUI_START + 196)
+#define HID_SEARCH_BACKWARD                         (HID_CUI_START + 197)
+#define HID_SEARCH_STARTOVER                        (HID_CUI_START + 198)
+#define HID_SEARCH_WILDCARD                         (HID_CUI_START + 199)
+#define HID_SEARCH_REGULAR                          (HID_CUI_START + 200)
+#define HID_SEARCH_APPROX                           (HID_CUI_START + 201)
+#define HID_SEARCH_APPROXSETTINGS                   (HID_CUI_START + 202)
+#define HID_SEARCH_BTN_SEARCH                       (HID_CUI_START + 203)
+#define HID_SEARCH_BTN_CLOSE                        (HID_CUI_START + 204)
+#define HID_GALLERY_BROWSER                         (HID_CUI_START + 205)
+#define HID_GALLERY_SEARCH                          (HID_CUI_START + 206)
+#define HID_GALLERY_APPLY                           (HID_CUI_START + 207)
+#define HID_SPLDLG_BUTTON_IGNORERULE                (HID_CUI_START + 208)
+#define HID_CONFIG_ACCEL                            (HID_CUI_START + 209)
+#define HID_ACCELCONFIG_LISTBOX                     (HID_CUI_START + 210)
+#define HID_CONFIGGROUP_ACC_LISTBOX                 (HID_CUI_START + 211)
+#define HID_CONFIGFUNCTION_ACC_LISTBOX              (HID_CUI_START + 212)
+#define HID_MACRO_LB_EVENT                          (HID_CUI_START + 213)
+#define HID_MACRO_GROUP                             (HID_CUI_START + 214)
+#define HID_MACRO_MACROS                            (HID_CUI_START + 215)
+#define HID_DIALOG_HANGULHANJA                      (HID_CUI_START + 216)
+#define HID_HANGULHANJA_OPT_DLG                     (HID_CUI_START + 217)
+#define HID_HANGULHANJA_NEWDICT_DLG                 (HID_CUI_START + 218)
+#define HID_HANGULHANJA_EDIT_DLG                    (HID_CUI_START + 219)
+#define HID_HANGULHANJA_OPT_DICTS_LB                (HID_CUI_START + 220)
+#define HID_MULTIPATH                               (HID_CUI_START + 221)
+#define HID_SCRIPTORG_DIALOG                        (HID_CUI_START + 222)
+#define HID_SCRIPTSBOX                              (HID_CUI_START + 223)
+#define HID_SPELLCHECK                              (HID_CUI_START + 224)
+#define HID_TPSIZE_CTRL                             (HID_CUI_START + 225)
+#define HID_TPROTATION_CTRL1                        (HID_CUI_START + 226)
+#define HID_TPROTATION_CTRL2                        (HID_CUI_START + 227)
+#define HID_TRANS_ANGLE                             (HID_CUI_START + 228)
+#define HID_TPPOSITION_CTRL                         (HID_CUI_START + 229)
+#define HID_NUMBERFORMAT_LB_FORMAT                  (HID_CUI_START + 230)
+#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_CUI_START + 231)
+#define HID_TRANS_SLANT                             (HID_CUI_START + 232)
+#define HID_TPHATCH_CTRL                            (HID_CUI_START + 233)
+#define HID_SEARCHATTR_CTL_ATTR                     (HID_CUI_START + 234)
+#define HID_NUMBERFORMAT_TBI_INFO                   (HID_CUI_START + 235)
+#define HID_SEARCHATTR                              (HID_CUI_START + 236)
+#define HID_ALIGNMENT_CTR_DIAL                      (HID_CUI_START + 237)
+#define HID_ALIGNMENT_CTR_BORDER_LOCK               (HID_CUI_START + 238)
+#define HID_SEARCHSIMILARITY                        (HID_CUI_START + 239)
+#define UID_SEARCH_RECORDSTATUS                     (HID_CUI_START + 240)
+#define HID_OFAPAGE_AUTOCORR_CLB                    (HID_CUI_START + 241)
+#define HID_AUTOCORR_LANGUAGE                       (HID_CUI_START + 242)
+#define HID_OFAPAGE_AUTOFORMAT_CLB                  (HID_CUI_START + 243)
+#define HID_TPCOLOR_RGB_1                           (HID_CUI_START + 244)
+#define HID_TPCOLOR_RGB_2                           (HID_CUI_START + 245)
+#define HID_TPCOLOR_RGB_3                           (HID_CUI_START + 246)
+#define HID_TPCOLOR_CMYK_1                          (HID_CUI_START + 247)
+#define HID_TPCOLOR_CMYK_2                          (HID_CUI_START + 248)
+#define HID_TPCOLOR_CMYK_3                          (HID_CUI_START + 249)
+#define HID_ALIGNMENT                               (HID_CUI_START + 250)
+#define HID_OFAPAGE_AUTOCORR_OPTIONS                (HID_CUI_START + 251)
+#define HID_OFAPAGE_AUTOFMT_OPTIONS                 (HID_CUI_START + 252)
+#define HID_OFAPAGE_AUTOCORR_REPLACE                (HID_CUI_START + 253)
+#define HID_OFACTL_AUTOCORR_REPLACE                 (HID_CUI_START + 254)
+#define HID_OFAPAGE_AUTOCORR_EXCEPT                 (HID_CUI_START + 255)
+#define HID_OFAPAGE_AUTOCORR_QUOTE                  (HID_CUI_START + 256)
+#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS            (HID_CUI_START + 257)
+#define HID_BACKGROUND                              (HID_CUI_START + 258)
+#define HID_BACKGROUND_CTL_BGDCOLORSET              (HID_CUI_START + 259)
+#define HID_BACKGROUND_CTL_POSITION                 (HID_CUI_START + 260)
+#define HID_BORDER                                  (HID_CUI_START + 261)
+#define HID_BORDER_CTL_PRESETS                      (HID_CUI_START + 262)
+#define HID_BORDER_CTL_SHADOWS                      (HID_CUI_START + 263)
+#define HID_PAGE_CONNECTION                         (HID_CUI_START + 264)
+#define HID_PAGE_CONNECTION_CTL_PREVIEW             (HID_CUI_START + 265)
+#define HID_PAGE_DISTRIBUTE                         (HID_CUI_START + 266)
+#define HID_SVXPAGE_GRFCROP                         (HID_CUI_START + 267)
+#define HID_CAPTION                                 (HID_CUI_START + 268)
+#define HID_CAPTION_CTL_TYPE                        (HID_CUI_START + 269)
+#define HID_PAGE_MEASURE                            (HID_CUI_START + 270)
+#define HID_MEASURE_CTL_POSITION                    (HID_CUI_START + 271)
+#define HID_NUMBERFORMAT                            (HID_CUI_START + 272)
+#define HID_NUMBERFORMAT_TBI_ADD                    (HID_CUI_START + 273)
+#define HID_NUMBERFORMAT_TBI_REMOVE                 (HID_CUI_START + 274)
+#define HID_FORMAT_PAGE                             (HID_CUI_START + 275)
+#define HID_REDLINING_DLG                           (HID_CUI_START + 276)
+#define HID_REDLINING_EDIT                          (HID_CUI_START + 277)
+#define HID_REDLINING_PREV                          (HID_CUI_START + 278)
+#define HID_REDLINING_NEXT                          (HID_CUI_START + 279)
+#define HID_FORMAT_PARAGRAPH_STD                    (HID_CUI_START + 280)
+#define HID_VALUESET_SINGLENUM                      (HID_CUI_START + 281)
+#define HID_VALUESET_BULLET                         (HID_CUI_START + 282)
+#define HID_VALUESET_NUM                            (HID_CUI_START + 283)
+#define HID_VALUESET_NUMBMP                         (HID_CUI_START + 284)
+#define HID_SVXPAGE_PICK_NUM                        (HID_CUI_START + 285)
+#define HID_SVXPAGE_PICK_SINGLE_NUM                 (HID_CUI_START + 286)
+#define HID_SVXPAGE_PICK_BMP                        (HID_CUI_START + 287)
+#define HID_SVXPAGE_PICK_BULLET                     (HID_CUI_START + 288)
+#define HID_SVXPAGE_NUM_OPTIONS                     (HID_CUI_START + 289)
+#define HID_SVXPAGE_NUM_POSITION                    (HID_CUI_START + 290)
+#define HID_MEASURE_CTL_PREVIEW                     (HID_CUI_START + 291)
+#define HID_FORMAT_PARAGRAPH_EXT                    (HID_CUI_START + 292)
+#define HID_FORMAT_PARAGRAPH_ALIGN                  (HID_CUI_START + 293)
+#define HID_SVXPAGE_PARA_ASIAN                      (HID_CUI_START + 294)
+#define HID_SVXPAGE_SWPOSSIZE                       (HID_CUI_START + 295)
+#define HID_AREA_TRANSPARENCE                       (HID_CUI_START + 296)
+#define HID_AREA_AREA                               (HID_CUI_START + 297)
+#define HID_AREA_SHADOW                             (HID_CUI_START + 298)
+#define HID_AREA_HATCH                              (HID_CUI_START + 299)
+#define HID_AREA_BITMAP                             (HID_CUI_START + 300)
+#define HID_TPSHADOW_CTRL                           (HID_CUI_START + 301)
+#define HID_AREA_GRADIENT                           (HID_CUI_START + 302)
+#define HID_LINE_ENDDEF                             (HID_CUI_START + 303)
+#define HID_LINE_LINE                               (HID_CUI_START + 304)
+#define HID_LINE_DEF                                (HID_CUI_START + 305)
+#define HID_SPELLDLG_SETWORD                        (HID_CUI_START + 306)
+#define HID_TABULATOR                               (HID_CUI_START + 307)
+#define HID_PAGE_TEXTATTR                           (HID_CUI_START + 308)
+#define HID_TEXTATTR_CTL_POSITION                   (HID_CUI_START + 309)
+#define HID_TRANS_POSITION_SIZE                     (HID_CUI_START + 310)
+// free
+#define HID_SVXPAGE_CHAR_NAME                       (HID_CUI_START + 312)
+#define HID_SVXPAGE_CHAR_EFFECTS                    (HID_CUI_START + 313)
+#define HID_SVXPAGE_CHAR_POSITION                   (HID_CUI_START + 314)
+#define HID_HYPERLINK_INTERNET                      (HID_CUI_START + 315)
+#define HID_HYPERLINK_MAIL                          (HID_CUI_START + 316)
+#define HID_HYPERLINK_DOCUMENT                      (HID_CUI_START + 317)
+#define HID_HYPERLINK_NEWDOCUMENT                   (HID_CUI_START + 318)
+#define HID_HYPERLINK_MARKWND                       (HID_CUI_START + 319)
+#define HID_ICCDIALOG_RESET_BTN                     (HID_CUI_START + 320)
+#define HID_ICCDIALOG_CHOICECTRL                    (HID_CUI_START + 321)
+#define HID_HYPERDLG_INET_PATH                      (HID_CUI_START + 322)
+#define HID_HYPERDLG_MAIL_PATH                      (HID_CUI_START + 323)
+#define HID_HYPERDLG_DOC_PATH                       (HID_CUI_START + 324)
+#define HID_ICCDIALOG_OK_BTN                        (HID_CUI_START + 325)
+#define HID_ICCDIALOG_CANCEL_BTN                    (HID_CUI_START + 326)
+#define HID_HYPERLINK_MARKWND_APPLY                 (HID_CUI_START + 327)
+#define HID_HYPERLINK_MARKWND_CLOSE                 (HID_CUI_START + 328)
+#define HID_HYPERLINK_MARKWND_TREE                  (HID_CUI_START + 329)
+#define HID_SVXPAGE_CHAR_TWOLINES                   (HID_CUI_START + 330)
+#define HID_GRFFILTER_EMBOSS_LIGHT                  (HID_CUI_START + 331)
+#define HID_PASTE_DLG                               (HID_CUI_START + 333)
+#define HID_LINKDLG_TABLB                           (HID_CUI_START + 334)
+#define HID_MACRO_HEADERTABLISTBOX                  (HID_CUI_START + 335)
+#define HID_GALLERY_ENTER_TITLE                     (HID_CUI_START + 336)
+#define HID_GALLERY_TITLE_EDIT                      (HID_CUI_START + 337)
+
+// please adjust ACT_SVX_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// Overrun check ---------------------------------------------------------
+// -----------------------------------------------------------------------
+
+#define ACT_CUI_HID_END     HID_CUI_START + 337
+
+#if ACT_CUI_HID_END > HID_CUI_END
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#endif
+
diff --git a/svx/source/cui/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index c9f220c0df6f..c9f220c0df6f 100644
--- a/svx/source/cui/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
diff --git a/svx/source/cui/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 1e3dae701e7b..1e3dae701e7b 100644
--- a/svx/source/cui/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
diff --git a/svx/source/cui/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 04fe1fb6f7a6..19ddae5f6e0b 100644
--- a/svx/source/cui/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_TABPAGE_INET_HYPERLINK_HXX
 #define _SVX_TABPAGE_INET_HYPERLINK_HXX
 
-#include <hyperdlg.hxx>
+#include <svx/hyperdlg.hxx>
 #include "cuihyperdlg.hxx"
 #include "hltpbase.hxx"
 
diff --git a/svx/source/cui/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 797695b09e00..797695b09e00 100644
--- a/svx/source/cui/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
diff --git a/svx/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 6853eac1ccb6..6853eac1ccb6 100644
--- a/svx/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
diff --git a/svx/inc/hlmarkwn_def.hxx b/cui/source/inc/hlmarkwn_def.hxx
index a668737411a6..a668737411a6 100644
--- a/svx/inc/hlmarkwn_def.hxx
+++ b/cui/source/inc/hlmarkwn_def.hxx
diff --git a/svx/source/cui/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 71bb37eade02..3f0306659b83 100644
--- a/svx/source/cui/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -35,16 +35,14 @@
 #include <sfx2/app.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/transfer.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
@@ -52,17 +50,12 @@
 #include <svtools/inettbc.hxx>
 #include <vcl/timer.hxx>
 
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
-
+#include <cuires.hrc>
 #include <com/sun/star/frame/XFrame.hpp>
-
-#ifndef _SVX_HELPID_HRC
 #include "helpid.hrc"
-#endif
-
-#include "hlnkitem.hxx"
+#include <svx/hlnkitem.hxx>
 
 #include "hlmarkwn.hxx"
 #include "iconcdlg.hxx"
diff --git a/svx/source/cui/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 771080a5aaac..ea74b4a66075 100644
--- a/svx/source/cui/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -38,8 +38,8 @@
 #endif
 #include <vcl/image.hxx>
 #include <svtools/ivctrl.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <tools/list.hxx>
 #include <tools/string.hxx>
 
diff --git a/svx/source/cui/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 1924b5ca8c7a..1924b5ca8c7a 100644
--- a/svx/source/cui/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
diff --git a/svx/source/cui/insrc.hxx b/cui/source/inc/insrc.hxx
index e187313bdd03..e187313bdd03 100644
--- a/svx/source/cui/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
diff --git a/svx/source/cui/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx
index d17625ee380e..d17625ee380e 100644
--- a/svx/source/cui/internationaloptions.hxx
+++ b/cui/source/inc/internationaloptions.hxx
diff --git a/svx/source/cui/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 9581fbf9ba78..9581fbf9ba78 100644
--- a/svx/source/cui/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
diff --git a/svx/source/cui/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 4703079c9420..4703079c9420 100644
--- a/svx/source/cui/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
diff --git a/svx/source/cui/macroass.hxx b/cui/source/inc/macroass.hxx
index da4fc49e4596..a41bd0d8da98 100755
--- a/svx/source/cui/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -34,7 +34,7 @@
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
diff --git a/svx/source/cui/macropg.hxx b/cui/source/inc/macropg.hxx
index 37f714028c82..0ed414e92751 100644
--- a/svx/source/cui/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
diff --git a/svx/source/cui/measure.hxx b/cui/source/inc/measure.hxx
index 1c51d94767c8..71f665bea750 100644
--- a/svx/source/cui/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -35,10 +35,8 @@
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
 #include <sfx2/basedlgs.hxx>
-#ifndef _SVX_DLGCTRL_HXX
 #include <svx/dlgctrl.hxx>
-#endif
-#include "measctrl.hxx"
+#include <svx/measctrl.hxx>
 
 class SdrView;
 
diff --git a/svx/source/cui/multifil.hxx b/cui/source/inc/multifil.hxx
index 242e28c17707..242e28c17707 100644
--- a/svx/source/cui/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
diff --git a/svx/source/cui/multipat.hxx b/cui/source/inc/multipat.hxx
index e7fd86799955..e7fd86799955 100644
--- a/svx/source/cui/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
diff --git a/svx/source/cui/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx
index 9d29152a656f..9d29152a656f 100644
--- a/svx/source/cui/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
diff --git a/svx/source/cui/numfmt.hxx b/cui/source/inc/numfmt.hxx
index e14f397cf0ba..0c2b42d64150 100644
--- a/svx/source/cui/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -36,28 +36,13 @@
 #include <tools/color.hxx>
 #include <tools/string.hxx>
 #include <sfx2/tabdlg.hxx>
-
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
-
-#ifndef _TOOLBOX_HXX //autogen
 #include <vcl/toolbox.hxx>
-#endif
-
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <svx/langbox.hxx>
-#include "fontlb.hxx"
+#include <svx/fontlb.hxx>
 
 //CHINA001 #define SVX_NUMVAL_STANDARD      -1234.12345678901234
 //CHINA001 #define SVX_NUMVAL_CURRENCY      -1234
diff --git a/svx/source/cui/numpages.hxx b/cui/source/inc/numpages.hxx
index 9e3447228b45..a5d8a212d48e 100644
--- a/svx/source/cui/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -43,7 +43,7 @@
 #include <svx/numdef.hxx>
 #endif
 #include <svtools/ctrlbox.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 // -----------------------------------------------------------------------
 class SvxNumRule;
diff --git a/svx/source/cui/optasian.hxx b/cui/source/inc/optasian.hxx
index 98c142031cd2..98c142031cd2 100644
--- a/svx/source/cui/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
diff --git a/svx/source/cui/optdict.hxx b/cui/source/inc/optdict.hxx
index b09c1d1e773e..b09c1d1e773e 100644
--- a/svx/source/cui/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
diff --git a/svx/inc/svx/optimprove.hxx b/cui/source/inc/optimprove.hxx
index 61f184239e88..61f184239e88 100644
--- a/svx/inc/svx/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
diff --git a/svx/inc/svx/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 6c2a0a7ac528..6c2a0a7ac528 100644
--- a/svx/inc/svx/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
diff --git a/svx/source/cui/optpath.hxx b/cui/source/inc/optpath.hxx
index c05b0b778c58..c05b0b778c58 100644
--- a/svx/source/cui/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
diff --git a/svx/source/cui/page.hxx b/cui/source/inc/page.hxx
index a1fae0536af8..1b716aedfd46 100644
--- a/svx/source/cui/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -32,31 +32,16 @@
 
 
 #include <sfx2/tabdlg.hxx>
-
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
-
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
-
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
 #include <svx/pagectrl.hxx>
 #include <svx/frmdirlbox.hxx>
-
 #include <svx/svxenum.hxx>
-
 #include <i18npool/paper.hxx>
-
-#include "flagsdef.hxx" //CHINA001
+#include <svx/flagsdef.hxx>
 
 // enum ------------------------------------------------------------------
 
diff --git a/svx/source/cui/paragrph.hxx b/cui/source/inc/paragrph.hxx
index c75869747ee2..baadcaecb0ea 100644
--- a/svx/source/cui/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -32,21 +32,15 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <sfx2/tabdlg.hxx>
-#include "relfld.hxx"       // SvxRelativeField
+#include <svx/relfld.hxx>       // SvxRelativeField
 #include <svx/paraprev.hxx>     // Preview
 #include <svx/frmdirlbox.hxx>
-
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#include "flagsdef.hxx"
+#include <svx/flagsdef.hxx>
+
 // define ----------------------------------------------------------------
 
 // 1/2 cm in TWIPS
diff --git a/svx/source/cui/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index edbbaf53e6ee..edbbaf53e6ee 100644
--- a/svx/source/cui/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
diff --git a/svx/source/cui/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 9c4f2551c09b..9c4f2551c09b 100644
--- a/svx/source/cui/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
diff --git a/svx/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index a0477d25b262..a0477d25b262 100644
--- a/svx/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
diff --git a/svx/source/cui/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 0cb2a6d4fb5d..0cb2a6d4fb5d 100644
--- a/svx/source/cui/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
diff --git a/svx/source/cui/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index b89c9ef21e8a..b89c9ef21e8a 100644
--- a/svx/source/cui/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
diff --git a/svx/source/cui/selector.hxx b/cui/source/inc/selector.hxx
index 10346f251563..3e21a3812835 100644
--- a/svx/source/cui/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -43,7 +43,7 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <sfx2/minarray.hxx>
 
 #define SVX_CFGGROUP_FUNCTION 1
diff --git a/svx/source/cui/showcols.hxx b/cui/source/inc/showcols.hxx
index fd64abf36e2c..fd64abf36e2c 100644
--- a/svx/source/cui/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
diff --git a/svx/source/cui/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index e325e25a8284..e325e25a8284 100644
--- a/svx/source/cui/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
diff --git a/svx/source/cui/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index cdbf37b4db66..6d2e9a1195aa 100644
--- a/svx/source/cui/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -37,7 +37,7 @@
 #include <sfx2/tabdlg.hxx>
 
 #include <svx/checklbx.hxx>
-#include "srchdlg.hxx"
+#include <svx/srchdlg.hxx>
 
 // class SvxSearchFormatDialog -------------------------------------------
 
diff --git a/svx/source/cui/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 945f6acbb9e4..66d432ea37b4 100644
--- a/svx/source/cui/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -39,7 +39,8 @@
 #include <sfx2/tabdlg.hxx>
 
 #include <svx/tstpitem.hxx>
-#include "flagsdef.hxx"
+#include <svx/flagsdef.hxx>
+
 // forward ---------------------------------------------------------------
 
 class TabWin_Impl;
diff --git a/svx/source/cui/textanim.hxx b/cui/source/inc/textanim.hxx
index 576bda45450a..576bda45450a 100644
--- a/svx/source/cui/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
diff --git a/svx/source/cui/textattr.hxx b/cui/source/inc/textattr.hxx
index d2e8d795653f..d2e8d795653f 100644
--- a/svx/source/cui/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
diff --git a/svx/source/cui/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 3a5abeedf4a1..3a5abeedf4a1 100644
--- a/svx/source/cui/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
diff --git a/svx/source/cui/treeopt.hxx b/cui/source/inc/treeopt.hxx
index cce278686b27..cce278686b27 100644
--- a/svx/source/cui/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
diff --git a/svx/source/cui/zoom.hxx b/cui/source/inc/zoom.hxx
index d031da97bc55..d031da97bc55 100644
--- a/svx/source/cui/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
diff --git a/svx/source/cui/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 344bca7fbd10..822a3632a76d 100644
--- a/svx/source/cui/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -29,20 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <com/sun/star/uno/Sequence.hxx>
 // header for SvStream
 #include <tools/stream.hxx>
 // header for SAL_STATIC_CAST
 #include <sal/types.h>
-
 #include "cfgchart.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 
 #define ROW_COLOR_COUNT 12
 
@@ -130,7 +126,7 @@ void SvxChartColorTable::useDefault()
 
     clear();
 
-    String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+    String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
     String aPrefix, aPostfix, aName;
     xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" );
     if( nPos != STRING_NOTFOUND )
@@ -220,7 +216,7 @@ BOOL SvxChartOptions::RetrieveOptions()
         Color aCol;
 
         // create strings for entry names
-        String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+        String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
         String aPrefix, aPostfix, aName;
         xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" );
         if( nPos != STRING_NOTFOUND )
@@ -270,6 +266,10 @@ void SvxChartOptions::Commit()
     PutProperties( aNames, aValues );
 }
 
+void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
 // --------------------
 // class SvxChartColorTableItem
 // --------------------
diff --git a/svx/source/cui/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 86a2490a2cf8..89f18e621cff 100644
--- a/svx/source/cui/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -36,7 +36,7 @@
 // header for ConfigItem
 #include <unotools/configitem.hxx>
 // header for SfxPoolItem
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 // header for XColorEntry
 #include <svx/xtable.hxx>
 
@@ -90,6 +90,7 @@ public:
     void                        SetDefaultColors( const SvxChartColorTable& aCol );
 
     virtual void                Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 };
 
 // ====================
diff --git a/svx/source/cui/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index f787168f1f2d..1a681beb263e 100644
--- a/svx/source/cui/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -29,24 +29,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "connpoolconfig.hxx"
 #include "connpoolsettings.hxx"
 
 #include "connpooloptions.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <unotools/confignode.hxx>
 #include <comphelper/extract.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <comphelper/processfactory.hxx>
 #include "sdbcdriverenum.hxx"
 
-#include <svx/svxids.hrc>
-
 //........................................................................
 namespace offapp
 {
diff --git a/svx/source/cui/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx
index 248dd16146f0..248dd16146f0 100644
--- a/svx/source/cui/connpoolconfig.hxx
+++ b/cui/source/options/connpoolconfig.hxx
diff --git a/svx/source/cui/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index d7874bc8d4cb..fd195b18a7e3 100644
--- a/svx/source/cui/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 #ifdef SVX_DLLIMPLEMENTATION
 #undef SVX_DLLIMPLEMENTATION
@@ -41,11 +41,11 @@
 #include <svtools/editbrowsebox.hxx>
 #include <vcl/field.hxx>
 #include "connpoolsettings.hxx"
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 //........................................................................
 namespace offapp
@@ -158,11 +158,11 @@ namespace offapp
         DriverListControl_Base::Init();
 
         Size aColWidth = LogicToPixel(Size(160, 0), MAP_APPFONT);
-        InsertDataColumn(1, String(SVX_RES(STR_DRIVER_NAME)), aColWidth.Width());
+        InsertDataColumn(1, String(CUI_RES(STR_DRIVER_NAME)), aColWidth.Width());
         aColWidth = LogicToPixel(Size(30, 0), MAP_APPFONT);
-        InsertDataColumn(2, String(SVX_RES(STR_POOLED_FLAG)), aColWidth.Width());
+        InsertDataColumn(2, String(CUI_RES(STR_POOLED_FLAG)), aColWidth.Width());
         aColWidth = LogicToPixel(Size(60, 0), MAP_APPFONT);
-        InsertDataColumn(3, String(SVX_RES(STR_POOL_TIMEOUT)), aColWidth.Width());
+        InsertDataColumn(3, String(CUI_RES(STR_POOL_TIMEOUT)), aColWidth.Width());
             // Attention: the resource of the string is local to the resource of the enclosing dialog!
     }
 
@@ -338,16 +338,16 @@ namespace offapp
     //====================================================================
     //--------------------------------------------------------------------
     ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
-        :SfxTabPage(_pParent, SVX_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet)
-        ,m_aFrame               (this,              SVX_RES(FL_POOLING))
-        ,m_aEnablePooling       (this,      SVX_RES(CB_POOL_CONNS))
-        ,m_aDriversLabel        (this,      SVX_RES(FT_DRIVERS))
-        ,m_pDriverList(new DriverListControl(this, SVX_RES(CTRL_DRIVER_LIST)))
-        ,m_aDriverLabel         (this,      SVX_RES(FT_DRIVERLABEL))
-        ,m_aDriver              (this,      SVX_RES(FT_DRIVER))
-        ,m_aDriverPoolingEnabled(this,      SVX_RES(CB_DRIVERPOOLING))
-        ,m_aTimeoutLabel        (this,      SVX_RES(FT_TIMEOUT))
-        ,m_aTimeout             (this,      SVX_RES(NF_TIMEOUT))
+        :SfxTabPage(_pParent, CUI_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet)
+        ,m_aFrame               (this,              CUI_RES(FL_POOLING))
+        ,m_aEnablePooling       (this,      CUI_RES(CB_POOL_CONNS))
+        ,m_aDriversLabel        (this,      CUI_RES(FT_DRIVERS))
+        ,m_pDriverList(new DriverListControl(this, CUI_RES(CTRL_DRIVER_LIST)))
+        ,m_aDriverLabel         (this,      CUI_RES(FT_DRIVERLABEL))
+        ,m_aDriver              (this,      CUI_RES(FT_DRIVER))
+        ,m_aDriverPoolingEnabled(this,      CUI_RES(CB_DRIVERPOOLING))
+        ,m_aTimeoutLabel        (this,      CUI_RES(FT_TIMEOUT))
+        ,m_aTimeout             (this,      CUI_RES(NF_TIMEOUT))
     {
         m_pDriverList->Init();
         m_pDriverList->Show();
diff --git a/svx/source/cui/connpooloptions.hrc b/cui/source/options/connpooloptions.hrc
index 89f3ae64e1f8..89f3ae64e1f8 100644
--- a/svx/source/cui/connpooloptions.hrc
+++ b/cui/source/options/connpooloptions.hrc
diff --git a/svx/source/cui/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 019061efdb2e..b2b40354f433 100644
--- a/svx/source/cui/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -31,12 +31,12 @@
 #ifndef _OFFAPP_CONNPOOLOPTIONS_HXX_
 #define _OFFAPP_CONNPOOLOPTIONS_HXX_
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
-#include <databaseregistrationui.hxx>
+#include <svx/databaseregistrationui.hxx>
 
 //........................................................................
 namespace offapp
diff --git a/svx/source/cui/connpooloptions.src b/cui/source/options/connpooloptions.src
index 9218efda609a..c8d1dd03e47d 100644
--- a/svx/source/cui/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include "connpooloptions.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 #define PAGE_SIZE_X     260
 #define PAGE_SIZE_Y     185
diff --git a/svx/source/cui/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 6e1986f36e22..03951a4ee271 100644
--- a/svx/source/cui/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 #ifdef SVX_DLLIMPLEMENTATION
 #undef SVX_DLLIMPLEMENTATION
diff --git a/svx/source/cui/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 80ae105d0521..085732a6db74 100644
--- a/svx/source/cui/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/string.hxx>
 #include <comphelper/stl_types.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //........................................................................
 namespace offapp
diff --git a/svx/source/cui/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index efeeffebaf4f..c958204fe3c4 100644
--- a/svx/source/cui/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -29,44 +29,35 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <vcl/wrkwin.hxx>
 #include <vcl/morebtn.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/style.hxx>
-#include <svtools/searchopt.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/style.hxx>
+#include <unotools/searchopt.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 
 #define _CUI_SRCHDLG_CXX
 #include "cuisrchdlg.hxx"
 
-#include <svx/dialogs.hrc>
-#include <svx/svxitems.hrc>
-//#include "srchdlg.hrc"
-
+#include <cuires.hrc>
 
 #define ITEMID_SETITEM      0
 
 #include <sfx2/srchitem.hxx>
 #include <svx/pageitem.hxx>
-//#include "srchctrl.hxx"
-//CHINA001 #include "srchxtra.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
 #include <optjsearch.hxx>
 #include <svx/brshitem.hxx>
 #include "backgrnd.hxx"
@@ -76,7 +67,7 @@
 
 SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
             Window *pParent,
-            const SfxItemSet& rOptionsSet, USHORT /*nUniqueId*/, INT32 nInitialFlags ) :
+            const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) :
     SfxSingleTabDialog  ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
     nInitialTlFlags( nInitialFlags )
 {
diff --git a/svx/source/cui/dbregister.cxx b/cui/source/options/dbregister.cxx
index a1b24691a280..23e8bf865626 100644
--- a/svx/source/cui/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -29,26 +29,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include "dbregister.hxx"
 #include "dbregister.hrc"
 #include "dbregistersettings.hxx"
 #include "connpooloptions.hxx"
-#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
-#endif
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
+#include <svl/filenotation.hxx>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include <svtools/editbrowsebox.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include <vcl/field.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -57,15 +50,15 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <vcl/msgbox.hxx>
 #include <svtools/svtabbx.hxx>
-
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "doclinkdialog.hxx"
 #include <tools/urlobj.hxx>
 #include <unotools/localfilehelper.hxx>
 #include "optHeaderTabListbox.hxx"
 #include <sfx2/docfilt.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "dbregisterednamesconfig.hxx"
+#include <svx/dialogs.hrc>
 
 #define TAB_WIDTH1      80
 #define TAB_WIDTH_MIN   10
@@ -126,15 +119,15 @@ short DatabaseRegistrationDialog::Execute()
 
 DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_DBREGISTER), rSet ),
+    SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ),
 
-    aTypeText       ( this, SVX_RES( FT_TYPE ) ),
-    aPathText       ( this, SVX_RES( FT_PATH ) ),
-    aPathCtrl       ( this, SVX_RES( LB_PATH ) ),
-    m_aNew          ( this, SVX_RES( BTN_NEW ) ),
-    m_aEdit         ( this, SVX_RES( BTN_EDIT ) ),
-    m_aDelete       ( this, SVX_RES( BTN_DELETE ) ),
-    aStdBox         ( this, SVX_RES( GB_STD ) ),
+    aTypeText       ( this, CUI_RES( FT_TYPE ) ),
+    aPathText       ( this, CUI_RES( FT_PATH ) ),
+    aPathCtrl       ( this, CUI_RES( LB_PATH ) ),
+    m_aNew          ( this, CUI_RES( BTN_NEW ) ),
+    m_aEdit         ( this, CUI_RES( BTN_EDIT ) ),
+    m_aDelete       ( this, CUI_RES( BTN_DELETE ) ),
+    aStdBox         ( this, CUI_RES( GB_STD ) ),
     pHeaderBar      ( NULL ),
     pPathBox        ( NULL ),
     m_pCurEntry     ( NULL ),
@@ -304,7 +297,7 @@ IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG )
     SvLBoxEntry* pEntry = pPathBox->FirstSelected();
     if ( pEntry )
     {
-        QueryBox aQuery(this,SVX_RES(QUERY_DELETE_CONFIRM));
+        QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM));
         if ( aQuery.Execute() == RET_YES )
             pPathBox->GetModel()->Remove(pEntry);
     }
diff --git a/svx/source/cui/dbregister.hrc b/cui/source/options/dbregister.hrc
index f2324aac186c..f2324aac186c 100644
--- a/svx/source/cui/dbregister.hrc
+++ b/cui/source/options/dbregister.hrc
diff --git a/svx/source/cui/dbregister.src b/cui/source/options/dbregister.src
index bead1ae683cf..aaa8dc5302bc 100644
--- a/svx/source/cui/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -29,13 +29,9 @@
  ************************************************************************/
 
 #include "dbregister.hrc"
+#include <cuires.hrc>
+#include <cuires.hrc>
 #include <svx/dialogs.hrc>
-#ifndef _SVX_SVXIDS_HRC //autogen
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SVX_DIALOGS_HRC //autogen
-#include <svx/dialogs.hrc>
-#endif
 
 // RID_SFXPAGE_PATH -----------------------------------------------------
 #define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
diff --git a/svx/source/cui/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 4f9cf1150422..6fd7e34b2729 100644
--- a/svx/source/cui/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -29,26 +29,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
 #include "dbregisterednamesconfig.hxx"
-
-
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <tools/diagnose_ex.h>
-
-#include <svx/svxids.hrc>
 #include <unotools/confignode.hxx>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include "dbregistersettings.hxx"
 #include "connpooloptions.hxx"
 
diff --git a/svx/source/cui/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx
index 366910c0f193..366910c0f193 100644
--- a/svx/source/cui/dbregisterednamesconfig.hxx
+++ b/cui/source/options/dbregisterednamesconfig.hxx
diff --git a/svx/source/cui/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx
index 45745e3b59cb..c3d3b7e8c244 100644
--- a/svx/source/cui/dbregistersettings.cxx
+++ b/cui/source/options/dbregistersettings.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include "dbregistersettings.hxx"
 
diff --git a/svx/source/cui/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index ef994e4d0ee2..672d4bf63bcd 100644
--- a/svx/source/cui/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -32,7 +32,7 @@
 #define SVX_DBREGISTERSETTING_HXX
 
 #include <comphelper/stl_types.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //........................................................................
 namespace svx
diff --git a/svx/source/cui/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index aec98ea74aba..1af621348023 100644
--- a/svx/source/cui/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -29,24 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "doclinkdialog.hxx"
-#ifndef _SVX_DOCLINKDIALOG_HRC_
 #include "doclinkdialog.hrc"
-#endif
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
+#include <cuires.hrc>
 #include <tools/debug.hxx>
-#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
-#endif
+#include <svl/filenotation.hxx>
 #include <vcl/msgbox.hxx>
 #include <ucbhelper/content.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
@@ -64,19 +56,19 @@ namespace svx
     //==================================================================
     //------------------------------------------------------------------
     ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew )
-        :ModalDialog( _pParent, SVX_RES(DLG_DOCUMENTLINK) )
-        ,m_aURLLabel        (this, SVX_RES(FT_URL))
-        ,m_aURL             (this, SVX_RES(CMB_URL))
-        ,m_aBrowseFile      (this, SVX_RES(PB_BROWSEFILE))
-        ,m_aNameLabel       (this, SVX_RES(FT_NAME))
-        ,m_aName            (this, SVX_RES(ET_NAME))
-        ,m_aBottomLine      (this, SVX_RES(FL_BOTTOM))
-        ,m_aOK              (this, SVX_RES(BTN_OK))
-        ,m_aCancel          (this, SVX_RES(BTN_CANCEL))
-        ,m_aHelp            (this, SVX_RES(BTN_HELP))
+        :ModalDialog( _pParent, CUI_RES(DLG_DOCUMENTLINK) )
+        ,m_aURLLabel        (this, CUI_RES(FT_URL))
+        ,m_aURL             (this, CUI_RES(CMB_URL))
+        ,m_aBrowseFile      (this, CUI_RES(PB_BROWSEFILE))
+        ,m_aNameLabel       (this, CUI_RES(FT_NAME))
+        ,m_aName            (this, CUI_RES(ET_NAME))
+        ,m_aBottomLine      (this, CUI_RES(FL_BOTTOM))
+        ,m_aOK              (this, CUI_RES(BTN_OK))
+        ,m_aCancel          (this, CUI_RES(BTN_CANCEL))
+        ,m_aHelp            (this, CUI_RES(BTN_HELP))
         ,m_bCreatingNew(_bCreateNew)
     {
-        String sText = String( SVX_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) );
+        String sText = String( CUI_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) );
         SetText(sText);
 
         FreeResource();
@@ -141,7 +133,7 @@ namespace svx
 
         if (!bFileExists)
         {
-            String sMsg = String(SVX_RES(STR_LINKEDDOC_DOESNOTEXIST));
+            String sMsg = String(CUI_RES(STR_LINKEDDOC_DOESNOTEXIST));
             sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText());
             ErrorBox aError(this, WB_OK , sMsg);
             aError.Execute();
@@ -150,7 +142,7 @@ namespace svx
         INetURLObject aURL( sURL );
         if ( aURL.GetProtocol() != INET_PROT_FILE )
         {
-            String sMsg = String(SVX_RES(STR_LINKEDDOC_NO_SYSTEM_FILE));
+            String sMsg = String(CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE));
             sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText());
             ErrorBox aError(this, WB_OK , sMsg);
             aError.Execute();
@@ -162,7 +154,7 @@ namespace svx
         {
             if ( !m_aNameValidator.Call( &sCurrentText ) )
             {
-                String sMsg = String(SVX_RES(STR_NAME_CONFLICT));
+                String sMsg = String(CUI_RES(STR_NAME_CONFLICT));
                 sMsg.SearchAndReplaceAscii("$file$", sCurrentText);
                 InfoBox aError(this, sMsg);
                 aError.Execute();
diff --git a/svx/source/cui/doclinkdialog.hrc b/cui/source/options/doclinkdialog.hrc
index 022c43b6d620..022c43b6d620 100644
--- a/svx/source/cui/doclinkdialog.hrc
+++ b/cui/source/options/doclinkdialog.hrc
diff --git a/svx/source/cui/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 81ec0c34d0c5..81ec0c34d0c5 100644
--- a/svx/source/cui/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
diff --git a/svx/source/cui/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index e4c8ceb3de87..9fe56360b82a 100644
--- a/svx/source/cui/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #ifndef _SVX_DOCLINKDIALOG_HRC_
 #include "doclinkdialog.hrc"
 #endif
diff --git a/svx/source/cui/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9e957ffbb43b..614993aeb91f 100644
--- a/svx/source/cui/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -29,29 +29,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-#ifdef PRECOMPILED
-#include "svxpch.hxx"
-#endif
+#include "precompiled_cui.hxx"
 #include <tools/shl.hxx>
 #include <svtools/ctrltool.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#ifndef _OFA_FONTSUBSTCONFIG_HXX
 #include <svtools/fontsubstconfig.hxx>
-#endif
-#include <svtools/sourceviewconfig.hxx>
-
+#include <unotools/sourceviewconfig.hxx>
 #include "fontsubs.hrc"
 #include "fontsubs.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 /*********************************************************************/
 /*                                                                   */
@@ -65,32 +54,32 @@
 
 SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
                                 const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES(RID_SVX_FONT_SUBSTITUTION), rSet),
-    aUseTableCB         (this,  SVX_RES(CB_USETABLE)),
-    aFont1FT            (this,  SVX_RES(FT_FONT1)),
-    aFont1CB            (this,  SVX_RES(CB_FONT1)),
-    aFont2FT            (this,  SVX_RES(FT_FONT2)),
-    aFont2CB            (this,  SVX_RES(CB_FONT2)),
-    aNewDelTBX          (this,  SVX_RES(TBX_SUBSTNEWDEL)),
-    aCheckLB            (this,  SVX_RES(CLB_SUBSTITUTES)),
-
-    aSourceViewFontsFL (this,  SVX_RES(FL_SOURCEVIEW  )),
-    aFontNameFT        (this,  SVX_RES(FT_FONTNAME    )),
-    aFontNameLB        (this,  SVX_RES(LB_FONTNAME    )),
-    aNonPropFontsOnlyCB(this,  SVX_RES(CB_NONPROP     )),
-    aFontHeightFT      (this,  SVX_RES(FT_FONTHEIGHT  )),
-    aFontHeightLB      (this,  SVX_RES(LB_FONTHEIGHT  )),
-
-    aImageList          (SVX_RES(IL_ICON)),
-
-    sAutomatic          (SVX_RES( STR_AUTOMATIC  )),
+    SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet),
+    aUseTableCB         (this,  CUI_RES(CB_USETABLE)),
+    aFont1FT            (this,  CUI_RES(FT_FONT1)),
+    aFont1CB            (this,  CUI_RES(CB_FONT1)),
+    aFont2FT            (this,  CUI_RES(FT_FONT2)),
+    aFont2CB            (this,  CUI_RES(CB_FONT2)),
+    aNewDelTBX          (this,  CUI_RES(TBX_SUBSTNEWDEL)),
+    aCheckLB            (this,  CUI_RES(CLB_SUBSTITUTES)),
+
+    aSourceViewFontsFL (this,  CUI_RES(FL_SOURCEVIEW  )),
+    aFontNameFT        (this,  CUI_RES(FT_FONTNAME    )),
+    aFontNameLB        (this,  CUI_RES(LB_FONTNAME    )),
+    aNonPropFontsOnlyCB(this,  CUI_RES(CB_NONPROP     )),
+    aFontHeightFT      (this,  CUI_RES(FT_FONTHEIGHT  )),
+    aFontHeightLB      (this,  CUI_RES(LB_FONTHEIGHT  )),
+
+    aImageList          (CUI_RES(IL_ICON)),
+
+    sAutomatic          (CUI_RES( STR_AUTOMATIC  )),
     pConfig(new SvtFontSubstConfig),
-    pSourceViewConfig(new svt::SourceViewConfig),
+    pSourceViewConfig(new utl::SourceViewConfig),
 
-    sHeader1            (SVX_RES( STR_HEADER1       )),
-    sHeader2            (SVX_RES( STR_HEADER2       )),
-    sHeader3            (SVX_RES( STR_HEADER3       )),
-    sHeader4            (SVX_RES( STR_HEADER4       )),
+    sHeader1            (CUI_RES( STR_HEADER1       )),
+    sHeader2            (CUI_RES( STR_HEADER2       )),
+    sHeader3            (CUI_RES( STR_HEADER3       )),
+    sHeader4            (CUI_RES( STR_HEADER4       )),
 
     sFontGroup          ("FontSubstitution"),
     pCheckButtonData(0)
diff --git a/svx/source/cui/fontsubs.hrc b/cui/source/options/fontsubs.hrc
index 9344d41c0fc7..6ef1c7a9047a 100644
--- a/svx/source/cui/fontsubs.hrc
+++ b/cui/source/options/fontsubs.hrc
@@ -30,7 +30,7 @@
 #ifndef _SVX_FONT_SUBSTITUTION
 #define _SVX_FONT_SUBSTITUTION
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 // defines ------------------------------------------------------------------
 
diff --git a/svx/source/cui/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 8032136bdc3d..f14ce19c490b 100644
--- a/svx/source/cui/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -36,6 +36,11 @@
 #include <vcl/toolbox.hxx>
 #include <svtools/ctrlbox.hxx>
 
+namespace utl
+{
+    class SourceViewConfig;
+}
+
 // class SvxFontSubstCheckListBox ------------------------------------------
 
 class SvxFontSubstCheckListBox : public SvxSimpleTable
@@ -88,7 +93,7 @@ class SvxFontSubstTabPage : public SfxTabPage
     String                      sAutomatic;
 
     SvtFontSubstConfig*         pConfig;
-    svt::SourceViewConfig*      pSourceViewConfig;
+    utl::SourceViewConfig*      pSourceViewConfig;
 
     String          sHeader1;
     String          sHeader2;
diff --git a/svx/source/cui/fontsubs.src b/cui/source/options/fontsubs.src
index f3160d2f4808..3400162c6992 100644
--- a/svx/source/cui/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -30,7 +30,6 @@
 
  // include ------------------------------------------------------------------
 
-#include <svx/svxids.hrc>
 #include "fontsubs.hrc"
 #include "helpid.hrc"
 
diff --git a/svx/source/cui/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx
index 43efb498048a..c5e00404ced1 100644
--- a/svx/source/cui/internationaloptions.cxx
+++ b/cui/source/options/internationaloptions.cxx
@@ -29,20 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "internationaloptions.hxx"
-#ifndef _OFFAPP_INTERNATIONALOPTIONS_HRC_
 #include "internationaloptions.hrc"
-#endif
-#include <svtools/eitem.hxx>
-
-#include <svx/dialogs.hrc>
+#include <svl/eitem.hxx>
+#include <cuires.hrc>
 #include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
+#include <svx/dialogs.hrc>
 
 namespace offapp
 {
@@ -68,12 +63,12 @@ namespace offapp
     };
 
     inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) :
-        m_aFL_DefaultTextDirection  ( _pParent, SVX_RES( FL_DEFTXTDIRECTION ) )
-        ,m_aRB_TxtDirLeft2Right     ( _pParent, SVX_RES( RB_TXTDIR_LEFT2RIGHT ) )
-        ,m_aRB_TxtDirRight2Left     ( _pParent, SVX_RES( RB_TXTDIR_RIGHT2LEFT ) )
-        ,m_aFL_SheetView            ( _pParent, SVX_RES( FL_SHEETVIEW ) )
-        ,m_aCB_ShtVwRight2Left      ( _pParent, SVX_RES( CB_SHTVW_RIGHT2LEFT ) )
-        ,m_aCB_ShtVwCurrentDocOnly  ( _pParent, SVX_RES( CB_SHTVW_CURRENTDOCONLY ) )
+        m_aFL_DefaultTextDirection  ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) )
+        ,m_aRB_TxtDirLeft2Right     ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) )
+        ,m_aRB_TxtDirRight2Left     ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) )
+        ,m_aFL_SheetView            ( _pParent, CUI_RES( FL_SHEETVIEW ) )
+        ,m_aCB_ShtVwRight2Left      ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) )
+        ,m_aCB_ShtVwCurrentDocOnly  ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) )
 
         ,m_bEnable_SheetView_Opt    ( FALSE )
     {
@@ -134,7 +129,7 @@ namespace offapp
     }
 
     InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) :
-        SfxTabPage  ( _pParent, SVX_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
+        SfxTabPage  ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
 
         ,m_pImpl    ( new IMPL( this ) )
     {
diff --git a/svx/source/cui/internationaloptions.hrc b/cui/source/options/internationaloptions.hrc
index b367340ba2fe..b367340ba2fe 100644
--- a/svx/source/cui/internationaloptions.hrc
+++ b/cui/source/options/internationaloptions.hrc
diff --git a/svx/source/cui/internationaloptions.src b/cui/source/options/internationaloptions.src
index ab725d9c4f0b..846bb444c9b5 100644
--- a/svx/source/cui/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -30,6 +30,7 @@
 
 #include "internationaloptions.hrc"
 #include "helpid.hrc"
+#include <cuires.hrc>
 #include <svx/dialogs.hrc>
 
 TabPage RID_OFA_TP_INTERNATIONAL
diff --git a/cui/source/options/makefile.mk b/cui/source/options/makefile.mk
new file mode 100755
index 000000000000..b31d70f3e773
--- /dev/null
+++ b/cui/source/options/makefile.mk
@@ -0,0 +1,122 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=options
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=options
+SRC1FILES =  \
+        connpooloptions.src \
+        dbregister.src \
+        doclinkdialog.src \
+        fontsubs.src \
+        internationaloptions.src \
+        optaccessibility.src \
+        optasian.src \
+        optchart.src \
+        optcolor.src \
+        optctl.src \
+        optdict.src \
+        optfltr.src \
+        optgdlg.src \
+        optgenrl.src \
+        opthtml.src \
+        optimprove.src \
+        optinet2.src \
+        optjava.src \
+        optjsearch.src \
+        optlingu.src \
+        optmemory.src \
+        optpath.src \
+        optsave.src \
+        optupdt.src \
+        readonlyimage.src \
+        securityoptions.src \
+        treeopt.src \
+        webconninfo.src \
+
+
+SLOFILES+=\
+        $(SLO)$/cfgchart.obj \
+        $(SLO)$/connpoolconfig.obj \
+        $(SLO)$/connpooloptions.obj \
+        $(SLO)$/connpoolsettings.obj \
+        $(SLO)$/cuisrchdlg.obj \
+        $(SLO)$/dbregister.obj \
+        $(SLO)$/dbregisterednamesconfig.obj \
+        $(SLO)$/dbregistersettings.obj \
+        $(SLO)$/doclinkdialog.obj \
+        $(SLO)$/fontsubs.obj \
+        $(SLO)$/internationaloptions.obj \
+        $(SLO)$/optaccessibility.obj \
+        $(SLO)$/optasian.obj \
+        $(SLO)$/optchart.obj \
+        $(SLO)$/optcolor.obj \
+        $(SLO)$/optctl.obj \
+        $(SLO)$/optdict.obj \
+        $(SLO)$/optfltr.obj \
+        $(SLO)$/optgdlg.obj \
+        $(SLO)$/optgenrl.obj \
+        $(SLO)$/optHeaderTabListbox.obj \
+        $(SLO)$/opthtml.obj \
+        $(SLO)$/optimprove.obj \
+        $(SLO)$/optimprove2.obj \
+        $(SLO)$/optinet2.obj \
+        $(SLO)$/optjava.obj \
+        $(SLO)$/optjsearch.obj \
+        $(SLO)$/optlingu.obj \
+        $(SLO)$/optmemory.obj \
+        $(SLO)$/optpath.obj \
+        $(SLO)$/optsave.obj \
+        $(SLO)$/optupdt.obj \
+        $(SLO)$/radiobtnbox.obj \
+        $(SLO)$/readonlyimage.obj \
+        $(SLO)$/sdbcdriverenum.obj \
+        $(SLO)$/securityoptions.obj \
+        $(SLO)$/treeopt.obj \
+        $(SLO)$/webconninfo.obj \
+
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/svx/source/cui/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 4ffbd122dbab..a3107df7069b 100644
--- a/svx/source/cui/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -29,11 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "optHeaderTabListbox.hxx"
 #include <vcl/svapp.hxx>
 #include <svtools/headbar.hxx>
diff --git a/svx/source/cui/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx
index 26608d9791b8..26608d9791b8 100644
--- a/svx/source/cui/optHeaderTabListbox.hxx
+++ b/cui/source/options/optHeaderTabListbox.hxx
diff --git a/svx/source/cui/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 4f47bbf168ae..3ceacf56d082 100644
--- a/svx/source/cui/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -29,15 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <optaccessibility.hxx>
 #include <optaccessibility.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include <svtools/accessibilityoptions.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
@@ -58,19 +55,19 @@ struct SvxAccessibilityOptionsTabPage_Impl
 };
 
 SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet )
-    :SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
-    ,m_aMiscellaneousLabel      (this, SVX_RES(FL_MISCELLANEOUS     ))
-    ,m_aAccessibilityTool       (this, SVX_RES(CB_ACCESSIBILITY_TOOL    ))
-    ,m_aTextSelectionInReadonly (this, SVX_RES(CB_TEXTSELECTION     ))
-    ,m_aAnimatedGraphics        (this, SVX_RES(CB_ANIMATED_GRAPHICS ))
-    ,m_aAnimatedTexts           (this, SVX_RES(CB_ANIMATED_TEXTS        ))
-    ,m_aTipHelpCB               (this, SVX_RES(CB_TIPHELP               ))
-    ,m_aTipHelpNF               (this, SVX_RES(NF_TIPHELP               ))
-    ,m_aTipHelpFT               (this, SVX_RES(FT_TIPHELP               ))
-    ,m_aHCOptionsLabel          (this, SVX_RES(FL_HC_OPTIONS            ))
-    ,m_aAutoDetectHC            (this, SVX_RES(CB_AUTO_DETECT_HC        ))
-    ,m_aAutomaticFontColor      (this, SVX_RES(CB_AUTOMATIC_FONT_COLOR))
-    ,m_aPagePreviews            (this, SVX_RES(CB_PAGE_PREVIEWS       ))
+    :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
+    ,m_aMiscellaneousLabel      (this, CUI_RES(FL_MISCELLANEOUS     ))
+    ,m_aAccessibilityTool       (this, CUI_RES(CB_ACCESSIBILITY_TOOL    ))
+    ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION     ))
+    ,m_aAnimatedGraphics        (this, CUI_RES(CB_ANIMATED_GRAPHICS ))
+    ,m_aAnimatedTexts           (this, CUI_RES(CB_ANIMATED_TEXTS        ))
+    ,m_aTipHelpCB               (this, CUI_RES(CB_TIPHELP               ))
+    ,m_aTipHelpNF               (this, CUI_RES(NF_TIPHELP               ))
+    ,m_aTipHelpFT               (this, CUI_RES(FT_TIPHELP               ))
+    ,m_aHCOptionsLabel          (this, CUI_RES(FL_HC_OPTIONS            ))
+    ,m_aAutoDetectHC            (this, CUI_RES(CB_AUTO_DETECT_HC        ))
+    ,m_aAutomaticFontColor      (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR))
+    ,m_aPagePreviews            (this, CUI_RES(CB_PAGE_PREVIEWS       ))
     ,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
 {
     FreeResource();
diff --git a/svx/inc/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc
index 248cf16bc96e..248cf16bc96e 100644
--- a/svx/inc/optaccessibility.hrc
+++ b/cui/source/options/optaccessibility.hrc
diff --git a/svx/source/cui/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index ff0eee457c1a..ff0eee457c1a 100644
--- a/svx/source/cui/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
diff --git a/svx/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 676c54f6ee61..ef375fb80117 100644
--- a/svx/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -31,7 +31,7 @@
 #include <optaccessibility.hrc>
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
 {
diff --git a/svx/source/cui/optasian.cxx b/cui/source/options/optasian.cxx
index d96dcdd13c1f..0bbf0ac287bd 100644
--- a/svx/source/cui/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -29,22 +29,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <optasian.hxx>
 #include <svx/langitem.hxx>
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
 #include <optasian.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#ifndef _TABLE_HXX //autogen
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include <tools/table.hxx>
-#endif
 #include <tools/shl.hxx>
-#include <asiancfg.hxx>
+#include <svx/asiancfg.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
@@ -156,23 +151,23 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
 static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
 
 SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
-    aKerningGB(             this, SVX_RES(GB_KERNING            )),
-    aCharKerningRB(         this, SVX_RES(RB_CHAR_KERNING       )),
-    aCharPunctKerningRB(    this, SVX_RES(RB_CHAR_PUNCT     )),
-    aCharDistGB(            this, SVX_RES(GB_CHAR_DIST      )),
-    aNoCompressionRB(       this, SVX_RES(RB_NO_COMP            )),
-    aPunctCompressionRB(    this, SVX_RES(RB_PUNCT_COMP     )),
-     aPunctKanaCompressionRB(this, SVX_RES(RB_PUNCT_KANA_COMP   )),
-    aStartEndGB(            this, SVX_RES(GB_START_END      )),
-    aLanguageFT(            this, SVX_RES(FT_LANGUAGE           )),
-    aLanguageLB(            this, SVX_RES(LB_LANGUAGE           )),
-    aStandardCB(            this, SVX_RES(CB_STANDARD           )),
-    aStartFT(               this, SVX_RES(FT_START          )),
-    aStartED(               this, SVX_RES(ED_START          )),
-    aEndFT(                 this, SVX_RES(FT_END                )),
-    aEndED(                 this, SVX_RES(ED_END                )),
-    aHintFT(                this, SVX_RES(FT_HINT               )),
+    SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
+    aKerningGB(             this, CUI_RES(GB_KERNING            )),
+    aCharKerningRB(         this, CUI_RES(RB_CHAR_KERNING       )),
+    aCharPunctKerningRB(    this, CUI_RES(RB_CHAR_PUNCT     )),
+    aCharDistGB(            this, CUI_RES(GB_CHAR_DIST      )),
+    aNoCompressionRB(       this, CUI_RES(RB_NO_COMP            )),
+    aPunctCompressionRB(    this, CUI_RES(RB_PUNCT_COMP     )),
+     aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP   )),
+    aStartEndGB(            this, CUI_RES(GB_START_END      )),
+    aLanguageFT(            this, CUI_RES(FT_LANGUAGE           )),
+    aLanguageLB(            this, CUI_RES(LB_LANGUAGE           )),
+    aStandardCB(            this, CUI_RES(CB_STANDARD           )),
+    aStartFT(               this, CUI_RES(FT_START          )),
+    aStartED(               this, CUI_RES(ED_START          )),
+    aEndFT(                 this, CUI_RES(FT_END                )),
+    aEndED(                 this, CUI_RES(ED_END                )),
+    aHintFT(                this, CUI_RES(FT_HINT               )),
     pImpl(new SvxAsianLayoutPage_Impl)
 {
     FreeResource();
diff --git a/svx/inc/optasian.hrc b/cui/source/options/optasian.hrc
index 2d9c8a282352..2d9c8a282352 100644
--- a/svx/inc/optasian.hrc
+++ b/cui/source/options/optasian.hrc
diff --git a/svx/source/options/optasian.src b/cui/source/options/optasian.src
index 6a09421fcf2c..f8286ea1186c 100644
--- a/svx/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -31,7 +31,7 @@
 #include <optasian.hrc>
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 TabPage RID_SVXPAGE_ASIAN_LAYOUT
 {
diff --git a/svx/source/cui/optchart.cxx b/cui/source/options/optchart.cxx
index 652c0500a8d9..c32bffe730c9 100644
--- a/svx/source/cui/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -29,18 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/pathoptions.hxx>
-
-#include <svx/dialogs.hrc>
-
+#include "precompiled_cui.hxx"
+#include <unotools/pathoptions.hxx>
+#include <cuires.hrc>
 #include "optchart.hxx"
 #include "optchart.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
+#include <svx/svxids.hrc> // for SID_SCH_EDITOPTIONS
 
 // ====================
 // class ChartColorLB
@@ -63,13 +58,13 @@ void ChartColorLB::FillBox( const SvxChartColorTable & rTab )
 // ====================
 SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
+    SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
 
-    aGbChartColors  ( this, SVX_RES( FL_CHART_COLOR_LIST ) ),
-    aLbChartColors  ( this, SVX_RES( LB_CHART_COLOR_LIST ) ),
-    aGbColorBox     ( this, SVX_RES( FL_COLOR_BOX ) ),
-    aValSetColorBox ( this, SVX_RES( CT_COLOR_BOX ) ),
-    aPBDefault      ( this, SVX_RES( PB_RESET_TO_DEFAULT ) )
+    aGbChartColors  ( this, CUI_RES( FL_CHART_COLOR_LIST ) ),
+    aLbChartColors  ( this, CUI_RES( LB_CHART_COLOR_LIST ) ),
+    aGbColorBox     ( this, CUI_RES( FL_COLOR_BOX ) ),
+    aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ),
+    aPBDefault      ( this, CUI_RES( PB_RESET_TO_DEFAULT ) )
 {
     FreeResource();
 
diff --git a/svx/source/inc/optchart.hrc b/cui/source/options/optchart.hrc
index ac42f857f8ea..ac42f857f8ea 100644
--- a/svx/source/inc/optchart.hrc
+++ b/cui/source/options/optchart.hrc
diff --git a/svx/source/cui/optchart.hxx b/cui/source/options/optchart.hxx
index 9316d2a8ea85..9316d2a8ea85 100644
--- a/svx/source/cui/optchart.hxx
+++ b/cui/source/options/optchart.hxx
diff --git a/svx/source/options/optchart.src b/cui/source/options/optchart.src
index bab97295d291..1008f5383a11 100644
--- a/svx/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include "optchart.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
 // tab page for setting the default colors used for new charts
diff --git a/svx/source/cui/optcolor.cxx b/cui/source/options/optcolor.cxx
index e20c2284314c..6d451c53cab9 100644
--- a/svx/source/cui/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <svtools/colorcfg.hxx>
@@ -42,23 +38,18 @@
 #include <svtools/ctrlbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <svx/xtable.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <boost/shared_ptr.hpp>
-//CHINA001 #ifndef _SVX_DLG_NAME_HXX
-//CHINA001 #include <dlgname.hxx>
-//CHINA001 #endif
-#include <svx/svxdlg.hxx> //CHINA001
-#ifndef _SVX_HELPID_HRC
+#include <svx/svxdlg.hxx>
 #include <helpid.hrc>
-#endif
-#include <svx/svxids.hrc>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "optcolor.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optcolor.hrc"
-#include "dlgutil.hxx"
+#include <svx/dlgutil.hxx>
+
 using namespace ::com::sun::star;
 using namespace ::svtools;
 
@@ -1443,17 +1434,17 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
  ---------------------------------------------------------------------------*/
 SvxColorOptionsTabPage::SvxColorOptionsTabPage(
     Window* pParent, const SfxItemSet& rCoreSet) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ),
-       aColorSchemeFL(  this, SVX_RES( FL_COLORSCHEME ) ),
-       aColorSchemeFT(  this, SVX_RES( FT_COLORSCHEME ) ),
-       aColorSchemeLB(  this, SVX_RES( LB_COLORSCHEME ) ),
-       aSaveSchemePB(   this, SVX_RES( PB_SAVESCHEME) ),
-       aDeleteSchemePB( this, SVX_RES( PB_DELETESCHEME ) ),
-       aCustomColorsFL( this, SVX_RES( FL_CUSTOMCOLORS ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ),
+       aColorSchemeFL(  this, CUI_RES( FL_COLORSCHEME ) ),
+       aColorSchemeFT(  this, CUI_RES( FT_COLORSCHEME ) ),
+       aColorSchemeLB(  this, CUI_RES( LB_COLORSCHEME ) ),
+       aSaveSchemePB(   this, CUI_RES( PB_SAVESCHEME) ),
+       aDeleteSchemePB( this, CUI_RES( PB_DELETESCHEME ) ),
+       aCustomColorsFL( this, CUI_RES( FL_CUSTOMCOLORS ) ),
        bFillItemSetCalled(FALSE),
        pColorConfig(0),
        pExtColorConfig(0),
-       pColorConfigCT(  new ColorConfigCtrl_Impl(this, SVX_RES( CT_COLORCONFIG ) ))
+       pColorConfigCT(  new ColorConfigCtrl_Impl(this, CUI_RES( CT_COLORCONFIG ) ))
 {
     FreeResource();
     aColorSchemeLB.SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
@@ -1582,14 +1573,14 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
         String sName;
         //CHINA001 SvxNameDialog aNameDlg(pButton,
         //CHINA001                     sName,
-        //CHINA001                     String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)));
+        //CHINA001                     String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)));
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
         AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton,
-                            sName, String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)), RID_SVXDLG_NAME );
+                            sName, String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)) );
         DBG_ASSERT(aNameDlg, "Dialogdiet fail!");//CHINA001
         aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
-        aNameDlg->SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
+        aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
         aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME);
         aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME);
         aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
@@ -1607,8 +1598,8 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
     else
     {
         DBG_ASSERT(aColorSchemeLB.GetEntryCount() > 1, "don't delete the last scheme");
-        QueryBox aQuery(pButton, SVX_RES(RID_SVXQB_DELETE_COLOR_CONFIG));
-        aQuery.SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)));
+        QueryBox aQuery(pButton, CUI_RES(RID_SVXQB_DELETE_COLOR_CONFIG));
+        aQuery.SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)));
         if(RET_YES == aQuery.Execute())
         {
             rtl::OUString sDeleteScheme(aColorSchemeLB.GetSelectEntry());
diff --git a/svx/inc/optcolor.hrc b/cui/source/options/optcolor.hrc
index 06730cf196c0..06730cf196c0 100644
--- a/svx/inc/optcolor.hrc
+++ b/cui/source/options/optcolor.hrc
diff --git a/svx/source/cui/optcolor.hxx b/cui/source/options/optcolor.hxx
index c50062f15366..c50062f15366 100644
--- a/svx/source/cui/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
diff --git a/svx/source/options/optcolor.src b/cui/source/options/optcolor.src
index 593439807c14..9f3b42e0be30 100644
--- a/svx/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -30,7 +30,7 @@
  // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optcolor.hrc"
  // pragma ----------------------------------------------------------------
 
diff --git a/svx/source/cui/optctl.cxx b/cui/source/options/optctl.cxx
index a2a2b2cc461c..199fcc38090b 100644
--- a/svx/source/cui/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -29,21 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 #include "optctl.hxx"
-#include <svx/dialmgr.hxx>
-
-#ifndef _SVX_OPTCTL_HRC
+#include <dialmgr.hxx>
 #include "optctl.hrc"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svtools/ctloptions.hxx>
+#include <cuires.hrc>
+#include <svl/ctloptions.hxx>
 
 // class SvxCTLOptionsPage -----------------------------------------------------
 
@@ -63,19 +54,19 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG )
 
 SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
-
-    m_aSequenceCheckingFL   ( this, SVX_RES( FL_SEQUENCECHECKING ) ),
-    m_aSequenceCheckingCB   ( this, SVX_RES( CB_SEQUENCECHECKING ) ),
-    m_aRestrictedCB         ( this, SVX_RES( CB_RESTRICTED ) ),
-    m_aTypeReplaceCB        ( this, SVX_RES( CB_TYPE_REPLACE ) ),
-    m_aCursorControlFL      ( this, SVX_RES( FL_CURSORCONTROL ) ),
-    m_aMovementFT           ( this, SVX_RES( FT_MOVEMENT ) ),
-    m_aMovementLogicalRB    ( this, SVX_RES( RB_MOVEMENT_LOGICAL ) ),
-    m_aMovementVisualRB     ( this, SVX_RES( RB_MOVEMENT_VISUAL ) ),
-    m_aGeneralFL            ( this, SVX_RES( FL_GENERAL ) ),
-    m_aNumeralsFT           ( this, SVX_RES( FT_NUMERALS ) ),
-    m_aNumeralsLB           ( this, SVX_RES( LB_NUMERALS ) )
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
+
+    m_aSequenceCheckingFL   ( this, CUI_RES( FL_SEQUENCECHECKING ) ),
+    m_aSequenceCheckingCB   ( this, CUI_RES( CB_SEQUENCECHECKING ) ),
+    m_aRestrictedCB         ( this, CUI_RES( CB_RESTRICTED ) ),
+    m_aTypeReplaceCB        ( this, CUI_RES( CB_TYPE_REPLACE ) ),
+    m_aCursorControlFL      ( this, CUI_RES( FL_CURSORCONTROL ) ),
+    m_aMovementFT           ( this, CUI_RES( FT_MOVEMENT ) ),
+    m_aMovementLogicalRB    ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ),
+    m_aMovementVisualRB     ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ),
+    m_aGeneralFL            ( this, CUI_RES( FL_GENERAL ) ),
+    m_aNumeralsFT           ( this, CUI_RES( FT_NUMERALS ) ),
+    m_aNumeralsLB           ( this, CUI_RES( LB_NUMERALS ) )
 
 {
     FreeResource();
diff --git a/svx/inc/optctl.hrc b/cui/source/options/optctl.hrc
index 4897926f610c..4897926f610c 100644
--- a/svx/inc/optctl.hrc
+++ b/cui/source/options/optctl.hrc
diff --git a/svx/source/cui/optctl.hxx b/cui/source/options/optctl.hxx
index 0dae0e24f180..0dae0e24f180 100644
--- a/svx/source/cui/optctl.hxx
+++ b/cui/source/options/optctl.hxx
diff --git a/svx/source/options/optctl.src b/cui/source/options/optctl.src
index 2cf9ad051f67..f750264a1df1 100644
--- a/svx/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -30,7 +30,7 @@
 
 #include "optctl.hrc"
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 #include <sfx2/sfx.hrc>
 
diff --git a/svx/source/cui/optdict.cxx b/cui/source/options/optdict.cxx
index 88674c141b36..e56089dd351e 100644
--- a/svx/source/cui/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -29,41 +29,29 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
-
-
-#include <unolingu.hxx>
-#include <dlgutil.hxx>
+#include <svx/unolingu.hxx>
+#include <svx/dlgutil.hxx>
 #include <sfx2/sfxuno.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <unotools/intlwrapper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
+#include <svx/dialogs.hrc>
 
 #define _SVX_OPTDICT_CXX
 
-#ifndef _LINGUISTIC_MISC_HHX_
 #include <linguistic/misc.hxx>
-#endif
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optdict.hrc"
-
-
-
 #include "optdict.hxx"
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
+#include <dialmgr.hxx>
+#include <svx/svxerr.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -114,17 +102,17 @@ static CDE_RESULT cmpDicEntry_Impl( const String &rText1, const String &rText2 )
 SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
         Reference< XSpellChecker1 >  &xSpl ) :
 
-    ModalDialog( pParent, SVX_RES( RID_SFXDLG_NEWDICT ) ),
-
-    aNameText       ( this, SVX_RES( FT_DICTNAME ) ),
-    aNameEdit       ( this, SVX_RES( ED_DICTNAME ) ),
-    aLanguageText   ( this, SVX_RES( FT_DICTLANG ) ),
-    aLanguageLB     ( this, SVX_RES( LB_DICTLANG ) ),
-    aExceptBtn      ( this, SVX_RES( BTN_EXCEPT ) ),
-    aNewDictBox     ( this, SVX_RES( GB_NEWDICT ) ),
-    aOKBtn          ( this, SVX_RES( BTN_NEWDICT_OK ) ),
-    aCancelBtn      ( this, SVX_RES( BTN_NEWDICT_ESC ) ),
-    aHelpBtn        ( this, SVX_RES( BTN_NEWDICT_HLP ) ),
+    ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ),
+
+    aNameText       ( this, CUI_RES( FT_DICTNAME ) ),
+    aNameEdit       ( this, CUI_RES( ED_DICTNAME ) ),
+    aLanguageText   ( this, CUI_RES( FT_DICTLANG ) ),
+    aLanguageLB     ( this, CUI_RES( LB_DICTLANG ) ),
+    aExceptBtn      ( this, CUI_RES( BTN_EXCEPT ) ),
+    aNewDictBox     ( this, CUI_RES( GB_NEWDICT ) ),
+    aOKBtn          ( this, CUI_RES( BTN_NEWDICT_OK ) ),
+    aCancelBtn      ( this, CUI_RES( BTN_NEWDICT_ESC ) ),
+    aHelpBtn        ( this, CUI_RES( BTN_NEWDICT_HLP ) ),
     xSpell( xSpl )
 {
     // Handler installieren
@@ -165,7 +153,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
     if ( bFound )
     {
         // Doppelte Namen?
-        InfoBox( this, SVX_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
+        InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
         aNameEdit.GrabFocus();
         return 0;
     }
@@ -192,7 +180,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
 
         // Fehler: konnte neues W"orterbuch nicht anlegen
         SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, String(),
-            this, RID_SVXERRCTX, &DIALOG_MGR() );
+            this, RID_SVXERRCTX, &CUI_MGR() );
         ErrorHandler::HandleError( *new StringErrorInfo(
                 ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
 
@@ -238,23 +226,23 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
             const String& rName,
             Reference< XSpellChecker1 >  &xSpl ) :
 
-    ModalDialog( pParent, SVX_RES( RID_SFXDLG_EDITDICT ) ),
-
-    aBookFT         ( this, SVX_RES( FT_BOOK ) ),
-    aAllDictsLB     ( this, SVX_RES( LB_ALLDICTS ) ),
-    aLangFT         ( this, SVX_RES( FT_DICTLANG ) ),
-    aLangLB         ( this, SVX_RES( LB_DICTLANG ) ),
-    aWordFT         ( this, SVX_RES( FT_WORD ) ),
-    aWordED         ( this, SVX_RES( ED_WORD ) ),
-    aReplaceFT      ( this, SVX_RES( FT_REPLACE ) ),
-    aReplaceED      ( this, SVX_RES( ED_REPLACE ) ),
-    aWordsLB        ( this, SVX_RES( TLB_REPLACE ) ),
-    aNewReplacePB   ( this, SVX_RES( PB_NEW_REPLACE ) ),
-    aDeletePB       ( this, SVX_RES( PB_DELETE_REPLACE ) ),
-    aEditDictsBox   ( this, SVX_RES( GB_EDITDICTS ) ),
-    aCloseBtn       ( this, SVX_RES( BTN_EDITCLOSE ) ),
-    aHelpBtn        ( this, SVX_RES( BTN_EDITHELP ) ),
-    sModify         (SVX_RES(STR_MODIFY)),
+    ModalDialog( pParent, CUI_RES( RID_SFXDLG_EDITDICT ) ),
+
+    aBookFT         ( this, CUI_RES( FT_BOOK ) ),
+    aAllDictsLB     ( this, CUI_RES( LB_ALLDICTS ) ),
+    aLangFT         ( this, CUI_RES( FT_DICTLANG ) ),
+    aLangLB         ( this, CUI_RES( LB_DICTLANG ) ),
+    aWordFT         ( this, CUI_RES( FT_WORD ) ),
+    aWordED         ( this, CUI_RES( ED_WORD ) ),
+    aReplaceFT      ( this, CUI_RES( FT_REPLACE ) ),
+    aReplaceED      ( this, CUI_RES( ED_REPLACE ) ),
+    aWordsLB        ( this, CUI_RES( TLB_REPLACE ) ),
+    aNewReplacePB   ( this, CUI_RES( PB_NEW_REPLACE ) ),
+    aDeletePB       ( this, CUI_RES( PB_DELETE_REPLACE ) ),
+    aEditDictsBox   ( this, CUI_RES( GB_EDITDICTS ) ),
+    aCloseBtn       ( this, CUI_RES( BTN_EDITCLOSE ) ),
+    aHelpBtn        ( this, CUI_RES( BTN_EDITHELP ) ),
+    sModify         (CUI_RES(STR_MODIFY)),
     sNew            (aNewReplacePB.GetText()),
     aDecoView       ( this),
     xSpell          ( xSpl ),
@@ -471,7 +459,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox *, EMPTYARG )
 
     if ( nLang != nOldLang )
     {
-        QueryBox aBox( this, SVX_RES( RID_SFXQB_SET_LANGUAGE ) );
+        QueryBox aBox( this, CUI_RES( RID_SFXQB_SET_LANGUAGE ) );
         String sTxt( aBox.GetMessText() );
         sTxt.SearchAndReplaceAscii( "%1", aAllDictsLB.GetSelectEntry() );
         aBox.SetMessText( sTxt );
diff --git a/svx/source/inc/optdict.hrc b/cui/source/options/optdict.hrc
index af9e9302d7d5..af9e9302d7d5 100644
--- a/svx/source/inc/optdict.hrc
+++ b/cui/source/options/optdict.hrc
diff --git a/svx/source/options/optdict.src b/cui/source/options/optdict.src
index 740853410a61..589f73b4f46b 100644
--- a/svx/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -30,7 +30,7 @@
  // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optdict.hrc"
  // pragma ----------------------------------------------------------------
 
diff --git a/svx/source/cui/optfltr.cxx b/cui/source/options/optfltr.cxx
index d6c838a13314..feb38daff447 100644
--- a/svx/source/cui/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -29,21 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
-#include <svtools/moduleoptions.hxx>
-
-#include <svtools/fltrcfg.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/fltrcfg.hxx>
 #include "optfltr.hxx"
 #include "optfltr.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 enum MSFltrPg2_CheckBoxEntries {
     Math,
@@ -59,17 +54,17 @@ enum MSFltrPg2_CheckBoxEntries {
 // -----------------------------------------------------------------------
 
 OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
-    aMSWordGB       ( this, SVX_RES( GB_WORD        ) ),
-    aWBasicCodeCB   ( this, SVX_RES( CB_WBAS_CODE ) ),
-    aWBasicStgCB    ( this, SVX_RES( CB_WBAS_STG  ) ),
-    aMSExcelGB      ( this, SVX_RES( GB_EXCEL     ) ),
-    aEBasicCodeCB   ( this, SVX_RES( CB_EBAS_CODE ) ),
-    aEBasicExectblCB( this, SVX_RES( CB_EBAS_EXECTBL ) ),
-    aEBasicStgCB    ( this, SVX_RES( CB_EBAS_STG  ) ),
-    aMSPPointGB     ( this, SVX_RES( GB_PPOINT    ) ),
-    aPBasicCodeCB   ( this, SVX_RES( CB_PBAS_CODE ) ),
-    aPBasicStgCB    ( this, SVX_RES( CB_PBAS_STG  ) )
+    : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
+    aMSWordGB       ( this, CUI_RES( GB_WORD        ) ),
+    aWBasicCodeCB   ( this, CUI_RES( CB_WBAS_CODE ) ),
+    aWBasicStgCB    ( this, CUI_RES( CB_WBAS_STG  ) ),
+    aMSExcelGB      ( this, CUI_RES( GB_EXCEL     ) ),
+    aEBasicCodeCB   ( this, CUI_RES( CB_EBAS_CODE ) ),
+    aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ),
+    aEBasicStgCB    ( this, CUI_RES( CB_EBAS_STG  ) ),
+    aMSPPointGB     ( this, CUI_RES( GB_PPOINT    ) ),
+    aPBasicCodeCB   ( this, CUI_RES( CB_PBAS_CODE ) ),
+    aPBasicStgCB    ( this, CUI_RES( CB_PBAS_STG  ) )
 {
     FreeResource();
 
@@ -150,16 +145,16 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
  * --------------------------------------------------*/
 OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
                                         const SfxItemSet& rSet )
-    : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
-    aCheckLB            ( this, SVX_RES( CLB_SETTINGS   )),
-    aHeader1FT          ( this, SVX_RES( FT_HEADER1_EXPLANATION )),
-    aHeader2FT          ( this, SVX_RES( FT_HEADER2_EXPLANATION )),
-    sHeader1            ( SVX_RES( ST_HEADER1 )),
-    sHeader2            ( SVX_RES( ST_HEADER2 )),
-    sChgToFromMath      ( SVX_RES( ST_CHG_MATH  )),
-    sChgToFromWriter    ( SVX_RES( ST_CHG_WRITER )),
-    sChgToFromCalc      ( SVX_RES( ST_CHG_CALC )),
-    sChgToFromImpress   ( SVX_RES( ST_CHG_IMPRESS )),
+    : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
+    aCheckLB            ( this, CUI_RES( CLB_SETTINGS   )),
+    aHeader1FT          ( this, CUI_RES( FT_HEADER1_EXPLANATION )),
+    aHeader2FT          ( this, CUI_RES( FT_HEADER2_EXPLANATION )),
+    sHeader1            ( CUI_RES( ST_HEADER1 )),
+    sHeader2            ( CUI_RES( ST_HEADER2 )),
+    sChgToFromMath      ( CUI_RES( ST_CHG_MATH  )),
+    sChgToFromWriter    ( CUI_RES( ST_CHG_WRITER )),
+    sChgToFromCalc      ( CUI_RES( ST_CHG_CALC )),
+    sChgToFromImpress   ( CUI_RES( ST_CHG_IMPRESS )),
     pCheckButtonData(0)
 {
     FreeResource();
diff --git a/svx/source/cui/optfltr.hrc b/cui/source/options/optfltr.hrc
index dad722916860..dad722916860 100644
--- a/svx/source/cui/optfltr.hrc
+++ b/cui/source/options/optfltr.hrc
diff --git a/svx/source/cui/optfltr.hxx b/cui/source/options/optfltr.hxx
index 6f8c975098db..6f8c975098db 100644
--- a/svx/source/cui/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
diff --git a/svx/source/cui/optfltr.src b/cui/source/options/optfltr.src
index 9e932406b265..a03a3bc1cc9c 100644
--- a/svx/source/cui/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -29,7 +29,7 @@
  ************************************************************************/
  // include -----------------------------------------------------------------
 #include "optfltr.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
  // pragma ------------------------------------------------------------------
 
 // RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
diff --git a/svx/source/cui/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9a53de6bea72..656eca17fd22 100644
--- a/svx/source/cui/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -29,16 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/zforlist.hxx>
+#include "precompiled_cui.hxx"
+#include <svl/zforlist.hxx>
 #include <goodies/grfmgr.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/szitem.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svl/szitem.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/imgmgr.hxx>
@@ -46,50 +43,41 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/cacheoptions.hxx>
-#include <svtools/fontoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/cacheoptions.hxx>
+#include <unotools/fontoptions.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <unotools/startoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/printwarningoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/printwarningoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include <svtools/helpopt.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <unotools/configitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <comphelper/types.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <svtools/langtab.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/configmgr.hxx>
 #include "cuioptgenrl.hxx"
 #include "optpath.hxx"
 #include "optsave.hxx"
-#include <svx/optlingu.hxx>
+#include "optlingu.hxx"
 #include <svx/xpool.hxx>
-#include "dlgutil.hxx"
-#ifndef _SVX_TAB_AREA_HXX
+#include <svx/dlgutil.hxx>
 #include "cuitabarea.hxx"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include "unolingu.hxx"
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
+#include <cuires.hrc>
+#include <svx/unolingu.hxx>
 #include <svx/langitem.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <rtl/ustrbuf.hxx>
 
 
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <svtools/helpopt.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -109,7 +97,7 @@
 
 #include "optgdlg.hrc"
 #include "optgdlg.hxx"
-#include "ofaitem.hxx"
+#include <svx/ofaitem.hxx>
 #include <svtools/apearcfg.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 
@@ -206,26 +194,26 @@ namespace
 
 OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( OFA_TP_MISC ), rSet ),
-
-    aHelpFL             ( this, SVX_RES( FL_HELP ) ),
-    aToolTipsCB         ( this, SVX_RES( CB_TOOLTIP ) ),
-    aExtHelpCB          ( this, SVX_RES( CB_EXTHELP ) ),
-    aHelpAgentCB        ( this, SVX_RES( CB_HELPAGENT ) ),
-    aHelpAgentResetBtn  ( this, SVX_RES( PB_HELPAGENT_RESET ) ),
-    aHelpFormatFT       ( this, SVX_RES( FT_HELPFORMAT ) ),
-    aHelpFormatLB       ( this, SVX_RES( LB_HELPFORMAT ) ),
-    aFileDlgFL          ( this, SVX_RES( FL_FILEDLG ) ),
-    aFileDlgROImage     ( this, SVX_RES( FI_FILEDLG_RO ) ),
-    aFileDlgCB          ( this, SVX_RES( CB_FILEDLG ) ),
-    aPrintDlgFL         ( this, SVX_RES( FL_PRINTDLG ) ),
-    aPrintDlgCB         ( this, SVX_RES( CB_PRINTDLG ) ),
-    aDocStatusFL        ( this, SVX_RES( FL_DOCSTATUS ) ),
-    aDocStatusCB        ( this, SVX_RES( CB_DOCSTATUS ) ),
-    aTwoFigureFL        ( this, SVX_RES( FL_TWOFIGURE ) ),
-    aInterpretFT        ( this, SVX_RES( FT_INTERPRET ) ),
-    aYearValueField     ( this, SVX_RES( NF_YEARVALUE ) ),
-    aToYearFT           ( this, SVX_RES( FT_TOYEAR ) )
+    SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ),
+
+    aHelpFL             ( this, CUI_RES( FL_HELP ) ),
+    aToolTipsCB         ( this, CUI_RES( CB_TOOLTIP ) ),
+    aExtHelpCB          ( this, CUI_RES( CB_EXTHELP ) ),
+    aHelpAgentCB        ( this, CUI_RES( CB_HELPAGENT ) ),
+    aHelpAgentResetBtn  ( this, CUI_RES( PB_HELPAGENT_RESET ) ),
+    aHelpFormatFT       ( this, CUI_RES( FT_HELPFORMAT ) ),
+    aHelpFormatLB       ( this, CUI_RES( LB_HELPFORMAT ) ),
+    aFileDlgFL          ( this, CUI_RES( FL_FILEDLG ) ),
+    aFileDlgROImage     ( this, CUI_RES( FI_FILEDLG_RO ) ),
+    aFileDlgCB          ( this, CUI_RES( CB_FILEDLG ) ),
+    aPrintDlgFL         ( this, CUI_RES( FL_PRINTDLG ) ),
+    aPrintDlgCB         ( this, CUI_RES( CB_PRINTDLG ) ),
+    aDocStatusFL        ( this, CUI_RES( FL_DOCSTATUS ) ),
+    aDocStatusCB        ( this, CUI_RES( CB_DOCSTATUS ) ),
+    aTwoFigureFL        ( this, CUI_RES( FL_TWOFIGURE ) ),
+    aInterpretFT        ( this, CUI_RES( FT_INTERPRET ) ),
+    aYearValueField     ( this, CUI_RES( NF_YEARVALUE ) ),
+    aToYearFT           ( this, CUI_RES( FT_TOYEAR ) )
 
 {
     FreeResource();
@@ -673,40 +661,40 @@ void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const
 
 OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( OFA_TP_VIEW ), rSet ),
+    SfxTabPage( pParent, CUI_RES( OFA_TP_VIEW ), rSet ),
 
-    aUserInterfaceFL    ( this, SVX_RES( FL_USERINTERFACE ) ),
-    aWindowSizeFT       ( this, SVX_RES( FT_WINDOWSIZE ) ),
-    aWindowSizeMF       ( this, SVX_RES( MF_WINDOWSIZE ) ),
-    aIconSizeStyleFT    ( this, SVX_RES( FT_ICONSIZESTYLE ) ),
-    aIconSizeLB              ( this, SVX_RES( LB_ICONSIZE ) ),
-    aIconStyleLB        ( this, SVX_RES( LB_ICONSTYLE ) ),
-    m_aSystemFont               (this, SVX_RES( CB_SYSTEM_FONT ) ),
+    aUserInterfaceFL    ( this, CUI_RES( FL_USERINTERFACE ) ),
+    aWindowSizeFT       ( this, CUI_RES( FT_WINDOWSIZE ) ),
+    aWindowSizeMF       ( this, CUI_RES( MF_WINDOWSIZE ) ),
+    aIconSizeStyleFT    ( this, CUI_RES( FT_ICONSIZESTYLE ) ),
+    aIconSizeLB              ( this, CUI_RES( LB_ICONSIZE ) ),
+    aIconStyleLB        ( this, CUI_RES( LB_ICONSTYLE ) ),
+    m_aSystemFont               (this, CUI_RES( CB_SYSTEM_FONT ) ),
 #if defined( UNX )
-    aFontAntiAliasing   ( this, SVX_RES( CB_FONTANTIALIASING )),
-    aAAPointLimitLabel  ( this, SVX_RES( FT_POINTLIMIT_LABEL )),
-    aAAPointLimit       ( this, SVX_RES( NF_AA_POINTLIMIT )),
-    aAAPointLimitUnits  ( this, SVX_RES( FT_POINTLIMIT_UNIT )),
+    aFontAntiAliasing   ( this, CUI_RES( CB_FONTANTIALIASING )),
+    aAAPointLimitLabel  ( this, CUI_RES( FT_POINTLIMIT_LABEL )),
+    aAAPointLimit       ( this, CUI_RES( NF_AA_POINTLIMIT )),
+    aAAPointLimitUnits  ( this, CUI_RES( FT_POINTLIMIT_UNIT )),
 #endif
-    aMenuFL             ( this, SVX_RES( FL_MENU ) ),
-    aMenuIconsFT        ( this, SVX_RES( FT_MENU_ICONS )),
-    aMenuIconsLB        ( this, SVX_RES( LB_MENU_ICONS )),
-    aFontListsFL        ( this, SVX_RES( FL_FONTLISTS) ),
-    aFontShowCB         ( this, SVX_RES( CB_FONT_SHOW ) ),
-    aFontHistoryCB      ( this, SVX_RES( CB_FONT_HISTORY ) ),
-    aRenderingFL        ( this, SVX_RES( FL_RENDERING ) ),
-    aUseHardwareAccell  ( this, SVX_RES( CB_USE_HARDACCELL ) ),
-    aUseAntiAliase      ( this, SVX_RES( CB_USE_ANTIALIASE ) ),
-    aMouseFL            ( this, SVX_RES( FL_MOUSE ) ),
-    aMousePosFT         ( this, SVX_RES( FT_MOUSEPOS ) ),
-    aMousePosLB         ( this, SVX_RES( LB_MOUSEPOS ) ),
-    aMouseMiddleFT      ( this, SVX_RES( FT_MOUSEMIDDLE ) ),
-    aMouseMiddleLB      ( this, SVX_RES( LB_MOUSEMIDDLE ) ),
+    aMenuFL             ( this, CUI_RES( FL_MENU ) ),
+    aMenuIconsFT        ( this, CUI_RES( FT_MENU_ICONS )),
+    aMenuIconsLB        ( this, CUI_RES( LB_MENU_ICONS )),
+    aFontListsFL        ( this, CUI_RES( FL_FONTLISTS) ),
+    aFontShowCB         ( this, CUI_RES( CB_FONT_SHOW ) ),
+    aFontHistoryCB      ( this, CUI_RES( CB_FONT_HISTORY ) ),
+    aRenderingFL        ( this, CUI_RES( FL_RENDERING ) ),
+    aUseHardwareAccell  ( this, CUI_RES( CB_USE_HARDACCELL ) ),
+    aUseAntiAliase      ( this, CUI_RES( CB_USE_ANTIALIASE ) ),
+    aMouseFL            ( this, CUI_RES( FL_MOUSE ) ),
+    aMousePosFT         ( this, CUI_RES( FT_MOUSEPOS ) ),
+    aMousePosLB         ( this, CUI_RES( LB_MOUSEPOS ) ),
+    aMouseMiddleFT      ( this, CUI_RES( FT_MOUSEMIDDLE ) ),
+    aMouseMiddleLB      ( this, CUI_RES( LB_MOUSEMIDDLE ) ),
 
     // #i97672#
-    maSelectionFL(this, SVX_RES(FL_SELECTION)),
-    maSelectionCB(this, SVX_RES(CB_SELECTION)),
-    maSelectionMF(this, SVX_RES(MF_SELECTION)),
+    maSelectionFL(this, CUI_RES(FL_SELECTION)),
+    maSelectionCB(this, CUI_RES(CB_SELECTION)),
+    maSelectionMF(this, CUI_RES(MF_SELECTION)),
 
     nSizeLB_InitialSelection(0),
     nStyleLB_InitialSelection(0),
@@ -756,7 +744,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     };
 
     // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos)
-    CheckBox* pFontAntiAliasing = new CheckBox( this, SVX_RES( CB_FONTANTIALIASING ) );
+    CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) );
     sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y();
     DELETEZ( pFontAntiAliasing );
 
@@ -781,6 +769,30 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
         m_aSystemFont.Enable( FALSE );
     }
 
+    const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings();
+
+    // remove non-installed icon themes
+    if( aIconStyleLB.GetEntryCount() == STYLE_SYMBOLS_THEMES_MAX )
+    {
+        // do not check 0th item == auto; it is not a real theme
+        aIconStyleItemId[0] = 0;
+        ULONG nItem = 1;
+        for ( ULONG n=0; ++n < STYLE_SYMBOLS_THEMES_MAX; )
+        {
+            if ( aStyleSettings.CheckSymbolStyle( n ) )
+            {
+                // existing style => save the item id
+                aIconStyleItemId[n] = nItem++;
+            }
+            else
+            {
+                // non-existing style => remove item;
+                aIconStyleLB.RemoveEntry( nItem );
+                aIconStyleItemId[n] = 0;
+            }
+        }
+    }
+
     // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)'
     if( aIconStyleLB.GetEntryCount() > 1 )
     {
@@ -788,19 +800,14 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
         aAutoStr += ::rtl::OUString::createFromAscii( " (" );
 
-        switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
-        {
-            case STYLE_SYMBOLS_DEFAULT:     aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
-            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
-            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
-            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
-            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
-            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
-        }
+        ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
+        if ( aIconStyleItemId[nAutoStyle] )
+            aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
 
         aIconStyleLB.RemoveEntry( 0 );
         aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString::createFromAscii( ")" ), 0 );
-        aIconStyleLB.SetSeparatorPos( aIconStyleLB.GetEntryCount() - 2 );
+        // separate auto and other icon themes
+        aIconStyleLB.SetSeparatorPos( 0 );
     }
 }
 
@@ -879,20 +886,16 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
     UINT16 nStyleLB_NewSelection = aIconStyleLB.GetSelectEntryPos();
     if( nStyleLB_InitialSelection != nStyleLB_NewSelection )
     {
-        sal_Int16 eSet = SFX_SYMBOLS_STYLE_AUTO;
-        switch( nStyleLB_NewSelection )
+        // find the style name in the aIconStyleItemId table
+        // items from the non-installed icon themes were removed
+        for ( ULONG n=0; n < STYLE_SYMBOLS_THEMES_MAX; n++ )
         {
-            case 0: eSet = SFX_SYMBOLS_STYLE_AUTO;       break;
-            case 1: eSet = SFX_SYMBOLS_STYLE_DEFAULT;    break;
-            case 2: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
-            case 3: eSet = SFX_SYMBOLS_STYLE_INDUSTRIAL; break;
-            case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL;    break;
-            case 5: eSet = SFX_SYMBOLS_STYLE_TANGO;      break;
-            case 6: eSet = SFX_SYMBOLS_STYLE_CLASSIC;    break;
-            default:
-                DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" );
+            if ( aIconStyleItemId[n] == nStyleLB_NewSelection )
+            {
+                aMiscOptions.SetSymbolsStyle( n );
+                n = STYLE_SYMBOLS_THEMES_MAX;
+            }
         }
-        aMiscOptions.SetSymbolsStyle( eSet );
     }
 
     BOOL bAppearanceChanged = FALSE;
@@ -1063,19 +1066,8 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
     aIconSizeLB.SelectEntryPos( nSizeLB_InitialSelection );
     aIconSizeLB.SaveValue();
 
-    if( aMiscOptions.GetSymbolsStyle() != SFX_SYMBOLS_STYLE_AUTO )
-    {
-        switch ( aMiscOptions.GetCurrentSymbolsStyle() )
-        {
-            case SFX_SYMBOLS_STYLE_DEFAULT:    nStyleLB_InitialSelection = 1; break;
-            case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 2; break;
-            case SFX_SYMBOLS_STYLE_INDUSTRIAL: nStyleLB_InitialSelection = 3; break;
-            case SFX_SYMBOLS_STYLE_CRYSTAL:    nStyleLB_InitialSelection = 4; break;
-            case SFX_SYMBOLS_STYLE_TANGO:      nStyleLB_InitialSelection = 5; break;
-            case SFX_SYMBOLS_STYLE_CLASSIC:    nStyleLB_InitialSelection = 6; break;
-            default:                           nStyleLB_InitialSelection = 0; break;
-        }
-    }
+    if( aMiscOptions.GetSymbolsStyle() != STYLE_SYMBOLS_AUTO )
+        nStyleLB_InitialSelection = aIconStyleItemId[aMiscOptions.GetCurrentSymbolsStyle()];
 
     aIconStyleLB.SelectEntryPos( nStyleLB_InitialSelection );
     aIconStyleLB.SaveValue();
@@ -1243,34 +1235,34 @@ static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale");
 static Sequence< OUString > seqInstalledLanguages;
 
 OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage( pParent, SVX_RES( OFA_TP_LANGUAGES ), rSet ),
-    aUILanguageGB(this,         SVX_RES(FL_UI_LANG      )),
-    aLocaleSettingFI(this,      SVX_RES(FI_LOCALESETTING)),
-    aUserInterfaceFT(this,      SVX_RES(FT_USERINTERFACE)),
-    aUserInterfaceLB(this,      SVX_RES(LB_USERINTERFACE)),
-    aLocaleSettingFT(this,      SVX_RES(FT_LOCALESETTING)),
-    aLocaleSettingLB(this,      SVX_RES(LB_LOCALESETTING)),
-    aCurrencyFI( this,          SVX_RES(FI_CURRENCY       )),
-    aDecimalSeparatorFT(this,   SVX_RES(FT_DECIMALSEPARATOR)),
-    aDecimalSeparatorCB(this,   SVX_RES(CB_DECIMALSEPARATOR)),
-    aCurrencyFT( this,          SVX_RES(FT_CURRENCY       )),
-    aCurrencyLB( this,          SVX_RES(LB_CURRENCY       )),
-    aLinguLanguageGB(this,      SVX_RES(FL_LINGU_LANG       )),
-    aWesternLanguageFI(this,    SVX_RES(FI_WEST_LANG      )),
-    aWesternLanguageFT(this,    SVX_RES(FT_WEST_LANG      )),
-    aWesternLanguageLB(this,    SVX_RES(LB_WEST_LANG        )),
-    aAsianLanguageFI(this,      SVX_RES(FI_ASIAN_LANG     )),
-    aAsianLanguageFT(this,      SVX_RES(FT_ASIAN_LANG     )),
-    aAsianLanguageLB(this,      SVX_RES(LB_ASIAN_LANG       )),
-    aComplexLanguageFI(this,    SVX_RES(FI_COMPLEX_LANG   )),
-    aComplexLanguageFT(this,    SVX_RES(FT_COMPLEX_LANG   )),
-    aComplexLanguageLB(this,    SVX_RES(LB_COMPLEX_LANG )),
-    aCurrentDocCB(this,         SVX_RES(CB_CURRENT_DOC  )),
-    aEnhancedFL(this,           SVX_RES(FL_ENHANCED    )),
-    aAsianSupportFI(this,       SVX_RES(FI_ASIANSUPPORT   )),
-    aAsianSupportCB(this,       SVX_RES(CB_ASIANSUPPORT   )),
-    aCTLSupportFI(this,         SVX_RES(FI_CTLSUPPORT    )),
-    aCTLSupportCB(this,         SVX_RES(CB_CTLSUPPORT   )),
+    SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ),
+    aUILanguageGB(this,         CUI_RES(FL_UI_LANG      )),
+    aLocaleSettingFI(this,      CUI_RES(FI_LOCALESETTING)),
+    aUserInterfaceFT(this,      CUI_RES(FT_USERINTERFACE)),
+    aUserInterfaceLB(this,      CUI_RES(LB_USERINTERFACE)),
+    aLocaleSettingFT(this,      CUI_RES(FT_LOCALESETTING)),
+    aLocaleSettingLB(this,      CUI_RES(LB_LOCALESETTING)),
+    aCurrencyFI( this,          CUI_RES(FI_CURRENCY       )),
+    aDecimalSeparatorFT(this,   CUI_RES(FT_DECIMALSEPARATOR)),
+    aDecimalSeparatorCB(this,   CUI_RES(CB_DECIMALSEPARATOR)),
+    aCurrencyFT( this,          CUI_RES(FT_CURRENCY       )),
+    aCurrencyLB( this,          CUI_RES(LB_CURRENCY       )),
+    aLinguLanguageGB(this,      CUI_RES(FL_LINGU_LANG       )),
+    aWesternLanguageFI(this,    CUI_RES(FI_WEST_LANG      )),
+    aWesternLanguageFT(this,    CUI_RES(FT_WEST_LANG      )),
+    aWesternLanguageLB(this,    CUI_RES(LB_WEST_LANG        )),
+    aAsianLanguageFI(this,      CUI_RES(FI_ASIAN_LANG     )),
+    aAsianLanguageFT(this,      CUI_RES(FT_ASIAN_LANG     )),
+    aAsianLanguageLB(this,      CUI_RES(LB_ASIAN_LANG       )),
+    aComplexLanguageFI(this,    CUI_RES(FI_COMPLEX_LANG   )),
+    aComplexLanguageFT(this,    CUI_RES(FT_COMPLEX_LANG   )),
+    aComplexLanguageLB(this,    CUI_RES(LB_COMPLEX_LANG )),
+    aCurrentDocCB(this,         CUI_RES(CB_CURRENT_DOC  )),
+    aEnhancedFL(this,           CUI_RES(FL_ENHANCED    )),
+    aAsianSupportFI(this,       CUI_RES(FI_ASIANSUPPORT   )),
+    aAsianSupportCB(this,       CUI_RES(CB_ASIANSUPPORT   )),
+    aCTLSupportFI(this,         CUI_RES(FI_CTLSUPPORT    )),
+    aCTLSupportCB(this,         CUI_RES(CB_CTLSUPPORT   )),
     sDecimalSeparatorLabel(aDecimalSeparatorCB.GetText()),
     pLangConfig(new LanguageConfig_Impl)
 {
@@ -1460,6 +1452,11 @@ void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[]
 
 BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
 {
+    // lock configuration broadcasters so that we can coordinate the notifications
+    pLangConfig->aSysLocaleOptions.BlockBroadcasts( TRUE );
+    pLangConfig->aLanguageOptions.BlockBroadcasts( TRUE );
+    pLangConfig->aLinguConfig.BlockBroadcasts( TRUE );
+
     if(aCTLSupportCB.IsChecked() &&
             (aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked()) ||
             (aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos()))
@@ -1498,7 +1495,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
             xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString));
             Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
             // display info
-            InfoBox aBox(this, SVX_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART));
+            InfoBox aBox(this, CUI_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART));
             aBox.Execute();
 
             // tell quickstarter to stop being a veto listener
@@ -1523,8 +1520,6 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
         OSL_ENSURE(sal_False, aMsg.getStr());
     }
 
-    pLangConfig->aSysLocaleOptions.BlockBroadcasts( TRUE );
-
     OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
     LanguageType eOldLocale = (sLang.getLength() ?
         lcl_LangStringToLangType( sLang ) : LANGUAGE_SYSTEM);
@@ -1544,22 +1539,18 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
                 sNewLang += aLocale.Country;
             }
         }
-        // Set application settings before options, so listeners at the
-        // options will access the new locale.
-        AllSettings aSettings( Application::GetSettings() );
-        aSettings.SetLanguage( eNewLocale );
-        Application::SetSettings( aSettings );
+
+        // locale nowadays get to AppSettings via notification
+        // this will happen after releasing the lock on the ConfigurationBroadcaster at
+        // the end of this method
         pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
         rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, TRUE ) );
     }
 
-    //
     if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked())
         pLangConfig->aSysLocaleOptions.SetDecimalSeparatorAsLocale(aDecimalSeparatorCB.IsChecked());
 
-    // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for
-    // locale default. This must be set _after_ the locale above in order to
-    // have a valid locale for broadcasting the currency change.
+    // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
     OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
     USHORT nCurrPos = aCurrencyLB.GetSelectEntryPos();
     const NfCurrencyEntry* pCurr = (const NfCurrencyEntry*)
@@ -1647,19 +1638,19 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
     {
         sal_Bool bChecked = aAsianSupportCB.IsChecked();
         pLangConfig->aLanguageOptions.SetAll(bChecked);
-        //iterate over all bindings to invalidate vertical text direction
 
-      const sal_uInt16 STATE_COUNT = 2;
+        //iterate over all bindings to invalidate vertical text direction
+        const sal_uInt16 STATE_COUNT = 2;
 
-      SfxBoolItem* pBoolItems[STATE_COUNT];
-      pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, FALSE);
-      pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, FALSE);
+        SfxBoolItem* pBoolItems[STATE_COUNT];
+        pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, FALSE);
+        pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, FALSE);
 
-      SfxVoidItem* pInvalidItems[STATE_COUNT];
-      pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE);
-      pInvalidItems[1] = new SfxVoidItem(SID_TEXT_FITTOSIZE_VERTICAL);
+        SfxVoidItem* pInvalidItems[STATE_COUNT];
+        pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE);
+        pInvalidItems[1] = new SfxVoidItem(SID_TEXT_FITTOSIZE_VERTICAL);
 
-    lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
+        lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
     }
 
     if ( aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked() )
@@ -1674,11 +1665,15 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
         lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
     }
 
-
-
     if ( pLangConfig->aSysLocaleOptions.IsModified() )
         pLangConfig->aSysLocaleOptions.Commit();
+
+    // first release the lock on the ConfigurationBroadcaster for Locale changes
+    // it seems that our code relies on the fact that before other changes like e.g. currency
+    // are broadcasted locale changes have been done
     pLangConfig->aSysLocaleOptions.BlockBroadcasts( FALSE );
+    pLangConfig->aLanguageOptions.BlockBroadcasts( FALSE );
+    pLangConfig->aLinguConfig.BlockBroadcasts( FALSE );
 
     return FALSE;
 }
diff --git a/svx/source/cui/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 3ad985caa706..3ad985caa706 100644
--- a/svx/source/cui/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
diff --git a/svx/source/cui/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 4b86896fa58f..4813e23c4305 100644
--- a/svx/source/cui/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -138,6 +138,9 @@ private:
     UINT16          nStyleLB_InitialSelection;
     BOOL            bSfxSymbolsAuto;
 
+    // item ID for the given icon theme
+    // might be zero when the theme is not installed and the item is removed
+    ULONG           aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX];
     SvtTabAppearanceCfg*    pAppearanceCfg;
     CanvasSettings*         pCanvasSettings;
     SvtOptionsDrawinglayer* mpDrawinglayerOpt;
diff --git a/svx/source/cui/optgdlg.src b/cui/source/options/optgdlg.src
index f663a7ed44ef..8318d4eccd10 100644
--- a/svx/source/cui/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -29,7 +29,7 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optgdlg.hrc"
 #include "helpid.hrc"
 
@@ -250,6 +250,7 @@ TabPage OFA_TP_VIEW
             < "Industrial" ; > ;
             < "Crystal" ; > ;
             < "Tango" ; > ;
+            < "Oxygen" ; > ;
             < "Classic" ; > ;
         };
     };
diff --git a/svx/source/cui/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 7159cfdd7e61..85c0d450cc47 100644
--- a/svx/source/cui/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -29,27 +29,24 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #define _SVX_OPTGENRL_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optgenrl.hrc"
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include "cuioptgenrl.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
 #include <svx/strarray.hxx>
+#include <svx/svxids.hrc> // SID_FIELD_GRABFOCUS
 
 #define TRIM(s) s.EraseLeadingChars().EraseTrailingChars()
 
@@ -97,53 +94,53 @@ String ConvertToStore_Impl( const String& rText )
 
 SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
 
-    SfxTabPage( pParent, SVX_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
-
-    aCompanyLbl     ( this, SVX_RES( FT_COMPANY ), true ),
-    aCompanyEdit    ( this, SVX_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ),
-    aNameLbl        ( this, SVX_RES( FT_NAME ), true ),
-    aNameLblRuss    ( this, SVX_RES( FT_NAME_RUSS ), true ),
-    aNameLblEastern ( this, SVX_RES( FT_NAME_EASTERN ), true ),
-    aFirstName      ( this, SVX_RES( ED_FIRSTNAME ), 0, &aNameLbl ),
-    aFatherName     ( this, SVX_RES( ED_FATHERNAME ) ),
-    aName           ( this, SVX_RES( ED_NAME ), 1, &aNameLbl ),
-    aShortName      ( this, SVX_RES( ED_SHORTNAME ), 2, &aNameLbl ),
-    aStreetLbl      ( this, SVX_RES( FT_STREET ), true ),
-    aStreetLblRuss  ( this, SVX_RES( FT_STREET_RUSS ), true ),
-    aStreetEdit     ( this, SVX_RES( ED_STREET ), 0, &aStreetLbl ),
-    aApartmentNrEdit( this, SVX_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ),
-    aCityLbl        ( this, SVX_RES( FT_CITY ), true ),
-    aPLZEdit        ( this, SVX_RES( ED_PLZ ), 0, &aCityLbl ),
-    aCityEdit       ( this, SVX_RES( ED_CITY ), 1, &aCityLbl ),
-    aUsCityEdit     ( this, SVX_RES( ED_US_CITY ), 0, &aCityLbl ),
-    aUsStateEdit    ( this, SVX_RES( ED_US_STATE ), 1, &aCityLbl ),
-    aUsZipEdit      ( this, SVX_RES( ED_US_ZIPCODE ), 2, &aCityLbl ),
-    aCountryLbl     ( this, SVX_RES( FT_COUNTRY ), true ),
-    aCountryEdit    ( this, SVX_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ),
-    aTitlePosLbl    ( this, SVX_RES( FT_TITLEPOS ), true ),
-    aTitleEdit      ( this, SVX_RES( ED_TITLE ), 0, &aTitlePosLbl ),
-    aPositionEdit   ( this, SVX_RES( ED_POSITION ), 1, &aTitlePosLbl ),
-    aPhoneLbl       ( this, SVX_RES( FT_PHONE ), true ),
-    aTelPrivEdit    ( this, SVX_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ),
-    aTelCompanyEdit ( this, SVX_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ),
-    aFaxMailLbl     ( this, SVX_RES( FT_FAXMAIL ), true ),
-    aFaxEdit        ( this, SVX_RES( ED_FAX ), 0, &aFaxMailLbl ),
-    aEmailEdit      ( this, SVX_RES( ED_EMAIL ), 1, &aFaxMailLbl ),
-    aAddrFrm        ( this, SVX_RES( GB_ADDRESS ) ),
-    aUseDataCB      ( this, SVX_RES( CB_USEDATA ) ),
+    SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
+
+    aCompanyLbl     ( this, CUI_RES( FT_COMPANY ), true ),
+    aCompanyEdit    ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ),
+    aNameLbl        ( this, CUI_RES( FT_NAME ), true ),
+    aNameLblRuss    ( this, CUI_RES( FT_NAME_RUSS ), true ),
+    aNameLblEastern ( this, CUI_RES( FT_NAME_EASTERN ), true ),
+    aFirstName      ( this, CUI_RES( ED_FIRSTNAME ), 0, &aNameLbl ),
+    aFatherName     ( this, CUI_RES( ED_FATHERNAME ) ),
+    aName           ( this, CUI_RES( ED_NAME ), 1, &aNameLbl ),
+    aShortName      ( this, CUI_RES( ED_SHORTNAME ), 2, &aNameLbl ),
+    aStreetLbl      ( this, CUI_RES( FT_STREET ), true ),
+    aStreetLblRuss  ( this, CUI_RES( FT_STREET_RUSS ), true ),
+    aStreetEdit     ( this, CUI_RES( ED_STREET ), 0, &aStreetLbl ),
+    aApartmentNrEdit( this, CUI_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ),
+    aCityLbl        ( this, CUI_RES( FT_CITY ), true ),
+    aPLZEdit        ( this, CUI_RES( ED_PLZ ), 0, &aCityLbl ),
+    aCityEdit       ( this, CUI_RES( ED_CITY ), 1, &aCityLbl ),
+    aUsCityEdit     ( this, CUI_RES( ED_US_CITY ), 0, &aCityLbl ),
+    aUsStateEdit    ( this, CUI_RES( ED_US_STATE ), 1, &aCityLbl ),
+    aUsZipEdit      ( this, CUI_RES( ED_US_ZIPCODE ), 2, &aCityLbl ),
+    aCountryLbl     ( this, CUI_RES( FT_COUNTRY ), true ),
+    aCountryEdit    ( this, CUI_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ),
+    aTitlePosLbl    ( this, CUI_RES( FT_TITLEPOS ), true ),
+    aTitleEdit      ( this, CUI_RES( ED_TITLE ), 0, &aTitlePosLbl ),
+    aPositionEdit   ( this, CUI_RES( ED_POSITION ), 1, &aTitlePosLbl ),
+    aPhoneLbl       ( this, CUI_RES( FT_PHONE ), true ),
+    aTelPrivEdit    ( this, CUI_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ),
+    aTelCompanyEdit ( this, CUI_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ),
+    aFaxMailLbl     ( this, CUI_RES( FT_FAXMAIL ), true ),
+    aFaxEdit        ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ),
+    aEmailEdit      ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ),
+    aAddrFrm        ( this, CUI_RES( GB_ADDRESS ) ),
+    aUseDataCB      ( this, CUI_RES( CB_USEDATA ) ),
 
     pImpl           ( new GeneralTabPage_Impl )
 
 {
     LanguageType eLang = Application::GetSettings().GetUILanguage();
-    pImpl->maQueryStr = String( SVX_RES( STR_QUERY_REG ) );
+    pImpl->maQueryStr = String( CUI_RES( STR_QUERY_REG ) );
 
     if ( LANGUAGE_ENGLISH_US == eLang )
     {
         // amerikanische Postadresse aufbauen
         aPLZEdit.Hide();
         aCityEdit.Hide();
-        aCityLbl.SetText( SVX_RES( STR_US_STATE ) );
+        aCityLbl.SetText( CUI_RES( STR_US_STATE ) );
     }
     else if ( LANGUAGE_RUSSIAN == eLang )
     {
diff --git a/svx/inc/optgenrl.hrc b/cui/source/options/optgenrl.hrc
index 4c519d5ebb70..4c519d5ebb70 100644
--- a/svx/inc/optgenrl.hrc
+++ b/cui/source/options/optgenrl.hrc
diff --git a/svx/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index cff6f8d4216c..1d0b049dd204 100644
--- a/svx/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -33,7 +33,7 @@
 #include <sfx2/sfx.hrc>
 
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optgenrl.hrc"
 
 // RID_SFXPAGE_GENERAL ------------------------------------------------------
@@ -276,24 +276,6 @@ QueryBox RID_SVXQB_CHANGEDATA
     Message [ en-US ] = "The User Data have been changed.\nNote that, if you continue, the registration key will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change your User Data?";
 };
 
- // RID_SVXSTR_FIELDUNIT_TABLE --------------------------------------------
-
-StringArray RID_SVXSTR_FIELDUNIT_TABLE
-{
-    ItemList [ en-US ] =
-    {
-        < "Millimeter" ; FUNIT_MM ; > ;
-        < "Centimeter" ; FUNIT_CM ; > ;
-        < "Meter" ; FUNIT_M ; > ;
-        < "Kilometer" ; FUNIT_KM ; > ;
-        < "Inch" ; FUNIT_INCH ; > ;
-        < "Foot" ; FUNIT_FOOT ; > ;
-        < "Miles" ; FUNIT_MILE ; > ;
-        < "Pica" ; FUNIT_PICA ; > ;
-        < "Point" ; FUNIT_POINT ; > ;
-    };
-    };
-
  // ********************************************************************** EOF
 
 
diff --git a/svx/source/cui/opthtml.cxx b/cui/source/options/opthtml.cxx
index 837768dded1a..bddcd4a9e182 100644
--- a/svx/source/cui/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -29,22 +29,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
 #include <svtools/langtab.hxx>
 
-#include "htmlcfg.hxx"
+#include <svx/htmlcfg.hxx>
 #include "opthtml.hxx"
 #include "opthtml.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 // Umwandlung der Modi zu den Positionen in der Listbox
 const USHORT aPosToExportArr[] =
@@ -67,34 +63,34 @@ const USHORT aExportToPosArr[] =
 // -----------------------------------------------------------------------
 
 OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
-        SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
-    aFontSizeGB     ( this, SVX_RES( GB_FONTSIZE       ) ),
-    aSize1FT        ( this, SVX_RES( FT_SIZE1          ) ),
-    aSize1NF        ( this, SVX_RES( NF_SIZE1          ) ),
-    aSize2FT        ( this, SVX_RES( FT_SIZE2          ) ),
-    aSize2NF        ( this, SVX_RES( NF_SIZE2          ) ),
-    aSize3FT        ( this, SVX_RES( FT_SIZE3          ) ),
-    aSize3NF        ( this, SVX_RES( NF_SIZE3          ) ),
-    aSize4FT        ( this, SVX_RES( FT_SIZE4          ) ),
-    aSize4NF        ( this, SVX_RES( NF_SIZE4          ) ),
-    aSize5FT        ( this, SVX_RES( FT_SIZE5          ) ),
-    aSize5NF        ( this, SVX_RES( NF_SIZE5          ) ),
-    aSize6FT        ( this, SVX_RES( FT_SIZE6          ) ),
-    aSize6NF        ( this, SVX_RES( NF_SIZE6          ) ),
-    aSize7FT        ( this, SVX_RES( FT_SIZE7          ) ),
-    aSize7NF        ( this, SVX_RES( NF_SIZE7          ) ),
-    aImportGB       ( this, SVX_RES( GB_IMPORT     ) ),
-    aNumbersEnglishUSCB ( this, SVX_RES( CB_NUMBERS_ENGLISH_US ) ),
-    aUnknownTagCB   ( this, SVX_RES( CB_UNKNOWN_TAGS ) ),
-    aIgnoreFontNamesCB( this, SVX_RES( CB_IGNORE_FONTNAMES ) ),
-    aExportGB       ( this, SVX_RES( GB_EXPORT       ) ),
-    aExportLB       ( this, SVX_RES( LB_EXPORT       ) ),
-    aStarBasicCB    ( this, SVX_RES( CB_STARBASIC    ) ),
-    aStarBasicWarningCB(this, SVX_RES( CB_STARBASIC_WARNING    ) ),
-    aPrintExtensionCB( this,SVX_RES(CB_PRINT_EXTENSION )),
-    aSaveGrfLocalCB ( this, SVX_RES( CB_LOCAL_GRF    ) ),
-    aCharSetFT      ( this, SVX_RES( FT_CHARSET      ) ),
-    aCharSetLB      ( this, SVX_RES( LB_CHARSET      ) )
+        SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
+    aFontSizeGB     ( this, CUI_RES( GB_FONTSIZE       ) ),
+    aSize1FT        ( this, CUI_RES( FT_SIZE1          ) ),
+    aSize1NF        ( this, CUI_RES( NF_SIZE1          ) ),
+    aSize2FT        ( this, CUI_RES( FT_SIZE2          ) ),
+    aSize2NF        ( this, CUI_RES( NF_SIZE2          ) ),
+    aSize3FT        ( this, CUI_RES( FT_SIZE3          ) ),
+    aSize3NF        ( this, CUI_RES( NF_SIZE3          ) ),
+    aSize4FT        ( this, CUI_RES( FT_SIZE4          ) ),
+    aSize4NF        ( this, CUI_RES( NF_SIZE4          ) ),
+    aSize5FT        ( this, CUI_RES( FT_SIZE5          ) ),
+    aSize5NF        ( this, CUI_RES( NF_SIZE5          ) ),
+    aSize6FT        ( this, CUI_RES( FT_SIZE6          ) ),
+    aSize6NF        ( this, CUI_RES( NF_SIZE6          ) ),
+    aSize7FT        ( this, CUI_RES( FT_SIZE7          ) ),
+    aSize7NF        ( this, CUI_RES( NF_SIZE7          ) ),
+    aImportGB       ( this, CUI_RES( GB_IMPORT     ) ),
+    aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
+    aUnknownTagCB   ( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
+    aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ),
+    aExportGB       ( this, CUI_RES( GB_EXPORT       ) ),
+    aExportLB       ( this, CUI_RES( LB_EXPORT       ) ),
+    aStarBasicCB    ( this, CUI_RES( CB_STARBASIC    ) ),
+    aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING    ) ),
+    aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )),
+    aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF    ) ),
+    aCharSetFT      ( this, CUI_RES( FT_CHARSET      ) ),
+    aCharSetLB      ( this, CUI_RES( LB_CHARSET      ) )
 
 {
     FreeResource();
diff --git a/svx/source/cui/opthtml.hrc b/cui/source/options/opthtml.hrc
index 6525a31fc877..6525a31fc877 100644
--- a/svx/source/cui/opthtml.hrc
+++ b/cui/source/options/opthtml.hrc
diff --git a/svx/source/cui/opthtml.hxx b/cui/source/options/opthtml.hxx
index cfdb8821bec4..3d630ea692ff 100644
--- a/svx/source/cui/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -30,25 +30,13 @@
 #ifndef _OFA_OPTHTML_HXX
 #define _OFA_OPTHTML_HXX
 
-
-#ifndef _BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX
 #include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_LSTBOX_HXX
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _GROUP_HXX
 #include <vcl/group.hxx>
-#endif
 #include <sfx2/tabdlg.hxx>
-#include "txencbox.hxx"
-
+#include <svx/txencbox.hxx>
 
 class OfaHtmlTabPage : public SfxTabPage
 {
diff --git a/svx/source/cui/opthtml.src b/cui/source/options/opthtml.src
index dc5b5f9431c7..29f5ff1fe78e 100644
--- a/svx/source/cui/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -30,7 +30,7 @@
 
  // include -----------------------------------------------------------------
 #include "opthtml.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
  // RID_OFAPAGE_HTMLOPT -----------------------------------------------------
 TabPage RID_OFAPAGE_HTMLOPT
diff --git a/svx/source/cui/optimprove.cxx b/cui/source/options/optimprove.cxx
index e644cc58d7b8..c8f52a63e708 100644
--- a/svx/source/cui/optimprove.cxx
+++ b/cui/source/options/optimprove.cxx
@@ -29,22 +29,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 // include ---------------------------------------------------------------
 
 #define _SVX_OPTIMPROVE_CXX
 
-#include <svx/optimprove.hxx>
-#include <svx/dialmgr.hxx>
+#include <optimprove.hxx>
+#include <dialmgr.hxx>
 #include <vcl/msgbox.hxx>
-
+#include <svx/dialogs.hrc>
 #include "optimprove.hrc"
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -64,21 +61,21 @@ using namespace com::sun::star::system;
 
 SvxImprovementPage::SvxImprovementPage( Window* pParent ) :
 
-    TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) ),
-
-    m_aImproveFL                ( this, SVX_RES( FL_IMPROVE ) ),
-    m_aInvitationFT             ( this, SVX_RES( FT_INVITATION ) ),
-    m_aYesRB                    ( this, SVX_RES( RB_YES ) ),
-    m_aNoRB                     ( this, SVX_RES( RB_NO ) ),
-    m_aDataFL                   ( this, SVX_RES( FL_DATA ) ),
-    m_aNumberOfReportsFT        ( this, SVX_RES( FT_NR_REPORTS ) ),
-    m_aNumberOfReportsValueFT   ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ),
-    m_aNumberOfActionsFT        ( this, SVX_RES( FT_NR_ACTIONS ) ),
-    m_aNumberOfActionsValueFT   ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ),
-    m_aShowDataPB               ( this, SVX_RES( PB_SHOWDATA ) ),
-
-    m_sInfo                     (       SVX_RES( STR_INFO ) ),
-    m_sMoreInfo                 (       SVX_RES( STR_MOREINFO ) )
+    TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ),
+
+    m_aImproveFL                ( this, CUI_RES( FL_IMPROVE ) ),
+    m_aInvitationFT             ( this, CUI_RES( FT_INVITATION ) ),
+    m_aYesRB                    ( this, CUI_RES( RB_YES ) ),
+    m_aNoRB                     ( this, CUI_RES( RB_NO ) ),
+    m_aDataFL                   ( this, CUI_RES( FL_DATA ) ),
+    m_aNumberOfReportsFT        ( this, CUI_RES( FT_NR_REPORTS ) ),
+    m_aNumberOfReportsValueFT   ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
+    m_aNumberOfActionsFT        ( this, CUI_RES( FT_NR_ACTIONS ) ),
+    m_aNumberOfActionsValueFT   ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
+    m_aShowDataPB               ( this, CUI_RES( PB_SHOWDATA ) ),
+
+    m_sInfo                     (       CUI_RES( STR_INFO ) ),
+    m_sMoreInfo                 (       CUI_RES( STR_MOREINFO ) )
 
 {
     FreeResource();
diff --git a/svx/inc/optimprove.hrc b/cui/source/options/optimprove.hrc
index 919b01c6fb6a..919b01c6fb6a 100644
--- a/svx/inc/optimprove.hrc
+++ b/cui/source/options/optimprove.hrc
diff --git a/svx/source/options/optimprove.src b/cui/source/options/optimprove.src
index 86fc6d1c1a5d..d8782144cdb3 100644
--- a/svx/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -31,8 +31,9 @@
 // include --------------------------------------------------------------
 
 #include "optimprove.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
+#include <svx/dialogs.hrc>
 
 TabPage RID_SVXPAGE_IMPROVEMENT
 {
diff --git a/svx/source/cui/optimprove2.cxx b/cui/source/options/optimprove2.cxx
index b988c7b75bad..1509b88ce186 100644
--- a/svx/source/cui/optimprove2.cxx
+++ b/cui/source/options/optimprove2.cxx
@@ -29,24 +29,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
 #define _SVX_OPTIMPROVE_CXX
 
-#include <svx/optimprove.hxx>
-#include <svx/dialmgr.hxx>
+#include <optimprove.hxx>
+#include <dialmgr.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "optimprove.hrc"
 #include "helpid.hrc"
+#include <cuires.hrc>
 #include <svx/dialogs.hrc>
-
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/oooimprovement/XCore.hpp>
@@ -72,7 +68,7 @@ using namespace com::sun::star::system;
 
 SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
 
-    TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) )
+    TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) )
 
 {
     FreeResource();
@@ -82,22 +78,22 @@ SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
 
 SvxImprovementOptionsPage::SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ),
-
-    m_aImproveFL                ( this, SVX_RES( FL_IMPROVE ) ),
-    m_aInvitationFT             ( this, SVX_RES( FT_INVITATION ) ),
-    m_aYesRB                    ( this, SVX_RES( RB_YES ) ),
-    m_aNoRB                     ( this, SVX_RES( RB_NO ) ),
-    m_aInfoFI                   ( this, SVX_RES( FI_INFO ) ),
-    m_aDataFL                   ( this, SVX_RES( FL_DATA ) ),
-    m_aNumberOfReportsFT        ( this, SVX_RES( FT_NR_REPORTS ) ),
-    m_aNumberOfReportsValueFT   ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ),
-    m_aNumberOfActionsFT        ( this, SVX_RES( FT_NR_ACTIONS ) ),
-    m_aNumberOfActionsValueFT   ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ),
-    m_aShowDataPB               ( this, SVX_RES( PB_SHOWDATA ) ),
-
-    m_sInfo                     (       SVX_RES( STR_INFO ) ),
-    m_sMoreInfo                 (       SVX_RES( STR_MOREINFO ) )
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ),
+
+    m_aImproveFL                ( this, CUI_RES( FL_IMPROVE ) ),
+    m_aInvitationFT             ( this, CUI_RES( FT_INVITATION ) ),
+    m_aYesRB                    ( this, CUI_RES( RB_YES ) ),
+    m_aNoRB                     ( this, CUI_RES( RB_NO ) ),
+    m_aInfoFI                   ( this, CUI_RES( FI_INFO ) ),
+    m_aDataFL                   ( this, CUI_RES( FL_DATA ) ),
+    m_aNumberOfReportsFT        ( this, CUI_RES( FT_NR_REPORTS ) ),
+    m_aNumberOfReportsValueFT   ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
+    m_aNumberOfActionsFT        ( this, CUI_RES( FT_NR_ACTIONS ) ),
+    m_aNumberOfActionsValueFT   ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
+    m_aShowDataPB               ( this, CUI_RES( PB_SHOWDATA ) ),
+
+    m_sInfo                     (       CUI_RES( STR_INFO ) ),
+    m_sMoreInfo                 (       CUI_RES( STR_MOREINFO ) )
 
 {
     FreeResource();
diff --git a/svx/source/cui/optinet2.cxx b/cui/source/options/optinet2.cxx
index 01d97a9e7e0b..b8d7fec16efc 100644
--- a/svx/source/cui/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -29,20 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <tools/config.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfilt.hxx>
@@ -50,48 +46,31 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/filedlghelper.hxx>
 #include <tools/inetdef.hxx>
-#include <svtools/urihelper.hxx>
-
-#ifndef _CNTWIDS_HRC
-#include <svtools/cntwids.hrc>
-#endif
-#include <svtools/inetoptions.hxx>
-#ifndef _SV_SVAPP_HXX
+#include <svl/urihelper.hxx>
+#include <svl/cntwids.hrc>
+#include <unotools/inetoptions.hxx>
 #include <sfx2/app.hxx>
-#endif
 #include <sfx2/objsh.hxx>
 #include <unotools/bootstrap.hxx>
 #include <vcl/help.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX
-#include <svtools/securityoptions.hxx>
-#endif
-#ifndef _SVTOOLS_JAVAPTIONS_HXX
-#include <svtools/javaoptions.hxx>
-#endif
+#include <unotools/pathoptions.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/javaoptions.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #define _SVX_OPTINET2_CXX
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "optinet2.hxx"
-//CHINA001 #ifndef _SVX_MULTIFIL_HXX
-//CHINA001 #include "multifil.hxx"
-//CHINA001 #endif
 #include <svx/svxdlg.hxx> //CHINA001
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#ifndef _SVX_OPTINET_HRC
+#include <cuires.hrc>
 #include "optinet2.hrc"
-#endif
-#ifndef _SVX_HELPID_HRC
 #include "helpid.hrc"
-#endif
-#include "ofaitem.hxx"
-#include "htmlmode.hxx"
+#include <svx/ofaitem.hxx>
+#include <svx/htmlmode.hxx>
+#include <svx/svxids.hrc> // slot ids, mostly for changetracking
 
 // for security TP
 #include <comphelper/processfactory.hxx>
@@ -234,7 +213,7 @@ void SvxNoSpaceEdit::Modify()
 
         if ( !ByteString(::rtl::OUStringToOString(aValue,RTL_TEXTENCODING_UTF8)).IsNumericAscii() || (long)aValue.ToInt32() > USHRT_MAX )
             // der H�chstwert einer Portnummer ist USHRT_MAX
-            ErrorBox( this, SVX_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
+            ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
     }
 }
 
@@ -248,31 +227,31 @@ void SvxNoSpaceEdit::Modify()
 /********************************************************************/
 
 SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_PROXY ), rSet ),
-    aOptionGB   (this, SVX_RES(GB_SETTINGS)),
-
-    aProxyModeFT  (this, SVX_RES(FT_PROXYMODE)),
-    aProxyModeLB  (this, SVX_RES(LB_PROXYMODE)),
-
-    aHttpProxyFT      (this, SVX_RES( FT_HTTP_PROXY   )),
-    aHttpProxyED      (this, SVX_RES( ED_HTTP_PROXY     )),
-    aHttpPortFT       (this, SVX_RES( FT_HTTP_PORT      )),
-    aHttpPortED       (this, SVX_RES( ED_HTTP_PORT      ), TRUE),
-
-    aHttpsProxyFT      (this, SVX_RES( FT_HTTPS_PROXY     )),
-    aHttpsProxyED      (this, SVX_RES( ED_HTTPS_PROXY     )),
-    aHttpsPortFT       (this, SVX_RES( FT_HTTPS_PORT      )),
-    aHttpsPortED       (this, SVX_RES( ED_HTTPS_PORT      ), TRUE),
-
-    aFtpProxyFT       (this, SVX_RES( FT_FTP_PROXY      )),
-    aFtpProxyED       (this, SVX_RES( ED_FTP_PROXY      )),
-    aFtpPortFT        (this, SVX_RES( FT_FTP_PORT       )),
-    aFtpPortED        (this, SVX_RES( ED_FTP_PORT       ), TRUE),
-
-    aNoProxyForFT     (this, SVX_RES( FT_NOPROXYFOR     )),
-    aNoProxyForED     (this, SVX_RES( ED_NOPROXYFOR     )),
-    aNoProxyDescFT    (this, SVX_RES( ED_NOPROXYDESC    )),
-    sFromBrowser        (       SVX_RES( ST_PROXY_FROM_BROWSER ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_PROXY ), rSet ),
+    aOptionGB   (this, CUI_RES(GB_SETTINGS)),
+
+    aProxyModeFT  (this, CUI_RES(FT_PROXYMODE)),
+    aProxyModeLB  (this, CUI_RES(LB_PROXYMODE)),
+
+    aHttpProxyFT      (this, CUI_RES( FT_HTTP_PROXY   )),
+    aHttpProxyED      (this, CUI_RES( ED_HTTP_PROXY     )),
+    aHttpPortFT       (this, CUI_RES( FT_HTTP_PORT      )),
+    aHttpPortED       (this, CUI_RES( ED_HTTP_PORT      ), TRUE),
+
+    aHttpsProxyFT      (this, CUI_RES( FT_HTTPS_PROXY     )),
+    aHttpsProxyED      (this, CUI_RES( ED_HTTPS_PROXY     )),
+    aHttpsPortFT       (this, CUI_RES( FT_HTTPS_PORT      )),
+    aHttpsPortED       (this, CUI_RES( ED_HTTPS_PORT      ), TRUE),
+
+    aFtpProxyFT       (this, CUI_RES( FT_FTP_PROXY      )),
+    aFtpProxyED       (this, CUI_RES( ED_FTP_PROXY      )),
+    aFtpPortFT        (this, CUI_RES( FT_FTP_PORT       )),
+    aFtpPortED        (this, CUI_RES( ED_FTP_PORT       ), TRUE),
+
+    aNoProxyForFT     (this, CUI_RES( FT_NOPROXYFOR     )),
+    aNoProxyForED     (this, CUI_RES( ED_NOPROXYFOR     )),
+    aNoProxyDescFT    (this, CUI_RES( ED_NOPROXYDESC    )),
+    sFromBrowser        (       CUI_RES( ST_PROXY_FROM_BROWSER ) ),
     aProxyModePN(RTL_CONSTASCII_USTRINGPARAM("ooInetProxyType")),
     aHttpProxyPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyName")),
     aHttpPortPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyPort")),
@@ -748,33 +727,33 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
 
 SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
 
-    aSearchGB       ( this, SVX_RES( GB_SEARCH ) ),
-    aSearchLB       ( this, SVX_RES( LB_SEARCH ) ),
-    aSearchNameFT   ( this, SVX_RES( FT_SEARCH_NAME ) ),
-    aSearchNameED   ( this, SVX_RES( ED_SEARCH_NAME ) ),
-    aSearchFT       ( this, SVX_RES( FT_SEARCH ) ),
-    aAndRB          ( this, SVX_RES( RB_AND ) ),
-    aOrRB           ( this, SVX_RES( RB_OR ) ),
-    aExactRB        ( this, SVX_RES( RB_EXACT ) ),
+    aSearchGB       ( this, CUI_RES( GB_SEARCH ) ),
+    aSearchLB       ( this, CUI_RES( LB_SEARCH ) ),
+    aSearchNameFT   ( this, CUI_RES( FT_SEARCH_NAME ) ),
+    aSearchNameED   ( this, CUI_RES( ED_SEARCH_NAME ) ),
+    aSearchFT       ( this, CUI_RES( FT_SEARCH ) ),
+    aAndRB          ( this, CUI_RES( RB_AND ) ),
+    aOrRB           ( this, CUI_RES( RB_OR ) ),
+    aExactRB        ( this, CUI_RES( RB_EXACT ) ),
 
-    aURLFT          ( this, SVX_RES( FT_URL ) ),
-    aURLED          ( this, SVX_RES( ED_URL ) ),
+    aURLFT          ( this, CUI_RES( FT_URL ) ),
+    aURLED          ( this, CUI_RES( ED_URL ) ),
 
-    aPostFixFT      ( this, SVX_RES( FT_POSTFIX ) ),
-    aPostFixED      ( this, SVX_RES( ED_POSTFIX ) ),
-    aSeparatorFT    ( this, SVX_RES( FT_SEPARATOR ) ),
-    aSeparatorED    ( this, SVX_RES( ED_SEPARATOR ) ),
-    aCaseFT         ( this, SVX_RES( FT_CASE ) ),
-    aCaseED         ( this, SVX_RES( ED_CASE ) ),
+    aPostFixFT      ( this, CUI_RES( FT_POSTFIX ) ),
+    aPostFixED      ( this, CUI_RES( ED_POSTFIX ) ),
+    aSeparatorFT    ( this, CUI_RES( FT_SEPARATOR ) ),
+    aSeparatorED    ( this, CUI_RES( ED_SEPARATOR ) ),
+    aCaseFT         ( this, CUI_RES( FT_CASE ) ),
+    aCaseED         ( this, CUI_RES( ED_CASE ) ),
 
-    aNewPB          ( this, SVX_RES( PB_NEW ) ),
-    aAddPB          ( this, SVX_RES( PB_ADD ) ),
-    aChangePB       ( this, SVX_RES( PB_CHANGE ) ),
-    aDeletePB       ( this, SVX_RES( PB_DELETE ) ),
+    aNewPB          ( this, CUI_RES( PB_NEW ) ),
+    aAddPB          ( this, CUI_RES( PB_ADD ) ),
+    aChangePB       ( this, CUI_RES( PB_CHANGE ) ),
+    aDeletePB       ( this, CUI_RES( PB_DELETE ) ),
 
-    sModifyMsg(SVX_RES(MSG_MODIFY))
+    sModifyMsg(CUI_RES(MSG_MODIFY))
 {
     FreeResource();
 
@@ -1278,13 +1257,13 @@ public:
 
 JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) :
 
-    ModalDialog( pParent, SVX_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
+    ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
 
-    aImage      ( this, SVX_RES( IMG_JSCPT_WARNING ) ),
-    aWarningFT  ( this, SVX_RES( FT_JSCPT_WARNING ) ),
-    aDisableCB  ( this, SVX_RES( CB_JSCPT_DISABLE ) ),
-    aYesBtn     ( this, SVX_RES( BTN_JSCPT_YES ) ),
-    aNoBtn      ( this, SVX_RES( BTN_JSCPT_NO ) )
+    aImage      ( this, CUI_RES( IMG_JSCPT_WARNING ) ),
+    aWarningFT  ( this, CUI_RES( FT_JSCPT_WARNING ) ),
+    aDisableCB  ( this, CUI_RES( CB_JSCPT_DISABLE ) ),
+    aYesBtn     ( this, CUI_RES( BTN_JSCPT_YES ) ),
+    aNoBtn      ( this, CUI_RES( BTN_JSCPT_NO ) )
 
 {
     FreeResource();
@@ -1337,34 +1316,34 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
 /********************************************************************/
 
 SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet )
-    :SfxTabPage         ( pParent, SVX_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
-
-    ,maSecurityOptionsFL( this, SVX_RES( FL_SEC_SECURITYOPTIONS ) )
-    ,maSecurityOptionsFI( this, SVX_RES( FI_SEC_SECURITYOPTIONS ) )
-    ,maSecurityOptionsPB( this, SVX_RES( PB_SEC_SECURITYOPTIONS ) )
-
-    ,maPasswordsFL      ( this, SVX_RES( FL_SEC_PASSWORDS ) )
-    ,maSavePasswordsCB  ( this, SVX_RES( CB_SEC_SAVEPASSWORDS ) )
-    ,maShowConnectionsPB( this, SVX_RES( PB_SEC_CONNECTIONS ) )
-    ,maMasterPasswordCB ( this, SVX_RES( CB_SEC_MASTERPASSWORD ) )
-    ,maMasterPasswordFI ( this, SVX_RES( FI_SEC_MASTERPASSWORD ) )
-    ,maMasterPasswordPB ( this, SVX_RES( PB_SEC_MASTERPASSWORD ) )
-
-    ,maMacroSecFL       ( this, SVX_RES( FL_SEC_MACROSEC ) )
-    ,maMacroSecFI       ( this, SVX_RES( FI_SEC_MACROSEC ) )
-    ,maMacroSecPB       ( this, SVX_RES( PB_SEC_MACROSEC ) )
-    ,maFilesharingFL    ( this, SVX_RES( FL_SEC_FILESHARING ) )
-    ,maRecommReadOnlyCB ( this, SVX_RES( CB_SEC_RECOMMREADONLY ) )
-    ,maRecordChangesCB  ( this, SVX_RES( CB_SEC_RECORDCHANGES ) )
-    ,maProtectRecordsPB ( this, SVX_RES( PB_SEC_PROTRECORDS ) )
+    :SfxTabPage         ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
+
+    ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) )
+    ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) )
+    ,maSecurityOptionsPB( this, CUI_RES( PB_SEC_SECURITYOPTIONS ) )
+
+    ,maPasswordsFL      ( this, CUI_RES( FL_SEC_PASSWORDS ) )
+    ,maSavePasswordsCB  ( this, CUI_RES( CB_SEC_SAVEPASSWORDS ) )
+    ,maShowConnectionsPB( this, CUI_RES( PB_SEC_CONNECTIONS ) )
+    ,maMasterPasswordCB ( this, CUI_RES( CB_SEC_MASTERPASSWORD ) )
+    ,maMasterPasswordFI ( this, CUI_RES( FI_SEC_MASTERPASSWORD ) )
+    ,maMasterPasswordPB ( this, CUI_RES( PB_SEC_MASTERPASSWORD ) )
+
+    ,maMacroSecFL       ( this, CUI_RES( FL_SEC_MACROSEC ) )
+    ,maMacroSecFI       ( this, CUI_RES( FI_SEC_MACROSEC ) )
+    ,maMacroSecPB       ( this, CUI_RES( PB_SEC_MACROSEC ) )
+    ,maFilesharingFL    ( this, CUI_RES( FL_SEC_FILESHARING ) )
+    ,maRecommReadOnlyCB ( this, CUI_RES( CB_SEC_RECOMMREADONLY ) )
+    ,maRecordChangesCB  ( this, CUI_RES( CB_SEC_RECORDCHANGES ) )
+    ,maProtectRecordsPB ( this, CUI_RES( PB_SEC_PROTRECORDS ) )
 
     ,mpSecOptions       ( new SvtSecurityOptions )
     ,mpSecOptDlg        ( NULL )
     ,meRedlingMode      ( RL_NONE )
 
-    ,msProtectRecordsStr(               SVX_RES( STR_SEC_PROTRECORDS ) )
-    ,msUnprotectRecordsStr(             SVX_RES( STR_SEC_UNPROTRECORDS ) )
-    ,msPasswordStoringDeactivateStr(    SVX_RES( STR_SEC_NOPASSWDSAVE ) )
+    ,msProtectRecordsStr(               CUI_RES( STR_SEC_PROTRECORDS ) )
+    ,msUnprotectRecordsStr(             CUI_RES( STR_SEC_UNPROTRECORDS ) )
+    ,msPasswordStoringDeactivateStr(    CUI_RES( STR_SEC_NOPASSWDSAVE ) )
 
 {
     FreeResource();
@@ -1947,9 +1926,9 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& )
 
 //added by jmeng begin
 MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
-    aMSWordGB       ( this, SVX_RES( GB_MOZPLUGIN       ) ),
-    aWBasicCodeCB   ( this, SVX_RES( CB_MOZPLUGIN_CODE ) )
+    : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
+    aMSWordGB       ( this, CUI_RES( GB_MOZPLUGIN       ) ),
+    aWBasicCodeCB   ( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
 {
     FreeResource();
 }
@@ -2154,7 +2133,7 @@ public:
     virtual ~MailerProgramCfg_Impl();
 
     virtual void    Commit();
-
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 };
 
 /* -------------------------------------------------------------------------*/
@@ -2234,6 +2213,10 @@ void MailerProgramCfg_Impl::Commit()
     PutProperties(aNames, aValues);
 }
 
+void MailerProgramCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
 /* -------------------------------------------------------------------------*/
 
 struct SvxEMailTabPage_Impl
@@ -2242,13 +2225,13 @@ struct SvxEMailTabPage_Impl
 };
 
 SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) :
-    SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_INET_MAIL ), rSet),
-    aMailFL(this,           SVX_RES(FL_MAIL           )),
-    aMailerURLFI(this,      SVX_RES(FI_MAILERURL      )),
-    aMailerURLFT(this,      SVX_RES(FT_MAILERURL      )),
-    aMailerURLED(this,      SVX_RES(ED_MAILERURL      )),
-    aMailerURLPB(this,      SVX_RES(PB_MAILERURL      )),
-    m_sDefaultFilterName(   SVX_RES(STR_DEFAULT_FILENAME        )),
+    SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_INET_MAIL ), rSet),
+    aMailFL(this,           CUI_RES(FL_MAIL           )),
+    aMailerURLFI(this,      CUI_RES(FI_MAILERURL      )),
+    aMailerURLFT(this,      CUI_RES(FT_MAILERURL      )),
+    aMailerURLED(this,      CUI_RES(ED_MAILERURL      )),
+    aMailerURLPB(this,      CUI_RES(PB_MAILERURL      )),
+    m_sDefaultFilterName(   CUI_RES(STR_DEFAULT_FILENAME        )),
     pImpl(new SvxEMailTabPage_Impl)
 {
     FreeResource();
diff --git a/svx/inc/optinet2.hrc b/cui/source/options/optinet2.hrc
index da394d6d249f..1e9a3f65efeb 100644
--- a/svx/inc/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -169,6 +169,11 @@
 #define PB_MAILERURL                5
 #define STR_DEFAULT_FILENAME        6
 
+// plugin
+#define GB_MOZPLUGIN    1
+#define CB_MOZPLUGIN_CODE   2
+
+
 #endif // #ifndef _SVX_OPTINET_HRC
 
 // ******************************************************************* EOF
diff --git a/svx/source/cui/optinet2.hxx b/cui/source/options/optinet2.hxx
index 0f1364b716f8..00d1aaadc4fc 100644
--- a/svx/source/cui/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -34,13 +34,11 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/group.hxx>
 #include <vcl/field.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svtools/svtabbx.hxx>
 #include <sfx2/tabdlg.hxx>
-#ifndef _SVX_SRCHNCFG_HXX
-#include "srchcfg.hxx"
-#endif
+#include <svx/srchcfg.hxx>
 
 #ifdef _SVX_OPTINET2_CXX
 #include <svtools/headbar.hxx>
diff --git a/svx/source/options/optinet2.src b/cui/source/options/optinet2.src
index 2ef6dc59c2e4..e7bdc9eff17c 100644
--- a/svx/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -30,7 +30,7 @@
  // include ------------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optinet2.hrc"
  // pragma -------------------------------------------------------------------
 
diff --git a/svx/source/cui/optjava.cxx b/cui/source/options/optjava.cxx
index 549a4c09c96d..fdc36dadbbb7 100644
--- a/svx/source/cui/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -29,26 +29,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
 #include "optjava.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #include "optjava.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/imagemgr.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <comphelper/processfactory.hxx>
@@ -153,16 +149,16 @@ bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< :
 
 SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ),
 
-    m_aJavaLine         ( this, SVX_RES( FL_JAVA ) ),
-    m_aJavaEnableCB     ( this, SVX_RES( CB_JAVA_ENABLE ) ),
-    m_aJavaFoundLabel   ( this, SVX_RES( FT_JAVA_FOUND ) ),
-    m_aJavaList         ( this, SVX_RES( LB_JAVA ) ),
-    m_aJavaPathText     ( this, SVX_RES( FT_JAVA_PATH ) ),
-    m_aAddBtn           ( this, SVX_RES( PB_ADD ) ),
-    m_aParameterBtn     ( this, SVX_RES( PB_PARAMETER ) ),
-    m_aClassPathBtn     ( this, SVX_RES( PB_CLASSPATH ) ),
+    m_aJavaLine         ( this, CUI_RES( FL_JAVA ) ),
+    m_aJavaEnableCB     ( this, CUI_RES( CB_JAVA_ENABLE ) ),
+    m_aJavaFoundLabel   ( this, CUI_RES( FT_JAVA_FOUND ) ),
+    m_aJavaList         ( this, CUI_RES( LB_JAVA ) ),
+    m_aJavaPathText     ( this, CUI_RES( FT_JAVA_PATH ) ),
+    m_aAddBtn           ( this, CUI_RES( PB_ADD ) ),
+    m_aParameterBtn     ( this, CUI_RES( PB_PARAMETER ) ),
+    m_aClassPathBtn     ( this, CUI_RES( PB_CLASSPATH ) ),
 
     m_pParamDlg         ( NULL ),
     m_pPathDlg          ( NULL ),
@@ -171,9 +167,9 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
     m_pClassPath        ( NULL ),
     m_nInfoSize         ( 0 ),
     m_nParamSize        ( 0 ),
-    m_sInstallText      (       SVX_RES( STR_INSTALLED_IN ) ),
-    m_sAccessibilityText(       SVX_RES( STR_ACCESSIBILITY ) ),
-    m_sAddDialogText    (       SVX_RES( STR_ADDDLGTEXT ) ),
+    m_sInstallText      (       CUI_RES( STR_INSTALLED_IN ) ),
+    m_sAccessibilityText(       CUI_RES( STR_ACCESSIBILITY ) ),
+    m_sAddDialogText    (       CUI_RES( STR_ADDDLGTEXT ) ),
 
     xDialogListener     ( new ::svt::DialogClosedListener() )
 
@@ -196,11 +192,11 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
 
     m_aJavaList.SvxSimpleTable::SetTabs( aStaticTabs );
     String sHeader( '\t' );
-    sHeader += String( SVX_RES( STR_HEADER_VENDOR ) );
+    sHeader += String( CUI_RES( STR_HEADER_VENDOR ) );
     sHeader += '\t';
-    sHeader += String( SVX_RES( STR_HEADER_VERSION ) );
+    sHeader += String( CUI_RES( STR_HEADER_VERSION ) );
     sHeader += '\t';
-    sHeader += String( SVX_RES( STR_HEADER_FEATURES ) );
+    sHeader += String( CUI_RES( STR_HEADER_FEATURES ) );
     sHeader += '\t';
     m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
 
@@ -369,7 +365,7 @@ IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG )
             (void)eErr;
             if ( bRunning )
             {
-                WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
+                WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
                 aWarnBox.Execute();
             }
         }
@@ -413,7 +409,7 @@ IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG )
             (void)eErr;
             if ( bRunning )
             {
-                WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
+                WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
                 aWarnBox.Execute();
             }
         }
@@ -638,12 +634,12 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder )
     }
     else if ( JFW_E_NOT_RECOGNIZED == eErr )
     {
-        ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) );
+        ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) );
         aErrBox.Execute();
     }
     else if ( JFW_E_FAILED_VERSION == eErr )
     {
-        ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_FAILED_VERSION ) );
+        ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_FAILED_VERSION ) );
         aErrBox.Execute();
     }
 
@@ -720,7 +716,7 @@ BOOL SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
                     if ( bRunning ||
                         ( ( pInfo->nRequirements & JFW_REQUIRE_NEEDRESTART ) == JFW_REQUIRE_NEEDRESTART ) )
                     {
-                        WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART ) );
+                        WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART ) );
                         aWarnBox.Execute();
                     }
 
@@ -779,19 +775,19 @@ void SvxJavaOptionsPage::FillUserData()
 
 SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
 
-    ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
+    ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
 
-    m_aParameterLabel   ( this, SVX_RES( FT_PARAMETER ) ),
-    m_aParameterEdit    ( this, SVX_RES( ED_PARAMETER ) ),
-    m_aAssignBtn        ( this, SVX_RES( PB_ASSIGN ) ),
-    m_aAssignedLabel    ( this, SVX_RES( FT_ASSIGNED ) ),
-    m_aAssignedList     ( this, SVX_RES( LB_ASSIGNED ) ),
-    m_aExampleText      ( this, SVX_RES( FT_EXAMPLE ) ),
-    m_aRemoveBtn        ( this, SVX_RES( PB_REMOVE ) ),
-    m_aButtonsLine      ( this, SVX_RES( FL_BUTTONS ) ),
-    m_aOKBtn            ( this, SVX_RES( PB_PARAMETER_OK ) ),
-    m_aCancelBtn        ( this, SVX_RES( PB_PARAMETER_ESC ) ),
-    m_aHelpBtn          ( this, SVX_RES( PB_PARAMETER_HLP ) )
+    m_aParameterLabel   ( this, CUI_RES( FT_PARAMETER ) ),
+    m_aParameterEdit    ( this, CUI_RES( ED_PARAMETER ) ),
+    m_aAssignBtn        ( this, CUI_RES( PB_ASSIGN ) ),
+    m_aAssignedLabel    ( this, CUI_RES( FT_ASSIGNED ) ),
+    m_aAssignedList     ( this, CUI_RES( LB_ASSIGNED ) ),
+    m_aExampleText      ( this, CUI_RES( FT_EXAMPLE ) ),
+    m_aRemoveBtn        ( this, CUI_RES( PB_REMOVE ) ),
+    m_aButtonsLine      ( this, CUI_RES( FL_BUTTONS ) ),
+    m_aOKBtn            ( this, CUI_RES( PB_PARAMETER_OK ) ),
+    m_aCancelBtn        ( this, CUI_RES( PB_PARAMETER_ESC ) ),
+    m_aHelpBtn          ( this, CUI_RES( PB_PARAMETER_HLP ) )
 
 {
     FreeResource();
@@ -919,17 +915,17 @@ void SvxJavaParameterDlg::SetParameters( Sequence< ::rtl::OUString >& rParams )
 
 SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) :
 
-    ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
+    ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
 
-    m_aPathLabel        ( this, SVX_RES( FT_PATH ) ),
-    m_aPathList         ( this, SVX_RES( LB_PATH ) ),
-    m_aAddArchiveBtn    ( this, SVX_RES( PB_ADDARCHIVE ) ),
-    m_aAddPathBtn       ( this, SVX_RES( PB_ADDPATH ) ),
-    m_aRemoveBtn        ( this, SVX_RES( PB_REMOVE_PATH ) ),
-    m_aButtonsLine      ( this, SVX_RES( FL_PATH_BUTTONS ) ),
-    m_aOKBtn            ( this, SVX_RES( PB_PATH_OK ) ),
-    m_aCancelBtn        ( this, SVX_RES( PB_PATH_ESC ) ),
-    m_aHelpBtn          ( this, SVX_RES( PB_PATH_HLP ) )
+    m_aPathLabel        ( this, CUI_RES( FT_PATH ) ),
+    m_aPathList         ( this, CUI_RES( LB_PATH ) ),
+    m_aAddArchiveBtn    ( this, CUI_RES( PB_ADDARCHIVE ) ),
+    m_aAddPathBtn       ( this, CUI_RES( PB_ADDPATH ) ),
+    m_aRemoveBtn        ( this, CUI_RES( PB_REMOVE_PATH ) ),
+    m_aButtonsLine      ( this, CUI_RES( FL_PATH_BUTTONS ) ),
+    m_aOKBtn            ( this, CUI_RES( PB_PATH_OK ) ),
+    m_aCancelBtn        ( this, CUI_RES( PB_PATH_ESC ) ),
+    m_aHelpBtn          ( this, CUI_RES( PB_PATH_HLP ) )
 
 {
     FreeResource();
@@ -981,8 +977,8 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
 IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
 {
     sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
-    aDlg.SetTitle( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
-    aDlg.AddFilter( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+    aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
+    aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
     String sFolder;
     if ( m_aPathList.GetSelectEntryCount() > 0 )
     {
@@ -1004,7 +1000,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
         }
         else
         {
-            String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+            String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
             sMsg.SearchAndReplaceAscii( "%1", sFile );
             ErrorBox( this, WB_OK, sMsg ).Execute();
         }
@@ -1042,7 +1038,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG )
         }
         else
         {
-            String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+            String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
             sMsg.SearchAndReplaceAscii( "%1", sNewFolder );
             ErrorBox( this, WB_OK, sMsg ).Execute();
         }
diff --git a/svx/source/cui/optjava.hrc b/cui/source/options/optjava.hrc
index ac4b0108cc47..ac4b0108cc47 100644
--- a/svx/source/cui/optjava.hrc
+++ b/cui/source/options/optjava.hrc
diff --git a/svx/source/cui/optjava.hxx b/cui/source/options/optjava.hxx
index fb2a56162175..2b2ac090ca07 100644
--- a/svx/source/cui/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -34,16 +34,12 @@
 
 #include <vector>
 #include <ucbhelper/content.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/timer.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/simptabl.hxx>
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
 #include <svtools/dialogclosedlistener.hxx>
 #include "radiobtnbox.hxx"
 
diff --git a/svx/source/cui/optjava.src b/cui/source/options/optjava.src
index 56ea49e1b3fd..b1cce0a3e50b 100644
--- a/svx/source/cui/optjava.src
+++ b/cui/source/options/optjava.src
@@ -31,7 +31,7 @@
  // include --------------------------------------------------------------
 
 #include "optjava.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
 // RID_SVXPAGE_OPTIONS_JAVA ----------------------------------------------
diff --git a/svx/source/cui/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index cbc6d605ba03..ab08478e6caa 100644
--- a/svx/source/cui/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -29,21 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
 
 #include <tools/shl.hxx>
-#include <svtools/searchopt.hxx>
+#include <unotools/searchopt.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
-
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <optjsearch.hxx>
 #include "optjsearch.hrc"
 
@@ -52,29 +44,29 @@ using namespace com::sun::star::i18n;
 //////////////////////////////////////////////////////////////////////
 
 SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
-
-    aTreatAsEqual               ( this, SVX_RES( FL_TREAT_AS_EQUAL ) ),
-    aMatchCase                  ( this, SVX_RES( CB_MATCH_CASE ) ),
-    aMatchFullHalfWidth         ( this, SVX_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
-    aMatchHiraganaKatakana      ( this, SVX_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
-    aMatchContractions          ( this, SVX_RES( CB_MATCH_CONTRACTIONS ) ),
-    aMatchMinusDashChoon        ( this, SVX_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
-    aMatchRepeatCharMarks       ( this, SVX_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
-    aMatchVariantFormKanji      ( this, SVX_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
-    aMatchOldKanaForms          ( this, SVX_RES( CB_MATCH_OLD_KANA_FORMS ) ),
-    aMatchDiziDuzu              ( this, SVX_RES( CB_MATCH_DIZI_DUZU ) ),
-    aMatchBavaHafa              ( this, SVX_RES( CB_MATCH_BAVA_HAFA ) ),
-    aMatchTsithichiDhizi        ( this, SVX_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
-    aMatchHyuiyuByuvyu          ( this, SVX_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
-    aMatchSesheZeje             ( this, SVX_RES( CB_MATCH_SESHE_ZEJE ) ),
-    aMatchIaiya                 ( this, SVX_RES( CB_MATCH_IAIYA ) ),
-    aMatchKiku                  ( this, SVX_RES( CB_MATCH_KIKU ) ),
-    aMatchProlongedSoundMark    ( this, SVX_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
-    aIgnore                     ( this, SVX_RES( FL_IGNORE ) ),
-    aIgnorePunctuation          ( this, SVX_RES( CB_IGNORE_PUNCTUATION ) ),
-    aIgnoreWhitespace           ( this, SVX_RES( CB_IGNORE_WHITESPACES ) ),
-    aIgnoreMiddleDot            ( this, SVX_RES( CB_IGNORE_MIDDLE_DOT ) )
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
+
+    aTreatAsEqual               ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
+    aMatchCase                  ( this, CUI_RES( CB_MATCH_CASE ) ),
+    aMatchFullHalfWidth         ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
+    aMatchHiraganaKatakana      ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
+    aMatchContractions          ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
+    aMatchMinusDashChoon        ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
+    aMatchRepeatCharMarks       ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
+    aMatchVariantFormKanji      ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
+    aMatchOldKanaForms          ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
+    aMatchDiziDuzu              ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
+    aMatchBavaHafa              ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
+    aMatchTsithichiDhizi        ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
+    aMatchHyuiyuByuvyu          ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
+    aMatchSesheZeje             ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
+    aMatchIaiya                 ( this, CUI_RES( CB_MATCH_IAIYA ) ),
+    aMatchKiku                  ( this, CUI_RES( CB_MATCH_KIKU ) ),
+    aMatchProlongedSoundMark    ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
+    aIgnore                     ( this, CUI_RES( FL_IGNORE ) ),
+    aIgnorePunctuation          ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
+    aIgnoreWhitespace           ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
+    aIgnoreMiddleDot            ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) )
 {
     FreeResource();
     bSaveOptions = TRUE;
diff --git a/svx/inc/optjsearch.hrc b/cui/source/options/optjsearch.hrc
index dfe6b7bdb07a..dfe6b7bdb07a 100644
--- a/svx/inc/optjsearch.hrc
+++ b/cui/source/options/optjsearch.hrc
diff --git a/svx/source/cui/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index e1d1de79ae2e..e1d1de79ae2e 100644
--- a/svx/source/cui/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
diff --git a/svx/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index a0480b7492df..00496ecf8d6b 100644
--- a/svx/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include <helpid.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 #include "optjsearch.hrc"
 
diff --git a/svx/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f4ed552d7d27..7ca67a553278 100644
--- a/svx/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -29,28 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_USHORTS
-//#ifndef _SVSTDARR_HXX
-//#include <svtools/svstdarr.hxx>
-//#endif
 #include <vcl/msgbox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <tools/shl.hxx>
 #include <tools/dynary.hxx>
 #include <i18npool/mslangid.hxx>
-//#include <svtools/svarray.hxx>
-#include <svtools/lingucfg.hxx>
-#include <unolingu.hxx>
-#include <dlgutil.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svx/unolingu.hxx>
+#include <svx/dlgutil.hxx>
 #include <linguistic/lngprops.hxx>
 #include <linguistic/misc.hxx>
-#include <unolingu.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
@@ -70,21 +63,20 @@
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/system/XSystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
 #include <svtools/svlbox.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
 #define _SVX_OPTLINGU_CXX
-
 #include "optlingu.hrc"
 
 #include <svx/svxdlg.hxx>
-#include "optitems.hxx"
-#include <svx/optlingu.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/optitems.hxx>
+#include "optlingu.hxx"
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
 #include <ucbhelper/content.hxx>
@@ -357,18 +349,18 @@ class OptionsBreakSet : public ModalDialog
 
 public:
     OptionsBreakSet(Window* pParent, int nRID) :
-            ModalDialog(pParent, SVX_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
-            aOKPB       (this, SVX_RES(BT_OK_PREBREAK)),
-            aCancelPB   (this, SVX_RES(BT_CANCEL_PREBREAK)),
-            aValFL      (this, SVX_RES(FL_NUMVAL_PREBREAK)),
-            aValNF      (this, SVX_RES(ED_PREBREAK))
+            ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
+            aOKPB       (this, CUI_RES(BT_OK_PREBREAK)),
+            aCancelPB   (this, CUI_RES(BT_CANCEL_PREBREAK)),
+            aValFL      (this, CUI_RES(FL_NUMVAL_PREBREAK)),
+            aValNF      (this, CUI_RES(ED_PREBREAK))
     {
         DBG_ASSERT( STR_NUM_PRE_BREAK_DLG   == nRID ||
                     STR_NUM_POST_BREAK_DLG  == nRID ||
                     STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" );
 
         if (nRID != -1)
-            aValFL.SetText( String( SVX_RES(nRID) ) );
+            aValFL.SetText( String( CUI_RES(nRID) ) );
         FreeResource();
     }
 
@@ -1120,32 +1112,32 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, BOOL bEnable
 SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
                                   const SfxItemSet& rSet ):
 
-    SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_LINGU ), rSet ),
-
-    aLinguisticFL       ( this, SVX_RES( FL_LINGUISTIC ) ),
-    aLinguModulesFT     ( this, SVX_RES( FT_LINGU_MODULES ) ),
-    aLinguModulesCLB    ( this, SVX_RES( CLB_LINGU_MODULES ) ),
-    aLinguModulesEditPB ( this, SVX_RES( PB_LINGU_MODULES_EDIT ) ),
-    aLinguDicsFT        ( this, SVX_RES( FT_LINGU_DICS ) ),
-    aLinguDicsCLB       ( this, SVX_RES( CLB_LINGU_DICS ) ),
-    aLinguDicsNewPB     ( this, SVX_RES( PB_LINGU_DICS_NEW_DIC ) ),
-    aLinguDicsEditPB    ( this, SVX_RES( PB_LINGU_DICS_EDIT_DIC ) ),
-    aLinguDicsDelPB     ( this, SVX_RES( PB_LINGU_DICS_DEL_DIC ) ),
-    aLinguOptionsFT     ( this, SVX_RES( FT_LINGU_OPTIONS ) ),
-    aLinguOptionsCLB    ( this, SVX_RES( CLB_LINGU_OPTIONS ) ),
-    aLinguOptionsEditPB ( this, SVX_RES( PB_LINGU_OPTIONS_EDIT ) ),
-    aMoreDictsLink      ( this, SVX_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
-    sCapitalWords       ( SVX_RES( STR_CAPITAL_WORDS ) ),
-    sWordsWithDigits    ( SVX_RES( STR_WORDS_WITH_DIGITS ) ),
-    sCapitalization     ( SVX_RES( STR_CAPITALIZATION ) ),
-    sSpellSpecial       ( SVX_RES( STR_SPELL_SPECIAL ) ),
-    sSpellAuto          ( SVX_RES( STR_SPELL_AUTO ) ),
-    sGrammarAuto        ( SVX_RES( STR_GRAMMAR_AUTO ) ),
-    sNumMinWordlen      ( SVX_RES( STR_NUM_MIN_WORDLEN ) ),
-    sNumPreBreak        ( SVX_RES( STR_NUM_PRE_BREAK ) ),
-    sNumPostBreak       ( SVX_RES( STR_NUM_POST_BREAK ) ),
-    sHyphAuto           ( SVX_RES( STR_HYPH_AUTO ) ),
-    sHyphSpecial        ( SVX_RES( STR_HYPH_SPECIAL ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_LINGU ), rSet ),
+
+    aLinguisticFL       ( this, CUI_RES( FL_LINGUISTIC ) ),
+    aLinguModulesFT     ( this, CUI_RES( FT_LINGU_MODULES ) ),
+    aLinguModulesCLB    ( this, CUI_RES( CLB_LINGU_MODULES ) ),
+    aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ),
+    aLinguDicsFT        ( this, CUI_RES( FT_LINGU_DICS ) ),
+    aLinguDicsCLB       ( this, CUI_RES( CLB_LINGU_DICS ) ),
+    aLinguDicsNewPB     ( this, CUI_RES( PB_LINGU_DICS_NEW_DIC ) ),
+    aLinguDicsEditPB    ( this, CUI_RES( PB_LINGU_DICS_EDIT_DIC ) ),
+    aLinguDicsDelPB     ( this, CUI_RES( PB_LINGU_DICS_DEL_DIC ) ),
+    aLinguOptionsFT     ( this, CUI_RES( FT_LINGU_OPTIONS ) ),
+    aLinguOptionsCLB    ( this, CUI_RES( CLB_LINGU_OPTIONS ) ),
+    aLinguOptionsEditPB ( this, CUI_RES( PB_LINGU_OPTIONS_EDIT ) ),
+    aMoreDictsLink      ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
+    sCapitalWords       ( CUI_RES( STR_CAPITAL_WORDS ) ),
+    sWordsWithDigits    ( CUI_RES( STR_WORDS_WITH_DIGITS ) ),
+    sCapitalization     ( CUI_RES( STR_CAPITALIZATION ) ),
+    sSpellSpecial       ( CUI_RES( STR_SPELL_SPECIAL ) ),
+    sSpellAuto          ( CUI_RES( STR_SPELL_AUTO ) ),
+    sGrammarAuto        ( CUI_RES( STR_GRAMMAR_AUTO ) ),
+    sNumMinWordlen      ( CUI_RES( STR_NUM_MIN_WORDLEN ) ),
+    sNumPreBreak        ( CUI_RES( STR_NUM_PRE_BREAK ) ),
+    sNumPostBreak       ( CUI_RES( STR_NUM_POST_BREAK ) ),
+    sHyphAuto           ( CUI_RES( STR_HYPH_AUTO ) ),
+    sHyphSpecial        ( CUI_RES( STR_HYPH_SPECIAL ) ),
 
     pLinguData          ( NULL )
 {
@@ -1819,7 +1811,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
     else if (&aLinguDicsDelPB == pBtn)
     {
         if ( RET_NO ==
-             QueryBox( this, SVX_RES( RID_SFXQB_DELDICT ) ).Execute() )
+             QueryBox( this, CUI_RES( RID_SFXQB_DELDICT ) ).Execute() )
             return 0;
 
         SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry();
@@ -2038,22 +2030,22 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
 --------------------------------------------------*/
 
 SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) :
-    ModalDialog( pParent, SVX_RES(RID_SVXDLG_EDIT_MODULES ) ),
-    aModulesFL      ( this, SVX_RES( FL_EDIT_MODULES_OPTIONS ) ),
-    aLanguageFT     ( this, SVX_RES( FT_EDIT_MODULES_LANGUAGE ) ),
-    aLanguageLB     ( this, SVX_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ),
-    aModulesCLB     ( this, SVX_RES( CLB_EDIT_MODULES_MODULES ) ),
-    aPrioUpPB       ( this, SVX_RES( PB_EDIT_MODULES_PRIO_UP ) ),
-    aPrioDownPB     ( this, SVX_RES( PB_EDIT_MODULES_PRIO_DOWN ) ),
-    aBackPB         ( this, SVX_RES( PB_EDIT_MODULES_PRIO_BACK ) ),
-    aMoreDictsLink  ( this, SVX_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ),
-    aButtonsFL      ( this, SVX_RES( FL_EDIT_MODULES_BUTTONS ) ),
-    aHelpPB         ( this, SVX_RES( PB_HELP ) ),
-    aClosePB        ( this, SVX_RES( PB_OK ) ),
-    sSpell          (       SVX_RES( ST_SPELL ) ),
-    sHyph           (       SVX_RES( ST_HYPH ) ),
-    sThes           (       SVX_RES( ST_THES ) ),
-    sGrammar        (       SVX_RES( ST_GRAMMAR ) ),
+    ModalDialog( pParent, CUI_RES(RID_SVXDLG_EDIT_MODULES ) ),
+    aModulesFL      ( this, CUI_RES( FL_EDIT_MODULES_OPTIONS ) ),
+    aLanguageFT     ( this, CUI_RES( FT_EDIT_MODULES_LANGUAGE ) ),
+    aLanguageLB     ( this, CUI_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ),
+    aModulesCLB     ( this, CUI_RES( CLB_EDIT_MODULES_MODULES ) ),
+    aPrioUpPB       ( this, CUI_RES( PB_EDIT_MODULES_PRIO_UP ) ),
+    aPrioDownPB     ( this, CUI_RES( PB_EDIT_MODULES_PRIO_DOWN ) ),
+    aBackPB         ( this, CUI_RES( PB_EDIT_MODULES_PRIO_BACK ) ),
+    aMoreDictsLink  ( this, CUI_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ),
+    aButtonsFL      ( this, CUI_RES( FL_EDIT_MODULES_BUTTONS ) ),
+    aHelpPB         ( this, CUI_RES( PB_HELP ) ),
+    aClosePB        ( this, CUI_RES( PB_OK ) ),
+    sSpell          (       CUI_RES( ST_SPELL ) ),
+    sHyph           (       CUI_RES( ST_HYPH ) ),
+    sThes           (       CUI_RES( ST_THES ) ),
+    sGrammar        (       CUI_RES( ST_GRAMMAR ) ),
     rLinguData      ( rData )
 {
     pCheckButtonData = NULL;
diff --git a/svx/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc
index 73b481cbb6a3..73b481cbb6a3 100644
--- a/svx/source/options/optlingu.hrc
+++ b/cui/source/options/optlingu.hrc
diff --git a/svx/source/options/optlingu.src b/cui/source/options/optlingu.src
index a550451193f2..c0cb4489cd59 100644
--- a/svx/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -35,7 +35,7 @@
 
 #include <svtools/controldims.hrc>
 #include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 // RID_SVXDLG_EDIT_MODULES ---------------------------------------------------
 
diff --git a/svx/source/cui/optmemory.cxx b/cui/source/options/optmemory.cxx
index ac5a1809fc7b..a72660ba2e0f 100644
--- a/svx/source/cui/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -29,61 +29,48 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
 #include <svtools/langtab.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <goodies/grfmgr.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/szitem.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svl/szitem.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <vcl/msgbox.hxx>
 #include <rtl/math.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/cacheoptions.hxx>
-#include <svtools/fontoptions.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/cacheoptions.hxx>
+#include <unotools/fontoptions.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/cjkoptions.hxx>
-#ifndef INCLUDED_SVTOOLS_MISCPOPT_HXX
+#include <unotools/startoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <svtools/miscopt.hxx>
-#endif
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include <svtools/helpopt.hxx>
 #include <unotools/configitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <comphelper/types.hxx>
-#include "unolingu.hxx"
+#include <svx/unolingu.hxx>
 #include <svx/langitem.hxx>
 #include "cuioptgenrl.hxx"
 #include "optpath.hxx"
 #include "optsave.hxx"
-#include <svx/optlingu.hxx>
+#include "optlingu.hxx"
 #include <svx/xpool.hxx>
-#include "dlgutil.hxx"
-#ifndef _SVX_TAB_AREA_HXX
+#include <svx/dlgutil.hxx>
 #include "cuitabarea.hxx"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-
-
+#include <cuires.hrc>
 #include "optmemory.hrc"
 #include "optmemory.hxx"
-#include "ofaitem.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/ofaitem.hxx>
+#include <cuires.hrc>
 #include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 #define CONFIG_LANGUAGES "OfficeLanguages"
 
@@ -140,30 +127,30 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
 
 OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( OFA_TP_MEMORY ), rSet ),
-
-    aUndoBox                ( this, SVX_RES( GB_UNDO ) ),
-    aUndoText               ( this, SVX_RES( FT_UNDO ) ),
-    aUndoEdit               ( this, SVX_RES( ED_UNDO ) ),
-    aGbGraphicCache         ( this, SVX_RES( GB_GRAPHICCACHE ) ),
-    aFtGraphicCache         ( this, SVX_RES( FT_GRAPHICCACHE ) ),
-    aNfGraphicCache         ( this, SVX_RES( NF_GRAPHICCACHE ) ),
-    aFtGraphicCacheUnit     ( this, SVX_RES( FT_GRAPHICCACHE_UNIT         ) ),
-    aFtGraphicObjectCache   ( this, SVX_RES( FT_GRAPHICOBJECTCACHE ) ),
-    aNfGraphicObjectCache   ( this, SVX_RES( NF_GRAPHICOBJECTCACHE ) ),
-    aFtGraphicObjectCacheUnit(this, SVX_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ),
-    aFtGraphicObjectTime    ( this, SVX_RES( FT_GRAPHICOBJECTTIME ) ),
-    aTfGraphicObjectTime    ( this, SVX_RES( TF_GRAPHICOBJECTTIME ) ),
-    aFtGraphicObjectTimeUnit( this, SVX_RES( FT_GRAPHICOBJECTTIME_UNIT     ) ),
-
-    aGbOLECache             ( this, SVX_RES( GB_OLECACHE ) ),
-    aFtOLECache             ( this, SVX_RES( FT_OLECACHE ) ),
-    aNfOLECache             ( this, SVX_RES( NF_OLECACHE ) ),
-    aQuickLaunchFL          ( this, SVX_RES( FL_QUICKLAUNCH ) ),
-    aQuickLaunchCB          ( this, SVX_RES( CB_QUICKLAUNCH ) )//,
+    SfxTabPage( pParent, CUI_RES( OFA_TP_MEMORY ), rSet ),
+
+    aUndoBox                ( this, CUI_RES( GB_UNDO ) ),
+    aUndoText               ( this, CUI_RES( FT_UNDO ) ),
+    aUndoEdit               ( this, CUI_RES( ED_UNDO ) ),
+    aGbGraphicCache         ( this, CUI_RES( GB_GRAPHICCACHE ) ),
+    aFtGraphicCache         ( this, CUI_RES( FT_GRAPHICCACHE ) ),
+    aNfGraphicCache         ( this, CUI_RES( NF_GRAPHICCACHE ) ),
+    aFtGraphicCacheUnit     ( this, CUI_RES( FT_GRAPHICCACHE_UNIT         ) ),
+    aFtGraphicObjectCache   ( this, CUI_RES( FT_GRAPHICOBJECTCACHE ) ),
+    aNfGraphicObjectCache   ( this, CUI_RES( NF_GRAPHICOBJECTCACHE ) ),
+    aFtGraphicObjectCacheUnit(this, CUI_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ),
+    aFtGraphicObjectTime    ( this, CUI_RES( FT_GRAPHICOBJECTTIME ) ),
+    aTfGraphicObjectTime    ( this, CUI_RES( TF_GRAPHICOBJECTTIME ) ),
+    aFtGraphicObjectTimeUnit( this, CUI_RES( FT_GRAPHICOBJECTTIME_UNIT     ) ),
+
+    aGbOLECache             ( this, CUI_RES( GB_OLECACHE ) ),
+    aFtOLECache             ( this, CUI_RES( FT_OLECACHE ) ),
+    aNfOLECache             ( this, CUI_RES( NF_OLECACHE ) ),
+    aQuickLaunchFL          ( this, CUI_RES( FL_QUICKLAUNCH ) ),
+    aQuickLaunchCB          ( this, CUI_RES( CB_QUICKLAUNCH ) )//,
 {
 #if defined(UNX)
-    aQuickLaunchCB.SetText( SVX_RES( STR_QUICKLAUNCH_UNX ) );
+    aQuickLaunchCB.SetText( CUI_RES( STR_QUICKLAUNCH_UNX ) );
 #endif
     FreeResource();
 
diff --git a/svx/source/cui/optmemory.hrc b/cui/source/options/optmemory.hrc
index 0ba3f833d2e7..0ba3f833d2e7 100644
--- a/svx/source/cui/optmemory.hrc
+++ b/cui/source/options/optmemory.hrc
diff --git a/svx/source/cui/optmemory.hxx b/cui/source/options/optmemory.hxx
index f385dd60875f..f385dd60875f 100644
--- a/svx/source/cui/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
diff --git a/svx/source/cui/optmemory.src b/cui/source/options/optmemory.src
index fce14b15551d..e54dbde11eb7 100644
--- a/svx/source/cui/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -30,7 +30,7 @@
 
  // include ---------------------------------------------------------------
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "optmemory.hrc"
 #include "helpid.hrc"
 
diff --git a/svx/source/cui/optpath.cxx b/cui/source/options/optpath.cxx
index eeef9ec75fea..8e004b54b018 100644
--- a/svx/source/cui/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -29,39 +29,34 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
 #include <tools/shl.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/pickerhelper.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/pickerhelper.hxx>
+#include <svl/aeitem.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/filedlg.hxx>
 #include <tools/config.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/defaultoptions.hxx>
+#include <unotools/defaultoptions.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/viewoptions.hxx>
 
 #define _SVX_OPTPATH_CXX
 
 #include "optpath.hxx"
-#include <svx/dialmgr.hxx>
-//CHINA001 #include "multipat.hxx"
+#include <dialmgr.hxx>
 #include "optpath.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configurationhelper.hxx>
@@ -223,22 +218,22 @@ BOOL IsMultiPath_Impl( const USHORT nIndex )
 
 SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_PATH ), rSet ),
+    SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ),
 
-    aTypeText       ( this, SVX_RES( FT_TYPE ) ),
-    aPathText       ( this, SVX_RES( FT_PATH ) ),
-    aPathCtrl       ( this, SVX_RES( LB_PATH ) ),
-    aStandardBtn    ( this, SVX_RES( BTN_STANDARD ) ),
-    aPathBtn        ( this, SVX_RES( BTN_PATH ) ),
-    aStdBox         ( this, SVX_RES( GB_STD ) ),
+    aTypeText       ( this, CUI_RES( FT_TYPE ) ),
+    aPathText       ( this, CUI_RES( FT_PATH ) ),
+    aPathCtrl       ( this, CUI_RES( LB_PATH ) ),
+    aStandardBtn    ( this, CUI_RES( BTN_STANDARD ) ),
+    aPathBtn        ( this, CUI_RES( BTN_PATH ) ),
+    aStdBox         ( this, CUI_RES( GB_STD ) ),
 
     pHeaderBar      ( NULL ),
     pPathBox        ( NULL ),
-    pImpl           ( new OptPath_Impl( SVX_RES(IMG_LOCK), SVX_RES(IMG_LOCK_HC) ) ),
+    pImpl           ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ),
     xDialogListener ( new ::svt::DialogClosedListener() )
 
 {
-    pImpl->m_sMultiPathDlg = String( SVX_RES( STR_MULTIPATHDLG ) );
+    pImpl->m_sMultiPathDlg = String( CUI_RES( STR_MULTIPATHDLG ) );
     aStandardBtn.SetClickHdl( LINK( this, SvxPathTabPage, StandardHdl_Impl ) );
     Link aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
     aPathBtn.SetClickHdl( aLink );
@@ -349,7 +344,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
 #endif
             case SvtPathOptions::PATH_WORK:
             {
-                String aStr( SVX_RES( RID_SVXSTR_PATH_NAME_START + i ) );
+                String aStr( CUI_RES( RID_SVXSTR_PATH_NAME_START + i ) );
                 String sInternal, sUser, sWritable;
                 sal_Bool bReadOnly = sal_False;
                 GetPathList( i, sInternal, sUser, sWritable, bReadOnly );
@@ -588,7 +583,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
         if ( pFact )
         {
             AbstractSvxMultiPathDialog* pMultiDlg =
-                pFact->CreateSvxMultiPathDialog( this, RID_SVXDLG_MULTIPATH );
+                pFact->CreateSvxMultiPathDialog( this );
             DBG_ASSERT( pMultiDlg, "Dialogdiet fail!" );
             pMultiDlg->EnableRadioButtonMode();
 
diff --git a/svx/inc/optpath.hrc b/cui/source/options/optpath.hrc
index 0fcef57dcf4c..0fcef57dcf4c 100644
--- a/svx/inc/optpath.hrc
+++ b/cui/source/options/optpath.hrc
diff --git a/svx/source/options/optpath.src b/cui/source/options/optpath.src
index 65280895a506..7d0c3425636d 100644
--- a/svx/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -29,7 +29,7 @@
  ************************************************************************/
  // include --------------------------------------------------------------
 #include "optpath.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #ifndef _SFX_HRC
 #include <sfx2/sfx.hrc>
 #endif
diff --git a/svx/source/cui/optsave.cxx b/cui/source/options/optsave.cxx
index 893300d10e01..caf332fb4048 100644
--- a/svx/source/cui/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -29,28 +29,24 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #define _SVX_OPTSAVE_CXX
 
 #include "optsave.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 #include "optsave.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceasvector.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/saveopt.hxx>
 #include <comphelper/sequenceasvector.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <com/sun/star/container/XContainerQuery.hpp>
@@ -66,7 +62,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/configitem.hxx>
-#include <svtools/optionsdlg.hxx>
+#include <unotools/optionsdlg.hxx>
 
 #include <vcl/msgbox.hxx>
 
@@ -100,11 +96,11 @@ class FilterWarningDialog_Impl : public ModalDialog
 };
 // ----------------------------------------------------------------------
 FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) :
-    ModalDialog(pParent, SVX_RES( RID_SVXDLG_FILTER_WARNING ) ),
-    aOk(                this, SVX_RES(PB_OK               )),
-    aCancel(            this, SVX_RES(PB_CANCEL           )),
-    aImage(             this, SVX_RES(IMG_WARNING         )),
-    aFilterWarningFT(   this, SVX_RES(FT_FILTER_WARNING   ))
+    ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ),
+    aOk(                this, CUI_RES(PB_OK               )),
+    aCancel(            this, CUI_RES(PB_CANCEL           )),
+    aImage(             this, CUI_RES(IMG_WARNING         )),
+    aFilterWarningFT(   this, CUI_RES(FT_FILTER_WARNING   ))
 {
     FreeResource();
     aImage.SetImage(WarningBox::GetStandardImage());
@@ -201,41 +197,41 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
 
 SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_SAVE ), rCoreSet ),
-
-    aLoadFL             ( this, SVX_RES( LB_LOAD ) ),
-    aLoadUserSettingsCB ( this, SVX_RES( CB_LOAD_SETTINGS ) ),
-    aLoadDocPrinterCB   ( this, SVX_RES( CB_LOAD_DOCPRINTER ) ),
-
-    aSaveFL             ( this, SVX_RES( GB_SAVE ) ),
-    aDocInfoCB          ( this, SVX_RES( BTN_DOCINFO ) ),
-    aBackupFI           ( this, SVX_RES( FI_BACKUP ) ),
-    aBackupCB           ( this, SVX_RES( BTN_BACKUP ) ),
-    aAutoSaveCB         ( this, SVX_RES( BTN_AUTOSAVE ) ),
-    aAutoSaveEdit       ( this, SVX_RES( ED_AUTOSAVE ) ),
-    aMinuteFT           ( this, SVX_RES( FT_MINUTE ) ),
-    aRelativeFsysCB     ( this, SVX_RES( BTN_RELATIVE_FSYS ) ),
-    aRelativeInetCB     ( this, SVX_RES( BTN_RELATIVE_INET ) ),
-
-    aDefaultFormatFL    ( this, SVX_RES( FL_FILTER ) ),
-    aODFVersionFT       ( this, SVX_RES( FT_ODF_VERSION ) ),
-    aODFVersionLB       ( this, SVX_RES( LB_ODF_VERSION ) ),
-    aSizeOptimizationCB ( this, SVX_RES( BTN_NOPRETTYPRINTING ) ),
-    aWarnAlienFormatCB  ( this, SVX_RES( BTN_WARNALIENFORMAT ) ),
-    aDocTypeFT          ( this, SVX_RES( FT_APP ) ),
-    aDocTypeLB          ( this, SVX_RES( LB_APP ) ),
-    aSaveAsFT           ( this, SVX_RES( FT_FILTER ) ),
-    aSaveAsFI           ( this, SVX_RES( FI_FILTER ) ),
-    aSaveAsLB           ( this, SVX_RES( LB_FILTER ) ),
-    aODFWarningFI       ( this, SVX_RES( FI_ODF_WARNING ) ),
-    aODFWarningFT       ( this, SVX_RES( FT_WARN ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_SAVE ), rCoreSet ),
+
+    aLoadFL             ( this, CUI_RES( LB_LOAD ) ),
+    aLoadUserSettingsCB ( this, CUI_RES( CB_LOAD_SETTINGS ) ),
+    aLoadDocPrinterCB   ( this, CUI_RES( CB_LOAD_DOCPRINTER ) ),
+
+    aSaveFL             ( this, CUI_RES( GB_SAVE ) ),
+    aDocInfoCB          ( this, CUI_RES( BTN_DOCINFO ) ),
+    aBackupFI           ( this, CUI_RES( FI_BACKUP ) ),
+    aBackupCB           ( this, CUI_RES( BTN_BACKUP ) ),
+    aAutoSaveCB         ( this, CUI_RES( BTN_AUTOSAVE ) ),
+    aAutoSaveEdit       ( this, CUI_RES( ED_AUTOSAVE ) ),
+    aMinuteFT           ( this, CUI_RES( FT_MINUTE ) ),
+    aRelativeFsysCB     ( this, CUI_RES( BTN_RELATIVE_FSYS ) ),
+    aRelativeInetCB     ( this, CUI_RES( BTN_RELATIVE_INET ) ),
+
+    aDefaultFormatFL    ( this, CUI_RES( FL_FILTER ) ),
+    aODFVersionFT       ( this, CUI_RES( FT_ODF_VERSION ) ),
+    aODFVersionLB       ( this, CUI_RES( LB_ODF_VERSION ) ),
+    aSizeOptimizationCB ( this, CUI_RES( BTN_NOPRETTYPRINTING ) ),
+    aWarnAlienFormatCB  ( this, CUI_RES( BTN_WARNALIENFORMAT ) ),
+    aDocTypeFT          ( this, CUI_RES( FT_APP ) ),
+    aDocTypeLB          ( this, CUI_RES( LB_APP ) ),
+    aSaveAsFT           ( this, CUI_RES( FT_FILTER ) ),
+    aSaveAsFI           ( this, CUI_RES( FI_FILTER ) ),
+    aSaveAsLB           ( this, CUI_RES( LB_FILTER ) ),
+    aODFWarningFI       ( this, CUI_RES( FI_ODF_WARNING ) ),
+    aODFWarningFT       ( this, CUI_RES( FT_WARN ) ),
 
     pImpl               ( new SvxSaveTabPage_Impl )
 
 {
     sal_Bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
     aODFWarningFI.SetImage(
-        Image( SVX_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
+        Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
 
     FreeResource();
 
diff --git a/svx/inc/optsave.hrc b/cui/source/options/optsave.hrc
index c5b2ab5e765a..c5b2ab5e765a 100644
--- a/svx/inc/optsave.hrc
+++ b/cui/source/options/optsave.hrc
diff --git a/svx/source/cui/optsave.hxx b/cui/source/options/optsave.hxx
index 8c9fcbc75ac8..8c9fcbc75ac8 100644
--- a/svx/source/cui/optsave.hxx
+++ b/cui/source/options/optsave.hxx
diff --git a/svx/source/options/optsave.src b/cui/source/options/optsave.src
index 374f53ef618f..cffff43cd23a 100644
--- a/svx/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -30,7 +30,7 @@
 
  // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "optsave.hrc"
 
diff --git a/svx/inc/optspell.hrc b/cui/source/options/optspell.hrc
index e13ba3ea09a2..e13ba3ea09a2 100644
--- a/svx/inc/optspell.hrc
+++ b/cui/source/options/optspell.hrc
diff --git a/svx/source/options/optspell.src b/cui/source/options/optspell.src
index bc6f3ad37fce..bc6f3ad37fce 100644
--- a/svx/source/options/optspell.src
+++ b/cui/source/options/optspell.src
diff --git a/svx/source/cui/optupdt.cxx b/cui/source/options/optupdt.cxx
index ebe23d52b66d..0fb6e113c40d 100644
--- a/svx/source/cui/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -29,24 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <vcl/svapp.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/zforlist.hxx>
-
+#include <svl/zforlist.hxx>
 #include "optupdt.hxx"
 #include "optupdt.hrc"
-
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-
-
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
@@ -55,7 +47,6 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 
@@ -75,20 +66,20 @@ namespace util = ::com::sun::star::util;
 
 SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
-        m_aOptionsLine( this, SVX_RES( FL_OPTIONS ) ),
-        m_aAutoCheckCheckBox( this, SVX_RES( CB_AUTOCHECK ) ),
-        m_aEveryDayButton( this, SVX_RES( RB_EVERYDAY ) ),
-        m_aEveryWeekButton( this, SVX_RES( RB_EVERYWEEK ) ),
-        m_aEveryMonthButton( this, SVX_RES( RB_EVERYMONTH ) ),
-        m_aCheckNowButton( this, SVX_RES( PB_CHECKNOW ) ),
-        m_aAutoDownloadCheckBox( this, SVX_RES( CB_AUTODOWNLOAD ) ),
-        m_aDestPathLabel( this, SVX_RES( FT_DESTPATHLABEL ) ),
-        m_aDestPath( this, SVX_RES( FT_DESTPATH ) ),
-        m_aChangePathButton( this, SVX_RES( PB_CHANGEPATH ) ),
-        m_aLastChecked( this, SVX_RES( FT_LASTCHECKED ) )
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
+        m_aOptionsLine( this, CUI_RES( FL_OPTIONS ) ),
+        m_aAutoCheckCheckBox( this, CUI_RES( CB_AUTOCHECK ) ),
+        m_aEveryDayButton( this, CUI_RES( RB_EVERYDAY ) ),
+        m_aEveryWeekButton( this, CUI_RES( RB_EVERYWEEK ) ),
+        m_aEveryMonthButton( this, CUI_RES( RB_EVERYMONTH ) ),
+        m_aCheckNowButton( this, CUI_RES( PB_CHECKNOW ) ),
+        m_aAutoDownloadCheckBox( this, CUI_RES( CB_AUTODOWNLOAD ) ),
+        m_aDestPathLabel( this, CUI_RES( FT_DESTPATHLABEL ) ),
+        m_aDestPath( this, CUI_RES( FT_DESTPATH ) ),
+        m_aChangePathButton( this, CUI_RES( PB_CHANGEPATH ) ),
+        m_aLastChecked( this, CUI_RES( FT_LASTCHECKED ) )
 {
-    m_aNeverChecked = String( SVX_RES( STR_NEVERCHECKED ) );
+    m_aNeverChecked = String( CUI_RES( STR_NEVERCHECKED ) );
     FreeResource();
 
     m_aAutoCheckCheckBox.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, AutoCheckHdl_Impl ) );
diff --git a/svx/source/cui/optupdt.hrc b/cui/source/options/optupdt.hrc
index d9e77f7f1403..d9e77f7f1403 100644
--- a/svx/source/cui/optupdt.hrc
+++ b/cui/source/options/optupdt.hrc
diff --git a/svx/source/cui/optupdt.hxx b/cui/source/options/optupdt.hxx
index 4aa380844602..4aa380844602 100644
--- a/svx/source/cui/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
diff --git a/svx/source/cui/optupdt.src b/cui/source/options/optupdt.src
index 043abb8b6a95..55d213978672 100644
--- a/svx/source/cui/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -30,7 +30,7 @@
 
 // include --------------------------------------------------------------
 #include "optupdt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
  // RID_SVXPAGE_ONLINEUPDATE --------------------------------------------
diff --git a/svx/source/dialog/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 7aecbb95a91a..a3cf9719bf59 100644
--- a/svx/source/dialog/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -29,18 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-/*
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-*/
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
 #include "radiobtnbox.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 namespace svx {
 
diff --git a/svx/source/cui/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx
index b22ee80f3a4c..508c4e6cfaec 100644
--- a/svx/source/cui/readonlyimage.cxx
+++ b/cui/source/options/readonlyimage.cxx
@@ -29,17 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <readonlyimage.hxx>
 #include <vcl/help.hxx>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
+#include <dialmgr.hxx>
+#include <cuires.hrc>
+
 /*-- 26.02.2004 13:31:04---------------------------------------------------
 
   -----------------------------------------------------------------------*/
@@ -47,7 +43,7 @@ ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
             FixedImage(pParent, rResId)
 {
     sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetImage( Image(SVX_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
+    SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
 }
 
 /*-- 26.02.2004 13:31:04---------------------------------------------------
@@ -83,6 +79,6 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
   -----------------------------------------------------------------------*/
 const String& ReadOnlyImage::GetHelpTip()
 {
-     static String  aStr(SVX_RES(RID_SVXSTR_READONLY_CONFIG_TIP));
+     static String  aStr(CUI_RES(RID_SVXSTR_READONLY_CONFIG_TIP));
      return aStr;
 }
diff --git a/svx/source/cui/readonlyimage.hxx b/cui/source/options/readonlyimage.hxx
index 10e44989e9e9..10e44989e9e9 100644
--- a/svx/source/cui/readonlyimage.hxx
+++ b/cui/source/options/readonlyimage.hxx
diff --git a/svx/source/cui/readonlyimage.src b/cui/source/options/readonlyimage.src
index 0f698a833c46..92b7d2b73fb3 100644
--- a/svx/source/cui/readonlyimage.src
+++ b/cui/source/options/readonlyimage.src
@@ -30,7 +30,7 @@
 
  // include ---------------------------------------------------------------
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 String RID_SVXSTR_READONLY_CONFIG_TIP
 {
diff --git a/svx/source/cui/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index d8be80bea651..5da5d649a969 100644
--- a/svx/source/cui/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 #include "sdbcdriverenum.hxx"
 #include <comphelper/stl_types.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/cui/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index eaee591b22f3..eaee591b22f3 100644
--- a/svx/source/cui/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
diff --git a/svx/source/cui/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index e033b9010868..85afe1476d5b 100644
--- a/svx/source/cui/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -29,23 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
-#ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX
-#include <svtools/securityoptions.hxx>
-#endif
+#include <unotools/securityoptions.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include "securityoptions.hxx"
 #include "securityoptions.hrc"
 
@@ -69,29 +60,29 @@ namespace svx
 //........................................................................
 
 SecurityOptionsDialog::SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ) :
-     ModalDialog( pParent, SVX_RES( RID_SVXDLG_SECURITY_OPTIONS ) )
-    ,m_aWarningsFL      ( this, SVX_RES( FL_WARNINGS ) )
-    ,m_aWarningsFI      ( this, SVX_RES( FI_WARNINGS ) )
-    ,m_aSaveOrSendDocsFI( this, SVX_RES( FI_SAVESENDDOCS ) )
-    ,m_aSaveOrSendDocsCB( this, SVX_RES( CB_SAVESENDDOCS ) )
-    ,m_aSignDocsFI      ( this, SVX_RES( FI_SIGNDOCS ) )
-    ,m_aSignDocsCB      ( this, SVX_RES( CB_SIGNDOCS ) )
-    ,m_aPrintDocsFI     ( this, SVX_RES( FI_PRINTDOCS ) )
-    ,m_aPrintDocsCB     ( this, SVX_RES( CB_PRINTDOCS ) )
-    ,m_aCreatePdfFI     ( this, SVX_RES( FI_CREATEPDF ) )
-    ,m_aCreatePdfCB     ( this, SVX_RES( CB_CREATEPDF ) )
-    ,m_aOptionsFL       ( this, SVX_RES( FL_OPTIONS ) )
-    ,m_aRemovePersInfoFI( this, SVX_RES( FI_REMOVEINFO ) )
-    ,m_aRemovePersInfoCB( this, SVX_RES( CB_REMOVEINFO ) )
-    ,m_aRecommPasswdFI  ( this, SVX_RES( FI_RECOMMENDPWD ) )
-    ,m_aRecommPasswdCB  ( this, SVX_RES( CB_RECOMMENDPWD ) )
-    ,m_aCtrlHyperlinkFI ( this, SVX_RES( FI_CTRLHYPERLINK ) )
-    ,m_aCtrlHyperlinkCB ( this, SVX_RES( CB_CTRLHYPERLINK ) )
+     ModalDialog( pParent, CUI_RES( RID_SVXDLG_SECURITY_OPTIONS ) )
+    ,m_aWarningsFL      ( this, CUI_RES( FL_WARNINGS ) )
+    ,m_aWarningsFI      ( this, CUI_RES( FI_WARNINGS ) )
+    ,m_aSaveOrSendDocsFI( this, CUI_RES( FI_SAVESENDDOCS ) )
+    ,m_aSaveOrSendDocsCB( this, CUI_RES( CB_SAVESENDDOCS ) )
+    ,m_aSignDocsFI      ( this, CUI_RES( FI_SIGNDOCS ) )
+    ,m_aSignDocsCB      ( this, CUI_RES( CB_SIGNDOCS ) )
+    ,m_aPrintDocsFI     ( this, CUI_RES( FI_PRINTDOCS ) )
+    ,m_aPrintDocsCB     ( this, CUI_RES( CB_PRINTDOCS ) )
+    ,m_aCreatePdfFI     ( this, CUI_RES( FI_CREATEPDF ) )
+    ,m_aCreatePdfCB     ( this, CUI_RES( CB_CREATEPDF ) )
+    ,m_aOptionsFL       ( this, CUI_RES( FL_OPTIONS ) )
+    ,m_aRemovePersInfoFI( this, CUI_RES( FI_REMOVEINFO ) )
+    ,m_aRemovePersInfoCB( this, CUI_RES( CB_REMOVEINFO ) )
+    ,m_aRecommPasswdFI  ( this, CUI_RES( FI_RECOMMENDPWD ) )
+    ,m_aRecommPasswdCB  ( this, CUI_RES( CB_RECOMMENDPWD ) )
+    ,m_aCtrlHyperlinkFI ( this, CUI_RES( FI_CTRLHYPERLINK ) )
+    ,m_aCtrlHyperlinkCB ( this, CUI_RES( CB_CTRLHYPERLINK ) )
 
-    ,m_aButtonsFL       ( this, SVX_RES( FL_BUTTONS ) )
-    ,m_aOKBtn           ( this, SVX_RES( PB_OK ) )
-    ,m_aCancelBtn       ( this, SVX_RES( PB_CANCEL ) )
-    ,m_aHelpBtn         ( this, SVX_RES( PB_HELP ) )
+    ,m_aButtonsFL       ( this, CUI_RES( FL_BUTTONS ) )
+    ,m_aOKBtn           ( this, CUI_RES( PB_OK ) )
+    ,m_aCancelBtn       ( this, CUI_RES( PB_CANCEL ) )
+    ,m_aHelpBtn         ( this, CUI_RES( PB_HELP ) )
 
 {
     FreeResource();
diff --git a/svx/source/cui/securityoptions.hrc b/cui/source/options/securityoptions.hrc
index c0358d5f151b..c0358d5f151b 100644
--- a/svx/source/cui/securityoptions.hrc
+++ b/cui/source/options/securityoptions.hrc
diff --git a/svx/source/cui/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 0e78e328edd8..0e78e328edd8 100644
--- a/svx/source/cui/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
diff --git a/svx/source/cui/securityoptions.src b/cui/source/options/securityoptions.src
index 7f921bea1dd2..386f92a91fe3 100644
--- a/svx/source/cui/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -32,7 +32,7 @@
 
 #include <svtools/controldims.hrc>
 #include "securityoptions.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
 ModalDialog RID_SVXDLG_SECURITY_OPTIONS
diff --git a/svx/source/cui/treeopt.cxx b/cui/source/options/treeopt.cxx
index f33efffc2416..b45a19af4a70 100644
--- a/svx/source/cui/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/loader/CannotActivateFactoryException.hpp>
@@ -43,13 +39,10 @@
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
 #include <osl/module.hxx>
-
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <tools/rcid.h>
-
 #include <tools/shl.hxx>
-
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -67,39 +60,34 @@
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XTabController.hpp>
 #include <vcl/help.hxx>
-#ifndef _LINGUISTIC_MISC_HHX_
 #include <linguistic/misc.hxx>
-#endif
 #include <svtools/helpopt.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/optionsdlg.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <unotools/optionsdlg.hxx>
 #include <sfx2/module.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/waitobj.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <sfx2/printopt.hxx>
 #include <osl/module.h>
 #include <osl/process.h>
 #include <rtl/bootstrap.hxx>
-
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <svtools/apearcfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/linguprops.hxx>
 #include <sfx2/app.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xpool.hxx>
-#ifndef _SVX_TAB_AREA_HXX //autogen
 #include "cuitabarea.hxx"
-#endif
-#include "ofaitem.hxx"
+#include <svx/ofaitem.hxx>
 #include "opthtml.hxx"
 #include "optcolor.hxx"
 #include "optctl.hxx"
@@ -107,45 +95,41 @@
 #include "optsave.hxx"
 #include "optpath.hxx"
 #include "cuioptgenrl.hxx"
-#include <svx/optlingu.hxx>
-#ifndef _SVX_TAB_AREA_HXX //autogen
-#include "cuitabarea.hxx"
-#endif
+#include "optlingu.hxx"
 #include "optinet2.hxx"
 #include "optasian.hxx"
 #include "optaccessibility.hxx"
 #include "optjsearch.hxx"
 #include "connpooloptions.hxx"
 #include "optupdt.hxx"
-#include "svx/optimprove.hxx"
+#include <optimprove.hxx>
 #include "optchart.hxx"
-
 #include "optgdlg.hxx"
 #include "optmemory.hxx"
 #include "optfltr.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include "treeopt.hxx"
 #include "treeopt.hrc"
 #include "fontsubs.hxx"
-#include "unolingu.hxx"
+#include <svx/unolingu.hxx>
 #include <svx/xtable.hxx>
 #include "connpoolconfig.hxx"
 #include "dbregister.hxx"
 #include "dbregisterednamesconfig.hxx"
 #include "cfgchart.hxx"
+#include <svx/dialogs.hrc>
 
 #ifndef _SVX_LANGITEM_HXX
 #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
 #include <svx/langitem.hxx>
 #endif
-#ifndef _SVX_OPTITEMS_HXX
 
 
-#include <optitems.hxx>
-#endif
-#include <drawitem.hxx>
+#include <svx/optitems.hxx>
+
+#include <svx/drawitem.hxx>
 #include <rtl/uri.hxx>
 
 using namespace ::com::sun::star;
@@ -312,6 +296,7 @@ public:
     virtual ~MailMergeCfg_Impl();
 
     virtual void    Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
     sal_Bool IsEmailSupported() const {return bIsEmailSupported;}
 
@@ -341,6 +326,10 @@ void MailMergeCfg_Impl::Commit()
 {
 }
 
+void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
 //typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet );
 SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
 {
@@ -560,19 +549,19 @@ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent )
 // -----------------------------------------------------------------------
 
 #define INI_LIST() \
-    aOkPB               ( this, SVX_RES( PB_OK ) ),\
-    aCancelPB           ( this, SVX_RES( PB_CANCEL ) ),\
-    aHelpPB             ( this, SVX_RES( PB_HELP ) ),\
-    aBackPB             ( this, SVX_RES( PB_BACK ) ),\
-    aHiddenGB           ( this, SVX_RES( FB_BORDER ) ),\
-    aPageTitleFT        ( this, SVX_RES( FT_PAGE_TITLE ) ),\
-    aLine1FL            ( this, SVX_RES( FL_LINE_1 ) ),\
-    aHelpFT             ( this, SVX_RES( FT_HELPTEXT ) ),\
-    aHelpImg            ( this, SVX_RES( IMG_HELP ) ),\
-    aHelpTextsArr       (       SVX_RES( STR_HELPTEXTS ) ),\
-    aTreeLB             ( this, SVX_RES( TLB_PAGES ) ),\
+    aOkPB               ( this, CUI_RES( PB_OK ) ),\
+    aCancelPB           ( this, CUI_RES( PB_CANCEL ) ),\
+    aHelpPB             ( this, CUI_RES( PB_HELP ) ),\
+    aBackPB             ( this, CUI_RES( PB_BACK ) ),\
+    aHiddenGB           ( this, CUI_RES( FB_BORDER ) ),\
+    aPageTitleFT        ( this, CUI_RES( FT_PAGE_TITLE ) ),\
+    aLine1FL            ( this, CUI_RES( FL_LINE_1 ) ),\
+    aHelpFT             ( this, CUI_RES( FT_HELPTEXT ) ),\
+    aHelpImg            ( this, CUI_RES( IMG_HELP ) ),\
+    aHelpTextsArr       (       CUI_RES( STR_HELPTEXTS ) ),\
+    aTreeLB             ( this, CUI_RES( TLB_PAGES ) ),\
     sTitle              ( GetText() ),\
-    sNotLoadedError     (       SVX_RES( ST_LOAD_ERROR ) ),\
+    sNotLoadedError     (       CUI_RES( ST_LOAD_ERROR ) ),\
     pCurrentPageEntry   ( NULL ),\
     pColorPageItemSet   ( NULL ),\
     pColorTab           ( NULL ),\
@@ -593,7 +582,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
     const Reference< XFrame >& _xFrame,
     bool bActivateLastSelection ) :
 
-    SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ),
+    SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
     INI_LIST()
 {
     FreeResource();
@@ -610,7 +599,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
 
 OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ) :
 
-    SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ),
+    SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
 
     INI_LIST()
 
@@ -1450,19 +1439,19 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
  * --------------------------------------------------*/
 
 OfaPageResource::OfaPageResource() :
-    Resource(SVX_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
-    aGeneralDlgAry(SVX_RES(SID_GENERAL_OPTIONS)),
-    aInetDlgAry(SVX_RES(SID_INET_DLG)),
-    aLangDlgAry(SVX_RES(SID_LANGUAGE_OPTIONS)),
-    aTextDlgAry(SVX_RES(SID_SW_EDITOPTIONS)),
-    aHTMLDlgAry(SVX_RES(SID_SW_ONLINEOPTIONS)),
-    aCalcDlgAry(SVX_RES(SID_SC_EDITOPTIONS)),
-    aStarMathDlgAry(SVX_RES(SID_SM_EDITOPTIONS)),
-    aImpressDlgAry(SVX_RES(SID_SD_EDITOPTIONS)),
-    aDrawDlgAry(SVX_RES(SID_SD_GRAPHIC_OPTIONS)),
-    aChartDlgAry(SVX_RES(SID_SCH_EDITOPTIONS)),
-    aFilterDlgAry(SVX_RES(SID_FILTER_DLG)),
-    aDatasourcesDlgAry(SVX_RES(SID_SB_STARBASEOPTIONS))
+    Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
+    aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)),
+    aInetDlgAry(CUI_RES(SID_INET_DLG)),
+    aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)),
+    aTextDlgAry(CUI_RES(SID_SW_EDITOPTIONS)),
+    aHTMLDlgAry(CUI_RES(SID_SW_ONLINEOPTIONS)),
+    aCalcDlgAry(CUI_RES(SID_SC_EDITOPTIONS)),
+    aStarMathDlgAry(CUI_RES(SID_SM_EDITOPTIONS)),
+    aImpressDlgAry(CUI_RES(SID_SD_EDITOPTIONS)),
+    aDrawDlgAry(CUI_RES(SID_SD_GRAPHIC_OPTIONS)),
+    aChartDlgAry(CUI_RES(SID_SCH_EDITOPTIONS)),
+    aFilterDlgAry(CUI_RES(SID_FILTER_DLG)),
+    aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS))
 {
     FreeResource();
 }
@@ -1551,7 +1540,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
             SFX_APP()->GetOptions(aOptSet);
             pRet->Put(aOptSet);
 
-            SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig();
+            utl::MiscCfg    aMisc;
             const SfxPoolItem* pItem;
             SfxViewFrame* pViewFrame = SfxViewFrame::Current();
             if ( pViewFrame )
@@ -1562,17 +1551,17 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                 if( SFX_ITEM_AVAILABLE <= pDispatch->QueryState( SID_ATTR_YEAR2000, pItem ) )
                     pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const SfxUInt16Item*)pItem)->GetValue() ) );
                 else
-                    pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) );
+                    pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) );
             }
             else
-                pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) );
+                pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) );
 
 
             // Sonstiges - Tabulator
-            pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, pMisc->IsNotFoundWarning()));
+            pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning()));
 
-            sal_uInt16 nFlag = pMisc->IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0;
-            nFlag  |= pMisc->IsPaperOrientationWarning()  ? SFX_PRINTER_CHG_ORIENTATION : 0;
+            sal_uInt16 nFlag = aMisc.IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0;
+            nFlag  |= aMisc.IsPaperOrientationWarning()  ? SFX_PRINTER_CHG_ORIENTATION : 0;
             pRet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlag ));
 
         }
@@ -1686,7 +1675,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
     {
         case SID_GENERAL_OPTIONS:
         {
-            SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig();
+            utl::MiscCfg    aMisc;
             const SfxPoolItem* pItem;
             SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
             aOptSet.Put(rSet);
@@ -1707,20 +1696,20 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
                     SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
                     pDispatch->Execute( SID_ATTR_YEAR2000, SFX_CALLMODE_ASYNCHRON, pItem, 0L);
                 }
-                pMisc->SetYear2000(nY2K);
+                aMisc.SetYear2000(nY2K);
             }
 
 // -------------------------------------------------------------------------
 //          Drucken auswerten
 // -------------------------------------------------------------------------
             if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem))
-                pMisc->SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
+                aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
 
             if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, sal_False, &pItem))
             {
                 const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem;
-                pMisc->SetPaperSizeWarning(0 != (pFlag->GetValue() &  SFX_PRINTER_CHG_SIZE ));
-                pMisc->SetPaperOrientationWarning(0 !=  (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION ));
+                aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() &  SFX_PRINTER_CHG_SIZE ));
+                aMisc.SetPaperOrientationWarning(0 !=  (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION ));
             }
 // -------------------------------------------------------------------------
 //          evaluate help options
@@ -2034,7 +2023,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                          ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) )
                         AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
                 }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
 #endif
             }
@@ -2050,7 +2039,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                     if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
                 }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
 #endif
             }
diff --git a/svx/source/cui/treeopt.hrc b/cui/source/options/treeopt.hrc
index 7f8fab812dc2..7f8fab812dc2 100644
--- a/svx/source/cui/treeopt.hrc
+++ b/cui/source/options/treeopt.hrc
diff --git a/svx/source/cui/treeopt.src b/cui/source/options/treeopt.src
index 2bf5d0825cdc..05a67948da04 100644
--- a/svx/source/cui/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -29,8 +29,9 @@
  ************************************************************************/
 
 #include "treeopt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
+#include <svx/dialogs.hrc>
 
 #define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
 
diff --git a/svx/source/cui/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 997c246abf1e..162758a524fe 100644
--- a/svx/source/cui/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -29,26 +29,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include <com/sun/star/task/UrlRecord.hpp>
 #include <com/sun/star/task/XPasswordContainer.hpp>
 #include <com/sun/star/task/XMasterPasswordHandling.hpp>
 #include "com/sun/star/task/XUrlContainer.hpp"
-
 #include <comphelper/processfactory.hxx>
 #include <comphelper/docpasswordrequest.hxx>
-
 #include "webconninfo.hxx"
 #include "webconninfo.hrc"
 
@@ -108,22 +99,22 @@ void PasswordTable::Resort( bool bForced )
 
 // -----------------------------------------------------------------------
 WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) :
-     ModalDialog( pParent, SVX_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
-    ,m_aNeverShownFI    ( this, SVX_RES( FI_NEVERSHOWN ) )
-    ,m_aPasswordsLB     ( this, SVX_RES( LB_PASSWORDS ) )
-    ,m_aRemoveBtn       ( this, SVX_RES( PB_REMOVE ) )
-    ,m_aRemoveAllBtn    ( this, SVX_RES( PB_REMOVEALL ) )
-    ,m_aChangeBtn       ( this, SVX_RES( PB_CHANGE ) )
-    ,m_aButtonsFL       ( this, SVX_RES( FL_BUTTONS ) )
-    ,m_aCloseBtn        ( this, SVX_RES( PB_CLOSE ) )
-    ,m_aHelpBtn         ( this, SVX_RES( PB_HELP ) )
+     ModalDialog( pParent, CUI_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
+    ,m_aNeverShownFI    ( this, CUI_RES( FI_NEVERSHOWN ) )
+    ,m_aPasswordsLB     ( this, CUI_RES( LB_PASSWORDS ) )
+    ,m_aRemoveBtn       ( this, CUI_RES( PB_REMOVE ) )
+    ,m_aRemoveAllBtn    ( this, CUI_RES( PB_REMOVEALL ) )
+    ,m_aChangeBtn       ( this, CUI_RES( PB_CHANGE ) )
+    ,m_aButtonsFL       ( this, CUI_RES( FL_BUTTONS ) )
+    ,m_aCloseBtn        ( this, CUI_RES( PB_CLOSE ) )
+    ,m_aHelpBtn         ( this, CUI_RES( PB_HELP ) )
     ,m_nPos             ( -1 )
 {
     static long aStaticTabs[]= { 3, 0, 150, 250 };
     m_aPasswordsLB.SetTabs( aStaticTabs );
-    m_aPasswordsLB.InsertHeaderItem( 1, SVX_RESSTR( STR_WEBSITE ),
+    m_aPasswordsLB.InsertHeaderItem( 1, CUI_RESSTR( STR_WEBSITE ),
         HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW );
-    m_aPasswordsLB.InsertHeaderItem( 2, SVX_RESSTR( STR_USERNAME ),
+    m_aPasswordsLB.InsertHeaderItem( 2, CUI_RESSTR( STR_USERNAME ),
         HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS );
     m_aPasswordsLB.ResetTabs();
 
diff --git a/svx/source/cui/webconninfo.hrc b/cui/source/options/webconninfo.hrc
index de040b302d89..de040b302d89 100644
--- a/svx/source/cui/webconninfo.hrc
+++ b/cui/source/options/webconninfo.hrc
diff --git a/svx/source/cui/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index f24b9f0dd4c8..f24b9f0dd4c8 100644
--- a/svx/source/cui/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
diff --git a/svx/source/cui/webconninfo.src b/cui/source/options/webconninfo.src
index 328478c56e83..9252a698b29c 100644
--- a/svx/source/cui/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -32,7 +32,7 @@
 
 #include <svtools/controldims.hrc>
 #include "webconninfo.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 
 ModalDialog RID_SVXDLG_WEBCONNECTION_INFO
diff --git a/svx/source/cui/align.cxx b/cui/source/tabpages/align.cxx
index 641ee0717b96..f275cc084877 100644
--- a/svx/source/cui/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -29,35 +29,31 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
-#include <svx/svxenum.hxx>
+#include "align.hxx"
 
+#include <svx/svxenum.hxx>
 #include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "align.hrc"
-#include "rotmodit.hxx"
+#include <svx/rotmodit.hxx>
 
 #include <svx/algitem.hxx>
 #include <svx/frmdiritem.hxx>
-#include "align.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
 #include <tools/shl.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/itemconnect.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/localresaccess.hxx>
-#include <svx/svxids.hrc> //CHINA001
-#include "flagsdef.hxx" //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <svx/flagsdef.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
 #include <sfx2/request.hxx> //CHINA001
 
 namespace svx {
@@ -127,32 +123,32 @@ static USHORT s_pRanges[] =
 
 AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ),
-
-    maFlAlignment   ( this, SVX_RES( FL_ALIGNMENT ) ),
-    maFtHorAlign    ( this, SVX_RES( FT_HORALIGN ) ),
-    maLbHorAlign    ( this, SVX_RES( LB_HORALIGN ) ),
-    maFtIndent      ( this, SVX_RES( FT_INDENT ) ),
-    maEdIndent      ( this, SVX_RES( ED_INDENT ) ),
-    maFtVerAlign    ( this, SVX_RES( FT_VERALIGN ) ),
-    maLbVerAlign    ( this, SVX_RES( LB_VERALIGN ) ),
-
-    maFlOrient      ( this, SVX_RES( FL_ORIENTATION ) ),
-    maCtrlDial      ( this, SVX_RES( CTR_DIAL ) ),
-    maFtRotate      ( this, SVX_RES( FT_DEGREES ) ),
-    maNfRotate      ( this, SVX_RES( NF_DEGREES ) ),
-    maFtRefEdge     ( this, SVX_RES( FT_BORDER_LOCK ) ),
-    maVsRefEdge     ( this, SVX_RES( CTR_BORDER_LOCK ) ),
-    maCbStacked     ( this, SVX_RES( BTN_TXTSTACKED ) ),
-    maCbAsianMode   ( this, SVX_RES( BTN_ASIAN_VERTICAL ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ),
+
+    maFlAlignment   ( this, CUI_RES( FL_ALIGNMENT ) ),
+    maFtHorAlign    ( this, CUI_RES( FT_HORALIGN ) ),
+    maLbHorAlign    ( this, CUI_RES( LB_HORALIGN ) ),
+    maFtIndent      ( this, CUI_RES( FT_INDENT ) ),
+    maEdIndent      ( this, CUI_RES( ED_INDENT ) ),
+    maFtVerAlign    ( this, CUI_RES( FT_VERALIGN ) ),
+    maLbVerAlign    ( this, CUI_RES( LB_VERALIGN ) ),
+
+    maFlOrient      ( this, CUI_RES( FL_ORIENTATION ) ),
+    maCtrlDial      ( this, CUI_RES( CTR_DIAL ) ),
+    maFtRotate      ( this, CUI_RES( FT_DEGREES ) ),
+    maNfRotate      ( this, CUI_RES( NF_DEGREES ) ),
+    maFtRefEdge     ( this, CUI_RES( FT_BORDER_LOCK ) ),
+    maVsRefEdge     ( this, CUI_RES( CTR_BORDER_LOCK ) ),
+    maCbStacked     ( this, CUI_RES( BTN_TXTSTACKED ) ),
+    maCbAsianMode   ( this, CUI_RES( BTN_ASIAN_VERTICAL ) ),
     maOrientHlp     ( maCtrlDial, maNfRotate, maCbStacked ),
 
-    maFlProperties  ( this, SVX_RES( FL_WRAP ) ),
-    maBtnWrap       ( this, SVX_RES( BTN_WRAP ) ),
-    maBtnHyphen     ( this, SVX_RES( BTN_HYPH ) ),
-    maBtnShrink     ( this, SVX_RES( BTN_SHRINK ) ),
-    maFtFrameDir    ( this, SVX_RES( FT_TEXTFLOW ) ),
-    maLbFrameDir    ( this, SVX_RES( LB_FRAMEDIR ) )
+    maFlProperties  ( this, CUI_RES( FL_WRAP ) ),
+    maBtnWrap       ( this, CUI_RES( BTN_WRAP ) ),
+    maBtnHyphen     ( this, CUI_RES( BTN_HYPH ) ),
+    maBtnShrink     ( this, CUI_RES( BTN_SHRINK ) ),
+    maFtFrameDir    ( this, CUI_RES( FT_TEXTFLOW ) ),
+    maLbFrameDir    ( this, CUI_RES( LB_FRAMEDIR ) )
 {
     InitVsRefEgde();
 
@@ -172,9 +168,9 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttr
     maCbAsianMode.Show( SvtCJKOptions().IsVerticalTextEnabled() );
 
     // CTL frame direction
-    maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
-    maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
-    maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
+    maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
+    maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
+    maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
     if( !SvtLanguageOptions().IsCTLFontEnabled() )
     {
         maFtFrameDir.Hide();
@@ -238,7 +234,7 @@ void AlignmentTabPage::DataChanged( const DataChangedEvent& rDCEvt )
     SfxTabPage::DataChanged( rDCEvt );
     if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        svt::OLocalResourceAccess aLocalResAcc( SVX_RES( RID_SVXPAGE_ALIGNMENT ), RSC_TABPAGE );
+        svt::OLocalResourceAccess aLocalResAcc( CUI_RES( RID_SVXPAGE_ALIGNMENT ), RSC_TABPAGE );
         InitVsRefEgde();
     }
 }
@@ -248,7 +244,7 @@ void AlignmentTabPage::InitVsRefEgde()
     // remember selection - is deleted in call to ValueSet::Clear()
     USHORT nSel = maVsRefEdge.GetSelectItemId();
 
-    ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, DIALOG_MGR() );
+    ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, CUI_MGR() );
     ImageList aImageList( aResId );
     Size aItemSize( aImageList.GetImage( IID_BOTTOMLOCK ).GetSizePixel() );
 
@@ -256,9 +252,9 @@ void AlignmentTabPage::InitVsRefEgde()
     maVsRefEdge.SetStyle( maVsRefEdge.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER );
 
     maVsRefEdge.SetColCount( 3 );
-    maVsRefEdge.InsertItem( IID_BOTTOMLOCK, aImageList.GetImage( IID_BOTTOMLOCK ),  String( SVX_RES( STR_BOTTOMLOCK ) ) );
-    maVsRefEdge.InsertItem( IID_TOPLOCK,    aImageList.GetImage( IID_TOPLOCK ),     String( SVX_RES( STR_TOPLOCK ) ) );
-    maVsRefEdge.InsertItem( IID_CELLLOCK,   aImageList.GetImage( IID_CELLLOCK ),    String( SVX_RES( STR_CELLLOCK ) ) );
+    maVsRefEdge.InsertItem( IID_BOTTOMLOCK, aImageList.GetImage( IID_BOTTOMLOCK ),  String( CUI_RES( STR_BOTTOMLOCK ) ) );
+    maVsRefEdge.InsertItem( IID_TOPLOCK,    aImageList.GetImage( IID_TOPLOCK ),     String( CUI_RES( STR_TOPLOCK ) ) );
+    maVsRefEdge.InsertItem( IID_CELLLOCK,   aImageList.GetImage( IID_CELLLOCK ),    String( CUI_RES( STR_CELLLOCK ) ) );
 
     maVsRefEdge.SetSizePixel( maVsRefEdge.CalcWindowSizePixel( aItemSize ) );
 
diff --git a/svx/source/cui/align.hrc b/cui/source/tabpages/align.hrc
index d9138200d381..d9138200d381 100644
--- a/svx/source/cui/align.hrc
+++ b/cui/source/tabpages/align.hrc
diff --git a/svx/source/cui/align.src b/cui/source/tabpages/align.src
index 24e88b77a8a0..077e38105271 100644
--- a/svx/source/cui/align.src
+++ b/cui/source/tabpages/align.src
@@ -28,10 +28,10 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "align.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
 
 #define MASKCOLOR \
     MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }
diff --git a/svx/source/cui/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 330459b224f1..764a5e0b163e 100644
--- a/svx/source/cui/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -29,21 +29,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/keycodes.hxx>
 #include <sot/exchange.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <unotools/charclass.hxx>
@@ -51,13 +47,12 @@
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
-
 #include <vcl/svapp.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/eitem.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/SmartTagMgr.hxx>
 #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
 #include <com/sun/star/smarttags/XSmartTagAction.hpp>
@@ -66,11 +61,12 @@
 #include "autocdlg.hxx"
 #include "autocdlg.hrc"
 #include "helpid.hrc"
-#include "acorrcfg.hxx"
+#include <svx/acorrcfg.hxx>
 #include <svx/svxacorr.hxx>
 #include "cuicharmap.hxx"
-#include "unolingu.hxx"
-#include <svx/dialmgr.hxx>
+#include <svx/unolingu.hxx>
+#include <dialmgr.hxx>
+#include <svx/svxids.hrc> // SID_OPEN_SMARTTAGSOPTIONS
 
 static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
 
@@ -92,9 +88,9 @@ static ::com::sun::star::uno::Reference<
 --------------------------------------------------*/
 
 OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
-    SfxTabDialog(pParent, SVX_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
-    aLanguageFT(    this, SVX_RES(FT_LANG         )),
-    aLanguageLB(    this, SVX_RES(LB_LANG             ))
+    SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
+    aLanguageFT(    this, CUI_RES(FT_LANG         )),
+    aLanguageLB(    this, CUI_RES(LB_LANG             ))
 {
     BOOL bShowSWOptions = FALSE;
     BOOL bOpenSmartTagOptions = FALSE;
@@ -222,18 +218,18 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
 
 OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
-    aCheckLB            (this, SVX_RES(CLB_SETTINGS )),
-
-    sInput              (SVX_RES(ST_USE_REPLACE     )),
-    sDoubleCaps         (SVX_RES(ST_CPTL_STT_WORD     )),
-    sStartCap           (SVX_RES(ST_CPTL_STT_SENT     )),
-    sBoldUnderline      (SVX_RES(ST_BOLD_UNDER        )),
-    sURL                (SVX_RES(ST_DETECT_URL        )),
-    sNoDblSpaces        (SVX_RES(STR_NO_DBL_SPACES    )),
-    sHalf               (SVX_RES(ST_FRACTION          )),
-    sDash               (SVX_RES(ST_DASH                )),
-    sFirst              (SVX_RES(ST_ORDINAL           ))
+    SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
+    aCheckLB            (this, CUI_RES(CLB_SETTINGS )),
+
+    sInput              (CUI_RES(ST_USE_REPLACE     )),
+    sDoubleCaps         (CUI_RES(ST_CPTL_STT_WORD     )),
+    sStartCap           (CUI_RES(ST_CPTL_STT_SENT     )),
+    sBoldUnderline      (CUI_RES(ST_BOLD_UNDER        )),
+    sURL                (CUI_RES(ST_DETECT_URL        )),
+    sNoDblSpaces        (CUI_RES(STR_NO_DBL_SPACES    )),
+    sHalf               (CUI_RES(ST_FRACTION          )),
+    sDash               (CUI_RES(ST_DASH                )),
+    sFirst              (CUI_RES(ST_ORDINAL           ))
 {
     FreeResource();
 
@@ -366,11 +362,11 @@ class OfaAutoFmtPrcntSet : public ModalDialog
 
     public:
         OfaAutoFmtPrcntSet(Window* pParent) :
-            ModalDialog(pParent, SVX_RES(RID_OFADLG_PRCNT_SET)),
-                aOKPB(this,         SVX_RES(BT_OK)),
-                aCancelPB(this,     SVX_RES(BT_CANCEL)),
-                aPrcntFL(this,      SVX_RES(FL_PRCNT)),
-                aPrcntMF(this,  SVX_RES(ED_RIGHT_MARGIN))
+            ModalDialog(pParent, CUI_RES(RID_OFADLG_PRCNT_SET)),
+                aOKPB(this,         CUI_RES(BT_OK)),
+                aCancelPB(this,     CUI_RES(BT_CANCEL)),
+                aPrcntFL(this,      CUI_RES(FL_PRCNT)),
+                aPrcntMF(this,  CUI_RES(ED_RIGHT_MARGIN))
             {
                 FreeResource();
             }
@@ -476,33 +472,33 @@ enum OfaAutoFmtOptions
 
 OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
                                 const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
-    aCheckLB            (this,  SVX_RES(CLB_SETTINGS)),
-    aEditPB             (this,  SVX_RES(PB_EDIT)),
-    aHeader1Expl        (this,  SVX_RES(FT_HEADER1_EXPLANATION)),
-    aHeader2Expl        (this,  SVX_RES(FT_HEADER2_EXPLANATION)),
-    sHeader1            (SVX_RES( STR_HEADER1       )),
-    sHeader2            (SVX_RES( STR_HEADER2       )),
-    sDeleteEmptyPara    (SVX_RES( ST_DEL_EMPTY_PARA)),
-    sUseReplaceTbl      (SVX_RES(   ST_USE_REPLACE  )),
-    sCptlSttWord        (SVX_RES(   ST_CPTL_STT_WORD)),
-    sCptlSttSent        (SVX_RES(   ST_CPTL_STT_SENT)),
-    sTypo               (SVX_RES(   ST_TYPO         )),
-    sUserStyle          (SVX_RES(   ST_USER_STYLE   )),
-    sBullet             (SVX_RES(   ST_BULLET       )),
-    sBoldUnder          (SVX_RES(   ST_BOLD_UNDER   )),
-    sNoDblSpaces        (SVX_RES(   STR_NO_DBL_SPACES)),
-    sFraction           (SVX_RES(   ST_FRACTION     )),
-    sDetectURL          (SVX_RES(   ST_DETECT_URL   )),
-    sDash               (SVX_RES(   ST_DASH         )),
-    sOrdinal            (SVX_RES(   ST_ORDINAL      )),
-    sRightMargin        (SVX_RES(   ST_RIGHT_MARGIN )),
-    sNum                (SVX_RES(   STR_NUM         )),
-    sBorder             (SVX_RES(   STR_BORDER      )),
-    sTable              (SVX_RES(   STR_TABLE       )),
-    sReplaceTemplates   (SVX_RES(   STR_REPLACE_TEMPLATES)),
-    sDelSpaceAtSttEnd   (SVX_RES(   STR_DEL_SPACES_AT_STT_END)),
-    sDelSpaceBetweenLines(SVX_RES(STR_DEL_SPACES_BETWEEN_LINES)),
+    SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
+    aCheckLB            (this,  CUI_RES(CLB_SETTINGS)),
+    aEditPB             (this,  CUI_RES(PB_EDIT)),
+    aHeader1Expl        (this,  CUI_RES(FT_HEADER1_EXPLANATION)),
+    aHeader2Expl        (this,  CUI_RES(FT_HEADER2_EXPLANATION)),
+    sHeader1            (CUI_RES( STR_HEADER1       )),
+    sHeader2            (CUI_RES( STR_HEADER2       )),
+    sDeleteEmptyPara    (CUI_RES( ST_DEL_EMPTY_PARA)),
+    sUseReplaceTbl      (CUI_RES(   ST_USE_REPLACE  )),
+    sCptlSttWord        (CUI_RES(   ST_CPTL_STT_WORD)),
+    sCptlSttSent        (CUI_RES(   ST_CPTL_STT_SENT)),
+    sTypo               (CUI_RES(   ST_TYPO         )),
+    sUserStyle          (CUI_RES(   ST_USER_STYLE   )),
+    sBullet             (CUI_RES(   ST_BULLET       )),
+    sBoldUnder          (CUI_RES(   ST_BOLD_UNDER   )),
+    sNoDblSpaces        (CUI_RES(   STR_NO_DBL_SPACES)),
+    sFraction           (CUI_RES(   ST_FRACTION     )),
+    sDetectURL          (CUI_RES(   ST_DETECT_URL   )),
+    sDash               (CUI_RES(   ST_DASH         )),
+    sOrdinal            (CUI_RES(   ST_ORDINAL      )),
+    sRightMargin        (CUI_RES(   ST_RIGHT_MARGIN )),
+    sNum                (CUI_RES(   STR_NUM         )),
+    sBorder             (CUI_RES(   STR_BORDER      )),
+    sTable              (CUI_RES(   STR_TABLE       )),
+    sReplaceTemplates   (CUI_RES(   STR_REPLACE_TEMPLATES)),
+    sDelSpaceAtSttEnd   (CUI_RES(   STR_DEL_SPACES_AT_STT_END)),
+    sDelSpaceBetweenLines(CUI_RES(STR_DEL_SPACES_BETWEEN_LINES)),
 
     nPercent        ( 50 ),
     pCheckButtonData( NULL )
@@ -1039,16 +1035,16 @@ void lcl_ClearTable(DoubleStringTable& rTable)
 
 OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
-    aTextOnlyCB(    this, SVX_RES(CB_TEXT_ONLY      )),
-    aShortFT  (     this, SVX_RES(FT_SHORT          )),
-    aShortED  (     this, SVX_RES(ED_SHORT          )),
-    aReplaceFT(     this, SVX_RES(FT_REPLACE        )),
-    aReplaceED(     this, SVX_RES(ED_REPLACE        )),
-    aReplaceTLB(    this, SVX_RES(TLB_REPLACE       )),
-    aNewReplacePB(  this, SVX_RES(PB_NEW_REPLACE    )),
-    aDeleteReplacePB(this,SVX_RES(PB_DELETE_REPLACE )),
-    sModify(SVX_RES(STR_MODIFY)),
+    SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
+    aTextOnlyCB(    this, CUI_RES(CB_TEXT_ONLY      )),
+    aShortFT  (     this, CUI_RES(FT_SHORT          )),
+    aShortED  (     this, CUI_RES(ED_SHORT          )),
+    aReplaceFT(     this, CUI_RES(FT_REPLACE        )),
+    aReplaceED(     this, CUI_RES(ED_REPLACE        )),
+    aReplaceTLB(    this, CUI_RES(TLB_REPLACE       )),
+    aNewReplacePB(  this, CUI_RES(PB_NEW_REPLACE    )),
+    aDeleteReplacePB(this,CUI_RES(PB_DELETE_REPLACE )),
+    sModify(CUI_RES(STR_MODIFY)),
     sNew(aNewReplacePB.GetText()),
     pFormatText(0),
     eLang(eLastDialogLanguage),
@@ -1642,19 +1638,19 @@ void lcl_ClearTable(StringsTable& rTable)
 
 OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
-    aAbbrevFL       (this, SVX_RES(FL_ABBREV         )),
-    aAbbrevED       (this, SVX_RES(ED_ABBREV         )),
-    aAbbrevLB       (this, SVX_RES(LB_ABBREV         )),
-    aNewAbbrevPB    (this, SVX_RES(PB_NEWABBREV  )),
-    aDelAbbrevPB    (this, SVX_RES(PB_DELABBREV  )),
-    aAutoAbbrevCB   (this, SVX_RES(CB_AUTOABBREV     )),
-    aDoubleCapsFL   (this, SVX_RES(FL_DOUBLECAPS     )),
-    aDoubleCapsED   (this, SVX_RES(ED_DOUBLE_CAPS    )),
-    aDoubleCapsLB   (this, SVX_RES(LB_DOUBLE_CAPS    )),
-    aNewDoublePB    (this, SVX_RES(PB_NEWDOUBLECAPS)),
-    aDelDoublePB    (this, SVX_RES(PB_DELDOUBLECAPS)),
-    aAutoCapsCB     (this, SVX_RES(CB_AUTOCAPS   )),
+    SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
+    aAbbrevFL       (this, CUI_RES(FL_ABBREV         )),
+    aAbbrevED       (this, CUI_RES(ED_ABBREV         )),
+    aAbbrevLB       (this, CUI_RES(LB_ABBREV         )),
+    aNewAbbrevPB    (this, CUI_RES(PB_NEWABBREV  )),
+    aDelAbbrevPB    (this, CUI_RES(PB_DELABBREV  )),
+    aAutoAbbrevCB   (this, CUI_RES(CB_AUTOABBREV     )),
+    aDoubleCapsFL   (this, CUI_RES(FL_DOUBLECAPS     )),
+    aDoubleCapsED   (this, CUI_RES(ED_DOUBLE_CAPS    )),
+    aDoubleCapsLB   (this, CUI_RES(LB_DOUBLE_CAPS    )),
+    aNewDoublePB    (this, CUI_RES(PB_NEWDOUBLECAPS)),
+    aDelDoublePB    (this, CUI_RES(PB_DELDOUBLECAPS)),
+    aAutoCapsCB     (this, CUI_RES(CB_AUTOCAPS   )),
     eLang(eLastDialogLanguage)
 {
     FreeResource();
@@ -2040,31 +2036,31 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
 --------------------------------------------------*/
 
 OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
-    aSingleFL           (this, SVX_RES(FL_SINGLE         )),
-    aSingleTypoCB       (this, SVX_RES(CB_SGL_TYPO     )),
-    aSglStartQuoteFT    (this, SVX_RES(FT_SGL_STARTQUOTE )),
-    aSglStartQuotePB    (this, SVX_RES(PB_SGL_STARTQUOTE )),
-    aSglStartExFT       (this, SVX_RES(FT_SGSTEX       )),
-    aSglEndQuoteFT      (this, SVX_RES(FT_SGL_ENDQUOTE   )),
-    aSglEndQuotePB      (this, SVX_RES(PB_SGL_ENDQUOTE   )),
-    aSglEndExFT         (this, SVX_RES(FT_SGENEX       )),
-    aSglStandardPB      (this, SVX_RES(PB_SGL_STD      )),
-
-    aDoubleFL           (this, SVX_RES(FL_DOUBLE       )),
-    aTypoCB             (this, SVX_RES(CB_TYPO         )),
-    aStartQuoteFT       (this, SVX_RES(FT_STARTQUOTE   )),
-    aStartQuotePB       (this, SVX_RES(PB_STARTQUOTE   )),
-    aDblStartExFT       (this, SVX_RES(FT_DBSTEX       )),
-    aEndQuoteFT         (this, SVX_RES(FT_ENDQUOTE     )),
-    aEndQuotePB         (this, SVX_RES(PB_ENDQUOTE     )),
-    aDblEndExFT         (this, SVX_RES(FT_DBECEX       )),
-    aDblStandardPB      (this, SVX_RES(PB_DBL_STD      )),
-
-    sStartQuoteDlg  (SVX_RES(STR_CHANGE_START)),
-    sEndQuoteDlg    (SVX_RES(STR_CHANGE_END)),
-
-    sStandard(SVX_RES(ST_STANDARD))
+    SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
+    aSingleFL           (this, CUI_RES(FL_SINGLE         )),
+    aSingleTypoCB       (this, CUI_RES(CB_SGL_TYPO     )),
+    aSglStartQuoteFT    (this, CUI_RES(FT_SGL_STARTQUOTE )),
+    aSglStartQuotePB    (this, CUI_RES(PB_SGL_STARTQUOTE )),
+    aSglStartExFT       (this, CUI_RES(FT_SGSTEX       )),
+    aSglEndQuoteFT      (this, CUI_RES(FT_SGL_ENDQUOTE   )),
+    aSglEndQuotePB      (this, CUI_RES(PB_SGL_ENDQUOTE   )),
+    aSglEndExFT         (this, CUI_RES(FT_SGENEX       )),
+    aSglStandardPB      (this, CUI_RES(PB_SGL_STD      )),
+
+    aDoubleFL           (this, CUI_RES(FL_DOUBLE       )),
+    aTypoCB             (this, CUI_RES(CB_TYPO         )),
+    aStartQuoteFT       (this, CUI_RES(FT_STARTQUOTE   )),
+    aStartQuotePB       (this, CUI_RES(PB_STARTQUOTE   )),
+    aDblStartExFT       (this, CUI_RES(FT_DBSTEX       )),
+    aEndQuoteFT         (this, CUI_RES(FT_ENDQUOTE     )),
+    aEndQuotePB         (this, CUI_RES(PB_ENDQUOTE     )),
+    aDblEndExFT         (this, CUI_RES(FT_DBECEX       )),
+    aDblStandardPB      (this, CUI_RES(PB_DBL_STD      )),
+
+    sStartQuoteDlg  (CUI_RES(STR_CHANGE_START)),
+    sEndQuoteDlg    (CUI_RES(STR_CHANGE_END)),
+
+    sStandard(CUI_RES(ST_STANDARD))
 {
     FreeResource();
 
@@ -2303,20 +2299,20 @@ String OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
 
 OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
                                                 const SfxItemSet& rSet )
-    : SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet),
-    aCBActiv        (this, SVX_RES(CB_ACTIV)),
-    aCBAppendSpace  (this, SVX_RES(CB_APPEND_SPACE)),
-    aCBAsTip        (this, SVX_RES(CB_AS_TIP)),
-    aCBCollect      (this, SVX_RES(CB_COLLECT)),
-    aCBRemoveList   (this, SVX_RES(CB_REMOVE_LIST)),
-    aFTExpandKey    (this, SVX_RES(FT_EXPAND_KEY)),
-    aDCBExpandKey   (this, SVX_RES(DCB_EXPAND_KEY)),
-    aFTMinWordlen   (this, SVX_RES(FT_MIN_WORDLEN)),
-    aNFMinWordlen   (this, SVX_RES(NF_MIN_WORDLEN)),
-    aFTMaxEntries   (this, SVX_RES(FT_MAX_ENTRIES)),
-    aNFMaxEntries   (this, SVX_RES(NF_MAX_ENTRIES)),
-    aLBEntries      (*this, SVX_RES(LB_ENTRIES)),
-    aPBEntries      (this, SVX_RES(PB_ENTRIES)),
+    : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet),
+    aCBActiv        (this, CUI_RES(CB_ACTIV)),
+    aCBAppendSpace  (this, CUI_RES(CB_APPEND_SPACE)),
+    aCBAsTip        (this, CUI_RES(CB_AS_TIP)),
+    aCBCollect      (this, CUI_RES(CB_COLLECT)),
+    aCBRemoveList   (this, CUI_RES(CB_REMOVE_LIST)),
+    aFTExpandKey    (this, CUI_RES(FT_EXPAND_KEY)),
+    aDCBExpandKey   (this, CUI_RES(DCB_EXPAND_KEY)),
+    aFTMinWordlen   (this, CUI_RES(FT_MIN_WORDLEN)),
+    aNFMinWordlen   (this, CUI_RES(NF_MIN_WORDLEN)),
+    aFTMaxEntries   (this, CUI_RES(FT_MAX_ENTRIES)),
+    aNFMaxEntries   (this, CUI_RES(NF_MAX_ENTRIES)),
+    aLBEntries      (*this, CUI_RES(LB_ENTRIES)),
+    aPBEntries      (this, CUI_RES(PB_ENTRIES)),
     pAutoCmpltList( 0 ),
     nAutoCmpltListCnt( 0 )
 {
@@ -2551,11 +2547,11 @@ long OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
 
 OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent,
                                                       const SfxItemSet& rSet )
-    : SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet),
-    m_aMainCB( this, SVX_RES(CB_SMARTTAGS) ),
-    m_aSmartTagTypesLB( this, SVX_RES(LB_SMARTTAGS) ),
-    m_aPropertiesPB( this, SVX_RES(PB_SMARTTAGS) ),
-    m_aTitleFT( this, SVX_RES(FT_SMARTTAGS) )
+    : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet),
+    m_aMainCB( this, CUI_RES(CB_SMARTTAGS) ),
+    m_aSmartTagTypesLB( this, CUI_RES(LB_SMARTTAGS) ),
+    m_aPropertiesPB( this, CUI_RES(PB_SMARTTAGS) ),
+    m_aTitleFT( this, CUI_RES(FT_SMARTTAGS) )
 {
     FreeResource();
 
diff --git a/svx/source/cui/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index 6a698b4397d7..f1817b3f3f36 100644
--- a/svx/source/cui/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _SVX_AUTOCDLG_HRC
 #define _SVX_AUTOCDLG_HRC
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 // defines ------------------------------------------------------------------
 
diff --git a/svx/source/cui/autocdlg.src b/cui/source/tabpages/autocdlg.src
index a087bd7d59dc..030a47aae26b 100644
--- a/svx/source/cui/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -28,10 +28,10 @@
  *
  ************************************************************************/
  // include ------------------------------------------------------------------
-#include <svx/svxids.hrc>
 #include "autocdlg.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
+#include <svx/svxids.hrc> // SID_AUTOFORMAT
 
  // pragma -------------------------------------------------------------------
 /**************************************************************************/
diff --git a/svx/source/cui/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 9ba19816b1bf..004b79817b32 100644
--- a/svx/source/cui/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -29,33 +29,26 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
-#include <svtools/pathoptions.hxx>
-#include <svtools/intitem.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <svtools/wallitem.hxx>
-#include <svtools/cntwall.hxx>
-#ifndef _CNTIDS_HRC
+#include <svl/cntwall.hxx>
 #include <sfx2/cntids.hrc>
-#endif
+#include <svx/dialogs.hrc>
 
 #define _SVX_BACKGRND_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "backgrnd.hrc"
-#include <svx/svxitems.hrc>
-
-
-
+#include <svx/svxitems.hrc> // RID_SVXITEM_COL_WHITE
+#include <svx/dialmgr.hxx>
 
 // Tabellenhintergrund
 #define TBL_DEST_CELL   0
@@ -66,18 +59,15 @@
 #include "backgrnd.hxx"
 
 #include <svx/xtable.hxx>
-#include "opengrf.hxx"
-#include "impgrf.hxx"
-#include "svxerr.hxx"
-#include "drawitem.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
-#ifndef _SVT_CONTROLDIMS_HRC_
+#include <svx/opengrf.hxx>
+#include <svx/impgrf.hxx>
+#include <svx/svxerr.hxx>
+#include <svx/drawitem.hxx>
+#include <dialmgr.hxx>
+#include <svx/htmlmode.hxx>
 #include <svtools/controldims.hrc>
-#endif
-#include <svx/svxids.hrc> //CHINA001
-#include "flagsdef.hxx" //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <svx/flagsdef.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
 #include <sfx2/request.hxx> //CHINA001
 using namespace ::com::sun::star;
 // static ----------------------------------------------------------------
@@ -353,36 +343,36 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
 
 */
 
-    SvxTabPage( pParent, SVX_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
+    SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
 
-    aBorderWin          ( this, SVX_RES(CT_BORDER) ),
-    aBackgroundColorSet ( &aBorderWin, SVX_RES( SET_BGDCOLOR ) ),
-    aBackgroundColorBox ( this, SVX_RES( GB_BGDCOLOR ) ),
+    aBorderWin          ( this, CUI_RES(CT_BORDER) ),
+    aBackgroundColorSet ( &aBorderWin, CUI_RES( SET_BGDCOLOR ) ),
+    aBackgroundColorBox ( this, CUI_RES( GB_BGDCOLOR ) ),
     pPreviewWin1        ( new BackgroundPreviewImpl(
-                            this, SVX_RES( WIN_PREVIEW1 ), FALSE ) ),
-    aColTransFT         ( this, SVX_RES( FT_COL_TRANS ) ),
-    aColTransMF         ( this, SVX_RES( MF_COL_TRANS ) ),
-    aBtnBrowse          ( this, SVX_RES( BTN_BROWSE ) ),
-    aBtnLink            ( this, SVX_RES( BTN_LINK ) ),
-    aBtnPreview         ( this, SVX_RES( BTN_PREVIEW ) ),
-    aFtFile             ( this, SVX_RES( FT_FILE ) ),
-    aGbFile             ( this, SVX_RES( GB_FILE ) ),
-    aBtnPosition        ( this, SVX_RES( BTN_POSITION ) ),
-    aBtnArea            ( this, SVX_RES( BTN_AREA ) ),
-    aBtnTile            ( this, SVX_RES( BTN_TILE ) ),
-    aWndPosition        ( this, SVX_RES( WND_POSITION ), RP_MM ),
-    aGbPosition         ( this, SVX_RES( GB_POSITION ) ),
-    aGraphTransFL       ( this, SVX_RES( FL_GRAPH_TRANS ) ),
-    aGraphTransMF       ( this, SVX_RES( MF_GRAPH_TRANS ) ),
+                            this, CUI_RES( WIN_PREVIEW1 ), FALSE ) ),
+    aColTransFT         ( this, CUI_RES( FT_COL_TRANS ) ),
+    aColTransMF         ( this, CUI_RES( MF_COL_TRANS ) ),
+    aBtnBrowse          ( this, CUI_RES( BTN_BROWSE ) ),
+    aBtnLink            ( this, CUI_RES( BTN_LINK ) ),
+    aBtnPreview         ( this, CUI_RES( BTN_PREVIEW ) ),
+    aFtFile             ( this, CUI_RES( FT_FILE ) ),
+    aGbFile             ( this, CUI_RES( GB_FILE ) ),
+    aBtnPosition        ( this, CUI_RES( BTN_POSITION ) ),
+    aBtnArea            ( this, CUI_RES( BTN_AREA ) ),
+    aBtnTile            ( this, CUI_RES( BTN_TILE ) ),
+    aWndPosition        ( this, CUI_RES( WND_POSITION ), RP_MM ),
+    aGbPosition         ( this, CUI_RES( GB_POSITION ) ),
+    aGraphTransFL       ( this, CUI_RES( FL_GRAPH_TRANS ) ),
+    aGraphTransMF       ( this, CUI_RES( MF_GRAPH_TRANS ) ),
     pPreviewWin2        ( new BackgroundPreviewImpl(
-                            this, SVX_RES( WIN_PREVIEW2 ), TRUE ) ),
-    aSelectTxt          ( this, SVX_RES( FT_SELECTOR ) ),
-    aLbSelect           ( this, SVX_RES( LB_SELECTOR ) ),
-    aStrBrowse          ( SVX_RES( STR_BROWSE ) ),
-    aStrUnlinked        ( SVX_RES( STR_UNLINKED ) ),
-    aTblDesc            ( this, SVX_RES( FT_TBL_DESC ) ),
-    aTblLBox            ( this, SVX_RES( LB_TBL_BOX ) ),
-    aParaLBox           ( this, SVX_RES( LB_PARA_BOX ) ),
+                            this, CUI_RES( WIN_PREVIEW2 ), TRUE ) ),
+    aSelectTxt          ( this, CUI_RES( FT_SELECTOR ) ),
+    aLbSelect           ( this, CUI_RES( LB_SELECTOR ) ),
+    aStrBrowse          ( CUI_RES( STR_BROWSE ) ),
+    aStrUnlinked        ( CUI_RES( STR_UNLINKED ) ),
+    aTblDesc            ( this, CUI_RES( FT_TBL_DESC ) ),
+    aTblLBox            ( this, CUI_RES( LB_TBL_BOX ) ),
+    aParaLBox           ( this, CUI_RES( LB_PARA_BOX ) ),
     nHtmlMode           ( 0 ),
     bAllowShowSelector  ( TRUE ),
     bIsGraphicValid     ( FALSE ),
@@ -1164,7 +1154,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
                               String(),
                               this,
                               RID_SVXERRCTX,
-                              &DIALOG_MGR() );
+                              &CUI_MGR() );
 
     ErrorHandler::HandleError(
         *new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE,
@@ -1221,7 +1211,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
         Color aColWhite( COL_WHITE );
         String aStrWhite( SVX_RES( RID_SVXITEMS_COLOR_WHITE ) );
         WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD );
-        aBackgroundColorSet.SetText( String( SVX_RES( RID_SVXSTR_TRANSPARENT ) ) );
+        aBackgroundColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
         aBackgroundColorSet.SetStyle( nBits );
         for ( i = 0; i < nCount; i++ )
         {
diff --git a/svx/source/cui/backgrnd.hrc b/cui/source/tabpages/backgrnd.hrc
index ce154afa54b6..ce154afa54b6 100644
--- a/svx/source/cui/backgrnd.hrc
+++ b/cui/source/tabpages/backgrnd.hrc
diff --git a/svx/source/cui/backgrnd.src b/cui/source/tabpages/backgrnd.src
index c89361a18ae3..1ad9beca658c 100644
--- a/svx/source/cui/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -30,8 +30,10 @@
  // include ---------------------------------------------------------------
 #include <svtools/controldims.hrc>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "backgrnd.hrc"
+#include <svx/dialogs.hrc>
+
  // define ----------------------------------------------------------------
 #define UNLINKED_IMAGE                      \
     Text [ en-US ] = "Unlinked graphic" ; \
diff --git a/svx/source/cui/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index bf711acdb22b..bc50eaecca07 100644
--- a/svx/source/cui/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -29,22 +29,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
-
 #include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "page.hrc"
 
 #include "bbdlg.hxx"
 #include "border.hxx"
 #include "backgrnd.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 
 // class SvxBorderBackgroundDlg ------------------------------------------
 
@@ -52,7 +48,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg( Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 BOOL bEnableSelector ) :
 
-    SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_BBDLG ), &rCoreSet ),
+    SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_BBDLG ), &rCoreSet ),
     bEnableBackgroundSelector( bEnableSelector )
 {
     FreeResource();
diff --git a/svx/source/cui/bbdlg.src b/cui/source/tabpages/bbdlg.src
index 98b4bf01767e..b87576b9c975 100644
--- a/svx/source/cui/bbdlg.src
+++ b/cui/source/tabpages/bbdlg.src
@@ -28,8 +28,8 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
+#include <cuires.hrc>
 #include <svx/dialogs.hrc>
- // pragma ----------------------------------------------------------------
 
  // RID_SVXDLG_BBDLG ------------------------------------------------------
 TabDialog RID_SVXDLG_BBDLG
diff --git a/svx/source/cui/border.cxx b/cui/source/tabpages/border.cxx
index 101afc828371..31191b4dffe1 100644
--- a/svx/source/cui/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -29,38 +29,34 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
-
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
 #define _SVX_BORDER_CXX
 
-#include <svx/dialogs.hrc>
-#include <svx/svxitems.hrc>
+#include <cuires.hrc>
 #include "border.hrc"
 #include "helpid.hrc"
 
 #define LINESTYLE_HTML_MAX 5
 
 #include <svx/xtable.hxx>               // XColorTable
-#include "drawitem.hxx"
+#include <svx/drawitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/shaditem.hxx>
 #include "border.hxx"
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include <svx/dlgutil.hxx>
+#include <dialmgr.hxx>
+#include "svx/htmlmode.hxx"
 #include <vcl/msgbox.hxx>
-#include <svx/svxids.hrc> //CHINA001
-#include "flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx" //CHINA001
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
 #include <sfx2/itemconnect.hxx>
 #include "borderconn.hxx"
 
@@ -184,47 +180,47 @@ void lcl_SetDecimalDigitsTo1(MetricField& rField)
 SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
                                     const SfxItemSet& rCoreAttrs )
 
-    :   SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
-
-        aFlBorder       ( this, SVX_RES( FL_BORDER ) ),
-        aDefaultFT      ( this, SVX_RES( FT_DEFAULT ) ),
-        aWndPresets     ( this, SVX_RES( WIN_PRESETS ) ),
-        aUserDefFT      ( this, SVX_RES( FT_USERDEF ) ),
-        aFrameSel       ( this, SVX_RES( WIN_FRAMESEL ) ),
-
-        aFlSep1         ( this, SVX_RES( FL_SEPARATOR1 ) ),
-        aFlLine         ( this, SVX_RES( FL_LINE ) ),
-        aStyleFT        ( this, SVX_RES( FT_STYLE ) ),
-        aLbLineStyle    ( this, SVX_RES( LB_LINESTYLE ) ),
-        aColorFT        ( this, SVX_RES( FT_COLOR ) ),
-        aLbLineColor    ( this, SVX_RES( LB_LINECOLOR ) ),
-
-        aFlSep2         ( this, SVX_RES( FL_SEPARATOR2 ) ),
-        aDistanceFL     ( this, SVX_RES( FL_DISTANCE ) ),
-        aLeftFT         ( this, SVX_RES( FT_LEFT ) ),
-        aLeftMF         ( this, SVX_RES( MF_LEFT ) ),
-        aRightFT        ( this, SVX_RES( FT_RIGHT ) ),
-        aRightMF        ( this, SVX_RES( MF_RIGHT ) ),
-        aTopFT          ( this, SVX_RES( FT_TOP ) ),
-        aTopMF          ( this, SVX_RES( MF_TOP ) ),
-        aBottomFT       ( this, SVX_RES( FT_BOTTOM ) ),
-        aBottomMF       ( this, SVX_RES( MF_BOTTOM ) ),
-        aSynchronizeCB  ( this, SVX_RES( CB_SYNC ) ),
-
-        aFlShadow       ( this, SVX_RES( FL_SHADOW ) ),
-        aFtShadowPos    ( this, SVX_RES( FT_SHADOWPOS ) ),
-        aWndShadows     ( this, SVX_RES( WIN_SHADOWS ) ),
-        aFtShadowSize   ( this, SVX_RES( FT_SHADOWSIZE ) ),
-        aEdShadowSize   ( this, SVX_RES( ED_SHADOWSIZE ) ),
-        aFtShadowColor  ( this, SVX_RES( FT_SHADOWCOLOR ) ),
-        aLbShadowColor  ( this, SVX_RES( LB_SHADOWCOLOR ) ),
-        aPropertiesFL   ( this, SVX_RES( FL_PROPERTIES ) ),
-        aMergeWithNextCB( this, SVX_RES( CB_MERGEWITHNEXT ) ),
-        aMergeAdjacentBordersCB( this, SVX_RES( CB_MERGEADJACENTBORDERS ) ),
-        aShadowImgLstH( SVX_RES(ILH_SDW_BITMAPS)),
-        aShadowImgLst( SVX_RES(IL_SDW_BITMAPS)),
-        aBorderImgLstH( SVX_RES(ILH_PRE_BITMAPS)),
-        aBorderImgLst( SVX_RES(IL_PRE_BITMAPS)),
+    :   SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
+
+        aFlBorder       ( this, CUI_RES( FL_BORDER ) ),
+        aDefaultFT      ( this, CUI_RES( FT_DEFAULT ) ),
+        aWndPresets     ( this, CUI_RES( WIN_PRESETS ) ),
+        aUserDefFT      ( this, CUI_RES( FT_USERDEF ) ),
+        aFrameSel       ( this, CUI_RES( WIN_FRAMESEL ) ),
+
+        aFlSep1         ( this, CUI_RES( FL_SEPARATOR1 ) ),
+        aFlLine         ( this, CUI_RES( FL_LINE ) ),
+        aStyleFT        ( this, CUI_RES( FT_STYLE ) ),
+        aLbLineStyle    ( this, CUI_RES( LB_LINESTYLE ) ),
+        aColorFT        ( this, CUI_RES( FT_COLOR ) ),
+        aLbLineColor    ( this, CUI_RES( LB_LINECOLOR ) ),
+
+        aFlSep2         ( this, CUI_RES( FL_SEPARATOR2 ) ),
+        aDistanceFL     ( this, CUI_RES( FL_DISTANCE ) ),
+        aLeftFT         ( this, CUI_RES( FT_LEFT ) ),
+        aLeftMF         ( this, CUI_RES( MF_LEFT ) ),
+        aRightFT        ( this, CUI_RES( FT_RIGHT ) ),
+        aRightMF        ( this, CUI_RES( MF_RIGHT ) ),
+        aTopFT          ( this, CUI_RES( FT_TOP ) ),
+        aTopMF          ( this, CUI_RES( MF_TOP ) ),
+        aBottomFT       ( this, CUI_RES( FT_BOTTOM ) ),
+        aBottomMF       ( this, CUI_RES( MF_BOTTOM ) ),
+        aSynchronizeCB  ( this, CUI_RES( CB_SYNC ) ),
+
+        aFlShadow       ( this, CUI_RES( FL_SHADOW ) ),
+        aFtShadowPos    ( this, CUI_RES( FT_SHADOWPOS ) ),
+        aWndShadows     ( this, CUI_RES( WIN_SHADOWS ) ),
+        aFtShadowSize   ( this, CUI_RES( FT_SHADOWSIZE ) ),
+        aEdShadowSize   ( this, CUI_RES( ED_SHADOWSIZE ) ),
+        aFtShadowColor  ( this, CUI_RES( FT_SHADOWCOLOR ) ),
+        aLbShadowColor  ( this, CUI_RES( LB_SHADOWCOLOR ) ),
+        aPropertiesFL   ( this, CUI_RES( FL_PROPERTIES ) ),
+        aMergeWithNextCB( this, CUI_RES( CB_MERGEWITHNEXT ) ),
+        aMergeAdjacentBordersCB( this, CUI_RES( CB_MERGEADJACENTBORDERS ) ),
+        aShadowImgLstH( CUI_RES(ILH_SDW_BITMAPS)),
+        aShadowImgLst( CUI_RES(IL_SDW_BITMAPS)),
+        aBorderImgLstH( CUI_RES(ILH_PRE_BITMAPS)),
+        aBorderImgLst( CUI_RES(IL_PRE_BITMAPS)),
         nMinValue(0),
         nSWMode(0),
         mbHorEnabled( false ),
@@ -1047,7 +1043,7 @@ void SvxBorderTabPage::FillPresetVS()
     {
         aWndPresets.InsertItem( nVSIdx );
         aWndPresets.SetItemImage( nVSIdx, rImgList.GetImage( GetPresetImageId( nVSIdx ) ) );
-        aWndPresets.SetItemText( nVSIdx, SVX_RESSTR( GetPresetStringId( nVSIdx ) ) );
+        aWndPresets.SetItemText( nVSIdx, CUI_RESSTR( GetPresetStringId( nVSIdx ) ) );
     }
 
     // show the control
@@ -1081,7 +1077,7 @@ void SvxBorderTabPage::FillShadowVS()
     {
         aWndShadows.InsertItem( nVSIdx );
         aWndShadows.SetItemImage( nVSIdx, rImgList.GetImage( pnImgIds[ nVSIdx - 1 ] ) );
-        aWndShadows.SetItemText( nVSIdx, SVX_RESSTR( pnStrIds[ nVSIdx - 1 ] ) );
+        aWndShadows.SetItemText( nVSIdx, CUI_RESSTR( pnStrIds[ nVSIdx - 1 ] ) );
     }
 
     // show the control
@@ -1105,7 +1101,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
     aLbLineStyle.SetSourceUnit( FUNIT_TWIP );
 
     // Writer 2.0 Defaults:
-    aLbLineStyle.InsertEntry( SVX_RESSTR( STR_NONE ) );
+    aLbLineStyle.InsertEntry( SVX_RESSTR( RID_SVXSTR_NONE ) );
 
     aLbLineStyle.InsertEntry( LINE_WIDTH0 );
     aLbLineStyle.InsertEntry( LINE_WIDTH5 );
diff --git a/svx/source/cui/border.hrc b/cui/source/tabpages/border.hrc
index 7ba1b8cfc757..7ba1b8cfc757 100644
--- a/svx/source/cui/border.hrc
+++ b/cui/source/tabpages/border.hrc
diff --git a/svx/source/cui/border.src b/cui/source/tabpages/border.src
index 27f977a6dc3b..4359e78e84d6 100644
--- a/svx/source/cui/border.src
+++ b/cui/source/tabpages/border.src
@@ -29,9 +29,9 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "border.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
 
  // define ---------------------------------------------------------------
 #define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
diff --git a/svx/source/cui/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 7ed44720f989..c117e631abbd 100644
--- a/svx/source/cui/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -29,15 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include "borderconn.hxx"
 #include <svx/frmsel.hxx>
-#include "bolnitem.hxx"
+#include "svx/bolnitem.hxx"
 #include <svx/boxitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/shaditem.hxx>
diff --git a/svx/source/cui/borderconn.hxx b/cui/source/tabpages/borderconn.hxx
index 740c9c79f283..740c9c79f283 100644
--- a/svx/source/cui/borderconn.hxx
+++ b/cui/source/tabpages/borderconn.hxx
diff --git a/svx/source/cui/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 0d0b6de205de..6028fdf97ab9 100644
--- a/svx/source/cui/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -29,37 +29,32 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/sfontitm.hxx>
+#include <svl/sfontitm.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/msgbox.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 
 #define _SVX_CHARDLG_CXX
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 
-#include <svx/dialogs.hrc>
-#include <svx/svxitems.hrc>
+#include <cuires.hrc>
 #include "chardlg.hrc"
 
-//Erstmal definieren, damit die Klassendeklarionen angezogen werden.
-
 #include <svx/xtable.hxx>       // XColorTable
 #include "chardlg.hxx"
-#include "fontitem.hxx"
+#include "svx/fontitem.hxx"
 #include <svx/postitem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/crsditem.hxx>
@@ -74,28 +69,28 @@
 #include <svx/cmapitem.hxx>
 #include <svx/kernitem.hxx>
 #include <svx/blnkitem.hxx>
-#include "flstitem.hxx"
+#include "svx/flstitem.hxx"
 #include <svx/akrnitem.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/colritem.hxx>
-#include "drawitem.hxx"
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/htmlmode.hxx"
 #include "cuicharmap.hxx"
 #include "chardlg.h"
 #include <svx/emphitem.hxx>
 #include <svx/charreliefitem.hxx>
 #include <svx/twolinesitem.hxx>
-#include <charhiddenitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svx/charhiddenitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/charscaleitem.hxx>
 #include <svx/charrotateitem.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <cuires.hrc> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
 #include <sfx2/request.hxx> //CHINA001
-#include "flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx" //CHINA001
 
 using namespace ::com::sun::star;
 
@@ -574,58 +569,58 @@ struct SvxCharNamePage_Impl
 
 SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) :
 
-    SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_NAME ), rInSet, WIN_CHAR_PREVIEW, FT_CHAR_FONTTYPE ),
+    SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_NAME ), rInSet, WIN_CHAR_PREVIEW, FT_CHAR_FONTTYPE ),
     m_pImpl                 ( new SvxCharNamePage_Impl )
 {
-    m_pImpl->m_aNoStyleText = String( SVX_RES( STR_CHARNAME_NOSTYLE ) );
-    m_pImpl->m_aTransparentText = String( SVX_RES( STR_CHARNAME_TRANSPARENT ) );
+    m_pImpl->m_aNoStyleText = String( CUI_RES( STR_CHARNAME_NOSTYLE ) );
+    m_pImpl->m_aTransparentText = String( CUI_RES( STR_CHARNAME_TRANSPARENT ) );
 
     SvtLanguageOptions aLanguageOptions;
     sal_Bool bCJK = ( aLanguageOptions.IsCJKFontEnabled() || aLanguageOptions.IsCTLFontEnabled() );
 
-    m_pWestLine         = new FixedLine( this, SVX_RES( FL_WEST ) );
-    m_pWestFontNameFT   = new FixedText( this, SVX_RES( bCJK ? FT_WEST_NAME : FT_WEST_NAME_NOCJK ) );
-    m_pWestFontNameLB   = new FontNameBox( this, SVX_RES( bCJK ? LB_WEST_NAME : LB_WEST_NAME_NOCJK ) );
-    m_pWestFontStyleFT  = new FixedText( this, SVX_RES( bCJK ? FT_WEST_STYLE : FT_WEST_STYLE_NOCJK ) );
-    m_pWestFontStyleLB  = new FontStyleBox( this, SVX_RES( bCJK ? LB_WEST_STYLE : LB_WEST_STYLE_NOCJK ) );
-    m_pWestFontSizeFT   = new FixedText( this, SVX_RES( bCJK ? FT_WEST_SIZE : FT_WEST_SIZE_NOCJK ) );
-    m_pWestFontSizeLB   = new FontSizeBox( this, SVX_RES( bCJK ? LB_WEST_SIZE : LB_WEST_SIZE_NOCJK ) );
+    m_pWestLine         = new FixedLine( this, CUI_RES( FL_WEST ) );
+    m_pWestFontNameFT   = new FixedText( this, CUI_RES( bCJK ? FT_WEST_NAME : FT_WEST_NAME_NOCJK ) );
+    m_pWestFontNameLB   = new FontNameBox( this, CUI_RES( bCJK ? LB_WEST_NAME : LB_WEST_NAME_NOCJK ) );
+    m_pWestFontStyleFT  = new FixedText( this, CUI_RES( bCJK ? FT_WEST_STYLE : FT_WEST_STYLE_NOCJK ) );
+    m_pWestFontStyleLB  = new FontStyleBox( this, CUI_RES( bCJK ? LB_WEST_STYLE : LB_WEST_STYLE_NOCJK ) );
+    m_pWestFontSizeFT   = new FixedText( this, CUI_RES( bCJK ? FT_WEST_SIZE : FT_WEST_SIZE_NOCJK ) );
+    m_pWestFontSizeLB   = new FontSizeBox( this, CUI_RES( bCJK ? LB_WEST_SIZE : LB_WEST_SIZE_NOCJK ) );
 
     if( !bCJK )
     {
-        m_pColorFL  = new FixedLine( this, SVX_RES( FL_COLOR2 ) );
-        m_pColorFT  = new FixedText( this, SVX_RES( FT_COLOR2 ) );
-        m_pColorLB  = new ColorListBox( this, SVX_RES( LB_COLOR2 ) );
-    }
-
-    m_pWestFontLanguageFT   = new FixedText( this, SVX_RES( bCJK ? FT_WEST_LANG : FT_WEST_LANG_NOCJK ) );
-    m_pWestFontLanguageLB   = new SvxLanguageBox( this, SVX_RES( bCJK ? LB_WEST_LANG : LB_WEST_LANG_NOCJK ) );
-
-    m_pEastLine             = new FixedLine( this, SVX_RES( FL_EAST ) );
-    m_pEastFontNameFT       = new FixedText( this, SVX_RES( FT_EAST_NAME ) );
-    m_pEastFontNameLB       = new FontNameBox( this, SVX_RES( LB_EAST_NAME ) );
-    m_pEastFontStyleFT      = new FixedText( this, SVX_RES( FT_EAST_STYLE ) );
-    m_pEastFontStyleLB      = new FontStyleBox( this, SVX_RES( LB_EAST_STYLE ) );
-    m_pEastFontSizeFT       = new FixedText( this, SVX_RES( FT_EAST_SIZE ) );
-    m_pEastFontSizeLB       = new FontSizeBox( this, SVX_RES( LB_EAST_SIZE ) );
-    m_pEastFontLanguageFT   = new FixedText( this, SVX_RES( FT_EAST_LANG ) );
-    m_pEastFontLanguageLB   = new SvxLanguageBox( this, SVX_RES( LB_EAST_LANG ) );
-
-    m_pCTLLine              = new FixedLine( this, SVX_RES( FL_CTL ) );
-    m_pCTLFontNameFT        = new FixedText( this, SVX_RES( FT_CTL_NAME ) );
-    m_pCTLFontNameLB        = new FontNameBox( this, SVX_RES( LB_CTL_NAME ) );
-    m_pCTLFontStyleFT       = new FixedText( this, SVX_RES( FT_CTL_STYLE ) );
-    m_pCTLFontStyleLB       = new FontStyleBox( this, SVX_RES( LB_CTL_STYLE ) );
-    m_pCTLFontSizeFT        = new FixedText( this, SVX_RES( FT_CTL_SIZE ) );
-    m_pCTLFontSizeLB        = new FontSizeBox( this, SVX_RES( LB_CTL_SIZE ) );
-    m_pCTLFontLanguageFT    = new FixedText( this, SVX_RES( FT_CTL_LANG ) );
-    m_pCTLFontLanguageLB    = new SvxLanguageBox( this, SVX_RES( LB_CTL_LANG ) );
+        m_pColorFL  = new FixedLine( this, CUI_RES( FL_COLOR2 ) );
+        m_pColorFT  = new FixedText( this, CUI_RES( FT_COLOR2 ) );
+        m_pColorLB  = new ColorListBox( this, CUI_RES( LB_COLOR2 ) );
+    }
+
+    m_pWestFontLanguageFT   = new FixedText( this, CUI_RES( bCJK ? FT_WEST_LANG : FT_WEST_LANG_NOCJK ) );
+    m_pWestFontLanguageLB   = new SvxLanguageBox( this, CUI_RES( bCJK ? LB_WEST_LANG : LB_WEST_LANG_NOCJK ) );
+
+    m_pEastLine             = new FixedLine( this, CUI_RES( FL_EAST ) );
+    m_pEastFontNameFT       = new FixedText( this, CUI_RES( FT_EAST_NAME ) );
+    m_pEastFontNameLB       = new FontNameBox( this, CUI_RES( LB_EAST_NAME ) );
+    m_pEastFontStyleFT      = new FixedText( this, CUI_RES( FT_EAST_STYLE ) );
+    m_pEastFontStyleLB      = new FontStyleBox( this, CUI_RES( LB_EAST_STYLE ) );
+    m_pEastFontSizeFT       = new FixedText( this, CUI_RES( FT_EAST_SIZE ) );
+    m_pEastFontSizeLB       = new FontSizeBox( this, CUI_RES( LB_EAST_SIZE ) );
+    m_pEastFontLanguageFT   = new FixedText( this, CUI_RES( FT_EAST_LANG ) );
+    m_pEastFontLanguageLB   = new SvxLanguageBox( this, CUI_RES( LB_EAST_LANG ) );
+
+    m_pCTLLine              = new FixedLine( this, CUI_RES( FL_CTL ) );
+    m_pCTLFontNameFT        = new FixedText( this, CUI_RES( FT_CTL_NAME ) );
+    m_pCTLFontNameLB        = new FontNameBox( this, CUI_RES( LB_CTL_NAME ) );
+    m_pCTLFontStyleFT       = new FixedText( this, CUI_RES( FT_CTL_STYLE ) );
+    m_pCTLFontStyleLB       = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) );
+    m_pCTLFontSizeFT        = new FixedText( this, CUI_RES( FT_CTL_SIZE ) );
+    m_pCTLFontSizeLB        = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) );
+    m_pCTLFontLanguageFT    = new FixedText( this, CUI_RES( FT_CTL_LANG ) );
+    m_pCTLFontLanguageLB    = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) );
 
     if( bCJK )
     {
-        m_pColorFL  = new FixedLine( this, SVX_RES( FL_COLOR2 ) );
-        m_pColorFT  = new FixedText( this, SVX_RES( FT_COLOR2 ) );
-        m_pColorLB  = new ColorListBox( this, SVX_RES( LB_COLOR2 ) );
+        m_pColorFL  = new FixedLine( this, CUI_RES( FL_COLOR2 ) );
+        m_pColorFT  = new FixedText( this, CUI_RES( FT_COLOR2 ) );
+        m_pColorLB  = new ColorListBox( this, CUI_RES( LB_COLOR2 ) );
     }
 
     m_pWestLine             ->Show( bCJK );
@@ -1769,46 +1764,46 @@ void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) //add CHINA001
 
 SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSet ) :
 
-    SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_EFFECTS ), rInSet, WIN_EFFECTS_PREVIEW, FT_EFFECTS_FONTTYPE ),
+    SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_EFFECTS ), rInSet, WIN_EFFECTS_PREVIEW, FT_EFFECTS_FONTTYPE ),
 
-    m_aFontColorFT          ( this, SVX_RES( FT_FONTCOLOR ) ),
-    m_aFontColorLB          ( this, SVX_RES( LB_FONTCOLOR ) ),
+    m_aFontColorFT          ( this, CUI_RES( FT_FONTCOLOR ) ),
+    m_aFontColorLB          ( this, CUI_RES( LB_FONTCOLOR ) ),
 
-    m_aEffectsFT            ( this, SVX_RES( FT_EFFECTS ) ),
+    m_aEffectsFT            ( this, CUI_RES( FT_EFFECTS ) ),
     m_aEffectsLB            ( this, 0 ),
 
-    m_aEffects2LB           ( this, SVX_RES( LB_EFFECTS2 ) ),
+    m_aEffects2LB           ( this, CUI_RES( LB_EFFECTS2 ) ),
 
-    m_aReliefFT             ( this, SVX_RES( FT_RELIEF ) ),
-    m_aReliefLB             ( this, SVX_RES( LB_RELIEF ) ),
+    m_aReliefFT             ( this, CUI_RES( FT_RELIEF ) ),
+    m_aReliefLB             ( this, CUI_RES( LB_RELIEF ) ),
 
-    m_aOutlineBtn           ( this, SVX_RES( CB_OUTLINE ) ),
-    m_aShadowBtn            ( this, SVX_RES( CB_SHADOW ) ),
-    m_aBlinkingBtn          ( this, SVX_RES( CB_BLINKING ) ),
-    m_aHiddenBtn            ( this, SVX_RES( CB_CHARHIDDEN ) ),
+    m_aOutlineBtn           ( this, CUI_RES( CB_OUTLINE ) ),
+    m_aShadowBtn            ( this, CUI_RES( CB_SHADOW ) ),
+    m_aBlinkingBtn          ( this, CUI_RES( CB_BLINKING ) ),
+    m_aHiddenBtn            ( this, CUI_RES( CB_CHARHIDDEN ) ),
 
-    m_aVerticalLine         ( this, SVX_RES( FL_EFFECTS_VERTICAL ) ),
+    m_aVerticalLine         ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ),
 
-    m_aOverlineFT           ( this, SVX_RES( FT_OVERLINE ) ),
-    m_aOverlineLB           ( this, SVX_RES( LB_OVERLINE ) ),
-    m_aOverlineColorFT      ( this, SVX_RES( FT_OVERLINE_COLOR ) ),
-    m_aOverlineColorLB      ( this, SVX_RES( LB_OVERLINE_COLOR ) ),
-    m_aStrikeoutFT          ( this, SVX_RES( FT_STRIKEOUT ) ),
-    m_aStrikeoutLB          ( this, SVX_RES( LB_STRIKEOUT ) ),
-    m_aUnderlineFT          ( this, SVX_RES( FT_UNDERLINE ) ),
-    m_aUnderlineLB          ( this, SVX_RES( LB_UNDERLINE ) ),
-    m_aUnderlineColorFT     ( this, SVX_RES( FT_UNDERLINE_COLOR ) ),
-    m_aUnderlineColorLB     ( this, SVX_RES( LB_UNDERLINE_COLOR ) ),
-    m_aIndividualWordsBtn   ( this, SVX_RES( CB_INDIVIDUALWORDS ) ),
+    m_aOverlineFT           ( this, CUI_RES( FT_OVERLINE ) ),
+    m_aOverlineLB           ( this, CUI_RES( LB_OVERLINE ) ),
+    m_aOverlineColorFT      ( this, CUI_RES( FT_OVERLINE_COLOR ) ),
+    m_aOverlineColorLB      ( this, CUI_RES( LB_OVERLINE_COLOR ) ),
+    m_aStrikeoutFT          ( this, CUI_RES( FT_STRIKEOUT ) ),
+    m_aStrikeoutLB          ( this, CUI_RES( LB_STRIKEOUT ) ),
+    m_aUnderlineFT          ( this, CUI_RES( FT_UNDERLINE ) ),
+    m_aUnderlineLB          ( this, CUI_RES( LB_UNDERLINE ) ),
+    m_aUnderlineColorFT     ( this, CUI_RES( FT_UNDERLINE_COLOR ) ),
+    m_aUnderlineColorLB     ( this, CUI_RES( LB_UNDERLINE_COLOR ) ),
+    m_aIndividualWordsBtn   ( this, CUI_RES( CB_INDIVIDUALWORDS ) ),
 
-    m_aAsianLine            ( this, SVX_RES( FL_EFFECTS_ASIAN ) ),
+    m_aAsianLine            ( this, CUI_RES( FL_EFFECTS_ASIAN ) ),
 
-    m_aEmphasisFT           ( this, SVX_RES( FT_EMPHASIS ) ),
-    m_aEmphasisLB           ( this, SVX_RES( LB_EMPHASIS ) ),
-    m_aPositionFT           ( this, SVX_RES( FT_POSITION ) ),
-    m_aPositionLB           ( this, SVX_RES( LB_POSITION ) ),
+    m_aEmphasisFT           ( this, CUI_RES( FT_EMPHASIS ) ),
+    m_aEmphasisLB           ( this, CUI_RES( LB_EMPHASIS ) ),
+    m_aPositionFT           ( this, CUI_RES( FT_POSITION ) ),
+    m_aPositionLB           ( this, CUI_RES( LB_POSITION ) ),
 
-    m_aTransparentColorName ( SVX_RES( STR_CHARNAME_TRANSPARENT ) )
+    m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) )
 
 {
     m_aEffectsLB.Hide();
@@ -3042,31 +3037,31 @@ void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
 
 SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rInSet ) :
 
-    SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ),
-
-    m_aPositionLine     ( this, SVX_RES( FL_POSITION ) ),
-    m_aHighPosBtn       ( this, SVX_RES( RB_HIGHPOS ) ),
-    m_aNormalPosBtn     ( this, SVX_RES( RB_NORMALPOS ) ),
-    m_aLowPosBtn        ( this, SVX_RES( RB_LOWPOS ) ),
-    m_aHighLowFT        ( this, SVX_RES( FT_HIGHLOW ) ),
-    m_aHighLowEdit      ( this, SVX_RES( ED_HIGHLOW ) ),
-    m_aHighLowRB        ( this, SVX_RES( CB_HIGHLOW ) ),
-    m_aFontSizeFT       ( this, SVX_RES( FT_FONTSIZE ) ),
-    m_aFontSizeEdit     ( this, SVX_RES( ED_FONTSIZE ) ),
-    m_aRotationScalingFL( this, SVX_RES( FL_ROTATION_SCALING ) ),
-    m_aScalingFL        ( this, SVX_RES( FL_SCALING ) ),
-    m_a0degRB           ( this, SVX_RES( RB_0_DEG ) ),
-    m_a90degRB          ( this, SVX_RES( RB_90_DEG ) ),
-    m_a270degRB         ( this, SVX_RES( RB_270_DEG ) ),
-    m_aFitToLineCB      ( this, SVX_RES( CB_FIT_TO_LINE ) ),
-    m_aScaleWidthFT     ( this, SVX_RES( FT_SCALE_WIDTH ) ),
-    m_aScaleWidthMF     ( this, SVX_RES( MF_SCALE_WIDTH ) ),
-
-    m_aKerningLine      ( this, SVX_RES( FL_KERNING2 ) ),
-    m_aKerningLB        ( this, SVX_RES( LB_KERNING2 ) ),
-    m_aKerningFT        ( this, SVX_RES( FT_KERNING2 ) ),
-    m_aKerningEdit      ( this, SVX_RES( ED_KERNING2 ) ),
-    m_aPairKerningBtn   ( this, SVX_RES( CB_PAIRKERNING ) ),
+    SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ),
+
+    m_aPositionLine     ( this, CUI_RES( FL_POSITION ) ),
+    m_aHighPosBtn       ( this, CUI_RES( RB_HIGHPOS ) ),
+    m_aNormalPosBtn     ( this, CUI_RES( RB_NORMALPOS ) ),
+    m_aLowPosBtn        ( this, CUI_RES( RB_LOWPOS ) ),
+    m_aHighLowFT        ( this, CUI_RES( FT_HIGHLOW ) ),
+    m_aHighLowEdit      ( this, CUI_RES( ED_HIGHLOW ) ),
+    m_aHighLowRB        ( this, CUI_RES( CB_HIGHLOW ) ),
+    m_aFontSizeFT       ( this, CUI_RES( FT_FONTSIZE ) ),
+    m_aFontSizeEdit     ( this, CUI_RES( ED_FONTSIZE ) ),
+    m_aRotationScalingFL( this, CUI_RES( FL_ROTATION_SCALING ) ),
+    m_aScalingFL        ( this, CUI_RES( FL_SCALING ) ),
+    m_a0degRB           ( this, CUI_RES( RB_0_DEG ) ),
+    m_a90degRB          ( this, CUI_RES( RB_90_DEG ) ),
+    m_a270degRB         ( this, CUI_RES( RB_270_DEG ) ),
+    m_aFitToLineCB      ( this, CUI_RES( CB_FIT_TO_LINE ) ),
+    m_aScaleWidthFT     ( this, CUI_RES( FT_SCALE_WIDTH ) ),
+    m_aScaleWidthMF     ( this, CUI_RES( MF_SCALE_WIDTH ) ),
+
+    m_aKerningLine      ( this, CUI_RES( FL_KERNING2 ) ),
+    m_aKerningLB        ( this, CUI_RES( LB_KERNING2 ) ),
+    m_aKerningFT        ( this, CUI_RES( FT_KERNING2 ) ),
+    m_aKerningEdit      ( this, CUI_RES( ED_KERNING2 ) ),
+    m_aPairKerningBtn   ( this, CUI_RES( CB_PAIRKERNING ) ),
 
     m_nSuperEsc         ( (short)DFLT_ESC_SUPER ),
     m_nSubEsc           ( (short)DFLT_ESC_SUB ),
@@ -3810,16 +3805,16 @@ void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
 
 SvxCharTwoLinesPage::SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rInSet ) :
 
-    SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ),
+    SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ),
 
-    m_aSwitchOnLine     ( this, SVX_RES( FL_SWITCHON ) ),
-    m_aTwoLinesBtn      ( this, SVX_RES( CB_TWOLINES ) ),
+    m_aSwitchOnLine     ( this, CUI_RES( FL_SWITCHON ) ),
+    m_aTwoLinesBtn      ( this, CUI_RES( CB_TWOLINES ) ),
 
-    m_aEncloseLine      ( this, SVX_RES( FL_ENCLOSE ) ),
-    m_aStartBracketFT   ( this, SVX_RES( FT_STARTBRACKET ) ),
-    m_aStartBracketLB   ( this, SVX_RES( ED_STARTBRACKET ) ),
-    m_aEndBracketFT     ( this, SVX_RES( FT_ENDBRACKET ) ),
-    m_aEndBracketLB     ( this, SVX_RES( ED_ENDBRACKET ) ),
+    m_aEncloseLine      ( this, CUI_RES( FL_ENCLOSE ) ),
+    m_aStartBracketFT   ( this, CUI_RES( FT_STARTBRACKET ) ),
+    m_aStartBracketLB   ( this, CUI_RES( ED_STARTBRACKET ) ),
+    m_aEndBracketFT     ( this, CUI_RES( FT_ENDBRACKET ) ),
+    m_aEndBracketLB     ( this, CUI_RES( ED_ENDBRACKET ) ),
     m_nStartBracketPosition( 0 ),
     m_nEndBracketPosition( 0 )
 {
diff --git a/svx/source/cui/chardlg.h b/cui/source/tabpages/chardlg.h
index 83af82c3118c..83af82c3118c 100644
--- a/svx/source/cui/chardlg.h
+++ b/cui/source/tabpages/chardlg.h
diff --git a/svx/source/cui/chardlg.hrc b/cui/source/tabpages/chardlg.hrc
index 63faba788bbe..63faba788bbe 100644
--- a/svx/source/cui/chardlg.hrc
+++ b/cui/source/tabpages/chardlg.hrc
diff --git a/svx/source/cui/chardlg.src b/cui/source/tabpages/chardlg.src
index 19ad1e090435..2fd998b88d18 100644
--- a/svx/source/cui/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -29,15 +29,10 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "chardlg.hrc"
 #include "chardlg.h"
-
-// unbekannte Zeichenfarbe
-String RID_SVXSTR_COLOR_USER
-{
-    Text [ en-US ] = "User" ;
-};
+#include <svx/dialogs.hrc>
 
 // RID_SVXPAGE_CHAR_NAME ----------------------------------------------------
 
diff --git a/svx/source/cui/connect.cxx b/cui/source/tabpages/connect.cxx
index 739828ec9ccb..cd62234aeb2d 100644
--- a/svx/source/cui/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -29,18 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <tools/shl.hxx>
-#include "ofaitem.hxx"  // add CHINA001
+#include "svx/ofaitem.hxx"  // add CHINA001
 #include <sfx2/request.hxx> // add CHINA001
+#include <svx/dialogs.hrc>
+
 #define _SVX_CONNECT_CXX
 
 #include <svx/svdoedge.hxx>
@@ -48,13 +46,13 @@
 #include <svx/svdattrx.hxx>
 #include <svx/svdview.hxx>
 
-#include "connctrl.hxx"
+#include "svx/connctrl.hxx"
 #include "connect.hxx"
 #include "connect.hrc"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 static USHORT pRanges[] =
 {
@@ -99,31 +97,31 @@ SvxConnectionDialog::~SvxConnectionDialog()
 \************************************************************************/
 
 SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SfxTabPage      ( pWindow, SVX_RES( RID_SVXPAGE_CONNECTION ),
+                SfxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ),
                                   rInAttrs ),
 
-        aFtType                 ( this, SVX_RES( FT_TYPE ) ),
-        aLbType                 ( this, SVX_RES( LB_TYPE ) ),
-
-        aFlDelta                ( this, SVX_RES( FL_DELTA ) ),
-        aFtLine1                ( this, SVX_RES( FT_LINE_1 ) ),
-        aMtrFldLine1            ( this, SVX_RES( MTR_FLD_LINE_1 ) ),
-        aFtLine2                ( this, SVX_RES( FT_LINE_2 ) ),
-        aMtrFldLine2            ( this, SVX_RES( MTR_FLD_LINE_2 ) ),
-        aFtLine3                ( this, SVX_RES( FT_LINE_3 ) ),
-        aMtrFldLine3            ( this, SVX_RES( MTR_FLD_LINE_3 ) ),
-
-        aFlDistance             ( this, SVX_RES( FL_DISTANCE ) ),
-        aFtHorz1                ( this, SVX_RES( FT_HORZ_1 ) ),
-        aMtrFldHorz1            ( this, SVX_RES( MTR_FLD_HORZ_1 ) ),
-        aFtVert1                ( this, SVX_RES( FT_VERT_1 ) ),
-        aMtrFldVert1            ( this, SVX_RES( MTR_FLD_VERT_1 ) ),
-        aFtHorz2                ( this, SVX_RES( FT_HORZ_2 ) ),
-        aMtrFldHorz2            ( this, SVX_RES( MTR_FLD_HORZ_2 ) ),
-        aFtVert2                ( this, SVX_RES( FT_VERT_2 ) ),
-        aMtrFldVert2            ( this, SVX_RES( MTR_FLD_VERT_2 ) ),
-
-        aCtlPreview             ( this, SVX_RES( CTL_PREVIEW ), rInAttrs ),
+        aFtType                 ( this, CUI_RES( FT_TYPE ) ),
+        aLbType                 ( this, CUI_RES( LB_TYPE ) ),
+
+        aFlDelta                ( this, CUI_RES( FL_DELTA ) ),
+        aFtLine1                ( this, CUI_RES( FT_LINE_1 ) ),
+        aMtrFldLine1            ( this, CUI_RES( MTR_FLD_LINE_1 ) ),
+        aFtLine2                ( this, CUI_RES( FT_LINE_2 ) ),
+        aMtrFldLine2            ( this, CUI_RES( MTR_FLD_LINE_2 ) ),
+        aFtLine3                ( this, CUI_RES( FT_LINE_3 ) ),
+        aMtrFldLine3            ( this, CUI_RES( MTR_FLD_LINE_3 ) ),
+
+        aFlDistance             ( this, CUI_RES( FL_DISTANCE ) ),
+        aFtHorz1                ( this, CUI_RES( FT_HORZ_1 ) ),
+        aMtrFldHorz1            ( this, CUI_RES( MTR_FLD_HORZ_1 ) ),
+        aFtVert1                ( this, CUI_RES( FT_VERT_1 ) ),
+        aMtrFldVert1            ( this, CUI_RES( MTR_FLD_VERT_1 ) ),
+        aFtHorz2                ( this, CUI_RES( FT_HORZ_2 ) ),
+        aMtrFldHorz2            ( this, CUI_RES( MTR_FLD_HORZ_2 ) ),
+        aFtVert2                ( this, CUI_RES( FT_VERT_2 ) ),
+        aMtrFldVert2            ( this, CUI_RES( MTR_FLD_VERT_2 ) ),
+
+        aCtlPreview             ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
         rOutAttrs               ( rInAttrs ),
         aAttrSet                ( *rInAttrs.GetPool() )
 {
diff --git a/svx/inc/connect.hrc b/cui/source/tabpages/connect.hrc
index f6c49e5c7d6e..f6c49e5c7d6e 100644
--- a/svx/inc/connect.hrc
+++ b/cui/source/tabpages/connect.hrc
diff --git a/svx/source/cui/connect.src b/cui/source/tabpages/connect.src
index a2bd502e1717..9193dd4808cb 100644
--- a/svx/source/cui/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -32,8 +32,10 @@
  // include ---------------------------------------------------------------
 #include <svtools/controldims.hrc>
 #include "connect.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
  // RID_SVXPAGE_CONNECTION ------------------------------------------------
 TabPage RID_SVXPAGE_CONNECTION
 {
diff --git a/svx/source/cui/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 7ac9e82741b4..e7ec2a0e8ef6 100644
--- a/svx/source/cui/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -29,19 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include <sfx2/basedlgs.hxx>
-
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "dstribut.hxx"
 #include "dstribut.hrc"
-
+#include <svx/dialogs.hrc>
 #include <svx/svddef.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <tools/shl.hxx>
 
 static USHORT pRanges[] =
@@ -91,38 +87,38 @@ SvxDistributePage::SvxDistributePage(
     const SfxItemSet& rInAttrs,
     SvxDistributeHorizontal eHor,
     SvxDistributeVertical eVer)
-:   SvxTabPage(pWindow, SVX_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
+:   SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
     meDistributeHor(eHor),
     meDistributeVer(eVer),
-    maFlHorizontal      (this, SVX_RES(FL_HORIZONTAL        )),
-    maBtnHorNone        (this, SVX_RES(BTN_HOR_NONE     )),
-    maBtnHorLeft        (this, SVX_RES(BTN_HOR_LEFT     )),
-    maBtnHorCenter      (this, SVX_RES(BTN_HOR_CENTER       )),
-    maBtnHorDistance    (this, SVX_RES(BTN_HOR_DISTANCE )),
-    maBtnHorRight       (this, SVX_RES(BTN_HOR_RIGHT        )),
-    maHorLow            (this, SVX_RES(IMG_HOR_LOW      )),
-    maHorCenter         (this, SVX_RES(IMG_HOR_CENTER       )),
-    maHorDistance       (this, SVX_RES(IMG_HOR_DISTANCE )),
-    maHorHigh           (this, SVX_RES(IMG_HOR_HIGH     )),
-    maFlVertical        (this, SVX_RES(FL_VERTICAL      )),
-    maBtnVerNone        (this, SVX_RES(BTN_VER_NONE     )),
-    maBtnVerTop         (this, SVX_RES(BTN_VER_TOP      )),
-    maBtnVerCenter      (this, SVX_RES(BTN_VER_CENTER       )),
-    maBtnVerDistance    (this, SVX_RES(BTN_VER_DISTANCE )),
-    maBtnVerBottom      (this, SVX_RES(BTN_VER_BOTTOM       )),
-    maVerLow            (this, SVX_RES(IMG_VER_LOW        )),
-    maVerCenter         (this, SVX_RES(IMG_VER_CENTER       )),
-    maVerDistance       (this, SVX_RES(IMG_VER_DISTANCE   )),
-    maVerHigh           (this, SVX_RES(IMG_VER_HIGH       ))
+    maFlHorizontal      (this, CUI_RES(FL_HORIZONTAL        )),
+    maBtnHorNone        (this, CUI_RES(BTN_HOR_NONE     )),
+    maBtnHorLeft        (this, CUI_RES(BTN_HOR_LEFT     )),
+    maBtnHorCenter      (this, CUI_RES(BTN_HOR_CENTER       )),
+    maBtnHorDistance    (this, CUI_RES(BTN_HOR_DISTANCE )),
+    maBtnHorRight       (this, CUI_RES(BTN_HOR_RIGHT        )),
+    maHorLow            (this, CUI_RES(IMG_HOR_LOW      )),
+    maHorCenter         (this, CUI_RES(IMG_HOR_CENTER       )),
+    maHorDistance       (this, CUI_RES(IMG_HOR_DISTANCE )),
+    maHorHigh           (this, CUI_RES(IMG_HOR_HIGH     )),
+    maFlVertical        (this, CUI_RES(FL_VERTICAL      )),
+    maBtnVerNone        (this, CUI_RES(BTN_VER_NONE     )),
+    maBtnVerTop         (this, CUI_RES(BTN_VER_TOP      )),
+    maBtnVerCenter      (this, CUI_RES(BTN_VER_CENTER       )),
+    maBtnVerDistance    (this, CUI_RES(BTN_VER_DISTANCE )),
+    maBtnVerBottom      (this, CUI_RES(BTN_VER_BOTTOM       )),
+    maVerLow            (this, CUI_RES(IMG_VER_LOW        )),
+    maVerCenter         (this, CUI_RES(IMG_VER_CENTER       )),
+    maVerDistance       (this, CUI_RES(IMG_VER_DISTANCE   )),
+    maVerHigh           (this, CUI_RES(IMG_VER_HIGH       ))
 {
-    maHorLow.SetModeImage( Image( SVX_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maHorCenter.SetModeImage( Image( SVX_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maHorDistance.SetModeImage( Image( SVX_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maHorHigh.SetModeImage( Image( SVX_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerDistance.SetModeImage( Image( SVX_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerLow.SetModeImage( Image( SVX_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerCenter.SetModeImage( Image( SVX_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerHigh.SetModeImage( Image( SVX_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maHorLow.SetModeImage( Image( CUI_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maHorCenter.SetModeImage( Image( CUI_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maHorDistance.SetModeImage( Image( CUI_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maHorHigh.SetModeImage( Image( CUI_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maVerDistance.SetModeImage( Image( CUI_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maVerLow.SetModeImage( Image( CUI_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maVerCenter.SetModeImage( Image( CUI_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
+    maVerHigh.SetModeImage( Image( CUI_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
 
     FreeResource();
 }
diff --git a/svx/source/cui/dstribut.hrc b/cui/source/tabpages/dstribut.hrc
index 0834c8640785..0834c8640785 100644
--- a/svx/source/cui/dstribut.hrc
+++ b/cui/source/tabpages/dstribut.hrc
diff --git a/svx/source/cui/dstribut.src b/cui/source/tabpages/dstribut.src
index e9e0ede56590..88998dc674c5 100644
--- a/svx/source/cui/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -29,9 +29,10 @@
  ************************************************************************/
 
 // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "dstribut.hrc"
 #include "helpid.hrc"
+#include <svx/dialogs.hrc>
 
 // RID_SVXPAGE_DISTRIBUTE ---------------------------------------------------
 #define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
diff --git a/svx/source/dialog/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
index 4edc347908e0..063d70d1b81a 100644
--- a/svx/source/dialog/frmdirlbox.src
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 // frame direction ------------------------------------------------------------
 
diff --git a/svx/source/cui/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index c80d7b0d2b87..5afb0e817aa3 100644
--- a/svx/source/cui/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -29,42 +29,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-
-
+#include "precompiled_cui.hxx"
 
 #include <tools/shl.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/sfxsids.hrc>
-
-
-#include <svx/dialmgr.hxx>
-#include <dlgutil.hxx>
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/brshitem.hxx>
-
-#ifndef _GRFPAGE_HXX
 #include <grfpage.hxx>
-#endif
 #include <svx/grfcrop.hxx>
-
-#ifndef _GRFPAGE_HRC
 #include <grfpage.hrc>
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-
+#include <cuires.hrc>
+#include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP
 
 #define CM_1_TO_TWIP        567
 
@@ -79,31 +59,31 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
  --------------------------------------------------------------------*/
 
 SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
-    : SfxTabPage( pParent,  SVX_RES( RID_SVXPAGE_GRFCROP ), rSet ),
-    aCropFL(        this, SVX_RES( FL_CROP    )),
-    aZoomConstRB(   this, SVX_RES( RB_ZOOMCONST)),
-    aSizeConstRB(   this, SVX_RES( RB_SIZECONST)),
-    aLeftFT(        this, SVX_RES( FT_LEFT    )),
-    aLeftMF(        this, SVX_RES( MF_LEFT    )),
-    aRightFT(       this, SVX_RES( FT_RIGHT   )),
-    aRightMF(       this, SVX_RES( MF_RIGHT   )),
-    aTopFT(         this, SVX_RES( FT_TOP     )),
-    aTopMF(         this, SVX_RES( MF_TOP     )),
-    aBottomFT(      this, SVX_RES( FT_BOTTOM  )),
-    aBottomMF(      this, SVX_RES( MF_BOTTOM  )),
-    aZoomFL(        this, SVX_RES( FL_ZOOM    )),
-    aWidthZoomFT(   this, SVX_RES( FT_WIDTHZOOM )),
-    aWidthZoomMF(   this, SVX_RES( MF_WIDTHZOOM )),
-    aHeightZoomFT(  this, SVX_RES( FT_HEIGHTZOOM)),
-    aHeightZoomMF(  this, SVX_RES( MF_HEIGHTZOOM)),
-    aSizeFL(        this, SVX_RES( FL_SIZE    )),
-    aWidthFT(       this, SVX_RES( FT_WIDTH   )),
-    aWidthMF(       this, SVX_RES( MF_WIDTH   )),
-    aHeightFT(      this, SVX_RES( FT_HEIGHT  )),
-    aHeightMF(      this, SVX_RES( MF_HEIGHT  )),
-    aOrigSizeFT(    this, SVX_RES(FT_ORIG_SIZE)),
-    aOrigSizePB(    this, SVX_RES( PB_ORGSIZE )),
-    aExampleWN(     this, SVX_RES( WN_BSP     )),
+    : SfxTabPage( pParent,  CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ),
+    aCropFL(        this, CUI_RES( FL_CROP    )),
+    aZoomConstRB(   this, CUI_RES( RB_ZOOMCONST)),
+    aSizeConstRB(   this, CUI_RES( RB_SIZECONST)),
+    aLeftFT(        this, CUI_RES( FT_LEFT    )),
+    aLeftMF(        this, CUI_RES( MF_LEFT    )),
+    aRightFT(       this, CUI_RES( FT_RIGHT   )),
+    aRightMF(       this, CUI_RES( MF_RIGHT   )),
+    aTopFT(         this, CUI_RES( FT_TOP     )),
+    aTopMF(         this, CUI_RES( MF_TOP     )),
+    aBottomFT(      this, CUI_RES( FT_BOTTOM  )),
+    aBottomMF(      this, CUI_RES( MF_BOTTOM  )),
+    aZoomFL(        this, CUI_RES( FL_ZOOM    )),
+    aWidthZoomFT(   this, CUI_RES( FT_WIDTHZOOM )),
+    aWidthZoomMF(   this, CUI_RES( MF_WIDTHZOOM )),
+    aHeightZoomFT(  this, CUI_RES( FT_HEIGHTZOOM)),
+    aHeightZoomMF(  this, CUI_RES( MF_HEIGHTZOOM)),
+    aSizeFL(        this, CUI_RES( FL_SIZE    )),
+    aWidthFT(       this, CUI_RES( FT_WIDTH   )),
+    aWidthMF(       this, CUI_RES( MF_WIDTH   )),
+    aHeightFT(      this, CUI_RES( FT_HEIGHT  )),
+    aHeightMF(      this, CUI_RES( MF_HEIGHT  )),
+    aOrigSizeFT(    this, CUI_RES(FT_ORIG_SIZE)),
+    aOrigSizePB(    this, CUI_RES( PB_ORGSIZE )),
+    aExampleWN(     this, CUI_RES( WN_BSP     )),
     pLastCropField(0),
     bInitialized(FALSE),
     bSetOrigSize(FALSE)
diff --git a/svx/source/cui/grfpage.hrc b/cui/source/tabpages/grfpage.hrc
index 5743645f3eb0..5743645f3eb0 100644
--- a/svx/source/cui/grfpage.hrc
+++ b/cui/source/tabpages/grfpage.hrc
diff --git a/svx/source/cui/grfpage.src b/cui/source/tabpages/grfpage.src
index 0d6791fd917d..23004c704582 100644
--- a/svx/source/cui/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -28,9 +28,10 @@
  *
  ************************************************************************/
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "grfpage.hrc"
+#include <svx/dialogs.hrc>
 
 /************************************************************/
 /*                                                                                                                  */
diff --git a/svx/source/cui/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 327300d3a603..a311fadca64b 100644
--- a/svx/source/cui/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -29,24 +29,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <swpossizetabpage.hxx>
-
+#include <svx/dialogs.hrc>
 #define _SVX_LABDLG_CXX
 
 #include <svx/svdattrx.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <cuires.hrc>
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include "transfrm.hxx"
 
 #include "labdlg.hrc"
@@ -90,25 +86,25 @@ static USHORT pCaptionRanges[] =
 // -----------------------------------------------------------------------
 
 SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs)
- :  SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
-
-    aCT_CAPTTYPE(       this, SVX_RES( CT_CAPTTYPE ) ),
-    aFT_ABSTAND(        this, SVX_RES( FT_ABSTAND ) ),
-    aMF_ABSTAND(        this, SVX_RES( MF_ABSTAND ) ),
-    aFT_WINKEL(         this, SVX_RES( FT_WINKEL ) ),
-    aLB_WINKEL(         this, SVX_RES( LB_WINKEL ) ),
-    aFT_ANSATZ(         this, SVX_RES( FT_ANSATZ ) ),
-    aLB_ANSATZ(         this, SVX_RES( LB_ANSATZ ) ),
-    aFT_UM(             this, SVX_RES( FT_UM ) ),
-    aMF_ANSATZ(         this, SVX_RES( MF_ANSATZ ) ),
-    aFT_ANSATZ_REL(     this, SVX_RES( FT_ANSATZ_REL ) ),
-    aLB_ANSATZ_REL(     this, SVX_RES( LB_ANSATZ_REL ) ),
-    aFT_LAENGE(         this, SVX_RES( FT_LAENGE ) ),
-    aMF_LAENGE(         this, SVX_RES( MF_LAENGE ) ),
-    aCB_LAENGE(         this, SVX_RES( CB_LAENGE ) ),
-
-    aStrHorzList( SVX_RES(STR_HORZ_LIST) ),
-    aStrVertList( SVX_RES(STR_VERT_LIST) ),
+ :  SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
+
+    aCT_CAPTTYPE(       this, CUI_RES( CT_CAPTTYPE ) ),
+    aFT_ABSTAND(        this, CUI_RES( FT_ABSTAND ) ),
+    aMF_ABSTAND(        this, CUI_RES( MF_ABSTAND ) ),
+    aFT_WINKEL(         this, CUI_RES( FT_WINKEL ) ),
+    aLB_WINKEL(         this, CUI_RES( LB_WINKEL ) ),
+    aFT_ANSATZ(         this, CUI_RES( FT_ANSATZ ) ),
+    aLB_ANSATZ(         this, CUI_RES( LB_ANSATZ ) ),
+    aFT_UM(             this, CUI_RES( FT_UM ) ),
+    aMF_ANSATZ(         this, CUI_RES( MF_ANSATZ ) ),
+    aFT_ANSATZ_REL(     this, CUI_RES( FT_ANSATZ_REL ) ),
+    aLB_ANSATZ_REL(     this, CUI_RES( LB_ANSATZ_REL ) ),
+    aFT_LAENGE(         this, CUI_RES( FT_LAENGE ) ),
+    aMF_LAENGE(         this, CUI_RES( MF_LAENGE ) ),
+    aCB_LAENGE(         this, CUI_RES( CB_LAENGE ) ),
+
+    aStrHorzList( CUI_RES(STR_HORZ_LIST) ),
+    aStrVertList( CUI_RES(STR_VERT_LIST) ),
 
     rOutAttrs       ( rInAttrs )
 {
@@ -133,8 +129,8 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
     sal_uInt16 nBitmap;
     for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
     {
-        mpBmpCapTypes[nBitmap]  = new Image(Bitmap(SVX_RES(BMP_CAPTTYPE_1   + nBitmap)), COL_LIGHTMAGENTA );
-        mpBmpCapTypesH[nBitmap] = new Image(Bitmap(SVX_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA );
+        mpBmpCapTypes[nBitmap]  = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1   + nBitmap)), COL_LIGHTMAGENTA );
+        mpBmpCapTypesH[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA );
     }
 
     //------------ValueSet installieren--------------------------
@@ -144,9 +140,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
     aCT_CAPTTYPE.SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
 
     Image aImage;
-    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(SVX_RES(STR_CAPTTYPE_1)));
-    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(SVX_RES(STR_CAPTTYPE_2)));
-    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(SVX_RES(STR_CAPTTYPE_3)));
+    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1)));
+    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2)));
+    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3)));
 
     FillValueSet();
 
@@ -586,7 +582,7 @@ void SvxCaptionTabPage::FillValueSet()
 
 
 SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, USHORT nAnchorTypes)
- :  SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_CAPTION ) ),
+ :  SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ),
     pView       ( pSdrView ),
     nAnchorCtrls(nAnchorTypes)
 {
diff --git a/svx/source/cui/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index 82ea64c1620c..f75da680a0e0 100644
--- a/svx/source/cui/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 //#define RID_SVXPAGE_CAPTION       1000
 //#define RID_SVXDLG_CAPTION        1001
 
diff --git a/svx/source/cui/labdlg.src b/cui/source/tabpages/labdlg.src
index f3d464a1558e..e128fe7c1734 100644
--- a/svx/source/cui/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -30,7 +30,7 @@
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
 #include "labdlg.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
 
  // RID_SVXPAGE_CAPTION ---------------------------------------------------
 TabPage RID_SVXPAGE_CAPTION
diff --git a/svx/source/cui/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ac4eeffd6a68..3839bc5034ea 100644
--- a/svx/source/cui/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -29,26 +29,26 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
 #define ITEMID_MACRO 0
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #undef ITEMID_MACRO
 
 #include "macroass.hxx"
 
 #include <basic/basmgr.hxx>
-#include <svx/dialmgr.hxx>
-
+#include <dialmgr.hxx>
+#include <svx/dialogs.hrc>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <svtools/svmedit.hxx>
 #include "cfgutil.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include "macroass.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
 #include <sfx2/macrconf.hxx>
 #include "headertablistbox.hxx"
 
@@ -676,19 +676,19 @@ SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl(
 SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
     : _SfxMacroTabPage( pParent, rResId, rSet )
 {
-    mpImpl->pStrEvent           = new String(                   SVX_RES( STR_EVENT ) );
-    mpImpl->pAssignedMacro      = new String(                   SVX_RES( STR_ASSMACRO ) );
-    mpImpl->pEventLB            = new _HeaderTabListBox( this,  SVX_RES( LB_EVENT ) );
-    mpImpl->pAssignPB           = new PushButton( this,         SVX_RES( PB_ASSIGN ) );
-    mpImpl->pDeletePB           = new PushButton( this,         SVX_RES( PB_DELETE ) );
-    mpImpl->pScriptTypeLB       = new ListBox(this,             SVX_RES( LB_SCRIPTTYPE ) );
+    mpImpl->pStrEvent           = new String(                   CUI_RES( STR_EVENT ) );
+    mpImpl->pAssignedMacro      = new String(                   CUI_RES( STR_ASSMACRO ) );
+    mpImpl->pEventLB            = new _HeaderTabListBox( this,  CUI_RES( LB_EVENT ) );
+    mpImpl->pAssignPB           = new PushButton( this,         CUI_RES( PB_ASSIGN ) );
+    mpImpl->pDeletePB           = new PushButton( this,         CUI_RES( PB_DELETE ) );
+    mpImpl->pScriptTypeLB       = new ListBox(this,             CUI_RES( LB_SCRIPTTYPE ) );
     mpImpl->pScriptTypeLB->Hide();
-    mpImpl->pMacroFT            = new FixedText( this,          SVX_RES( FT_MACRO ) );
-    mpImpl->pGroupLB            = new SfxConfigGroupListBox_Impl( this,     SVX_RES( LB_GROUP ) );
-    mpImpl->pFT_MacroLBLabel    = new FixedText( this,          SVX_RES( FT_LABEL4LB_MACROS ) );
+    mpImpl->pMacroFT            = new FixedText( this,          CUI_RES( FT_MACRO ) );
+    mpImpl->pGroupLB            = new SfxConfigGroupListBox_Impl( this,     CUI_RES( LB_GROUP ) );
+    mpImpl->pFT_MacroLBLabel    = new FixedText( this,          CUI_RES( FT_LABEL4LB_MACROS ) );
     mpImpl->maStaticMacroLBLabel= mpImpl->pFT_MacroLBLabel->GetText();
-    mpImpl->pMacroLB            = new SfxConfigFunctionListBox_Impl( this,  SVX_RES( LB_MACROS ) );
-    mpImpl->pMacroStr           = new String(                   SVX_RES( STR_MACROS ) );
+    mpImpl->pMacroLB            = new SfxConfigFunctionListBox_Impl( this,  CUI_RES( LB_MACROS ) );
+    mpImpl->pMacroStr           = new String(                   CUI_RES( STR_MACROS ) );
 
     FreeResource();
 
@@ -701,7 +701,7 @@ SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Re
 
 SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
-    return new SfxMacroTabPage( pParent, SVX_RES( RID_SVXPAGE_EVENTASSIGN ), NULL, rAttrSet );
+    return new SfxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_EVENTASSIGN ), NULL, rAttrSet );
 }
 
 SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
diff --git a/svx/source/cui/macroass.hrc b/cui/source/tabpages/macroass.hrc
index 626cf010adf9..626cf010adf9 100644
--- a/svx/source/cui/macroass.hrc
+++ b/cui/source/tabpages/macroass.hrc
diff --git a/svx/source/cui/macroass.src b/cui/source/tabpages/macroass.src
index bb56baae45f6..3f8fad19cf59 100644
--- a/svx/source/cui/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -29,8 +29,10 @@
  ************************************************************************/
 
 #include "macroass.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
 #include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
 TabPage RID_SVXPAGE_EVENTASSIGN
 {
     Hide = TRUE ;
diff --git a/cui/source/tabpages/makefile.mk b/cui/source/tabpages/makefile.mk
new file mode 100755
index 000000000000..544803603907
--- /dev/null
+++ b/cui/source/tabpages/makefile.mk
@@ -0,0 +1,114 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=tabpages
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=tabpages
+SRC1FILES =  \
+        align.src \
+        autocdlg.src \
+        backgrnd.src \
+        bbdlg.src \
+        border.src \
+        chardlg.src \
+        connect.src \
+        dstribut.src \
+        frmdirlbox.src \
+        grfpage.src \
+        labdlg.src \
+        macroass.src \
+        measure.src \
+        numfmt.src \
+        numpages.src \
+        page.src \
+        paragrph.src \
+        strings.src \
+        swpossizetabpage.src \
+        tabarea.src \
+        tabline.src \
+        tabstpge.src \
+        textanim.src \
+        textattr.src \
+        transfrm.src
+
+
+SLOFILES+=\
+        $(SLO)$/align.obj \
+        $(SLO)$/autocdlg.obj \
+        $(SLO)$/backgrnd.obj \
+        $(SLO)$/bbdlg.obj \
+        $(SLO)$/border.obj \
+        $(SLO)$/borderconn.obj \
+        $(SLO)$/chardlg.obj \
+        $(SLO)$/connect.obj \
+        $(SLO)$/dstribut.obj \
+        $(SLO)$/grfpage.obj \
+        $(SLO)$/labdlg.obj \
+        $(SLO)$/macroass.obj \
+        $(SLO)$/measure.obj \
+        $(SLO)$/numfmt.obj \
+        $(SLO)$/numpages.obj \
+        $(SLO)$/page.obj \
+        $(SLO)$/paragrph.obj \
+        $(SLO)$/swpossizetabpage.obj \
+        $(SLO)$/tabarea.obj \
+        $(SLO)$/tabline.obj \
+        $(SLO)$/tabstpge.obj \
+        $(SLO)$/textanim.obj \
+        $(SLO)$/textattr.obj \
+        $(SLO)$/tparea.obj \
+        $(SLO)$/tpbitmap.obj \
+        $(SLO)$/tpcolor.obj \
+        $(SLO)$/tpgradnt.obj \
+        $(SLO)$/tphatch.obj \
+        $(SLO)$/tpline.obj \
+        $(SLO)$/tplnedef.obj \
+        $(SLO)$/tplneend.obj \
+        $(SLO)$/tpshadow.obj \
+        $(SLO)$/transfrm.obj \
+
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/svx/source/cui/measure.cxx b/cui/source/tabpages/measure.cxx
index 38eaf11ced7a..4b00f3289338 100644
--- a/svx/source/cui/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -29,19 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <tools/shl.hxx>
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 
 #define _SVX_MEASURE_CXX
 
@@ -49,15 +44,16 @@
 #include <svx/svdattr.hxx>
 #include <svx/svdattrx.hxx>
 #include <svx/svdview.hxx>
-
-#include "measctrl.hxx"
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include "svx/measctrl.hxx"
 #include "measure.hxx"
 #include "measure.hrc"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <svx/strarray.hxx>
 #include <sfx2/request.hxx> //add CHINA001
-#include "ofaitem.hxx" //add CHINA001
+#include "svx/ofaitem.hxx" //add CHINA001
 
 static USHORT pRanges[] =
 {
@@ -102,35 +98,35 @@ SvxMeasureDialog::~SvxMeasureDialog()
 \************************************************************************/
 
 SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SvxTabPage      ( pWindow, SVX_RES( RID_SVXPAGE_MEASURE ),
+                SvxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ),
                                   rInAttrs ),
 
-        aFlLine                 ( this, SVX_RES( FL_LINE ) ),
-        aFtLineDist             ( this, SVX_RES( FT_LINE_DIST ) ),
-        aMtrFldLineDist         ( this, SVX_RES( MTR_LINE_DIST ) ),
-        aFtHelplineOverhang     ( this, SVX_RES( FT_HELPLINE_OVERHANG ) ),
-        aMtrFldHelplineOverhang ( this, SVX_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
-        aFtHelplineDist         ( this, SVX_RES( FT_HELPLINE_DIST ) ),
-        aMtrFldHelplineDist     ( this, SVX_RES( MTR_FLD_HELPLINE_DIST ) ),
-        aFtHelpline1Len         ( this, SVX_RES( FT_HELPLINE1_LEN ) ),
-        aMtrFldHelpline1Len     ( this, SVX_RES( MTR_FLD_HELPLINE1_LEN ) ),
-        aFtHelpline2Len         ( this, SVX_RES( FT_HELPLINE2_LEN ) ),
-        aMtrFldHelpline2Len     ( this, SVX_RES( MTR_FLD_HELPLINE2_LEN ) ),
-        aTsbBelowRefEdge        ( this, SVX_RES( TSB_BELOW_REF_EDGE ) ),
-        aFtDecimalPlaces        ( this, SVX_RES( FT_DECIMALPLACES ) ),
-        aMtrFldDecimalPlaces    ( this, SVX_RES( MTR_FLD_DECIMALPLACES ) ),
-
-        aFlLabel                ( this, SVX_RES( FL_LABEL ) ),
-        aFtPosition             ( this, SVX_RES( FT_POSITION ) ),
-        aCtlPosition            ( this, SVX_RES( CTL_POSITION ) ),
-        aTsbAutoPosV            ( this, SVX_RES( TSB_AUTOPOSV ) ),
-        aTsbAutoPosH            ( this, SVX_RES( TSB_AUTOPOSH ) ),
-        aTsbShowUnit            ( this, SVX_RES( TSB_SHOW_UNIT ) ),
-        aLbUnit                 ( this, SVX_RES( LB_UNIT ) ),
-        aTsbParallel            ( this, SVX_RES( TSB_PARALLEL ) ),
-        aCtlPreview             ( this, SVX_RES( CTL_PREVIEW ), rInAttrs ),
-
-        aFlVert                 ( this, SVX_RES( FL_VERT ) ),
+        aFlLine                 ( this, CUI_RES( FL_LINE ) ),
+        aFtLineDist             ( this, CUI_RES( FT_LINE_DIST ) ),
+        aMtrFldLineDist         ( this, CUI_RES( MTR_LINE_DIST ) ),
+        aFtHelplineOverhang     ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ),
+        aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
+        aFtHelplineDist         ( this, CUI_RES( FT_HELPLINE_DIST ) ),
+        aMtrFldHelplineDist     ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ),
+        aFtHelpline1Len         ( this, CUI_RES( FT_HELPLINE1_LEN ) ),
+        aMtrFldHelpline1Len     ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ),
+        aFtHelpline2Len         ( this, CUI_RES( FT_HELPLINE2_LEN ) ),
+        aMtrFldHelpline2Len     ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ),
+        aTsbBelowRefEdge        ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ),
+        aFtDecimalPlaces        ( this, CUI_RES( FT_DECIMALPLACES ) ),
+        aMtrFldDecimalPlaces    ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ),
+
+        aFlLabel                ( this, CUI_RES( FL_LABEL ) ),
+        aFtPosition             ( this, CUI_RES( FT_POSITION ) ),
+        aCtlPosition            ( this, CUI_RES( CTL_POSITION ) ),
+        aTsbAutoPosV            ( this, CUI_RES( TSB_AUTOPOSV ) ),
+        aTsbAutoPosH            ( this, CUI_RES( TSB_AUTOPOSH ) ),
+        aTsbShowUnit            ( this, CUI_RES( TSB_SHOW_UNIT ) ),
+        aLbUnit                 ( this, CUI_RES( LB_UNIT ) ),
+        aTsbParallel            ( this, CUI_RES( TSB_PARALLEL ) ),
+        aCtlPreview             ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
+
+        aFlVert                 ( this, CUI_RES( FL_VERT ) ),
         rOutAttrs               ( rInAttrs ),
         aAttrSet                ( *rInAttrs.GetPool() ),
         pView( 0 ),
@@ -854,10 +850,10 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
 void SvxMeasurePage::FillUnitLB()
 {
     // fill ListBox with metrics
-    SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE );
+    SvxStringArray aMetricArr( SVX_RES( RID_SVXSTR_FIELDUNIT_TABLE ) );
 
     long nUnit = FUNIT_NONE;
-    String aStrMetric( SVX_RES( STR_MEASURE_AUTOMATIC ) );
+    String aStrMetric( CUI_RES( STR_MEASURE_AUTOMATIC ) );
     USHORT nPos = aLbUnit.InsertEntry( aStrMetric );
     aLbUnit.SetEntryData( nPos, (void*)nUnit );
 
diff --git a/svx/source/cui/measure.hrc b/cui/source/tabpages/measure.hrc
index b06a36775b3b..b06a36775b3b 100644
--- a/svx/source/cui/measure.hrc
+++ b/cui/source/tabpages/measure.hrc
diff --git a/svx/source/cui/measure.src b/cui/source/tabpages/measure.src
index df394e4bdbe3..75cb09737766 100644
--- a/svx/source/cui/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -28,9 +28,11 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "measure.hrc"
 #include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
 #define DELTA 20
  // pragma ----------------------------------------------------------------
 
diff --git a/svx/source/cui/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index d6978ea008b8..7a4fe198e6fe 100644
--- a/svx/source/cui/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -33,39 +33,35 @@
 #endif
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <i18npool/lang.h>
-
+#include <svx/dialogs.hrc>
 #define _SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/colorcfg.hxx>
 
 #define _SVX_NUMFMT_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "numfmt.hrc"
 
 #include <svx/numinf.hxx>
 
 #include "numfmt.hxx"
 #include <svx/numfmtsh.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <sfx2/request.hxx> //CHINA001
 #include <sfx2/app.hxx> //CHINA001
 #include <sfx2/basedlgs.hxx>
-#include "flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx" //CHINA001
 
 #define NUMKEY_UNDEFINED SAL_MAX_UINT32
 
@@ -243,56 +239,56 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
 #include <layout/layout-pre.hxx>
 
 #if ENABLE_LAYOUT
-#undef SVX_RES
-#define SVX_RES(x) #x
-#define SVX_RES_PLAIN(x) ResId (x, DIALOG_MGR ())
-#define THIS_SVX_RES(x) this, #x
+#undef CUI_RES
+#define CUI_RES(x) #x
+#define CUI_RES_PLAIN(x) ResId (x, CUI_MGR ())
+#define THIS_CUI_RES(x) this, #x
 #undef SfxTabPage
 #define SfxTabPage( parent, id, args ) SfxTabPage( parent, "number-format.xml", id, &args )
 #else /* !ENABLE_LAYOUT */
-#define SVX_RES_PLAIN SVX_RES
-#define THIS_SVX_RES SVX_RES
+#define CUI_RES_PLAIN CUI_RES
+#define THIS_CUI_RES CUI_RES
 #endif /* !ENABLE_LAYOUT */
 
 SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
                                                 const SfxItemSet&   rCoreAttrs )
 
-    :   SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
-
-        aFtCategory     ( this, SVX_RES( FT_CATEGORY ) ),
-        aLbCategory     ( this, SVX_RES( LB_CATEGORY ) ),
-        aFtFormat       ( this, SVX_RES( FT_FORMAT ) ),
-        aLbCurrency     ( this, SVX_RES( LB_CURRENCY) ),
-        aLbFormat       ( this, SVX_RES( LB_FORMAT ) ),
-        aFtLanguage     ( this, SVX_RES( FT_LANGUAGE ) ),
-        aLbLanguage     ( this, SVX_RES( LB_LANGUAGE ), FALSE ),
-        aCbSourceFormat ( this, SVX_RES( CB_SOURCEFORMAT ) ),
-        aFtDecimals     ( this, SVX_RES( FT_DECIMALS ) ),
-        aEdDecimals     ( this, SVX_RES( ED_DECIMALS ) ),
-        aFtLeadZeroes   ( this, SVX_RES( FT_LEADZEROES ) ),
-        aEdLeadZeroes   ( this, SVX_RES( ED_LEADZEROES ) ),
-        aBtnNegRed      ( this, SVX_RES( BTN_NEGRED ) ),
-        aBtnThousand    ( this, SVX_RES( BTN_THOUSAND ) ),
-        aFlOptions      ( this, SVX_RES( FL_OPTIONS ) ),
-
-        aFtEdFormat     ( this, SVX_RES( FT_EDFORMAT ) ),
-        aEdFormat       ( this, SVX_RES( ED_FORMAT ) ),
-        aIbAdd          ( this, SVX_RES( IB_ADD       ) ),
-        aIbInfo         ( this, SVX_RES( IB_INFO      ) ),
-        aIbRemove       ( this, SVX_RES( IB_REMOVE    ) ),
-        aFtComment      ( this, SVX_RES( FT_COMMENT ) ),
-        aEdComment      ( this, SVX_RES( ED_COMMENT ) ),
+    :   SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
+
+        aFtCategory     ( this, CUI_RES( FT_CATEGORY ) ),
+        aLbCategory     ( this, CUI_RES( LB_CATEGORY ) ),
+        aFtFormat       ( this, CUI_RES( FT_FORMAT ) ),
+        aLbCurrency     ( this, CUI_RES( LB_CURRENCY) ),
+        aLbFormat       ( this, CUI_RES( LB_FORMAT ) ),
+        aFtLanguage     ( this, CUI_RES( FT_LANGUAGE ) ),
+        aLbLanguage     ( this, CUI_RES( LB_LANGUAGE ), FALSE ),
+        aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
+        aFtDecimals     ( this, CUI_RES( FT_DECIMALS ) ),
+        aEdDecimals     ( this, CUI_RES( ED_DECIMALS ) ),
+        aFtLeadZeroes   ( this, CUI_RES( FT_LEADZEROES ) ),
+        aEdLeadZeroes   ( this, CUI_RES( ED_LEADZEROES ) ),
+        aBtnNegRed      ( this, CUI_RES( BTN_NEGRED ) ),
+        aBtnThousand    ( this, CUI_RES( BTN_THOUSAND ) ),
+        aFlOptions      ( this, CUI_RES( FL_OPTIONS ) ),
+
+        aFtEdFormat     ( this, CUI_RES( FT_EDFORMAT ) ),
+        aEdFormat       ( this, CUI_RES( ED_FORMAT ) ),
+        aIbAdd          ( this, CUI_RES( IB_ADD       ) ),
+        aIbInfo         ( this, CUI_RES( IB_INFO      ) ),
+        aIbRemove       ( this, CUI_RES( IB_REMOVE    ) ),
+        aFtComment      ( this, CUI_RES( FT_COMMENT ) ),
+        aEdComment      ( this, CUI_RES( ED_COMMENT ) ),
 
 #if ENABLE_LAYOUT
-        aWndPreview     ( LAYOUT_THIS_WINDOW(this), SVX_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+        aWndPreview     ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
 #else
-        aWndPreview     ( this, SVX_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+        aWndPreview     ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
 #endif
         pNumItem        ( NULL ),
         pNumFmtShell    ( NULL ),
         nInitFormat     ( ULONG_MAX ),
 
-        sAutomaticEntry ( THIS_SVX_RES( STR_AUTO_ENTRY)),
+        sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)),
         pLastActivWindow( NULL )
 {
 #if ENABLE_LAYOUT
@@ -313,8 +309,8 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
 
 void SvxNumberFormatTabPage::Init_Impl()
 {
-    ImageList               aIconList( SVX_RES_PLAIN ( IL_ICON ) );
-    ImageList               aIconListHC( SVX_RES_PLAIN ( IL_ICON_HC ) );
+    ImageList               aIconList( CUI_RES_PLAIN ( IL_ICON ) );
+    ImageList               aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) );
 
     bNumItemFlag=TRUE;
     bOneAreaFlag=FALSE;
diff --git a/svx/source/cui/numfmt.hrc b/cui/source/tabpages/numfmt.hrc
index 102c5a212ac6..102c5a212ac6 100644
--- a/svx/source/cui/numfmt.hrc
+++ b/cui/source/tabpages/numfmt.hrc
diff --git a/svx/source/cui/numfmt.src b/cui/source/tabpages/numfmt.src
index 96269bb9ec09..7e2b5706fb70 100644
--- a/svx/source/cui/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -28,10 +28,10 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "numfmt.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
 
  // RID_SVXPAGE_NUMBERFORMAT ----------------------------------------------
 TabPage RID_SVXPAGE_NUMBERFORMAT
diff --git a/svx/source/cui/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 92b5934baed7..22c13efa37ab 100644
--- a/svx/source/cui/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
@@ -41,36 +37,32 @@
 
 #include <numpages.hxx>
 #include <numpages.hrc>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
+#include <dialmgr.hxx>
+#include <cuires.hrc>
 #include <tools/shl.hxx>
 #include <i18npool/mslangid.hxx>
 #include <svtools/valueset.hxx>
-#ifndef _SVX_HELPID_HRC
 #include <helpid.hrc>
-#endif
 #include <svx/numitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
-#include <gallery.hxx>
-#include <svtools/urihelper.hxx>
+#include <svx/gallery.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/brshitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
 #include "cuicharmap.hxx"
-#include <flstitem.hxx>
-#include <dlgutil.hxx>
+#include <svx/flstitem.hxx>
+#include <svx/dlgutil.hxx>
 #include <svx/xtable.hxx>
-#include <drawitem.hxx>
-#include <numvset.hxx>
-#include <htmlmode.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svx/drawitem.hxx>
+#include <svx/numvset.hxx>
+#include <svx/htmlmode.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -79,16 +71,18 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/text/XNumberingTypeInfo.hpp>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 
 #include <algorithm>
 #include <vector>
-#include "opengrf.hxx"
+#include "svx/opengrf.hxx"
 
-#include <svx/dialogs.hrc> //CHINA001
+#include <cuires.hrc> //CHINA001
 #include <sfx2/request.hxx> //CHINA001
-#include <svtools/aeitem.hxx> //add CHINA001
-#include <svtools/stritem.hxx>//add CHINA001
-#include <svtools/slstitm.hxx> //add CHINA001
+#include <svl/aeitem.hxx> //add CHINA001
+#include <svl/stritem.hxx>//add CHINA001
+#include <svl/slstitm.hxx> //add CHINA001
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -238,9 +232,9 @@ Font& lcl_GetDefaultBulletFont()
 
 SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
                                const SfxItemSet& rSet)  :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ),
-    aValuesFL(      this, SVX_RES(FL_VALUES) ),
-    pExamplesVS(    new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ),
+    aValuesFL(      this, CUI_RES(FL_VALUES) ),
+    pExamplesVS(    new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -311,7 +305,7 @@ SfxTabPage*  SvxSingleNumPickTabPage::Create( Window* pParent,
 
 BOOL  SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    if(bPreset || bModified && pSaveNum)
+    if( (bPreset || bModified) && pSaveNum)
     {
         *pSaveNum = *pActNum;
         rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -467,9 +461,9 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
 
 SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
                                const SfxItemSet& rSet)  :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_BULLET ), rSet ),
-    aValuesFL(      this, SVX_RES(FL_VALUES) ),
-    pExamplesVS(    new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BULLET ), rSet ),
+    aValuesFL(      this, CUI_RES(FL_VALUES) ),
+    pExamplesVS(    new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -513,7 +507,7 @@ SfxTabPage*  SvxBulletPickTabPage::Create( Window* pParent,
 
 BOOL  SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    if(bPreset || bModified && pActNum)
+    if( (bPreset || bModified) && pActNum)
     {
         *pSaveNum = *pActNum;
         rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -667,9 +661,9 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
 
 SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_NUM ), rSet ),
-    aValuesFL(      this, SVX_RES(FL_VALUES) ),
-    pExamplesVS(    new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_NUM ), rSet ),
+    aValuesFL(      this, CUI_RES(FL_VALUES) ),
+    pExamplesVS(    new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -750,7 +744,7 @@ SfxTabPage*  SvxNumPickTabPage::Create( Window* pParent,
 
 BOOL  SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    if(bPreset || bModified && pActNum)
+    if( (bPreset || bModified) && pActNum)
     {
         *pSaveNum = *pActNum;
         rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -978,11 +972,11 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
 
 SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_BMP ), rSet ),
-    aValuesFL(      this, SVX_RES(FL_VALUES) ),
-    pExamplesVS(    new SvxBmpNumValueSet(this, SVX_RES(VS_VALUES)/*, aGrfNames*/ )),
-    aErrorText(     this, SVX_RES(FT_ERROR)),
-    aLinkedCB(      this, SVX_RES(CB_LINKED)),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BMP ), rSet ),
+    aValuesFL(      this, CUI_RES(FL_VALUES) ),
+    pExamplesVS(    new SvxBmpNumValueSet(this, CUI_RES(VS_VALUES)/*, aGrfNames*/ )),
+    aErrorText(     this, CUI_RES(FT_ERROR)),
+    aLinkedCB(      this, CUI_RES(CB_LINKED)),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -1110,7 +1104,7 @@ BOOL  SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
 //      rSet.DisableItem(SID_ATTR_NUMBERING_RULE);
         return FALSE;
     }
-    if(bPreset || bModified && pActNum)
+    if( (bPreset || bModified) && pActNum)
     {
         *pSaveNum = *pActNum;
         rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -1314,42 +1308,42 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
 #define NUM_NO_GRAPHIC 1000
 SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUM_OPTIONS ), rSet ),
-
-    aFormatFL(      this, SVX_RES(FL_FORMAT   )),
-    aLevelFT(       this, SVX_RES(FT_LEVEL    )),
-    aLevelLB(       this, SVX_RES(LB_LEVEL  )),
-    aFmtFT(         this, SVX_RES(FT_FMT        )),
-    aFmtLB(         this, SVX_RES(LB_FMT        )),
-    aPrefixFT(      this, SVX_RES(FT_PREFIX )),
-    aPrefixED(      this, SVX_RES(ED_PREFIX )),
-    aSuffixFT(      this, SVX_RES(FT_SUFFIX )),
-    aSuffixED(      this, SVX_RES(ED_SUFFIX )),
-    aCharFmtFT(     this, SVX_RES(FT_CHARFMT    )),
-    aCharFmtLB(     this, SVX_RES(LB_CHARFMT    )),
-    aBulColorFT(    this, SVX_RES(FT_BUL_COLOR)),
-    aBulColLB(      this, SVX_RES(LB_BUL_COLOR)),
-    aBulRelSizeFT(  this, SVX_RES(FT_BUL_REL_SIZE)),
-    aBulRelSizeMF(  this, SVX_RES(MF_BUL_REL_SIZE)),
-    aAllLevelFT(    this, SVX_RES(FT_ALL_LEVEL)),
-    aAllLevelNF(    this, SVX_RES(NF_ALL_LEVEL)),
-    aStartFT(       this, SVX_RES(FT_START  )),
-    aStartED(       this, SVX_RES(ED_START  )),
-    aBulletPB(      this, SVX_RES(PB_BULLET )),
-    aAlignFT(       this, SVX_RES(FT_ALIGN  )),
-    aAlignLB(       this, SVX_RES(LB_ALIGN  )),
-    aBitmapFT(      this, SVX_RES(FT_BITMAP )),
-    aBitmapMB(      this, SVX_RES(MB_BITMAP )),
-    aSizeFT(        this, SVX_RES(FT_SIZE       )),
-    aWidthMF(       this, SVX_RES(MF_WIDTH  )),
-    aMultFT(        this, SVX_RES(FT_MULT       )),
-    aHeightMF(      this, SVX_RES(MF_HEIGHT )),
-    aRatioCB(       this, SVX_RES(CB_RATIO  )),
-    aOrientFT(      this, SVX_RES(FT_ORIENT )),
-    aOrientLB(      this, SVX_RES(LB_ORIENT )),
-    aSameLevelFL(   this, SVX_RES(FL_SAME_LEVEL)),
-    aSameLevelCB(   this, SVX_RES(CB_SAME_LEVEL)),
-    pPreviewWIN(    new SvxNumberingPreview(this, SVX_RES(WIN_PREVIEW   ))),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_OPTIONS ), rSet ),
+
+    aFormatFL(      this, CUI_RES(FL_FORMAT   )),
+    aLevelFT(       this, CUI_RES(FT_LEVEL    )),
+    aLevelLB(       this, CUI_RES(LB_LEVEL  )),
+    aFmtFT(         this, CUI_RES(FT_FMT        )),
+    aFmtLB(         this, CUI_RES(LB_FMT        )),
+    aPrefixFT(      this, CUI_RES(FT_PREFIX )),
+    aPrefixED(      this, CUI_RES(ED_PREFIX )),
+    aSuffixFT(      this, CUI_RES(FT_SUFFIX )),
+    aSuffixED(      this, CUI_RES(ED_SUFFIX )),
+    aCharFmtFT(     this, CUI_RES(FT_CHARFMT    )),
+    aCharFmtLB(     this, CUI_RES(LB_CHARFMT    )),
+    aBulColorFT(    this, CUI_RES(FT_BUL_COLOR)),
+    aBulColLB(      this, CUI_RES(LB_BUL_COLOR)),
+    aBulRelSizeFT(  this, CUI_RES(FT_BUL_REL_SIZE)),
+    aBulRelSizeMF(  this, CUI_RES(MF_BUL_REL_SIZE)),
+    aAllLevelFT(    this, CUI_RES(FT_ALL_LEVEL)),
+    aAllLevelNF(    this, CUI_RES(NF_ALL_LEVEL)),
+    aStartFT(       this, CUI_RES(FT_START  )),
+    aStartED(       this, CUI_RES(ED_START  )),
+    aBulletPB(      this, CUI_RES(PB_BULLET )),
+    aAlignFT(       this, CUI_RES(FT_ALIGN  )),
+    aAlignLB(       this, CUI_RES(LB_ALIGN  )),
+    aBitmapFT(      this, CUI_RES(FT_BITMAP )),
+    aBitmapMB(      this, CUI_RES(MB_BITMAP )),
+    aSizeFT(        this, CUI_RES(FT_SIZE       )),
+    aWidthMF(       this, CUI_RES(MF_WIDTH  )),
+    aMultFT(        this, CUI_RES(FT_MULT       )),
+    aHeightMF(      this, CUI_RES(MF_HEIGHT )),
+    aRatioCB(       this, CUI_RES(CB_RATIO  )),
+    aOrientFT(      this, CUI_RES(FT_ORIENT )),
+    aOrientLB(      this, CUI_RES(LB_ORIENT )),
+    aSameLevelFL(   this, CUI_RES(FL_SAME_LEVEL)),
+    aSameLevelCB(   this, CUI_RES(CB_SAME_LEVEL)),
+    pPreviewWIN(    new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW   ))),
     pActNum(0),
     pSaveNum(0),
     bLastWidthModified(FALSE),
@@ -1358,7 +1352,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
     bAutomaticCharStyles(TRUE),
     bHTMLMode(FALSE),
     bMenuButtonInitialized(FALSE),
-    sBullet(SVX_RES(STR_BULLET)),
+    sBullet(CUI_RES(STR_BULLET)),
     nBullet(0xff),
     nActNumLvl(USHRT_MAX),
     nNumItemId(SID_ATTR_NUMBERING_RULE)
@@ -1391,7 +1385,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
     PopupMenu* pPopup = new PopupMenu;
     aBitmapMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup );
 
-    pPopup->InsertItem( NUM_NO_GRAPHIC, String(SVX_RES(ST_POPUP_EMPTY_ENTRY)) );
+    pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) );
     pPopup->EnableItem( NUM_NO_GRAPHIC, FALSE );
 
     eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
@@ -2277,7 +2271,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
     String                  aGrfName;
     Size                    aSize;
     sal_Bool                bSucc(sal_False);
-    SvxOpenGraphicDialog    aGrfDlg( SVX_RES(RID_STR_EDIT_GRAPHIC) );
+    SvxOpenGraphicDialog    aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
 //  aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
 
     if(MN_GALLERY_ENTRY <= nItemId )
@@ -2999,33 +2993,33 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
 --------------------------------------------------*/
 SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
-    aPositionFL(    this, SVX_RES(FL_POSITION )),
-    aLevelFT(       this, SVX_RES(FT_LEVEL    )),
-    aLevelLB(       this, SVX_RES(LB_LEVEL  )),
-    aDistBorderFT(  this, SVX_RES(FT_BORDERDIST )),
-    aDistBorderMF(  this, SVX_RES(MF_BORDERDIST )),
-    aRelativeCB(    this, SVX_RES(CB_RELATIVE       )),
-    aIndentFT(      this, SVX_RES(FT_INDENT     )),
-    aIndentMF(      this, SVX_RES(MF_INDENT     )),
-    aDistNumFT(     this, SVX_RES(FT_NUMDIST        )),
-    aDistNumMF(     this, SVX_RES(MF_NUMDIST        )),
-    aAlignFT(       this, SVX_RES(FT_ALIGN  )),
-    aAlignLB(       this, SVX_RES(LB_ALIGN  )),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
+    aPositionFL(    this, CUI_RES(FL_POSITION )),
+    aLevelFT(       this, CUI_RES(FT_LEVEL    )),
+    aLevelLB(       this, CUI_RES(LB_LEVEL  )),
+    aDistBorderFT(  this, CUI_RES(FT_BORDERDIST )),
+    aDistBorderMF(  this, CUI_RES(MF_BORDERDIST )),
+    aRelativeCB(    this, CUI_RES(CB_RELATIVE       )),
+    aIndentFT(      this, CUI_RES(FT_INDENT     )),
+    aIndentMF(      this, CUI_RES(MF_INDENT     )),
+    aDistNumFT(     this, CUI_RES(FT_NUMDIST        )),
+    aDistNumMF(     this, CUI_RES(MF_NUMDIST        )),
+    aAlignFT(       this, CUI_RES(FT_ALIGN  )),
+    aAlignLB(       this, CUI_RES(LB_ALIGN  )),
     // --> OD 2008-01-10 #newlistlevelattrs#
-    aLabelFollowedByFT( this, SVX_RES(FT_LABEL_FOLLOWED_BY) ),
-    aLabelFollowedByLB( this, SVX_RES(LB_LABEL_FOLLOWED_BY) ),
-    aListtabFT( this, SVX_RES(FT_LISTTAB) ),
-    aListtabMF( this, SVX_RES(MF_LISTTAB) ),
-    aAlign2FT( this, SVX_RES(FT_ALIGN_2) ),
-    aAlign2LB( this, SVX_RES(LB_ALIGN_2) ),
-    aAlignedAtFT( this, SVX_RES(FT_ALIGNED_AT) ),
-    aAlignedAtMF( this, SVX_RES(MF_ALIGNED_AT) ),
-    aIndentAtFT( this, SVX_RES(FT_INDENT_AT) ),
-    aIndentAtMF( this, SVX_RES(MF_INDENT_AT) ),
+    aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ),
+    aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ),
+    aListtabFT( this, CUI_RES(FT_LISTTAB) ),
+    aListtabMF( this, CUI_RES(MF_LISTTAB) ),
+    aAlign2FT( this, CUI_RES(FT_ALIGN_2) ),
+    aAlign2LB( this, CUI_RES(LB_ALIGN_2) ),
+    aAlignedAtFT( this, CUI_RES(FT_ALIGNED_AT) ),
+    aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ),
+    aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ),
+    aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ),
     // <--
-    aStandardPB(    this, SVX_RES(PB_STANDARD       )),
-    pPreviewWIN(    new SvxNumberingPreview(this, SVX_RES(WIN_PREVIEW   ))),
+    aStandardPB(    this, CUI_RES(PB_STANDARD       )),
+    pPreviewWIN(    new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW   ))),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
diff --git a/svx/source/cui/numpages.hrc b/cui/source/tabpages/numpages.hrc
index 59ea5d0e8a94..59ea5d0e8a94 100644
--- a/svx/source/cui/numpages.hrc
+++ b/cui/source/tabpages/numpages.hrc
diff --git a/svx/source/cui/numpages.src b/cui/source/tabpages/numpages.src
index e202b2d13a84..731630b29840 100644
--- a/svx/source/cui/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -28,9 +28,10 @@
  *
  ************************************************************************/
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include <helpid.hrc>
 #include <numpages.hrc>
+#include <svx/dialogs.hrc>
 
 /**************************************************************************/
 /*                                                                        */
@@ -772,6 +773,7 @@ String RID_STR_EDIT_GRAPHIC
 {
     Text [ en-US ] = "Link" ;
 };
+/*
 String RID_STR_FULLNUMS_1 { Text = "1.|1.1|a)|61589|61589" ; };
 String RID_STR_FULLNUMS_2 { Text = "1.|a)|61589|61589|61589" ; };
 String RID_STR_FULLNUMS_3 { Text = "1.|(a)|i.|A.|61589" ; };
@@ -781,105 +783,7 @@ String RID_STR_FULLNUMS_6 { Text = "A.|I.|a.|i.|61589" ; };
 String RID_STR_FULLNUMS_7 { Text = "1|1.1|1.1.1|1.1.1.1|1.1.1.1.1" ; };
 String RID_STR_FULLNUMS_8 { Text = "61487|61488|61485|61589|61589" ; };
 String RID_STR_FULLNUMS_7_HTML { Text = "I.|I.|I|I.|I." ; };
-
-String RID_SVXSTR_BULLET_DESCRIPTION_0
-{
-    Text [en-US] = "Solid small circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_1
-{
-    Text [en-US] = "Solid large circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_2
-{
-    Text [en-US] = "Solid diamond bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_3
-{
-    Text [en-US] = "Solid large square bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_4
-{
-    Text [en-US] = "Right pointing arrow bullets filled out";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_5
-{
-    Text [en-US] = "Right pointing arrow bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_6
-{
-    Text [en-US] = "Check mark bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_7
-{
-    Text [en-US] = "Tick mark bullets";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
-{
-    Text [en-US] = "Number 1) 2) 3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
-{
-    Text [en-US] = "Number 1. 2. 3.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_2
-{
-    Text [en-US] = "Number (1) (2) (3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_3
-{
-    Text [en-US] = "Uppercase Roman number I. II. III.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_4
-{
-    Text [en-US] = "Uppercase letter A) B) C)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_5
-{
-    Text [en-US] = "Lowercase letter a) b) c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_6
-{
-    Text [en-US] = "Lowercase letter (a) (b) (c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_7
-{
-    Text [en-US] = "Lowercase Roman number i. ii. iii.";
-};
-
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
-{
-    Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
-{
-    Text [en-US] = "Numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
-{
-    Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
-{
-    Text [en-US] = "Numeric";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
-{
-    Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
-{
-    Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
-{
-    Text [en-US] = "Numeric with all sublevels";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
-{
-    Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet";
-};
-
+*/
 
 
 
diff --git a/svx/source/cui/page.cxx b/cui/source/tabpages/page.cxx
index f842af6b7559..27db31f684fa 100644
--- a/svx/source/cui/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -29,48 +29,25 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
-#ifndef _RESARY_HXX //autogen
 #include <tools/resary.hxx>
-#endif
-#ifndef _GRAPH_HXX //autogen
 #include <vcl/graph.hxx>
-#endif
 #include <sfx2/viewsh.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/languageoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/configitem.hxx>
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
 
 #define _SVX_PAGE_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "page.hrc"
 #include "helpid.hrc"
-
-
-
-
-
 #include "page.hxx"
 #include <svx/pageitem.hxx>
 #include <svx/brshitem.hxx>
@@ -81,22 +58,19 @@
 #include <svx/ulspitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/frmdiritem.hxx>
-//CHINA001 #include "bbdlg.hxx"
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include "svx/dlgutil.hxx"
+#include <dialmgr.hxx>
 #include <svx/paperinf.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <sfx2/module.hxx>
-
-
-#include <svtools/stritem.hxx>
-
-#include <svx/svxids.hrc> //CHINA001
+#include <svl/stritem.hxx>
+#include <svx/dialmgr.hxx>  // for RID_SVXSTR_PAPERBIN...
+#include <svx/dialogs.hrc>  // for RID_SVXSTR_PAPERBIN..., RID_SVXPAGE_PAGE
 
 // #i4219#
 #include <svtools/optionsdrawinglayer.hxx>
-#include <svtools/slstitm.hxx> //CHINA001
-#include <svtools/aeitem.hxx> //CHINA001
+#include <svl/slstitm.hxx> //CHINA001
+#include <svl/aeitem.hxx> //CHINA001
 #include <sfx2/request.hxx> //CHINA001
 // configuration helper =======================================================
 
@@ -121,6 +95,9 @@ public:
     /** Returns true, if the current HTML export mode is set to HTML 3.2. */
     inline bool                 IsExportModeHTML32() const { return mnExpMode == 0; } // 0 == HTML_CFG_HTML32, see offmgr/htmlcfg.hxx
 
+    virtual void    Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
+
 private:
     sal_Int32                   mnExpMode;
 };
@@ -139,6 +116,13 @@ SvxHtmlExportModeConfigItem_Impl::SvxHtmlExportModeConfigItem_Impl() :
         aPropValues[ 0 ] >>= mnExpMode;
 }
 
+void SvxHtmlExportModeConfigItem_Impl::Commit()
+{
+}
+
+void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
 
 // static ----------------------------------------------------------------
 
@@ -263,50 +247,50 @@ SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet& rSet )
 
 SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PAGE ), rAttr ),
-
-    aPaperSizeFl        ( this, SVX_RES( FL_PAPER_SIZE ) ),
-    aPaperFormatText    ( this, SVX_RES( FT_PAPER_FORMAT ) ),
-    aPaperSizeBox       ( this, SVX_RES( LB_PAPER_SIZE ) ),
-    aPaperWidthText     ( this, SVX_RES( FT_PAPER_WIDTH ) ),
-    aPaperWidthEdit     ( this, SVX_RES( ED_PAPER_WIDTH ) ),
-    aPaperHeightText    ( this, SVX_RES( FT_PAPER_HEIGHT ) ),
-    aPaperHeightEdit    ( this, SVX_RES( ED_PAPER_HEIGHT ) ),
-    aOrientationFT      ( this, SVX_RES( FT_ORIENTATION ) ),
-    aPortraitBtn        ( this, SVX_RES( RB_PORTRAIT ) ),
-    aLandscapeBtn       ( this, SVX_RES( RB_LANDSCAPE ) ),
-    aBspWin             ( this, SVX_RES( WN_BSP ) ),
-    aTextFlowLbl        ( this, SVX_RES( FT_TEXT_FLOW ) ),
-    aTextFlowBox        ( this, SVX_RES( LB_TEXT_FLOW ) ),
-    aPaperTrayLbl       ( this, SVX_RES( FT_PAPER_TRAY ) ),
-    aPaperTrayBox       ( this, SVX_RES( LB_PAPER_TRAY ) ),
-    aMarginFl           ( this, SVX_RES( FL_MARGIN ) ),
-    aLeftMarginLbl      ( this, SVX_RES( FT_LEFT_MARGIN ) ),
-    aLeftMarginEdit     ( this, SVX_RES( ED_LEFT_MARGIN ) ),
-    aRightMarginLbl     ( this, SVX_RES( FT_RIGHT_MARGIN ) ),
-    aRightMarginEdit    ( this, SVX_RES( ED_RIGHT_MARGIN ) ),
-    aTopMarginLbl       ( this, SVX_RES( FT_TOP_MARGIN ) ),
-    aTopMarginEdit      ( this, SVX_RES( ED_TOP_MARGIN ) ),
-    aBottomMarginLbl    ( this, SVX_RES( FT_BOTTOM_MARGIN ) ),
-    aBottomMarginEdit   ( this, SVX_RES( ED_BOTTOM_MARGIN ) ),
-
-    aLayoutFL           ( this, SVX_RES( FL_LAYOUT ) ),
-    aPageText           ( this, SVX_RES( FT_PAGELAYOUT ) ),
-    aLayoutBox          ( this, SVX_RES( LB_LAYOUT ) ),
-    aNumberFormatText   ( this, SVX_RES( FT_NUMBER_FORMAT ) ),
-    aNumberFormatBox    ( this, SVX_RES( LB_NUMBER_FORMAT ) ),
-    aBottomSeparatorFl  ( this, SVX_RES( FL_BOTTOM_SEP ) ),
-    aTblAlignFT         ( this, SVX_RES( FT_TBL_ALIGN ) ),
-    aHorzBox            ( this, SVX_RES( CB_HORZ ) ),
-    aVertBox            ( this, SVX_RES( CB_VERT ) ),
-    aAdaptBox           ( this, SVX_RES( CB_ADAPT ) ),
-    aRegisterCB         ( this, SVX_RES( CB_REGISTER ) ),
-    aRegisterFT         ( this, SVX_RES( FT_REGISTER ) ),
-    aRegisterLB         ( this, SVX_RES( LB_REGISTER ) ),
-
-    aInsideText         (       SVX_RES( STR_INSIDE ) ),
-    aOutsideText        (       SVX_RES( STR_OUTSIDE ) ),
-    aPrintRangeQueryText(       SVX_RES( STR_QUERY_PRINTRANGE ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PAGE ), rAttr ),
+
+    aPaperSizeFl        ( this, CUI_RES( FL_PAPER_SIZE ) ),
+    aPaperFormatText    ( this, CUI_RES( FT_PAPER_FORMAT ) ),
+    aPaperSizeBox       ( this, CUI_RES( LB_PAPER_SIZE ) ),
+    aPaperWidthText     ( this, CUI_RES( FT_PAPER_WIDTH ) ),
+    aPaperWidthEdit     ( this, CUI_RES( ED_PAPER_WIDTH ) ),
+    aPaperHeightText    ( this, CUI_RES( FT_PAPER_HEIGHT ) ),
+    aPaperHeightEdit    ( this, CUI_RES( ED_PAPER_HEIGHT ) ),
+    aOrientationFT      ( this, CUI_RES( FT_ORIENTATION ) ),
+    aPortraitBtn        ( this, CUI_RES( RB_PORTRAIT ) ),
+    aLandscapeBtn       ( this, CUI_RES( RB_LANDSCAPE ) ),
+    aBspWin             ( this, CUI_RES( WN_BSP ) ),
+    aTextFlowLbl        ( this, CUI_RES( FT_TEXT_FLOW ) ),
+    aTextFlowBox        ( this, CUI_RES( LB_TEXT_FLOW ) ),
+    aPaperTrayLbl       ( this, CUI_RES( FT_PAPER_TRAY ) ),
+    aPaperTrayBox       ( this, CUI_RES( LB_PAPER_TRAY ) ),
+    aMarginFl           ( this, CUI_RES( FL_MARGIN ) ),
+    aLeftMarginLbl      ( this, CUI_RES( FT_LEFT_MARGIN ) ),
+    aLeftMarginEdit     ( this, CUI_RES( ED_LEFT_MARGIN ) ),
+    aRightMarginLbl     ( this, CUI_RES( FT_RIGHT_MARGIN ) ),
+    aRightMarginEdit    ( this, CUI_RES( ED_RIGHT_MARGIN ) ),
+    aTopMarginLbl       ( this, CUI_RES( FT_TOP_MARGIN ) ),
+    aTopMarginEdit      ( this, CUI_RES( ED_TOP_MARGIN ) ),
+    aBottomMarginLbl    ( this, CUI_RES( FT_BOTTOM_MARGIN ) ),
+    aBottomMarginEdit   ( this, CUI_RES( ED_BOTTOM_MARGIN ) ),
+
+    aLayoutFL           ( this, CUI_RES( FL_LAYOUT ) ),
+    aPageText           ( this, CUI_RES( FT_PAGELAYOUT ) ),
+    aLayoutBox          ( this, CUI_RES( LB_LAYOUT ) ),
+    aNumberFormatText   ( this, CUI_RES( FT_NUMBER_FORMAT ) ),
+    aNumberFormatBox    ( this, CUI_RES( LB_NUMBER_FORMAT ) ),
+    aBottomSeparatorFl  ( this, CUI_RES( FL_BOTTOM_SEP ) ),
+    aTblAlignFT         ( this, CUI_RES( FT_TBL_ALIGN ) ),
+    aHorzBox            ( this, CUI_RES( CB_HORZ ) ),
+    aVertBox            ( this, CUI_RES( CB_VERT ) ),
+    aAdaptBox           ( this, CUI_RES( CB_ADAPT ) ),
+    aRegisterCB         ( this, CUI_RES( CB_REGISTER ) ),
+    aRegisterFT         ( this, CUI_RES( FT_REGISTER ) ),
+    aRegisterLB         ( this, CUI_RES( LB_REGISTER ) ),
+
+    aInsideText         (       CUI_RES( STR_INSIDE ) ),
+    aOutsideText        (       CUI_RES( STR_OUTSIDE ) ),
+    aPrintRangeQueryText(       CUI_RES( STR_QUERY_PRINTRANGE ) ),
 
     bLandscape          ( FALSE ),
     eMode               ( SVX_PAGE_MODE_STANDARD ),
@@ -339,16 +323,16 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
     bool bHTML32 = SvxHtmlExportModeConfigItem_Impl().IsExportModeHTML32();
 
     //  fill text flow listbox with valid entries
-    aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), FRMDIR_HORI_LEFT_TOP );
+    aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), FRMDIR_HORI_LEFT_TOP );
     if( bCTL )
-        aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_RTL_HORI ), FRMDIR_HORI_RIGHT_TOP );
+        aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_HORI ), FRMDIR_HORI_RIGHT_TOP );
     // #109989# do not show vertical directions in Writer/Web
     if( !bWeb )
     {
         if( bCJK )
-            aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), FRMDIR_VERT_TOP_RIGHT );
+            aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), FRMDIR_VERT_TOP_RIGHT );
 //        if( ... )
-//            aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), FRMDIR_VERT_TOP_LEFT );
+//            aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), FRMDIR_VERT_TOP_LEFT );
     }
 
     // #109989# show the text direction box in Writer/Web too, but only, if HTML export mode is not HTML3.2.
@@ -619,7 +603,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
 
     if ( ePaperStart != PAPER_A3 )
         nAryId = RID_SVXSTRARY_PAPERSIZE_DRAW;
-    ResStringArray aPaperAry( SVX_RES( nAryId ) );
+    ResStringArray aPaperAry( CUI_RES( nAryId ) );
     sal_uInt32 nCnt = aPaperAry.Count();
 
     for ( sal_uInt32 i = 0; i < nCnt; ++i )
diff --git a/svx/source/cui/page.h b/cui/source/tabpages/page.h
index 98aefdc79cc4..98aefdc79cc4 100644
--- a/svx/source/cui/page.h
+++ b/cui/source/tabpages/page.h
diff --git a/svx/source/cui/page.hrc b/cui/source/tabpages/page.hrc
index bd2810a39061..bd2810a39061 100644
--- a/svx/source/cui/page.hrc
+++ b/cui/source/tabpages/page.hrc
diff --git a/svx/source/cui/page.src b/cui/source/tabpages/page.src
index 6a44e41729a7..e8b83078f26a 100644
--- a/svx/source/cui/page.src
+++ b/cui/source/tabpages/page.src
@@ -30,10 +30,11 @@
 
  // include ---------------------------------------------------------------
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "page.hrc"
 #include "page.h"
+#include <svx/dialogs.hrc>
 
  // RID_SVXPAGE_PAGE ------------------------------------------------------
 
@@ -369,160 +370,6 @@ TabPage RID_SVXPAGE_PAGE
         Text [ en-US ] = "The margin settings are out of print range.\n\nDo you still want to apply these settings?";
     };
 };
- // App-spezifische Res
-String RID_SVXSTR_WRITER_PAGE
-{
-    Text [ en-US ] = "Continuation page" ;
-};
- // Papierformate
-String RID_SVXSTR_PAPER_A0
-{
-    Text = "A0" ;
-};
-String RID_SVXSTR_PAPER_A1
-{
-    Text = "A1" ;
-};
-String RID_SVXSTR_PAPER_A2
-{
-    Text = "A2" ;
-};
-String RID_SVXSTR_PAPER_A3
-{
-    Text = "A3" ;
-};
-String RID_SVXSTR_PAPER_A4
-{
-    Text = "A4" ;
-};
-String RID_SVXSTR_PAPER_A5
-{
-    Text = "A5" ;
-};
-String RID_SVXSTR_PAPER_B4_ISO
-{
-    Text = "B4 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_B5_ISO
-{
-    Text = "B5 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_LETTER
-{
-    Text = "Letter" ;
-};
-String RID_SVXSTR_PAPER_LEGAL
-{
-    Text = "Legal" ;
-};
-String RID_SVXSTR_PAPER_TABLOID
-{
-    Text = "Tabloid" ;
-};
-String RID_SVXSTR_PAPER_USER
-{
-    Text [ en-US ] = "User Defined" ;
-};
-String RID_SVXSTR_PAPER_B6_ISO
-{
-    Text = "B6 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_C4
-{
-    Text = "C4 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C5
-{
-    Text = "C5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C6
-{
-    Text = "C6 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C65
-{
-    Text = "C6/5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_DL
-{
-    Text = "DL Envelope" ;
-};
-String RID_SVXSTR_PAPER_DIA
-{
-    Text = "Dia Slide" ;
-};
-String RID_SVXSTR_PAPER_SCREEN
-{
-    Text [ en-US ] = "Screen" ;
-};
-String RID_SVXSTR_PAPER_C
-{
-    Text = "C" ;
-};
-String RID_SVXSTR_PAPER_D
-{
-    Text = "D" ;
-};
-String RID_SVXSTR_PAPER_E
-{
-    Text = "E" ;
-};
-String RID_SVXSTR_PAPER_EXECUTIVE
-{
-       Text = "Executive" ;
-};
-String RID_SVXSTR_PAPER_LEGAL2
-{
-    Text = "Long Bond" ;
-};
-String RID_SVXSTR_PAPER_MONARCH
-{
-    Text = "#8 (Monarch) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM675
-{
-    Text = "#6 3/4 (Personal) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM9
-{
-    Text = "#9 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM10
-{
-    Text = "#10 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM11
-{
-    Text = "#11 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM12
-{
-    Text = "#12 Envelope" ;
-};
-String RID_SVXSTR_PAPER_KAI16
-{
-    Text = "16 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32
-{
-    Text = "32 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32BIG
-{
-    Text = "Big 32 Kai" ;
-};
-String RID_SVXSTR_PAPER_B4_JIS
-{
-    Text = "B4 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B5_JIS
-{
-    Text = "B5 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B6_JIS
-{
-    Text = "B6 (JIS)" ;
-};
 StringArray RID_SVXSTRARY_PAPERSIZE_STD
 {
     ItemList [ en-US ] =
@@ -590,14 +437,6 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
         < "Screen" ; PAPERSIZE_SCREEN ; > ;
     };
 };
-String RID_SVXSTR_PAPERBIN
-{
-    Text [ en-US ] = "Paper tray" ;
-};
-String RID_SVXSTR_PAPERBIN_SETTINGS
-{
-    Text [ en-US ] = "[From printer settings]" ;
-};
  // ********************************************************************** EOF
 
 
diff --git a/svx/source/cui/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index c0b72b573099..4c2a1446755c 100644
--- a/svx/source/cui/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -29,42 +29,23 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
 #include <vcl/mnemonic.hxx>
-
-
-
-
-
-
-
-
-
-
-
-
-
+#include <svx/dialogs.hrc>
 
 #define _SVX_PARAGRPH_CXX   0
 
-
-
-
-#include <svtools/languageoptions.hxx>
-#include <pgrditem.hxx>
-#include <svx/dialogs.hrc>
+#include <svl/languageoptions.hxx>
+#include <svx/pgrditem.hxx>
+#include <cuires.hrc>
 #include "paragrph.hrc"
 #include "paragrph.hxx"
 #include <svx/frmdiritem.hxx>
-
 #include <svx/lspcitem.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/orphitem.hxx>
@@ -77,13 +58,13 @@
 #include <svx/lrspitem.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/keepitem.hxx>
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include "svx/dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/htmlmode.hxx"
 #include <svx/paravertalignitem.hxx>
-#include <svtools/eitem.hxx> //add CHINA001
+#include <svl/eitem.hxx> //add CHINA001
 #include <sfx2/request.hxx> //add CHINA001
-#include <svtools/intitem.hxx> //add CHINA001
+#include <svl/intitem.hxx> //add CHINA001
 
 // static ----------------------------------------------------------------
 
@@ -657,31 +638,31 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
 SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
                                                 const SfxItemSet& rAttr ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_STD_PARAGRAPH ), rAttr ),
-
-    aLeftLabel              ( this, SVX_RES( FT_LEFTINDENT ) ),
-    aLeftIndent             ( this, SVX_RES( ED_LEFTINDENT ) ),
-    aRightLabel             ( this, SVX_RES( FT_RIGHTINDENT ) ),
-    aRightIndent            ( this, SVX_RES( ED_RIGHTINDENT ) ),
-
-    aFLineLabel             ( this, SVX_RES( FT_FLINEINDENT ) ),
-    aFLineIndent            ( this, SVX_RES( ED_FLINEINDENT ) ),
-    aAutoCB                 ( this, SVX_RES( CB_AUTO ) ),
-    aIndentFrm              ( this, SVX_RES( FL_INDENT ) ),
-    aTopLabel               ( this, SVX_RES( FT_TOPDIST ) ),
-    aTopDist                ( this, SVX_RES( ED_TOPDIST ) ),
-    aBottomLabel            ( this, SVX_RES( FT_BOTTOMDIST ) ),
-    aBottomDist             ( this, SVX_RES( ED_BOTTOMDIST ) ),
-    aDistFrm                ( this, SVX_RES( FL_DIST ) ),
-    aLineDist               ( this, SVX_RES( LB_LINEDIST ) ),
-    aLineDistAtLabel        ( this, SVX_RES( FT_LINEDIST ) ),
-    aLineDistAtPercentBox   ( this, SVX_RES( ED_LINEDISTPERCENT ) ),
-    aLineDistAtMetricBox    ( this, SVX_RES( ED_LINEDISTMETRIC ) ),
-    aLineDistFrm            ( this, SVX_RES( FL_LINEDIST ) ),
-    sAbsDist                ( SVX_RES(ST_LINEDIST_ABS) ),
-    aExampleWin             ( this, SVX_RES( WN_EXAMPLE ) ),
-    aRegisterCB             ( this, SVX_RES( CB_REGISTER ) ),
-    aRegisterFL             ( this, SVX_RES( FL_REGISTER ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_STD_PARAGRAPH ), rAttr ),
+
+    aLeftLabel              ( this, CUI_RES( FT_LEFTINDENT ) ),
+    aLeftIndent             ( this, CUI_RES( ED_LEFTINDENT ) ),
+    aRightLabel             ( this, CUI_RES( FT_RIGHTINDENT ) ),
+    aRightIndent            ( this, CUI_RES( ED_RIGHTINDENT ) ),
+
+    aFLineLabel             ( this, CUI_RES( FT_FLINEINDENT ) ),
+    aFLineIndent            ( this, CUI_RES( ED_FLINEINDENT ) ),
+    aAutoCB                 ( this, CUI_RES( CB_AUTO ) ),
+    aIndentFrm              ( this, CUI_RES( FL_INDENT ) ),
+    aTopLabel               ( this, CUI_RES( FT_TOPDIST ) ),
+    aTopDist                ( this, CUI_RES( ED_TOPDIST ) ),
+    aBottomLabel            ( this, CUI_RES( FT_BOTTOMDIST ) ),
+    aBottomDist             ( this, CUI_RES( ED_BOTTOMDIST ) ),
+    aDistFrm                ( this, CUI_RES( FL_DIST ) ),
+    aLineDist               ( this, CUI_RES( LB_LINEDIST ) ),
+    aLineDistAtLabel        ( this, CUI_RES( FT_LINEDIST ) ),
+    aLineDistAtPercentBox   ( this, CUI_RES( ED_LINEDISTPERCENT ) ),
+    aLineDistAtMetricBox    ( this, CUI_RES( ED_LINEDISTMETRIC ) ),
+    aLineDistFrm            ( this, CUI_RES( FL_LINEDIST ) ),
+    sAbsDist                ( CUI_RES(ST_LINEDIST_ABS) ),
+    aExampleWin             ( this, CUI_RES( WN_EXAMPLE ) ),
+    aRegisterCB             ( this, CUI_RES( CB_REGISTER ) ),
+    aRegisterFL             ( this, CUI_RES( FL_REGISTER ) ),
     pActLineDistFld ( &aLineDistAtPercentBox ),
     nAbst           ( MAX_DURCH ),
     nWidth          ( 11905 /*567 * 50*/ ),
@@ -1057,34 +1038,34 @@ void    SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
 
 --------------------------------------------------*/
 SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet )
-    : SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
-    aAlignFrm           ( this, SVX_RES( FL_ALIGN ) ),
-    aLeft               ( this, SVX_RES( BTN_LEFTALIGN ) ),
-    aRight              ( this, SVX_RES( BTN_RIGHTALIGN ) ),
-    aCenter             ( this, SVX_RES( BTN_CENTERALIGN ) ),
-    aJustify            ( this, SVX_RES( BTN_JUSTIFYALIGN ) ),
-    aLastLineFT         ( this, SVX_RES( FT_LASTLINE ) ),
-    aLastLineLB         ( this, SVX_RES( LB_LASTLINE ) ),
-    aExpandCB           ( this, SVX_RES( CB_EXPAND ) ),
-    aSnapToGridCB       ( this, SVX_RES( CB_SNAP ) ),
-    aExampleWin         ( this, SVX_RES( WN_EXAMPLE ) ),
-
-    aVertAlignFL        ( this, SVX_RES( FL_VERTALIGN ) ),
-    aVertAlignFT        ( this, SVX_RES( FT_VERTALIGN ) ),
-    aVertAlignLB        ( this, SVX_RES( LB_VERTALIGN ) ),
-
-    aPropertiesFL       ( this, SVX_RES( FL_PROPERTIES    )),
-    aTextDirectionFT    ( this, SVX_RES( FT_TEXTDIRECTION )),
-    aTextDirectionLB    ( this, SVX_RES( LB_TEXTDIRECTION ))
+    : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
+    aAlignFrm           ( this, CUI_RES( FL_ALIGN ) ),
+    aLeft               ( this, CUI_RES( BTN_LEFTALIGN ) ),
+    aRight              ( this, CUI_RES( BTN_RIGHTALIGN ) ),
+    aCenter             ( this, CUI_RES( BTN_CENTERALIGN ) ),
+    aJustify            ( this, CUI_RES( BTN_JUSTIFYALIGN ) ),
+    aLastLineFT         ( this, CUI_RES( FT_LASTLINE ) ),
+    aLastLineLB         ( this, CUI_RES( LB_LASTLINE ) ),
+    aExpandCB           ( this, CUI_RES( CB_EXPAND ) ),
+    aSnapToGridCB       ( this, CUI_RES( CB_SNAP ) ),
+    aExampleWin         ( this, CUI_RES( WN_EXAMPLE ) ),
+
+    aVertAlignFL        ( this, CUI_RES( FL_VERTALIGN ) ),
+    aVertAlignFT        ( this, CUI_RES( FT_VERTALIGN ) ),
+    aVertAlignLB        ( this, CUI_RES( LB_VERTALIGN ) ),
+
+    aPropertiesFL       ( this, CUI_RES( FL_PROPERTIES    )),
+    aTextDirectionFT    ( this, CUI_RES( FT_TEXTDIRECTION )),
+    aTextDirectionLB    ( this, CUI_RES( LB_TEXTDIRECTION ))
 {
     SvtLanguageOptions aLangOptions;
     USHORT nLastLinePos = LASTLINEPOS_DEFAULT;
 
     if ( aLangOptions.IsAsianTypographyEnabled() )
     {
-        String sLeft(SVX_RES(ST_LEFTALIGN_ASIAN));
+        String sLeft(CUI_RES(ST_LEFTALIGN_ASIAN));
         aLeft.SetText(sLeft);
-        aRight.SetText(String(SVX_RES(ST_RIGHTALIGN_ASIAN)));
+        aRight.SetText(String(CUI_RES(ST_RIGHTALIGN_ASIAN)));
         sLeft = MnemonicGenerator::EraseAllMnemonicChars( sLeft );
 
         if ( aLastLineLB.GetEntryCount() == LASTLINECOUNT_OLD )
@@ -1113,9 +1094,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
     {
         if( aLangOptions.IsCTLFontEnabled() )
         {
-            aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
-            aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
-            aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
+            aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
+            aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
+            aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
 
             aPropertiesFL.Show();
             aTextDirectionFT.Show();
@@ -1307,7 +1288,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
         aLastLineLB.Hide();
         aLastLineFT.Hide();
         aExpandCB.Hide();
-        if(!(nHtmlMode & HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE) )
+        if(!(nHtmlMode & (HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE)) )
             aJustify.Disable();
         aSnapToGridCB.Show(FALSE);
     }
@@ -1960,39 +1941,39 @@ void SvxExtParagraphTabPage::DisablePageBreak()
 
 SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
-
-    aHyphenBox          ( this, SVX_RES( BTN_HYPHEN ) ),
-    aBeforeText         ( this, SVX_RES( FT_HYPHENBEFORE ) ),
-    aExtHyphenBeforeBox ( this, SVX_RES( ED_HYPHENBEFORE ) ),
-    aAfterText          ( this, SVX_RES( FT_HYPHENAFTER ) ),
-    aExtHyphenAfterBox  ( this, SVX_RES( ED_HYPHENAFTER ) ),
-    aMaxHyphenLabel     ( this, SVX_RES( FT_MAXHYPH ) ),
-    aMaxHyphenEdit      ( this, SVX_RES( ED_MAXHYPH ) ),
-    aExtFL              ( this, SVX_RES( FL_HYPHEN ) ),
-    aBreaksFL           ( this, SVX_RES( FL_BREAKS ) ),
-    aPageBreakBox       ( this, SVX_RES( BTN_PAGEBREAK ) ),
-    aBreakTypeFT        ( this, SVX_RES( FT_BREAKTYPE     )),
-    aBreakTypeLB        ( this, SVX_RES( LB_BREAKTYPE     )),
-    aBreakPositionFT    ( this, SVX_RES( FT_BREAKPOSITION )),
-    aBreakPositionLB    ( this, SVX_RES( LB_BREAKPOSITION )),
-//    aPageBox            ( this, SVX_RES( BTN_BREAKPAGE ) ),
-//    aColumnBox          ( this, SVX_RES( BTN_BREAKCOLUMN ) ),
-//    aBeforeBox          ( this, SVX_RES( BTN_PAGEBREAKBEFORE ) ),
-//    aAfterBox           ( this, SVX_RES( BTN_PAGEBREAKAFTER ) ),
-    aApplyCollBtn       ( this, SVX_RES( BTN_PAGECOLL ) ),
-    aApplyCollBox       ( this, SVX_RES( LB_PAGECOLL ) ),
-    aPagenumText        ( this, SVX_RES( FT_PAGENUM ) ),
-    aPagenumEdit        ( this, SVX_RES( ED_PAGENUM ) ),
-    aExtendFL           ( this, SVX_RES( FL_OPTIONS ) ),
-    aKeepTogetherBox    ( this, SVX_RES( BTN_KEEPTOGETHER ) ),
-    aKeepParaBox        ( this, SVX_RES( CB_KEEPTOGETHER ) ),
-    aOrphanBox          ( this, SVX_RES( BTN_ORPHANS ) ),
-    aOrphanRowNo        ( this, SVX_RES( ED_ORPHANS ) ),
-    aOrphanRowLabel     ( this, SVX_RES( FT_ORPHANS ) ),
-    aWidowBox           ( this, SVX_RES( BTN_WIDOWS ) ),
-    aWidowRowNo         ( this, SVX_RES( ED_WIDOWS ) ),
-    aWidowRowLabel      ( this, SVX_RES( FT_WIDOWS ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
+
+    aHyphenBox          ( this, CUI_RES( BTN_HYPHEN ) ),
+    aBeforeText         ( this, CUI_RES( FT_HYPHENBEFORE ) ),
+    aExtHyphenBeforeBox ( this, CUI_RES( ED_HYPHENBEFORE ) ),
+    aAfterText          ( this, CUI_RES( FT_HYPHENAFTER ) ),
+    aExtHyphenAfterBox  ( this, CUI_RES( ED_HYPHENAFTER ) ),
+    aMaxHyphenLabel     ( this, CUI_RES( FT_MAXHYPH ) ),
+    aMaxHyphenEdit      ( this, CUI_RES( ED_MAXHYPH ) ),
+    aExtFL              ( this, CUI_RES( FL_HYPHEN ) ),
+    aBreaksFL           ( this, CUI_RES( FL_BREAKS ) ),
+    aPageBreakBox       ( this, CUI_RES( BTN_PAGEBREAK ) ),
+    aBreakTypeFT        ( this, CUI_RES( FT_BREAKTYPE     )),
+    aBreakTypeLB        ( this, CUI_RES( LB_BREAKTYPE     )),
+    aBreakPositionFT    ( this, CUI_RES( FT_BREAKPOSITION )),
+    aBreakPositionLB    ( this, CUI_RES( LB_BREAKPOSITION )),
+//    aPageBox            ( this, CUI_RES( BTN_BREAKPAGE ) ),
+//    aColumnBox          ( this, CUI_RES( BTN_BREAKCOLUMN ) ),
+//    aBeforeBox          ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ),
+//    aAfterBox           ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ),
+    aApplyCollBtn       ( this, CUI_RES( BTN_PAGECOLL ) ),
+    aApplyCollBox       ( this, CUI_RES( LB_PAGECOLL ) ),
+    aPagenumText        ( this, CUI_RES( FT_PAGENUM ) ),
+    aPagenumEdit        ( this, CUI_RES( ED_PAGENUM ) ),
+    aExtendFL           ( this, CUI_RES( FL_OPTIONS ) ),
+    aKeepTogetherBox    ( this, CUI_RES( BTN_KEEPTOGETHER ) ),
+    aKeepParaBox        ( this, CUI_RES( CB_KEEPTOGETHER ) ),
+    aOrphanBox          ( this, CUI_RES( BTN_ORPHANS ) ),
+    aOrphanRowNo        ( this, CUI_RES( ED_ORPHANS ) ),
+    aOrphanRowLabel     ( this, CUI_RES( FT_ORPHANS ) ),
+    aWidowBox           ( this, CUI_RES( BTN_WIDOWS ) ),
+    aWidowRowNo         ( this, CUI_RES( ED_WIDOWS ) ),
+    aWidowRowLabel      ( this, CUI_RES( FT_WIDOWS ) ),
     bPageBreak  ( TRUE ),
     bHtmlMode   ( FALSE ),
     nStdPos     ( 0 )
@@ -2273,11 +2254,11 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
 
   -----------------------------------------------------------------------*/
 SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
-    aOptionsFL(         this, SVX_RES(FL_AS_OPTIONS       )),
-    aForbiddenRulesCB(  this, SVX_RES(CB_AS_FORBIDDEN     )),
-    aHangingPunctCB(    this, SVX_RES(CB_AS_HANG_PUNC     )),
-    aScriptSpaceCB(     this, SVX_RES(CB_AS_SCRIPT_SPACE    ))//,
+    SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
+    aOptionsFL(         this, CUI_RES(FL_AS_OPTIONS       )),
+    aForbiddenRulesCB(  this, CUI_RES(CB_AS_FORBIDDEN     )),
+    aHangingPunctCB(    this, CUI_RES(CB_AS_HANG_PUNC     )),
+    aScriptSpaceCB(     this, CUI_RES(CB_AS_SCRIPT_SPACE    ))//,
 
 {
     FreeResource();
diff --git a/svx/source/cui/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 6b0b835b07e3..6b0b835b07e3 100644
--- a/svx/source/cui/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
diff --git a/svx/source/cui/paragrph.src b/cui/source/tabpages/paragrph.src
index 996242dccbda..2e4ad98da17a 100644
--- a/svx/source/cui/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -28,9 +28,10 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "paragrph.hrc"
+#include <svx/dialogs.hrc>
 
  // RID_SVXPAGE_STD_PARAGRAPH ---------------------------------------------
 TabPage RID_SVXPAGE_STD_PARAGRAPH
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
new file mode 100644
index 000000000000..316e8741dcc9
--- /dev/null
+++ b/cui/source/tabpages/strings.src
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ // include ------------------------------------------------------------------
+#include <cuires.hrc>
+
+String RID_SVXSTR_DESC_GRADIENT
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */
+    Text [ en-US ] = "Please enter a name for the gradient:" ;
+};
+String RID_SVXSTR_ASK_DEL_GRADIENT
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */
+    Text [ en-US ] = "Do you want to delete the gradient?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_GRADIENT
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */
+    /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */
+    Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ;
+};
+String RID_SVXSTR_DESC_NEW_BITMAP
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */
+    Text [ en-US ] = "Please enter a name for the bitmap:" ;
+};
+String RID_SVXSTR_DESC_EXT_BITMAP
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */
+    Text [ en-US ] = "Please enter a name for the external bitmap:" ;
+};
+String RID_SVXSTR_ASK_DEL_BITMAP
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */
+    Text [ en-US ] = "Are you sure you want to delete the bitmap?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_BITMAP
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */
+    /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */
+    Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ;
+};
+String RID_SVXSTR_DESC_LINESTYLE
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */
+    Text [ en-US ] = "Please enter a name for the line style:" ;
+};
+String RID_SVXSTR_ASK_DEL_LINESTYLE
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */
+    Text [ en-US ] = "Do you want to delete the line style?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_LINESTYLE
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */
+    /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */
+    Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
+};
+String RID_SVXSTR_DESC_HATCH
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */
+    Text [ en-US ] = "Please enter a name for the hatching:" ;
+};
+String RID_SVXSTR_ASK_DEL_HATCH
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */
+    Text [ en-US ] = "Do you want to delete the hatching?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_HATCH
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */
+    /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */
+    Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ;
+};
+String RID_SVXSTR_CHANGE
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */
+    /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */
+    Text [ en-US ] = "Modify" ;
+};
+String RID_SVXSTR_ADD
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */
+    /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */
+    Text [ en-US ] = "Add" ;
+};
+String RID_SVXSTR_DESC_COLOR
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */
+    Text [ en-US ] = "Please enter a name for the new color:" ;
+};
+String RID_SVXSTR_ASK_DEL_COLOR
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */
+    Text [ en-US ] = "Do you want to delete the color?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_COLOR
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */
+    /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */
+    Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ;
+};
+String RID_SVXSTR_TABLE
+{
+    Text [ en-US ] = "Table" ;
+};
+String RID_SVXSTR_WRITE_DATA_ERROR
+{
+    Text [ en-US ] = "The file could not be saved!" ;
+};
+String RID_SVXSTR_READ_DATA_ERROR
+{
+    Text [ en-US ] = "The file could not be loaded!" ;
+};
+String RID_SVXSTR_WARN_TABLE_OVERWRITE
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
+    Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ;
+};
+String RID_SVXSTR_WARN_NAME_DUPLICATE
+{
+    Text [ en-US ] = "The name you have entered already exists. \nPlease choose another name." ;
+};
+String RID_SVXSTR_DESC_LINEEND
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */
+    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */
+    Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
+};
+String RID_SVXSTR_ASK_DEL_LINEEND
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */
+    Text [ en-US ] = "Do you want to delete the arrowhead?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_LINEEND
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */
+    /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */
+    Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ;
+};
+
diff --git a/svx/source/cui/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 685fc03145f2..488eb057418f 100644
--- a/svx/source/cui/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -29,23 +29,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 #include <cstddef>
 #include <swpossizetabpage.hxx>
-#include <svx/dialmgr.hxx>
-#include <dlgutil.hxx>
-#include <anchorid.hxx>
-#include <svtools/aeitem.hxx>
-#include <swframevalidation.hxx>
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
+#include <svx/anchorid.hxx>
+#include <svl/aeitem.hxx>
+#include <svx/swframevalidation.hxx>
 #include <tools/debug.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include <swpossizetabpage.hrc>
-#include <htmlmode.hxx>
+#include <svx/htmlmode.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/rectenum.hxx>
@@ -53,6 +49,7 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
+#include <svx/dialogs.hrc>
 
 using namespace ::com::sun::star::text;
 #define SwFPos SvxSwFramePosString
@@ -529,48 +526,48 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
 
   -----------------------------------------------------------------------*/
 SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  ) :
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ),
 #ifdef _MSC_VER
 #pragma warning (disable : 4355)
 #endif
-    m_aSizeFL(    this, SVX_RES( FL_SIZE   ) ),
-    m_aWidthFT(   this, SVX_RES( FT_WIDTH  ) ),
-    m_aWidthMF(   this, SVX_RES( MF_WIDTH  ) ),
-    m_aHeightFT(  this, SVX_RES( FT_HEIGHT ) ),
-    m_aHeightMF(  this, SVX_RES( MF_HEIGHT ) ),
-    m_aKeepRatioCB(this,SVX_RES( CB_KEEPRATIO) ),
-    m_aSeparatorFL(this,SVX_RES( FL_SEPARATOR) ),
-
-    m_aAnchorFL(  this, SVX_RES( FL_ANCHOR ) ),
-    m_aToPageRB(  this, SVX_RES( RB_TOPAGE ) ),
-    m_aToParaRB(  this, SVX_RES( RB_TOPARA ) ),
-    m_aToCharRB(  this, SVX_RES( RB_TOCHAR ) ),
-    m_aAsCharRB(  this, SVX_RES( RB_ASCHAR ) ),
-    m_aToFrameRB( this, SVX_RES( RB_TOFRAME) ),
-
-    m_aProtectionFL(  this, SVX_RES( FL_PROTECTION  ) ),
-    m_aPositionCB(    this, SVX_RES( CB_POSITION    ) ),
-    m_aSizeCB(        this, SVX_RES( CB_SIZE        ) ),
-
-    m_aPositionFL(    this, SVX_RES( FL_POSITION    ) ),
-    m_aHoriFT(        this, SVX_RES( FT_HORI        ) ),
-    m_aHoriLB(        this, SVX_RES( LB_HORI        ) ),
-    m_aHoriByFT(      this, SVX_RES( FT_HORIBY      ) ),
-    m_aHoriByMF(      this, SVX_RES( MF_HORIBY      ) ),
-    m_aHoriToFT(      this, SVX_RES( FT_HORITO      ) ),
-    m_aHoriToLB(      this, SVX_RES( LB_HORITO      ) ),
-
-    m_aHoriMirrorCB(  this, SVX_RES( CB_HORIMIRROR  ) ),
-
-    m_aVertFT(        this, SVX_RES( FT_VERT        ) ),
-    m_aVertLB(        this, SVX_RES( LB_VERT        ) ),
-    m_aVertByFT(      this, SVX_RES( FT_VERTBY      ) ),
-    m_aVertByMF(      this, SVX_RES( MF_VERTBY      ) ),
-    m_aVertToFT(      this, SVX_RES( FT_VERTTO      ) ),
-    m_aVertToLB(      this, SVX_RES( LB_VERTTO      ) ),
-
-    m_aFollowCB(      this, SVX_RES( CB_FOLLOW      ) ),
-    m_aExampleWN( this,   SVX_RES( WN_EXAMPLE ) ),
+    m_aSizeFL(    this, CUI_RES( FL_SIZE   ) ),
+    m_aWidthFT(   this, CUI_RES( FT_WIDTH  ) ),
+    m_aWidthMF(   this, CUI_RES( MF_WIDTH  ) ),
+    m_aHeightFT(  this, CUI_RES( FT_HEIGHT ) ),
+    m_aHeightMF(  this, CUI_RES( MF_HEIGHT ) ),
+    m_aKeepRatioCB(this,CUI_RES( CB_KEEPRATIO) ),
+    m_aSeparatorFL(this,CUI_RES( FL_SEPARATOR) ),
+
+    m_aAnchorFL(  this, CUI_RES( FL_ANCHOR ) ),
+    m_aToPageRB(  this, CUI_RES( RB_TOPAGE ) ),
+    m_aToParaRB(  this, CUI_RES( RB_TOPARA ) ),
+    m_aToCharRB(  this, CUI_RES( RB_TOCHAR ) ),
+    m_aAsCharRB(  this, CUI_RES( RB_ASCHAR ) ),
+    m_aToFrameRB( this, CUI_RES( RB_TOFRAME) ),
+
+    m_aProtectionFL(  this, CUI_RES( FL_PROTECTION  ) ),
+    m_aPositionCB(    this, CUI_RES( CB_POSITION    ) ),
+    m_aSizeCB(        this, CUI_RES( CB_SIZE        ) ),
+
+    m_aPositionFL(    this, CUI_RES( FL_POSITION    ) ),
+    m_aHoriFT(        this, CUI_RES( FT_HORI        ) ),
+    m_aHoriLB(        this, CUI_RES( LB_HORI        ) ),
+    m_aHoriByFT(      this, CUI_RES( FT_HORIBY      ) ),
+    m_aHoriByMF(      this, CUI_RES( MF_HORIBY      ) ),
+    m_aHoriToFT(      this, CUI_RES( FT_HORITO      ) ),
+    m_aHoriToLB(      this, CUI_RES( LB_HORITO      ) ),
+
+    m_aHoriMirrorCB(  this, CUI_RES( CB_HORIMIRROR  ) ),
+
+    m_aVertFT(        this, CUI_RES( FT_VERT        ) ),
+    m_aVertLB(        this, CUI_RES( LB_VERT        ) ),
+    m_aVertByFT(      this, CUI_RES( FT_VERTBY      ) ),
+    m_aVertByMF(      this, CUI_RES( MF_VERTBY      ) ),
+    m_aVertToFT(      this, CUI_RES( FT_VERTTO      ) ),
+    m_aVertToLB(      this, CUI_RES( LB_VERTTO      ) ),
+
+    m_aFollowCB(      this, CUI_RES( CB_FOLLOW      ) ),
+    m_aExampleWN( this,   CUI_RES( WN_EXAMPLE ) ),
 #ifdef _MSC_VER
 #pragma warning (default : 4355)
 #endif
diff --git a/svx/source/cui/swpossizetabpage.hrc b/cui/source/tabpages/swpossizetabpage.hrc
index af4a081cb045..af4a081cb045 100644
--- a/svx/source/cui/swpossizetabpage.hrc
+++ b/cui/source/tabpages/swpossizetabpage.hrc
diff --git a/svx/source/cui/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx
index e6458c27fb6c..911d72de1f48 100644
--- a/svx/source/cui/swpossizetabpage.hxx
+++ b/cui/source/tabpages/swpossizetabpage.hxx
@@ -31,13 +31,11 @@
 #define _SVX_SWPOSSIZETABPAGE_HXX
 
 #include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
-#include <swframeposstrings.hxx>
-#include <swframeexample.hxx>
+#include <svx/swframeposstrings.hxx>
+#include <svx/swframeexample.hxx>
 
 /*-- 01.03.2004 15:45:01---------------------------------------------------
   SvxSwPosSizeTabPage - position and size page for Writer drawing objects
diff --git a/svx/source/cui/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index ee8bac14f688..e84893c37457 100644
--- a/svx/source/cui/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -29,10 +29,9 @@
  ************************************************************************/
  // include ------------------------------------------------------------------
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "swpossizetabpage.hrc"
- // pragma -------------------------------------------------------------------
-
+#include <svx/dialogs.hrc>
 
  // RID_SVXPAGE_POSITION_SIZE ------------------------------------------------
 TabPage RID_SVXPAGE_SWPOSSIZE
diff --git a/svx/source/cui/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 219009eb15a1..86361fe2fea5 100644
--- a/svx/source/cui/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -29,43 +29,32 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
 #include <tools/ref.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
-
-#define _SVX_TABAREA_CXX
-
 #include <svx/dialogs.hrc>
 
+#define _SVX_TABAREA_CXX
 
-
-
-
-
+#include <cuires.hrc>
 #include <svx/xtable.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/svdmodel.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabarea.hxx"
 #include "tabarea.hrc"
 #include "dlgname.hxx"
-#include "dlgname.hrc"
-#include <svx/dialmgr.hxx>
+//#include "dlgname.hrc"
+#include <dialmgr.hxx>
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -83,7 +72,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
     const SdrView* /* pSdrView */
 ) :
 
-    SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_AREA ), pAttr ),
+    SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ),
 
     mpDrawModel          ( pModel ),
 //    mpView               ( pSdrView ),
@@ -120,7 +109,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
 
     CancelButton& rBtnCancel = GetCancelButton();
     rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) );
-//! rBtnCancel.SetText( SVX_RESSTR( RID_SVXSTR_CLOSE ) );
+//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/cui/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index c79e52d82380..c79e52d82380 100644
--- a/svx/source/cui/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
diff --git a/svx/source/cui/tabarea.src b/cui/source/tabpages/tabarea.src
index 877d1c5799fd..cbb4020b6bd3 100644
--- a/svx/source/cui/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -29,8 +29,9 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabarea.hrc"
+#include <svx/dialogs.hrc>
 
 #define MASKCOLOR       MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 
diff --git a/svx/source/cui/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 456842f93171..fe344770a7db 100644
--- a/svx/source/cui/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -29,33 +29,28 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
+#include <svx/dialogs.hrc>
 
 #define _SVX_TABLINE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabline.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
 
 #include "cuitabarea.hxx"
 #include "cuitabline.hxx"
 #include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -78,7 +73,7 @@ SvxLineTabDialog::SvxLineTabDialog
     BOOL bHasObj
 ) :
 
-    SfxTabDialog    ( pParent, SVX_RES( RID_SVXDLG_LINE ), pAttr ),
+    SfxTabDialog    ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ),
     pDrawModel      ( pModel ),
     pObj            ( pSdrObj ),
     rOutAttrs       ( *pAttr ),
@@ -136,7 +131,7 @@ SvxLineTabDialog::SvxLineTabDialog
 
     CancelButton& rBtnCancel = GetCancelButton();
     rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) );
-//! rBtnCancel.SetText( SVX_RESSTR( RID_SVXSTR_CLOSE ) );
+//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/cui/tabline.hrc b/cui/source/tabpages/tabline.hrc
index c1e884ad4ab3..c1e884ad4ab3 100644
--- a/svx/source/cui/tabline.hrc
+++ b/cui/source/tabpages/tabline.hrc
diff --git a/svx/source/cui/tabline.src b/cui/source/tabpages/tabline.src
index 55e50c0e78b4..ed2d308970db 100644
--- a/svx/source/cui/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -28,9 +28,10 @@
  *
  ************************************************************************/
  // include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
 #include "tabline.hrc"
+#include <svx/dialogs.hrc>
 
 // Selecting LineStyle / Color / Width --------------------
 
diff --git a/svx/source/cui/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 991e809827ea..12b6fd870419 100644
--- a/svx/source/cui/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -29,38 +29,30 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
-
 #include <sfx2/app.hxx>
 #include <tools/shl.hxx>
 #include <svtools/ruler.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc>
 
 #define _SVX_TABSTPGE_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabstpge.hrc"
-
 #include <svx/lrspitem.hxx>
 #include "tabstpge.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <sfx2/module.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <sfx2/request.hxx> //CHINA001
-#include <svx/svxids.hrc> //add CHINA001
-#include <svtools/intitem.hxx> //add CHINA001
-
+#include <svl/intitem.hxx> //add CHINA001
 
 // class TabWin_Impl -----------------------------------------------------
 
@@ -115,32 +107,32 @@ void TabWin_Impl::Paint( const Rectangle& )
 SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
                                           const SfxItemSet& rAttr ):
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
-
-    aTabBox         ( this, SVX_RES( ED_TABPOS ) ),
-    aTabLabel       ( this, SVX_RES( FL_TABPOS ) ),
-    aTabLabelVert   ( this, SVX_RES( FL_TABPOS_VERT ) ),
-    aLeftTab        ( this, SVX_RES( BTN_TABTYPE_LEFT ) ),
-    aRightTab       ( this, SVX_RES( BTN_TABTYPE_RIGHT ) ),
-    aCenterTab      ( this, SVX_RES( BTN_TABTYPE_CENTER ) ),
-    aDezTab         ( this, SVX_RES( BTN_TABTYPE_DECIMAL ) ),
-    pLeftWin        ( new TabWin_Impl( this, SVX_RES( WIN_TABLEFT ), (USHORT)(RULER_TAB_LEFT|WB_HORZ) ) ),
-    pRightWin       ( new TabWin_Impl( this, SVX_RES( WIN_TABRIGHT ), (USHORT)(RULER_TAB_RIGHT|WB_HORZ) ) ),
-    pCenterWin      ( new TabWin_Impl( this, SVX_RES( WIN_TABCENTER ), (USHORT)(RULER_TAB_CENTER|WB_HORZ) ) ),
-    pDezWin         ( new TabWin_Impl( this, SVX_RES( WIN_TABDECIMAL ), (USHORT)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
-    aDezCharLabel   ( this, SVX_RES( FT_TABTYPE_DECCHAR ) ),
-    aDezChar        ( this, SVX_RES( ED_TABTYPE_DECCHAR ) ),
-    aTabTypeLabel   ( this, SVX_RES( FL_TABTYPE ) ),
-    aNoFillChar     ( this, SVX_RES( BTN_FILLCHAR_NO ) ),
-    aFillPoints     ( this, SVX_RES( BTN_FILLCHAR_POINTS ) ),
-    aFillDashLine   ( this, SVX_RES( BTN_FILLCHAR_DASHLINE ) ),
-    aFillSolidLine  ( this, SVX_RES( BTN_FILLCHAR_UNDERSCORE ) ),
-    aFillSpecial    ( this, SVX_RES( BTN_FILLCHAR_OTHER ) ),
-    aFillChar       ( this, SVX_RES( ED_FILLCHAR_OTHER ) ),
-    aFillLabel      ( this, SVX_RES( FL_FILLCHAR ) ),
-    aNewBtn         ( this, SVX_RES( BTN_NEW ) ),
-    aDelAllBtn      ( this, SVX_RES( BTN_DELALL ) ),
-    aDelBtn         ( this, SVX_RES( BTN_DEL ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
+
+    aTabBox         ( this, CUI_RES( ED_TABPOS ) ),
+    aTabLabel       ( this, CUI_RES( FL_TABPOS ) ),
+    aTabLabelVert   ( this, CUI_RES( FL_TABPOS_VERT ) ),
+    aLeftTab        ( this, CUI_RES( BTN_TABTYPE_LEFT ) ),
+    aRightTab       ( this, CUI_RES( BTN_TABTYPE_RIGHT ) ),
+    aCenterTab      ( this, CUI_RES( BTN_TABTYPE_CENTER ) ),
+    aDezTab         ( this, CUI_RES( BTN_TABTYPE_DECIMAL ) ),
+    pLeftWin        ( new TabWin_Impl( this, CUI_RES( WIN_TABLEFT ), (USHORT)(RULER_TAB_LEFT|WB_HORZ) ) ),
+    pRightWin       ( new TabWin_Impl( this, CUI_RES( WIN_TABRIGHT ), (USHORT)(RULER_TAB_RIGHT|WB_HORZ) ) ),
+    pCenterWin      ( new TabWin_Impl( this, CUI_RES( WIN_TABCENTER ), (USHORT)(RULER_TAB_CENTER|WB_HORZ) ) ),
+    pDezWin         ( new TabWin_Impl( this, CUI_RES( WIN_TABDECIMAL ), (USHORT)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
+    aDezCharLabel   ( this, CUI_RES( FT_TABTYPE_DECCHAR ) ),
+    aDezChar        ( this, CUI_RES( ED_TABTYPE_DECCHAR ) ),
+    aTabTypeLabel   ( this, CUI_RES( FL_TABTYPE ) ),
+    aNoFillChar     ( this, CUI_RES( BTN_FILLCHAR_NO ) ),
+    aFillPoints     ( this, CUI_RES( BTN_FILLCHAR_POINTS ) ),
+    aFillDashLine   ( this, CUI_RES( BTN_FILLCHAR_DASHLINE ) ),
+    aFillSolidLine  ( this, CUI_RES( BTN_FILLCHAR_UNDERSCORE ) ),
+    aFillSpecial    ( this, CUI_RES( BTN_FILLCHAR_OTHER ) ),
+    aFillChar       ( this, CUI_RES( ED_FILLCHAR_OTHER ) ),
+    aFillLabel      ( this, CUI_RES( FL_FILLCHAR ) ),
+    aNewBtn         ( this, CUI_RES( BTN_NEW ) ),
+    aDelAllBtn      ( this, CUI_RES( BTN_DELALL ) ),
+    aDelBtn         ( this, CUI_RES( BTN_DEL ) ),
 
     aAktTab     ( 0 ),
     aNewTabs    ( 0, 0, SVX_TAB_ADJUST_LEFT, GetWhich( SID_ATTR_TABSTOP ) ),
@@ -152,8 +144,8 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
     SvtCJKOptions aCJKOptions;
     if(aCJKOptions.IsAsianTypographyEnabled())
     {
-        aLeftTab  .SetText(String(SVX_RES(   ST_LEFTTAB_ASIAN )));
-        aRightTab .SetText(String(SVX_RES(   ST_RIGHTTAB_ASIAN )));
+        aLeftTab  .SetText(String(CUI_RES(   ST_LEFTTAB_ASIAN )));
+        aRightTab .SetText(String(CUI_RES(   ST_RIGHTTAB_ASIAN )));
     }
 
     // diese Page braucht ExchangeSupport
diff --git a/svx/source/cui/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc
index 60752fa70109..60752fa70109 100644
--- a/svx/source/cui/tabstpge.hrc
+++ b/cui/source/tabpages/tabstpge.hrc
diff --git a/svx/source/cui/tabstpge.src b/cui/source/tabpages/tabstpge.src
index 2b3649ef968f..b314e0ef53fb 100644
--- a/svx/source/cui/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -29,9 +29,9 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabstpge.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
 
  // RID_SVXPAGE_TABULATOR -------------------------------------------------
 TabPage RID_SVXPAGE_TABULATOR
diff --git a/svx/source/cui/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 6251d4c970e1..3c7bdbcd4653 100644
--- a/svx/source/cui/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -29,17 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <tools/shl.hxx>
 
+#include <cuires.hrc>
 #include <svx/dialogs.hrc>
 
 #ifndef _SVX_TEXTANIM_CXX
@@ -48,8 +45,8 @@
 #include "textanim.hxx"
 #include "textanim.hrc"
 #include "textattr.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 
 static USHORT pRanges[] =
 {
@@ -67,7 +64,7 @@ static USHORT pRanges[] =
 __EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
                                 const SfxItemSet* pAttr,
                                 const SdrView* pSdrView ) :
-        SfxTabDialog        ( pParent, SVX_RES( RID_SVXDLG_TEXT ), pAttr ),
+        SfxTabDialog        ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ),
         rOutAttrs           ( *pAttr ),
         pView               ( pSdrView )
 {
@@ -110,33 +107,33 @@ void __EXPORT SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
 \************************************************************************/
 
 SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SfxTabPage      ( pWindow, SVX_RES( RID_SVXPAGE_TEXTANIMATION ),
+                SfxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ),
                                   rInAttrs ),
-                aFlEffect       ( this, SVX_RES(FL_EFFECT)),
-                aFtEffects      ( this, SVX_RES(FT_EFFECTS)),
-                aLbEffect       ( this, SVX_RES( LB_EFFECT ) ),
-                //aCtlEffect        ( this, SVX_RES( CTL_EFFECT ) ),
-                aFtDirection    ( this, SVX_RES(FT_DIRECTION) ),
-                aBtnUp          ( this, SVX_RES( BTN_UP ) ),
-                aBtnLeft        ( this, SVX_RES( BTN_LEFT ) ),
-                aBtnRight       ( this, SVX_RES( BTN_RIGHT ) ),
-                aBtnDown        ( this, SVX_RES( BTN_DOWN ) ),
-
-                aFlProperties   ( this, SVX_RES(FL_PROPERTIES)),
-                aTsbStartInside ( this, SVX_RES( TSB_START_INSIDE ) ),
-                aTsbStopInside  ( this, SVX_RES( TSB_STOP_INSIDE ) ),
-
-                aFtCount        ( this, SVX_RES(FT_COUNT)),
-                aTsbEndless     ( this, SVX_RES( TSB_ENDLESS ) ),
-                aNumFldCount    ( this, SVX_RES( NUM_FLD_COUNT ) ),
-
-                aFtAmount       ( this, SVX_RES(FT_AMOUNT)),
-                aTsbPixel       ( this, SVX_RES( TSB_PIXEL ) ),
-                aMtrFldAmount   ( this, SVX_RES( MTR_FLD_AMOUNT ) ),
-
-                aFtDelay        ( this, SVX_RES(FT_DELAY)),
-                aTsbAuto        ( this, SVX_RES( TSB_AUTO ) ),
-                aMtrFldDelay    ( this, SVX_RES( MTR_FLD_DELAY ) ),
+                aFlEffect       ( this, CUI_RES(FL_EFFECT)),
+                aFtEffects      ( this, CUI_RES(FT_EFFECTS)),
+                aLbEffect       ( this, CUI_RES( LB_EFFECT ) ),
+                //aCtlEffect        ( this, CUI_RES( CTL_EFFECT ) ),
+                aFtDirection    ( this, CUI_RES(FT_DIRECTION) ),
+                aBtnUp          ( this, CUI_RES( BTN_UP ) ),
+                aBtnLeft        ( this, CUI_RES( BTN_LEFT ) ),
+                aBtnRight       ( this, CUI_RES( BTN_RIGHT ) ),
+                aBtnDown        ( this, CUI_RES( BTN_DOWN ) ),
+
+                aFlProperties   ( this, CUI_RES(FL_PROPERTIES)),
+                aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ),
+                aTsbStopInside  ( this, CUI_RES( TSB_STOP_INSIDE ) ),
+
+                aFtCount        ( this, CUI_RES(FT_COUNT)),
+                aTsbEndless     ( this, CUI_RES( TSB_ENDLESS ) ),
+                aNumFldCount    ( this, CUI_RES( NUM_FLD_COUNT ) ),
+
+                aFtAmount       ( this, CUI_RES(FT_AMOUNT)),
+                aTsbPixel       ( this, CUI_RES( TSB_PIXEL ) ),
+                aMtrFldAmount   ( this, CUI_RES( MTR_FLD_AMOUNT ) ),
+
+                aFtDelay        ( this, CUI_RES(FT_DELAY)),
+                aTsbAuto        ( this, CUI_RES( TSB_AUTO ) ),
+                aMtrFldDelay    ( this, CUI_RES( MTR_FLD_DELAY ) ),
 
                 rOutAttrs       ( rInAttrs ),
                 eAniKind        ( SDRTEXTANI_NONE )
diff --git a/svx/source/cui/textanim.hrc b/cui/source/tabpages/textanim.hrc
index 97d6b7c64525..97d6b7c64525 100644
--- a/svx/source/cui/textanim.hrc
+++ b/cui/source/tabpages/textanim.hrc
diff --git a/svx/source/cui/textanim.src b/cui/source/tabpages/textanim.src
index d9c211a020f5..851096104479 100644
--- a/svx/source/cui/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -30,8 +30,9 @@
  // pragma ----------------------------------------------------------------
 
 #include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "textanim.hrc"
+#include <svx/dialogs.hrc>
 
 // direction image buttons
 #define MA_HALFBUTTON_WIDTH     7
diff --git a/svx/source/cui/textattr.cxx b/cui/source/tabpages/textattr.cxx
index a7eb3069026a..6c81356cb334 100644
--- a/svx/source/cui/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -29,18 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <tools/shl.hxx>
-
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include <svx/svddef.hxx>
 #include <svx/sdtditm.hxx>
 #include <svx/sdtagitm.hxx>
@@ -51,18 +46,17 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdotext.hxx>
-
+#include <svx/dialogs.hrc>
 
 #ifndef _SVX_TEXTATTR_CXX
 #define _SVX_TEXTATTR_CXX
 #endif
 #include "textattr.hxx"
 #include "textattr.hrc"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <sfx2/request.hxx> //add CHINA001
-#include <ofaitem.hxx> //add CHINA001
-#include <svx/svxids.hrc> //add CHINA001
+#include <svx/ofaitem.hxx> //add CHINA001
 #include <svx/writingmodeitem.hxx>
 
 static USHORT pRanges[] =
@@ -108,32 +102,32 @@ static USHORT pRanges[] =
 \************************************************************************/
 
 SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SvxTabPage      ( pWindow, SVX_RES( RID_SVXPAGE_TEXTATTR ),
+                SvxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ),
                                   rInAttrs ),
 
-                aFlText         ( this, SVX_RES( FL_TEXT ) ),
-                aTsbAutoGrowWidth  ( this, SVX_RES( TSB_AUTOGROW_WIDTH ) ),
-                aTsbAutoGrowHeight ( this, SVX_RES( TSB_AUTOGROW_HEIGHT ) ),
-                aTsbFitToSize   ( this, SVX_RES( TSB_FIT_TO_SIZE ) ),
-                aTsbContour     ( this, SVX_RES( TSB_CONTOUR ) ),
-                aTsbWordWrapText( this, SVX_RES( TSB_WORDWRAP_TEXT ) ),
-                aTsbAutoGrowSize( this, SVX_RES( TSB_AUTOGROW_SIZE ) ),
-                aFlDistance     ( this, SVX_RES( FL_DISTANCE ) ),
-                aFtLeft         ( this, SVX_RES( FT_LEFT ) ),
-                aMtrFldLeft     ( this, SVX_RES( MTR_FLD_LEFT ) ),
-                aFtRight        ( this, SVX_RES( FT_RIGHT ) ),
-                aMtrFldRight    ( this, SVX_RES( MTR_FLD_RIGHT ) ),
-                aFtTop          ( this, SVX_RES( FT_TOP ) ),
-                aMtrFldTop      ( this, SVX_RES( MTR_FLD_TOP ) ),
-                aFtBottom       ( this, SVX_RES( FT_BOTTOM ) ),
-                aMtrFldBottom   ( this, SVX_RES( MTR_FLD_BOTTOM ) ),
-
-                aFlSeparator    ( this, SVX_RES( FL_SEPARATOR ) ),
-
-                aFlPosition     ( this, SVX_RES( FL_POSITION ) ),
-                aCtlPosition    ( this, SVX_RES( CTL_POSITION ),
+                aFlText         ( this, CUI_RES( FL_TEXT ) ),
+                aTsbAutoGrowWidth  ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
+                aTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
+                aTsbFitToSize   ( this, CUI_RES( TSB_FIT_TO_SIZE ) ),
+                aTsbContour     ( this, CUI_RES( TSB_CONTOUR ) ),
+                aTsbWordWrapText( this, CUI_RES( TSB_WORDWRAP_TEXT ) ),
+                aTsbAutoGrowSize( this, CUI_RES( TSB_AUTOGROW_SIZE ) ),
+                aFlDistance     ( this, CUI_RES( FL_DISTANCE ) ),
+                aFtLeft         ( this, CUI_RES( FT_LEFT ) ),
+                aMtrFldLeft     ( this, CUI_RES( MTR_FLD_LEFT ) ),
+                aFtRight        ( this, CUI_RES( FT_RIGHT ) ),
+                aMtrFldRight    ( this, CUI_RES( MTR_FLD_RIGHT ) ),
+                aFtTop          ( this, CUI_RES( FT_TOP ) ),
+                aMtrFldTop      ( this, CUI_RES( MTR_FLD_TOP ) ),
+                aFtBottom       ( this, CUI_RES( FT_BOTTOM ) ),
+                aMtrFldBottom   ( this, CUI_RES( MTR_FLD_BOTTOM ) ),
+
+                aFlSeparator    ( this, CUI_RES( FL_SEPARATOR ) ),
+
+                aFlPosition     ( this, CUI_RES( FL_POSITION ) ),
+                aCtlPosition    ( this, CUI_RES( CTL_POSITION ),
                                             RP_MM, 240, 100 ),
-                aTsbFullWidth   ( this, SVX_RES( TSB_FULL_WIDTH ) ),
+                aTsbFullWidth   ( this, CUI_RES( TSB_FULL_WIDTH ) ),
 
                 rOutAttrs       ( rInAttrs )
 {
diff --git a/svx/source/cui/textattr.hrc b/cui/source/tabpages/textattr.hrc
index 5abc50f04250..5abc50f04250 100644
--- a/svx/source/cui/textattr.hrc
+++ b/cui/source/tabpages/textattr.hrc
diff --git a/svx/source/cui/textattr.src b/cui/source/tabpages/textattr.src
index d0d22044bb51..c5636d15cbfa 100644
--- a/svx/source/cui/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -29,10 +29,10 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "textattr.hrc"
 #include "helpid.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
 
  // RID_SVXPAGE_TEXTATTR --------------------------------------------------
 TabPage RID_SVXPAGE_TEXTATTR
diff --git a/svx/source/cui/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 720de9cb00ef..ddeb02a20c1d 100644
--- a/svx/source/cui/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -29,17 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
+#include <svx/dialogs.hrc>
 
 #define _SVX_TPAREA_CXX
 
@@ -47,21 +44,21 @@
 #include <stdlib.h>
 #endif
 
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabarea.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
 #include <svx/xflbckit.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xlineit0.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabarea.hxx"
 #include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
-#include <svtools/intitem.hxx> //add CHINA001
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
+#include <svl/intitem.hxx> //add CHINA001
 #include <sfx2/request.hxx>//add CHINA001
 
 #define DLGWIN this->GetParent()->GetParent()
@@ -258,35 +255,35 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
 }
 
 SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs)
-:   SvxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
+:   SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
     rOutAttrs           ( rInAttrs ),
     nPageType(0),
     nDlgType(0),
 
-    aFlProp             ( this, SVX_RES( FL_PROP ) ),
-    aRbtTransOff        ( this, SVX_RES( RBT_TRANS_OFF ) ),
-    aRbtTransLinear     ( this, SVX_RES( RBT_TRANS_LINEAR ) ),
-    aRbtTransGradient   ( this, SVX_RES( RBT_TRANS_GRADIENT ) ),
-
-    aMtrTransparent     ( this, SVX_RES( MTR_TRANSPARENT ) ),
-
-    aFtTrgrType         ( this, SVX_RES( FT_TRGR_TYPE ) ),
-    aLbTrgrGradientType ( this, SVX_RES( LB_TRGR_GRADIENT_TYPES ) ),
-    aFtTrgrCenterX      ( this, SVX_RES( FT_TRGR_CENTER_X ) ),
-    aMtrTrgrCenterX     ( this, SVX_RES( MTR_TRGR_CENTER_X ) ),
-    aFtTrgrCenterY      ( this, SVX_RES( FT_TRGR_CENTER_Y ) ),
-    aMtrTrgrCenterY     ( this, SVX_RES( MTR_TRGR_CENTER_Y ) ),
-    aFtTrgrAngle        ( this, SVX_RES( FT_TRGR_ANGLE ) ),
-    aMtrTrgrAngle       ( this, SVX_RES( MTR_TRGR_ANGLE ) ),
-    aFtTrgrBorder       ( this, SVX_RES( FT_TRGR_BORDER ) ),
-    aMtrTrgrBorder      ( this, SVX_RES( MTR_TRGR_BORDER ) ),
-    aFtTrgrStartValue   ( this, SVX_RES( FT_TRGR_START_VALUE ) ),
-    aMtrTrgrStartValue  ( this, SVX_RES( MTR_TRGR_START_VALUE ) ),
-    aFtTrgrEndValue     ( this, SVX_RES( FT_TRGR_END_VALUE ) ),
-    aMtrTrgrEndValue    ( this, SVX_RES( MTR_TRGR_END_VALUE ) ),
-
-    aCtlBitmapPreview   ( this, SVX_RES( CTL_BITMAP_PREVIEW ) ),
-    aCtlXRectPreview    ( this, SVX_RES( CTL_TRANS_PREVIEW ) ),
+    aFlProp             ( this, CUI_RES( FL_PROP ) ),
+    aRbtTransOff        ( this, CUI_RES( RBT_TRANS_OFF ) ),
+    aRbtTransLinear     ( this, CUI_RES( RBT_TRANS_LINEAR ) ),
+    aRbtTransGradient   ( this, CUI_RES( RBT_TRANS_GRADIENT ) ),
+
+    aMtrTransparent     ( this, CUI_RES( MTR_TRANSPARENT ) ),
+
+    aFtTrgrType         ( this, CUI_RES( FT_TRGR_TYPE ) ),
+    aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ),
+    aFtTrgrCenterX      ( this, CUI_RES( FT_TRGR_CENTER_X ) ),
+    aMtrTrgrCenterX     ( this, CUI_RES( MTR_TRGR_CENTER_X ) ),
+    aFtTrgrCenterY      ( this, CUI_RES( FT_TRGR_CENTER_Y ) ),
+    aMtrTrgrCenterY     ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ),
+    aFtTrgrAngle        ( this, CUI_RES( FT_TRGR_ANGLE ) ),
+    aMtrTrgrAngle       ( this, CUI_RES( MTR_TRGR_ANGLE ) ),
+    aFtTrgrBorder       ( this, CUI_RES( FT_TRGR_BORDER ) ),
+    aMtrTrgrBorder      ( this, CUI_RES( MTR_TRGR_BORDER ) ),
+    aFtTrgrStartValue   ( this, CUI_RES( FT_TRGR_START_VALUE ) ),
+    aMtrTrgrStartValue  ( this, CUI_RES( MTR_TRGR_START_VALUE ) ),
+    aFtTrgrEndValue     ( this, CUI_RES( FT_TRGR_END_VALUE ) ),
+    aMtrTrgrEndValue    ( this, CUI_RES( MTR_TRGR_END_VALUE ) ),
+
+    aCtlBitmapPreview   ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
+    aCtlXRectPreview    ( this, CUI_RES( CTL_TRANS_PREVIEW ) ),
     bBitmap             ( FALSE ),
     pXPool              ( (XOutdevItemPool*) rInAttrs.GetPool() ),
     aXFillAttr          ( pXPool ),
@@ -623,45 +620,45 @@ void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
 
 SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
 
-    SvxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_AREA ), rInAttrs ),
-
-    aFlProp             ( this, SVX_RES( FL_PROP ) ),
-    aTypeLB             ( this, SVX_RES( LB_AREA_TYPE ) ),
-
-    aLbColor            ( this, SVX_RES( LB_COLOR ) ),
-    aLbGradient         ( this, SVX_RES( LB_GRADIENT ) ),
-    aLbHatching         ( this, SVX_RES( LB_HATCHING ) ),
-    aLbBitmap           ( this, SVX_RES( LB_BITMAP ) ),
-    aCtlBitmapPreview   ( this, SVX_RES( CTL_BITMAP_PREVIEW ) ),
-
-    aTsbStepCount       ( this, SVX_RES( TSB_STEPCOUNT ) ),
-    aFlStepCount        ( this, SVX_RES( FL_STEPCOUNT ) ),
-    aNumFldStepCount    ( this, SVX_RES( NUM_FLD_STEPCOUNT ) ),
-
-    aCbxHatchBckgrd     ( this, SVX_RES( CB_HATCHBCKGRD ) ),
-    aLbHatchBckgrdColor ( this, SVX_RES( LB_HATCHBCKGRDCOLOR ) ),
-
-    aFlSize             ( this, SVX_RES( FL_SIZE ) ),
-    aTsbOriginal        ( this, SVX_RES( TSB_ORIGINAL ) ),
-    aTsbScale           ( this, SVX_RES( TSB_SCALE ) ),
-    aFtXSize            ( this, SVX_RES( FT_X_SIZE ) ),
-    aMtrFldXSize        ( this, SVX_RES( MTR_FLD_X_SIZE ) ),
-    aFtYSize            ( this, SVX_RES( FT_Y_SIZE ) ),
-    aMtrFldYSize        ( this, SVX_RES( MTR_FLD_Y_SIZE ) ),
-    aFlPosition         ( this, SVX_RES( FL_POSITION ) ),
-    aCtlPosition        ( this, SVX_RES( CTL_POSITION ), RP_RM, 110, 80, CS_RECT ),
-    aFtXOffset          ( this, SVX_RES( FT_X_OFFSET ) ),
-    aMtrFldXOffset      ( this, SVX_RES( MTR_FLD_X_OFFSET ) ),
-    aFtYOffset          ( this, SVX_RES( FT_Y_OFFSET ) ),
-    aMtrFldYOffset      ( this, SVX_RES( MTR_FLD_Y_OFFSET ) ),
-    aTsbTile            ( this, SVX_RES( TSB_TILE ) ),
-    aTsbStretch         ( this, SVX_RES( TSB_STRETCH ) ),
-    aFlOffset           ( this, SVX_RES( FL_OFFSET ) ),
-    aRbtRow             ( this, SVX_RES( RBT_ROW ) ),
-    aRbtColumn          ( this, SVX_RES( RBT_COLUMN ) ),
-    aMtrFldOffset       ( this, SVX_RES( MTR_FLD_OFFSET ) ),
-
-    aCtlXRectPreview    ( this, SVX_RES( CTL_COLOR_PREVIEW ) ),
+    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ),
+
+    aFlProp             ( this, CUI_RES( FL_PROP ) ),
+    aTypeLB             ( this, CUI_RES( LB_AREA_TYPE ) ),
+
+    aLbColor            ( this, CUI_RES( LB_COLOR ) ),
+    aLbGradient         ( this, CUI_RES( LB_GRADIENT ) ),
+    aLbHatching         ( this, CUI_RES( LB_HATCHING ) ),
+    aLbBitmap           ( this, CUI_RES( LB_BITMAP ) ),
+    aCtlBitmapPreview   ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
+
+    aTsbStepCount       ( this, CUI_RES( TSB_STEPCOUNT ) ),
+    aFlStepCount        ( this, CUI_RES( FL_STEPCOUNT ) ),
+    aNumFldStepCount    ( this, CUI_RES( NUM_FLD_STEPCOUNT ) ),
+
+    aCbxHatchBckgrd     ( this, CUI_RES( CB_HATCHBCKGRD ) ),
+    aLbHatchBckgrdColor ( this, CUI_RES( LB_HATCHBCKGRDCOLOR ) ),
+
+    aFlSize             ( this, CUI_RES( FL_SIZE ) ),
+    aTsbOriginal        ( this, CUI_RES( TSB_ORIGINAL ) ),
+    aTsbScale           ( this, CUI_RES( TSB_SCALE ) ),
+    aFtXSize            ( this, CUI_RES( FT_X_SIZE ) ),
+    aMtrFldXSize        ( this, CUI_RES( MTR_FLD_X_SIZE ) ),
+    aFtYSize            ( this, CUI_RES( FT_Y_SIZE ) ),
+    aMtrFldYSize        ( this, CUI_RES( MTR_FLD_Y_SIZE ) ),
+    aFlPosition         ( this, CUI_RES( FL_POSITION ) ),
+    aCtlPosition        ( this, CUI_RES( CTL_POSITION ), RP_RM, 110, 80, CS_RECT ),
+    aFtXOffset          ( this, CUI_RES( FT_X_OFFSET ) ),
+    aMtrFldXOffset      ( this, CUI_RES( MTR_FLD_X_OFFSET ) ),
+    aFtYOffset          ( this, CUI_RES( FT_Y_OFFSET ) ),
+    aMtrFldYOffset      ( this, CUI_RES( MTR_FLD_Y_OFFSET ) ),
+    aTsbTile            ( this, CUI_RES( TSB_TILE ) ),
+    aTsbStretch         ( this, CUI_RES( TSB_STRETCH ) ),
+    aFlOffset           ( this, CUI_RES( FL_OFFSET ) ),
+    aRbtRow             ( this, CUI_RES( RBT_ROW ) ),
+    aRbtColumn          ( this, CUI_RES( RBT_COLUMN ) ),
+    aMtrFldOffset       ( this, CUI_RES( MTR_FLD_OFFSET ) ),
+
+    aCtlXRectPreview    ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
 
     rOutAttrs           ( rInAttrs ),
 
@@ -1861,7 +1858,7 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG )
     aLbHatchBckgrdColor.Hide();
 
     // Text der Tabelle setzen
-    String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
     INetURLObject   aURL( pColorTab->GetPath() );
 
     aURL.Append( pColorTab->GetName() );
@@ -1951,7 +1948,7 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG )
     aLbHatchBckgrdColor.Hide();
 
     // Text der Tabelle setzen
-    String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
     INetURLObject   aURL( pGradientList->GetPath() );
 
     aURL.Append( pGradientList->GetName() );
@@ -2046,7 +2043,7 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG )
     aLbHatchBckgrdColor.Enable();
 
     // Text der Tabelle setzen
-    String          aString( SVX_RES( RID_SVXSTR_TABLE ) );     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    String          aString( CUI_RES( RID_SVXSTR_TABLE ) );     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
     INetURLObject   aURL( pHatchingList->GetPath() );
 
     aURL.Append( pHatchingList->GetName() );
@@ -2214,7 +2211,7 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG )
     aFlOffset.Show();
 
     // Text der Tabelle setzen
-    String          aString( SVX_RES( RID_SVXSTR_TABLE ) );     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    String          aString( CUI_RES( RID_SVXSTR_TABLE ) );     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
     INetURLObject   aURL( pBitmapList->GetPath() );
 
     aURL.Append( pBitmapList->GetName() );
diff --git a/svx/source/cui/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 47a516e65f3b..f34afb49a823 100644
--- a/svx/source/cui/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
@@ -52,35 +48,32 @@
 #include <tools/shl.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
-#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <svx/dialmgr.hxx>
 #include <vcl/bmpacc.hxx>
+#include <svx/dialogs.hrc>
 
 #define _SVX_TPBITMAP_CXX
 
-
-
-#include <svx/dialogs.hrc>
-
+#include <cuires.hrc>
 #include "helpid.hrc"
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include "xoutbmp.hxx"
-#include "drawitem.hxx"
+#include "svx/xoutbmp.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabarea.hxx"
 #include "tabarea.hrc"
 #include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
 #include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
-#include "opengrf.hxx"
+#include <dialmgr.hxx>
+#include "svx/opengrf.hxx"
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -96,26 +89,26 @@ SvxBitmapTabPage::SvxBitmapTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SvxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
+    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
 
-    aCtlPixel           ( this, SVX_RES( CTL_PIXEL ) ),
-    aFtPixelEdit        ( this, SVX_RES( FT_PIXEL_EDIT ) ),
-    aFtColor            ( this, SVX_RES( FT_COLOR ) ),
-    aLbColor            ( this, SVX_RES( LB_COLOR ) ),
-    aFtBackgroundColor  ( this, SVX_RES( FT_BACKGROUND_COLOR ) ),
-    aLbBackgroundColor  ( this, SVX_RES( LB_BACKGROUND_COLOR ) ),
+    aCtlPixel           ( this, CUI_RES( CTL_PIXEL ) ),
+    aFtPixelEdit        ( this, CUI_RES( FT_PIXEL_EDIT ) ),
+    aFtColor            ( this, CUI_RES( FT_COLOR ) ),
+    aLbColor            ( this, CUI_RES( LB_COLOR ) ),
+    aFtBackgroundColor  ( this, CUI_RES( FT_BACKGROUND_COLOR ) ),
+    aLbBackgroundColor  ( this, CUI_RES( LB_BACKGROUND_COLOR ) ),
     // This fix text is used only to provide the name for the following
     // bitmap list box.  The fixed text is not displayed.
-    aLbBitmapsHidden    ( this, SVX_RES( FT_BITMAPS_HIDDEN ) ),
-    aLbBitmaps          ( this, SVX_RES( LB_BITMAPS ) ),
-    aFlProp             ( this, SVX_RES( FL_PROP ) ),
-    aCtlPreview         ( this, SVX_RES( CTL_PREVIEW ) ),
-    aBtnAdd             ( this, SVX_RES( BTN_ADD ) ),
-    aBtnModify          ( this, SVX_RES( BTN_MODIFY ) ),
-    aBtnImport          ( this, SVX_RES( BTN_IMPORT ) ),
-    aBtnDelete          ( this, SVX_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, SVX_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, SVX_RES( BTN_SAVE ) ),
+    aLbBitmapsHidden    ( this, CUI_RES( FT_BITMAPS_HIDDEN ) ),
+    aLbBitmaps          ( this, CUI_RES( LB_BITMAPS ) ),
+    aFlProp             ( this, CUI_RES( FL_PROP ) ),
+    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
+    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnImport          ( this, CUI_RES( BTN_IMPORT ) ),
+    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
 
     aBitmapCtl          ( this, aCtlPreview.GetSizePixel() ),
     rOutAttrs           ( rInAttrs ),
@@ -129,8 +122,8 @@ SvxBitmapTabPage::SvxBitmapTabPage
     aXFillAttr          ( pXPool ),
     rXFSet              ( aXFillAttr.GetItemSet() )
 {
-    aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -222,7 +215,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet&  )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
             INetURLObject   aURL( pBitmapList->GetPath() );
 
             aURL.Append( pBitmapList->GetName() );
@@ -558,17 +551,13 @@ long SvxBitmapTabPage::CheckChanges_Impl()
 
         if( bBmpChanged )
         {
-            ResMgr& rMgr = DIALOG_MGR();
+            ResMgr& rMgr = CUI_MGR();
             Image aWarningBoxImage = WarningBox::GetStandardImage();
-            //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
-            //CHINA001  String( SVX_RES( RID_SVXSTR_BITMAP, rMgr ) ),
-            //CHINA001  String( SVX_RES( RID_SVXSTR_ASK_CHANGE_BITMAP, rMgr ) ),
-            //CHINA001  &aWarningBoxImage );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
             AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
-                                                        String( ResId( RID_SVXSTR_BITMAP, rMgr ) ),
-                                                        String( ResId( RID_SVXSTR_ASK_CHANGE_BITMAP, rMgr ) ),
+                                                        String( SVX_RES( RID_SVXSTR_BITMAP ) ),
+                                                        String( CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ) ),
                                                         &aWarningBoxImage  );
             DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
             aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
@@ -611,9 +600,9 @@ long SvxBitmapTabPage::CheckChanges_Impl()
 
 IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
-    String aNewName( ResId( RID_SVXSTR_BITMAP, rMgr ) );
-    String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
+    ResMgr& rMgr = CUI_MGR();
+    String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
+    String aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_BITMAP ) );
     String aName;
 
     long nCount = pBitmapList->Count();
@@ -632,10 +621,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
                 bDifferent = FALSE;
     }
 
-    //CHINA001 SvxNameDialog* pDlg     = new SvxNameDialog( DLGWIN, aName, aDesc );
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
     DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
     WarningBox*    pWarnBox = NULL;
     USHORT         nError   = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -742,7 +730,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
     SvxOpenGraphicDialog aDlg( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Import" ) ) );
     aDlg.EnableLink(sal_False);
 
@@ -763,10 +751,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
             // convert file URL to UI name
             String          aName;
             INetURLObject   aURL( aDlg.GetPath() );
-            //CHINA001 SvxNameDialog*  pDlg = new SvxNameDialog( DLGWIN, aURL.GetName().GetToken( 0, '.' ), aDesc );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-            AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc, RID_SVXDLG_NAME );
+            AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc );
             DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
             nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
 
@@ -850,16 +837,15 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = DIALOG_MGR();
-        String aNewName( ResId( RID_SVXSTR_BITMAP, rMgr ) );
+        ResMgr& rMgr = CUI_MGR();
+        String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
         String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
         String aName( pBitmapList->GetBitmap( nPos )->GetName() );
         String aOldName = aName;
 
-        //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
         long nCount = pBitmapList->Count();
@@ -922,8 +908,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//!         SVX_RES( RID_SVXSTR_DEL_BITMAP ),
-            String( SVX_RES( RID_SVXSTR_ASK_DEL_BITMAP ) ) );
+            String( CUI_RES( RID_SVXSTR_ASK_DEL_BITMAP ) ) );
 
         if( aQueryBox.Execute() == RET_YES )
         {
@@ -955,7 +940,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 {
     USHORT nReturn = RET_YES;
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
 
     if ( *pnBitmapListState & CT_MODIFIED )
     {
@@ -1086,7 +1071,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         {
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().getLength() > 18 )
@@ -1105,7 +1090,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         else
         {
             ErrorBox( DLGWIN, WinBits( WB_OK ),
-                String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
         }
     }
 
diff --git a/svx/source/cui/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 3a7399ae073d..616dba0169e8 100644
--- a/svx/source/cui/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -29,16 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <svtools/colrdlg.hxx>
@@ -48,21 +44,21 @@
 
 #define _SVX_TPCOLOR_CXX
 
-
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabarea.hxx"
 #include "tabarea.hrc"
 #include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
 #include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
 #include <cuitabline.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 
 #define DLGWIN GetParentDialog( this )
 
@@ -91,35 +87,35 @@ SvxColorTabPage::SvxColorTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SfxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
-
-    aFlProp             ( this, SVX_RES( FL_PROP ) ),
-    aFtName             ( this, SVX_RES( FT_NAME ) ),
-    aEdtName            ( this, SVX_RES( EDT_NAME ) ),
-    aFtColor            ( this, SVX_RES( FT_COLOR ) ),
-    aLbColor            ( this, SVX_RES( LB_COLOR ) ),
-
-    aTableNameFT        ( this, SVX_RES( FT_TABLE_NAME ) ),
-    aValSetColorTable   ( this, SVX_RES( CTL_COLORTABLE ) ),
-
-    aCtlPreviewOld      ( this, SVX_RES( CTL_PREVIEW_OLD ) ),
-    aCtlPreviewNew      ( this, SVX_RES( CTL_PREVIEW_NEW ) ),
-
-    aLbColorModel       ( this, SVX_RES( LB_COLORMODEL ) ),
-    aFtColorModel1      ( this, SVX_RES( FT_1 ) ),
-    aMtrFldColorModel1  ( this, SVX_RES( MTR_FLD_1 ) ),
-    aFtColorModel2      ( this, SVX_RES( FT_2 ) ),
-    aMtrFldColorModel2  ( this, SVX_RES( MTR_FLD_2 ) ),
-    aFtColorModel3      ( this, SVX_RES( FT_3 ) ),
-    aMtrFldColorModel3  ( this, SVX_RES( MTR_FLD_3 ) ),
-    aFtColorModel4      ( this, SVX_RES( FT_4 ) ),
-    aMtrFldColorModel4  ( this, SVX_RES( MTR_FLD_4 ) ),
-    aBtnAdd             ( this, SVX_RES( BTN_ADD ) ),
-    aBtnModify          ( this, SVX_RES( BTN_MODIFY ) ),
-    aBtnWorkOn          ( this, SVX_RES( BTN_WORK_ON ) ),
-    aBtnDelete          ( this, SVX_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, SVX_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, SVX_RES( BTN_SAVE ) ),
+    SfxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
+
+    aFlProp             ( this, CUI_RES( FL_PROP ) ),
+    aFtName             ( this, CUI_RES( FT_NAME ) ),
+    aEdtName            ( this, CUI_RES( EDT_NAME ) ),
+    aFtColor            ( this, CUI_RES( FT_COLOR ) ),
+    aLbColor            ( this, CUI_RES( LB_COLOR ) ),
+
+    aTableNameFT        ( this, CUI_RES( FT_TABLE_NAME ) ),
+    aValSetColorTable   ( this, CUI_RES( CTL_COLORTABLE ) ),
+
+    aCtlPreviewOld      ( this, CUI_RES( CTL_PREVIEW_OLD ) ),
+    aCtlPreviewNew      ( this, CUI_RES( CTL_PREVIEW_NEW ) ),
+
+    aLbColorModel       ( this, CUI_RES( LB_COLORMODEL ) ),
+    aFtColorModel1      ( this, CUI_RES( FT_1 ) ),
+    aMtrFldColorModel1  ( this, CUI_RES( MTR_FLD_1 ) ),
+    aFtColorModel2      ( this, CUI_RES( FT_2 ) ),
+    aMtrFldColorModel2  ( this, CUI_RES( MTR_FLD_2 ) ),
+    aFtColorModel3      ( this, CUI_RES( FT_3 ) ),
+    aMtrFldColorModel3  ( this, CUI_RES( MTR_FLD_3 ) ),
+    aFtColorModel4      ( this, CUI_RES( FT_4 ) ),
+    aMtrFldColorModel4  ( this, CUI_RES( MTR_FLD_4 ) ),
+    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnWorkOn          ( this, CUI_RES( BTN_WORK_ON ) ),
+    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
 
     rOutAttrs           ( rInAttrs ),
     pColorTab( NULL ),
@@ -135,8 +131,8 @@ SvxColorTabPage::SvxColorTabPage
     eCM                 ( CM_RGB )
 
 {
-    aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
 
     FreeResource();
 
@@ -235,7 +231,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
             INetURLObject   aURL( pColorTab->GetPath() );
 
             aURL.Append( pColorTab->GetName() );
@@ -307,16 +303,12 @@ long SvxColorTabPage::CheckChanges_Impl()
             ColorToPercent_Impl( aTmpColor.GetBlue() ) != ColorToPercent_Impl( aColor.GetBlue() ) ||
             aString != aEdtName.GetText() )
         {
-            ResMgr& rMgr = DIALOG_MGR();
+            ResMgr& rMgr = CUI_MGR();
             Image aWarningBoxImage = WarningBox::GetStandardImage();
-            //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
-            //CHINA001  String( SVX_RES( RID_SVXSTR_COLOR, pMgr ) ),
-            //CHINA001  String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, pMgr ) ),
-            //CHINA001  &aWarningBoxImage );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
             AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
-                                                        String( ResId( RID_SVXSTR_COLOR, rMgr ) ),
+                                                        SVX_RESSTR( RID_SVXSTR_COLOR ),
                                                         String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ) ),
                                                         &aWarningBoxImage );
             DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
@@ -482,7 +474,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         pWindow = pWindow->GetParent();
     }
 
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
     String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
     String aName( aEdtName.GetText() );
     XColorEntry* pEntry;
@@ -502,10 +494,9 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
         aWarningBox.Execute();
 
-        //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
         BOOL bLoop = TRUE;
 
@@ -570,7 +561,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = DIALOG_MGR();
+        ResMgr& rMgr = CUI_MGR();
         String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
         String aName( aEdtName.GetText() );
         long nCount = pColorTab->Count();
@@ -589,10 +580,9 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
             aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
             aWarningBox.Execute();
 
-            //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-            AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+            AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
             DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
             BOOL bLoop = TRUE;
 
@@ -693,7 +683,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-            String( SVX_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) );
+            String( CUI_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) );
 
         if( aQueryBox.Execute() == RET_YES )
         {
@@ -745,7 +735,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 //
 IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
     USHORT nReturn = RET_YES;
 
     if( *pnColorTableState & CT_MODIFIED )
@@ -916,7 +906,7 @@ IMPL_LINK( SvxColorTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         {
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().getLength() > 18 )
@@ -936,7 +926,7 @@ IMPL_LINK( SvxColorTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         else
         {
             ErrorBox aErrorBox( DLGWIN, WinBits( WB_OK ),
-                String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) );
+                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) );
             aErrorBox.Execute();
         }
     }
diff --git a/svx/source/cui/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 2624738baaa4..01381602b0a9 100644
--- a/svx/source/cui/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -29,37 +29,34 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <vcl/wrkwin.hxx>
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #define _SVX_TPGRADNT_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "helpid.hrc"
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabarea.hxx"
 #include "tabarea.hrc"
 #include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
 #include <svx/svxdlg.hxx> //CHINA001
+#include <dialmgr.hxx>
 #include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -77,32 +74,32 @@ SvxGradientTabPage::SvxGradientTabPage
     Window* pParent,
     const SfxItemSet& rInAttrs
 ) :
-    SfxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ),
-
-    aFlProp             ( this, SVX_RES( FL_PROP ) ),
-    aFtType             ( this, SVX_RES( FT_TYPE ) ),
-    aLbGradientType     ( this, SVX_RES( LB_GRADIENT_TYPES ) ),
-    aFtCenterX          ( this, SVX_RES( FT_CENTER_X ) ),
-    aMtrCenterX         ( this, SVX_RES( MTR_CENTER_X ) ),
-    aFtCenterY          ( this, SVX_RES( FT_CENTER_Y ) ),
-    aMtrCenterY         ( this, SVX_RES( MTR_CENTER_Y ) ),
-    aFtAngle            ( this, SVX_RES( FT_ANGLE ) ),
-    aMtrAngle           ( this, SVX_RES( MTR_ANGLE ) ),
-    aFtBorder           ( this, SVX_RES( FT_BORDER ) ),
-    aMtrBorder          ( this, SVX_RES( MTR_BORDER ) ),
-    aFtColorFrom        ( this, SVX_RES( FT_COLOR_FROM ) ),
-    aLbColorFrom        ( this, SVX_RES( LB_COLOR_FROM ) ),
-    aMtrColorFrom       ( this, SVX_RES( MTR_COLOR_FROM ) ),
-    aFtColorTo          ( this, SVX_RES( FT_COLOR_TO ) ),
-    aLbColorTo          ( this, SVX_RES( LB_COLOR_TO ) ),
-    aMtrColorTo         ( this, SVX_RES( MTR_COLOR_TO ) ),
-    aLbGradients        ( this, SVX_RES( LB_GRADIENTS ) ),
-    aCtlPreview         ( this, SVX_RES( CTL_PREVIEW ) ),
-    aBtnAdd             ( this, SVX_RES( BTN_ADD ) ),
-    aBtnModify          ( this, SVX_RES( BTN_MODIFY ) ),
-    aBtnDelete          ( this, SVX_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, SVX_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, SVX_RES( BTN_SAVE ) ),
+    SfxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ),
+
+    aFlProp             ( this, CUI_RES( FL_PROP ) ),
+    aFtType             ( this, CUI_RES( FT_TYPE ) ),
+    aLbGradientType     ( this, CUI_RES( LB_GRADIENT_TYPES ) ),
+    aFtCenterX          ( this, CUI_RES( FT_CENTER_X ) ),
+    aMtrCenterX         ( this, CUI_RES( MTR_CENTER_X ) ),
+    aFtCenterY          ( this, CUI_RES( FT_CENTER_Y ) ),
+    aMtrCenterY         ( this, CUI_RES( MTR_CENTER_Y ) ),
+    aFtAngle            ( this, CUI_RES( FT_ANGLE ) ),
+    aMtrAngle           ( this, CUI_RES( MTR_ANGLE ) ),
+    aFtBorder           ( this, CUI_RES( FT_BORDER ) ),
+    aMtrBorder          ( this, CUI_RES( MTR_BORDER ) ),
+    aFtColorFrom        ( this, CUI_RES( FT_COLOR_FROM ) ),
+    aLbColorFrom        ( this, CUI_RES( LB_COLOR_FROM ) ),
+    aMtrColorFrom       ( this, CUI_RES( MTR_COLOR_FROM ) ),
+    aFtColorTo          ( this, CUI_RES( FT_COLOR_TO ) ),
+    aLbColorTo          ( this, CUI_RES( LB_COLOR_TO ) ),
+    aMtrColorTo         ( this, CUI_RES( MTR_COLOR_TO ) ),
+    aLbGradients        ( this, CUI_RES( LB_GRADIENTS ) ),
+    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
+    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
 
     rOutAttrs           ( rInAttrs ),
 
@@ -115,8 +112,8 @@ SvxGradientTabPage::SvxGradientTabPage
     aXFillAttr          ( pXPool ),
     rXFSet              ( aXFillAttr.GetItemSet() )
 {
-    aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
 
     FreeResource();
 
@@ -225,7 +222,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
             INetURLObject   aURL( pGradientList->GetPath() );
 
             aURL.Append( pGradientList->GetName() );
@@ -288,17 +285,13 @@ long SvxGradientTabPage::CheckChanges_Impl()
 
         if( !( aTmpGradient == aGradient ) )
         {
-            ResMgr& rMgr = DIALOG_MGR();
+            ResMgr& rMgr = CUI_MGR();
             Image aWarningBoxImage = WarningBox::GetStandardImage();
-            //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
-            //CHINA001  String( ResId( RID_SVXSTR_GRADIENT, rMgr ) ),
-            //CHINA001  String( ResId( RID_SVXSTR_ASK_CHANGE_GRADIENT, rMgr ) ),
-            //CHINA001  &aWarningBoxImage );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
             AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
-                                                        String( ResId( RID_SVXSTR_GRADIENT, rMgr ) ),
-                                                        String( ResId( RID_SVXSTR_ASK_CHANGE_GRADIENT, rMgr ) ),
+                                                        SVX_RESSTR( RID_SVXSTR_GRADIENT ),
+                                                        CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ),
                                                         &aWarningBoxImage );
             DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
             aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
@@ -443,9 +436,9 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
 
 IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
-    String aNewName( ResId( RID_SVXSTR_GRADIENT, rMgr ) );
-    String aDesc( ResId( RID_SVXSTR_DESC_GRADIENT, rMgr ) );
+    ResMgr& rMgr = CUI_MGR();
+    String aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
+    String aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
     String aName;
 
     long nCount = pGradientList->Count();
@@ -464,10 +457,9 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
                 bDifferent = FALSE;
     }
 
-    //CHINA001 SvxNameDialog* pDlg     = new SvxNameDialog( DLGWIN, aName, aDesc );
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
     DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
     WarningBox*    pWarnBox = NULL;
     USHORT         nError   = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -556,16 +548,15 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = DIALOG_MGR();
-        String aNewName( ResId( RID_SVXSTR_GRADIENT, rMgr ) );
-        String aDesc( ResId( RID_SVXSTR_DESC_GRADIENT, rMgr ) );
+        ResMgr& rMgr = CUI_MGR();
+        String aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
+        String aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
         String aName( pGradientList->GetGradient( nPos )->GetName() );
         String aOldName = aName;
 
-        //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
         long nCount = pGradientList->Count();
@@ -630,8 +621,7 @@ IMPL_LINK( SvxGradientTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//!         SVX_RES( RID_SVXSTR_DEL_GRADIENT ),
-            String( SVX_RES( RID_SVXSTR_ASK_DEL_GRADIENT ) ) );
+            String( CUI_RES( RID_SVXSTR_ASK_DEL_GRADIENT ) ) );
 
         if ( aQueryBox.Execute() == RET_YES )
         {
@@ -661,7 +651,7 @@ IMPL_LINK( SvxGradientTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
     USHORT nReturn = RET_YES;
 
     if ( *pnGradientListState & CT_MODIFIED )
@@ -798,7 +788,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         {
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().getLength() > 18 )
@@ -817,7 +807,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         else
         {
             ErrorBox( DLGWIN, WinBits( WB_OK ),
-                String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
         }
     }
 
diff --git a/svx/source/cui/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 58c55321195a..006099f1fde6 100644
--- a/svx/source/cui/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -29,19 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -49,24 +43,21 @@
 
 #define _SVX_TPHATCH_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabarea.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
 #include "helpid.hrc"
-
-
-
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabarea.hxx"
 #include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
 #include <svx/svxdlg.hxx> //CHINA001
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <svx/dialogs.hrc>
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -85,26 +76,26 @@ SvxHatchTabPage::SvxHatchTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SvxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_HATCH ), rInAttrs ),
+    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ),
 
-    aFtDistance         ( this, SVX_RES( FT_LINE_DISTANCE ) ),
-    aMtrDistance        ( this, SVX_RES( MTR_FLD_DISTANCE ) ),
-    aFtAngle            ( this, SVX_RES( FT_LINE_ANGLE ) ),
-    aMtrAngle           ( this, SVX_RES( MTR_FLD_ANGLE ) ),
-    aCtlAngle           ( this, SVX_RES( CTL_ANGLE ),
+    aFtDistance         ( this, CUI_RES( FT_LINE_DISTANCE ) ),
+    aMtrDistance        ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+    aFtAngle            ( this, CUI_RES( FT_LINE_ANGLE ) ),
+    aMtrAngle           ( this, CUI_RES( MTR_FLD_ANGLE ) ),
+    aCtlAngle           ( this, CUI_RES( CTL_ANGLE ),
                                     RP_RB, 200, 80, CS_ANGLE ),
-    aFlProp             ( this, SVX_RES( FL_PROP ) ),
-    aFtLineType         ( this, SVX_RES( FT_LINE_TYPE ) ),
-    aLbLineType         ( this, SVX_RES( LB_LINE_TYPE ) ),
-    aFtLineColor        ( this, SVX_RES( FT_LINE_COLOR ) ),
-    aLbLineColor        ( this, SVX_RES( LB_LINE_COLOR ) ),
-    aLbHatchings        ( this, SVX_RES( LB_HATCHINGS ) ),
-    aCtlPreview         ( this, SVX_RES( CTL_PREVIEW ) ),
-    aBtnAdd             ( this, SVX_RES( BTN_ADD ) ),
-    aBtnModify          ( this, SVX_RES( BTN_MODIFY ) ),
-    aBtnDelete          ( this, SVX_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, SVX_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, SVX_RES( BTN_SAVE ) ),
+    aFlProp             ( this, CUI_RES( FL_PROP ) ),
+    aFtLineType         ( this, CUI_RES( FT_LINE_TYPE ) ),
+    aLbLineType         ( this, CUI_RES( LB_LINE_TYPE ) ),
+    aFtLineColor        ( this, CUI_RES( FT_LINE_COLOR ) ),
+    aLbLineColor        ( this, CUI_RES( LB_LINE_COLOR ) ),
+    aLbHatchings        ( this, CUI_RES( LB_HATCHINGS ) ),
+    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
+    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
 
     rOutAttrs           ( rInAttrs ),
     pColorTab( NULL ),
@@ -117,8 +108,8 @@ SvxHatchTabPage::SvxHatchTabPage
     rXFSet              ( aXFillAttr.GetItemSet() )
 
 {
-    aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
 
     FreeResource();
 
@@ -215,7 +206,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
             INetURLObject   aURL( pHatchingList->GetPath() );
 
             aURL.Append( pHatchingList->GetName() );
@@ -270,17 +261,13 @@ long SvxHatchTabPage::CheckChanges_Impl()
         aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() ||
         aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() )
     {
-        ResMgr& rMgr = DIALOG_MGR();
+        ResMgr& rMgr = CUI_MGR();
         Image aWarningBoxImage = WarningBox::GetStandardImage();
-        //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
-        //CHINA001  String( ResId( RID_SVXSTR_HATCH, rMgr ) ),
-        //CHINA001  String( ResId( RID_SVXSTR_ASK_CHANGE_HATCH, rMgr ) ),
-        //CHINA001  &aWarningBoxImage );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
         AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
-                                                        String( ResId( RID_SVXSTR_HATCH, rMgr ) ),
-                                                        String( ResId( RID_SVXSTR_ASK_CHANGE_HATCH, rMgr ) ),
+                                                        SVX_RESSTR( RID_SVXSTR_HATCH ),
+                                                        CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ),
                                                         &aWarningBoxImage );
         DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
         aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
@@ -514,9 +501,9 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
-    String aNewName( ResId( RID_SVXSTR_HATCH, rMgr ) );
-    String aDesc( ResId( RID_SVXSTR_DESC_HATCH, rMgr ) );
+    ResMgr& rMgr = CUI_MGR();
+    String aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
+    String aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
     String aName;
 
     long nCount = pHatchingList->Count();
@@ -535,10 +522,9 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
                 bDifferent = FALSE;
     }
 
-    //CHINA001 SvxNameDialog* pDlg     = new SvxNameDialog( DLGWIN, aName, aDesc );
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
     DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
     WarningBox*    pWarnBox = NULL;
     USHORT         nError   = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -621,16 +607,15 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = DIALOG_MGR();
-        String aNewName( ResId( RID_SVXSTR_HATCH, rMgr ) );
-        String aDesc( ResId( RID_SVXSTR_DESC_HATCH, rMgr ) );
+        ResMgr& rMgr = CUI_MGR();
+        String aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
+        String aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
         String aName( pHatchingList->GetHatch( nPos )->GetName() );
         String aOldName = aName;
 
-        //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
         long nCount = pHatchingList->Count();
@@ -695,8 +680,7 @@ IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//!         SVX_RES( RID_SVXSTR_DEL_HATCH ),
-            String( SVX_RES( RID_SVXSTR_ASK_DEL_HATCH ) ) );
+            String( CUI_RES( RID_SVXSTR_ASK_DEL_HATCH ) ) );
 
         if( aQueryBox.Execute() == RET_YES )
         {
@@ -726,7 +710,7 @@ IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
     USHORT nReturn = RET_YES;
 
     if ( *pnHatchingListState & CT_MODIFIED )
@@ -853,7 +837,7 @@ IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         {
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().getLength() > 18 )
@@ -872,7 +856,7 @@ IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         else
         {
             ErrorBox( DLGWIN, WinBits( WB_OK ),
-                String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
         }
     }
 
diff --git a/svx/source/cui/tpline.cxx b/cui/source/tabpages/tpline.cxx
index c6cc30cbb0ba..09a5daadfe1d 100644
--- a/svx/source/cui/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -29,11 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
@@ -48,43 +44,36 @@
 
 #define _SVX_TPLINE_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabline.hrc"
-#include "dlgname.hrc"
-
-
-
-
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabline.hxx"
 #include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <svx/svdmodel.hxx>
-#include "svxgrahicitem.hxx"
-#include "linectrl.hrc"
-#include <sfx2/request.hxx> //add CHINA001
-#include "ofaitem.hxx" //add CHINA001
-//#58425# Symbole auf einer Linie (z.B. StarChart) Includes:
+#include "svx/svxgrahicitem.hxx"
+//#include "linectrl.hrc"
+#include <sfx2/request.hxx>
+#include "svx/ofaitem.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdmodel.hxx>
-#include <numvset.hxx>
+#include <svx/numvset.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/numitem.hxx>
 #include <svx/svxenum.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/brshitem.hxx>
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
 #include <svx/xbitmap.hxx>
 #include <unotools/localfilehelper.hxx>
-
-#include "opengrf.hxx"
+#include "svx/opengrf.hxx"
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 
 #define MAX_BMP_WIDTH   16
 #define MAX_BMP_HEIGHT  16
@@ -118,33 +107,33 @@ SvxLineTabPage::SvxLineTabPage
     Window* pParent,
     const SfxItemSet& rInAttrs
 ) :
-    SvxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_LINE ), rInAttrs ),
-    aFtLineStyle        ( this, SVX_RES( FT_LINE_STYLE ) ),
-    aLbLineStyle        ( this, SVX_RES( LB_LINE_STYLE ) ),
-    aFtColor            ( this, SVX_RES( FT_COLOR ) ),
-    aLbColor            ( this, SVX_RES( LB_COLOR ) ),
-    aFtLineWidth        ( this, SVX_RES( FT_LINE_WIDTH ) ),
-    aMtrLineWidth       ( this, SVX_RES( MTR_FLD_LINE_WIDTH ) ),
-    aFtTransparent      ( this, SVX_RES( FT_TRANSPARENT ) ),
-    aMtrTransparent     ( this, SVX_RES( MTR_LINE_TRANSPARENT ) ),
-    aFlLine             ( this, SVX_RES( FL_LINE ) ),
-    aFtLineEndsStyle    ( this, SVX_RES( FT_LINE_ENDS_STYLE ) ),
-    aLbStartStyle       ( this, SVX_RES( LB_START_STYLE ) ),
-    aFtLineEndsWidth    ( this, SVX_RES( FT_LINE_ENDS_WIDTH ) ),
-    aMtrStartWidth      ( this, SVX_RES( MTR_FLD_START_WIDTH ) ),
-    aTsbCenterStart     ( this, SVX_RES( TSB_CENTER_START ) ),
-    aLbEndStyle         ( this, SVX_RES( LB_END_STYLE ) ),
-    aMtrEndWidth        ( this, SVX_RES( MTR_FLD_END_WIDTH ) ),
-    aTsbCenterEnd       ( this, SVX_RES( TSB_CENTER_END ) ),
-    aCbxSynchronize     ( this, SVX_RES( CBX_SYNCHRONIZE ) ),
-    aFlLineEnds         ( this, SVX_RES( FL_LINE_ENDS ) ),
-    aCtlPreview         ( this, SVX_RES( CTL_PREVIEW ) ),
-    aFLSeparator        ( this, SVX_RES( FL_SEPARATOR ) ),
+    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ),
+    aFtLineStyle        ( this, CUI_RES( FT_LINE_STYLE ) ),
+    aLbLineStyle        ( this, CUI_RES( LB_LINE_STYLE ) ),
+    aFtColor            ( this, CUI_RES( FT_COLOR ) ),
+    aLbColor            ( this, CUI_RES( LB_COLOR ) ),
+    aFtLineWidth        ( this, CUI_RES( FT_LINE_WIDTH ) ),
+    aMtrLineWidth       ( this, CUI_RES( MTR_FLD_LINE_WIDTH ) ),
+    aFtTransparent      ( this, CUI_RES( FT_TRANSPARENT ) ),
+    aMtrTransparent     ( this, CUI_RES( MTR_LINE_TRANSPARENT ) ),
+    aFlLine             ( this, CUI_RES( FL_LINE ) ),
+    aFtLineEndsStyle    ( this, CUI_RES( FT_LINE_ENDS_STYLE ) ),
+    aLbStartStyle       ( this, CUI_RES( LB_START_STYLE ) ),
+    aFtLineEndsWidth    ( this, CUI_RES( FT_LINE_ENDS_WIDTH ) ),
+    aMtrStartWidth      ( this, CUI_RES( MTR_FLD_START_WIDTH ) ),
+    aTsbCenterStart     ( this, CUI_RES( TSB_CENTER_START ) ),
+    aLbEndStyle         ( this, CUI_RES( LB_END_STYLE ) ),
+    aMtrEndWidth        ( this, CUI_RES( MTR_FLD_END_WIDTH ) ),
+    aTsbCenterEnd       ( this, CUI_RES( TSB_CENTER_END ) ),
+    aCbxSynchronize     ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
+    aFlLineEnds         ( this, CUI_RES( FL_LINE_ENDS ) ),
+    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
+    aFLSeparator        ( this, CUI_RES( FL_SEPARATOR ) ),
 
     // #116827#
-    maFLEdgeStyle       ( this, SVX_RES( FL_EDGE_STYLE ) ),
-    maFTEdgeStyle       ( this, SVX_RES( FT_EDGE_STYLE ) ),
-    maLBEdgeStyle       ( this, SVX_RES( LB_EDGE_STYLE ) ),
+    maFLEdgeStyle       ( this, CUI_RES( FL_EDGE_STYLE ) ),
+    maFTEdgeStyle       ( this, CUI_RES( FT_EDGE_STYLE ) ),
+    maLBEdgeStyle       ( this, CUI_RES( LB_EDGE_STYLE ) ),
 
     pSymbolList(NULL),
     bNewSize(false),
@@ -152,13 +141,13 @@ SvxLineTabPage::SvxLineTabPage
     nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged
     pSymbolAttr(NULL),
     //#58425# Symbole auf einer Linie (z.B. StarChart)
-    aFlSymbol           ( this, SVX_RES(FL_SYMBOL_FORMAT)),
-    aSymbolMB           ( this, SVX_RES(MB_SYMBOL_BITMAP)),
-    aSymbolWidthFT      ( this, SVX_RES(FT_SYMBOL_WIDTH)),
-    aSymbolWidthMF      ( this, SVX_RES(MF_SYMBOL_WIDTH)),
-    aSymbolHeightFT     ( this, SVX_RES(FT_SYMBOL_HEIGHT)),
-    aSymbolHeightMF     ( this, SVX_RES(MF_SYMBOL_HEIGHT)),
-    aSymbolRatioCB      ( this, SVX_RES(CB_SYMBOL_RATIO)),
+    aFlSymbol           ( this, CUI_RES(FL_SYMBOL_FORMAT)),
+    aSymbolMB           ( this, CUI_RES(MB_SYMBOL_BITMAP)),
+    aSymbolWidthFT      ( this, CUI_RES(FT_SYMBOL_WIDTH)),
+    aSymbolWidthMF      ( this, CUI_RES(MF_SYMBOL_WIDTH)),
+    aSymbolHeightFT     ( this, CUI_RES(FT_SYMBOL_HEIGHT)),
+    aSymbolHeightMF     ( this, CUI_RES(MF_SYMBOL_HEIGHT)),
+    aSymbolRatioCB      ( this, CUI_RES(CB_SYMBOL_RATIO)),
 
     bLastWidthModified(FALSE),
     aSymbolLastSize(Size(0,0)),
@@ -299,34 +288,14 @@ void SvxLineTabPage::Construct()
 
 void SvxLineTabPage::FillListboxes()
 {
-//  aCtlPreview.SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
-
-    ResMgr& rMgr = DIALOG_MGR();
-
     // Linienstile
     USHORT nOldSelect = aLbLineStyle.GetSelectEntryPos();
-    aLbLineStyle.Clear();
-    aLbLineStyle.InsertEntry( String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) );
-
-    const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
-    Bitmap aBitmap ( SVX_RES ( RID_SVXCTRL_LINECTRL ) );
-    Color aSourceColors[2];
-    Color aDestColors[2];
-
-    aSourceColors[0] = Color( COL_WHITE );
-    aSourceColors[1] = Color( COL_BLACK );
-
-    aDestColors[0] = rStyles.GetFieldColor();
-    aDestColors[1] = rStyles.GetFieldTextColor();
-
-    aBitmap.Replace ( aSourceColors, aDestColors, 2 );
-    Image aSolidLine ( aBitmap );
-    aLbLineStyle.InsertEntry( String( ResId( RID_SVXSTR_SOLID, rMgr ) ), aSolidLine );
+    aLbLineStyle.FillStyles();
     aLbLineStyle.Fill( pDashList );
     aLbLineStyle.SelectEntryPos( nOldSelect );
 
     // LinienEndenStile
-    String sNone( ResId( RID_SVXSTR_NONE, rMgr ) );
+    String sNone( SVX_RES( RID_SVXSTR_NONE ) );
     nOldSelect = aLbStartStyle.GetSelectEntryPos();
     aLbStartStyle.Clear();
     aLbStartStyle.InsertEntry( sNone );
@@ -348,7 +317,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
         SetPageType(pPageTypeItem->GetValue()); //add CHINA001 end
     if( nDlgType == 0 && pDashList )  //CHINA001 if( *pDlgType == 0 && pDashList ) // Linien-Dialog
     {
-        ResMgr& rMgr = DIALOG_MGR();
         USHORT nPos;
         USHORT nCount;
 
@@ -366,9 +334,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
 
             aLbLineStyle.Clear();
             aLbLineStyle.InsertEntry(
-                String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) );
+                SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
             aLbLineStyle.InsertEntry(
-                String( ResId( RID_SVXSTR_SOLID, rMgr ) ) );
+                SVX_RESSTR( RID_SVXSTR_SOLID ) );
             aLbLineStyle.Fill( pDashList );
             nCount = aLbLineStyle.GetEntryCount();
 
@@ -409,7 +377,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
             *pnLineEndListState = CT_NONE;
 
             nPos = aLbLineStyle.GetSelectEntryPos();
-            String sNone( ResId( RID_SVXSTR_NONE, rMgr ) );
+            String sNone( SVX_RES( RID_SVXSTR_NONE ) );
             aLbStartStyle.Clear();
             aLbStartStyle.InsertEntry( sNone );
 
@@ -1795,7 +1763,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
         break;
         default:
         {
-            SvxOpenGraphicDialog aGrfDlg(SVX_RES(RID_STR_EDIT_GRAPHIC));
+            SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_STR_EDIT_GRAPHIC));
             aGrfDlg.EnableLink(sal_False);
             aGrfDlg.AsLink(sal_False);
             if( !aGrfDlg.Execute() )
diff --git a/svx/source/cui/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 7b22fe175d16..f3d92be73278 100644
--- a/svx/source/cui/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -29,17 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -47,24 +43,23 @@
 
 #define _SVX_TPLNEDEF_CXX
 
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabline.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
 #include "helpid.hrc"
 
-
-
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
 
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabline.hxx"
 #include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
 #include <svx/svxdlg.hxx> //CHINA001
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <svx/dialogs.hrc>
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -84,29 +79,29 @@ SvxLineDefTabPage::SvxLineDefTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_LINE_DEF ), rInAttrs ),
-
-    aFlDefinition   ( this, SVX_RES( FL_DEFINITION ) ),
-    aFTLinestyle    ( this, SVX_RES( FT_LINESTYLE ) ),
-    aLbLineStyles   ( this, SVX_RES( LB_LINESTYLES ) ),
-    aFtType         ( this, SVX_RES( FT_TYPE ) ),
-    aLbType1        ( this, SVX_RES( LB_TYPE_1 ) ),
-    aLbType2        ( this, SVX_RES( LB_TYPE_2 ) ),
-    aFtNumber       ( this, SVX_RES( FT_NUMBER ) ),
-    aNumFldNumber1  ( this, SVX_RES( NUM_FLD_1 ) ),
-    aNumFldNumber2  ( this, SVX_RES( NUM_FLD_2 ) ),
-    aFtLength       ( this, SVX_RES( FT_LENGTH ) ),
-    aMtrLength1     ( this, SVX_RES( MTR_FLD_LENGTH_1 ) ),
-    aMtrLength2     ( this, SVX_RES( MTR_FLD_LENGTH_2 ) ),
-    aFtDistance     ( this, SVX_RES( FT_DISTANCE ) ),
-    aMtrDistance    ( this, SVX_RES( MTR_FLD_DISTANCE ) ),
-    aCbxSynchronize ( this, SVX_RES( CBX_SYNCHRONIZE ) ),
-    aBtnAdd         ( this, SVX_RES( BTN_ADD ) ),
-    aBtnModify      ( this, SVX_RES( BTN_MODIFY ) ),
-    aBtnDelete      ( this, SVX_RES( BTN_DELETE ) ),
-    aBtnLoad        ( this, SVX_RES( BTN_LOAD ) ),
-    aBtnSave        ( this, SVX_RES( BTN_SAVE ) ),
-    aCtlPreview     ( this, SVX_RES( CTL_PREVIEW ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_LINE_DEF ), rInAttrs ),
+
+    aFlDefinition   ( this, CUI_RES( FL_DEFINITION ) ),
+    aFTLinestyle    ( this, CUI_RES( FT_LINESTYLE ) ),
+    aLbLineStyles   ( this, CUI_RES( LB_LINESTYLES ) ),
+    aFtType         ( this, CUI_RES( FT_TYPE ) ),
+    aLbType1        ( this, CUI_RES( LB_TYPE_1 ) ),
+    aLbType2        ( this, CUI_RES( LB_TYPE_2 ) ),
+    aFtNumber       ( this, CUI_RES( FT_NUMBER ) ),
+    aNumFldNumber1  ( this, CUI_RES( NUM_FLD_1 ) ),
+    aNumFldNumber2  ( this, CUI_RES( NUM_FLD_2 ) ),
+    aFtLength       ( this, CUI_RES( FT_LENGTH ) ),
+    aMtrLength1     ( this, CUI_RES( MTR_FLD_LENGTH_1 ) ),
+    aMtrLength2     ( this, CUI_RES( MTR_FLD_LENGTH_2 ) ),
+    aFtDistance     ( this, CUI_RES( FT_DISTANCE ) ),
+    aMtrDistance    ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+    aCbxSynchronize ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
+    aBtnAdd         ( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify      ( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnDelete      ( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad        ( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave        ( this, CUI_RES( BTN_SAVE ) ),
+    aCtlPreview     ( this, CUI_RES( CTL_PREVIEW ) ),
 
     rOutAttrs       ( rInAttrs ),
 
@@ -118,8 +113,8 @@ SvxLineDefTabPage::SvxLineDefTabPage
     aXLineAttr          ( pXPool ),
     rXLSet              ( aXLineAttr.GetItemSet() )
 {
-    aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
 
     FreeResource();
 
@@ -213,7 +208,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
             INetURLObject   aURL( pDashList->GetPath() );
 
             aURL.Append( pDashList->GetName() );
@@ -262,16 +257,12 @@ void SvxLineDefTabPage::CheckChanges_Impl()
         aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() ||
         aMtrDistance.GetText()       != aMtrDistance.GetSavedValue() )
     {
-        ResMgr& rMgr = DIALOG_MGR();
+        ResMgr& rMgr = CUI_MGR();
         Image aWarningBoxImage = WarningBox::GetStandardImage();
-        //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
-        //CHINA001  String( ResId( RID_SVXSTR_LINESTYLE, rMgr ) ),
-        //CHINA001  String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
-        //CHINA001  &aWarningBoxImage );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
         AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
-                                                    String( ResId( RID_SVXSTR_LINESTYLE, rMgr ) ),
+                                                    SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
                                                     String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
                                                     &aWarningBoxImage );
         DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
@@ -581,8 +572,8 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p )
 
 IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
-    String aNewName( ResId( RID_SVXSTR_LINESTYLE, rMgr ) );
+    ResMgr& rMgr = CUI_MGR();
+    String aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
     String aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
     String aName;
     XDashEntry* pEntry;
@@ -603,10 +594,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
                 bDifferent = FALSE;
     }
 
-    //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+    AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
     DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
     BOOL bLoop = TRUE;
 
@@ -676,16 +666,15 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = DIALOG_MGR();
-        String aNewName( ResId( RID_SVXSTR_LINESTYLE, rMgr ) );
+        ResMgr& rMgr = CUI_MGR();
+        String aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
         String aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
         String aName( pDashList->GetDash( nPos )->GetName() );
         String aOldName = aName;
 
-        //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
         long nCount = pDashList->Count();
@@ -752,8 +741,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//!         SVX_RES( RID_SVXSTR_DEL_LINESTYLE ),
-            String( SVX_RES( RID_SVXSTR_ASK_DEL_LINESTYLE ) ) );
+            String( CUI_RES( RID_SVXSTR_ASK_DEL_LINESTYLE ) ) );
 
         if ( aQueryBox.Execute() == RET_YES )
         {
@@ -785,7 +773,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
     USHORT nReturn = RET_YES;
 
     if ( *pnDashListState & CT_MODIFIED )
@@ -916,7 +904,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         {
 /*          // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().Len() > 18 )
@@ -937,7 +925,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         else
         {
             ErrorBox( DLGWIN, WinBits( WB_OK ),
-                String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
         }
     }
 
diff --git a/svx/source/cui/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index c83a88956273..08626f051f82 100644
--- a/svx/source/cui/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -29,46 +29,39 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #define _SVX_TPLNEEND_CXX
 
-#include <svx/dialogs.hrc>
-#include "dlgname.hrc"
+#include <cuires.hrc>
 #include "tabline.hrc"
 #include "helpid.hrc"
-
-
-
+#include <svx/dialmgr.hxx>
 
 #include <svx/svdobj.hxx>
 #include <svx/svdopath.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
 #include "cuitabline.hxx"
-//CHINA001 #include "dlgname.hxx"
 #include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <svx/dialogs.hrc>
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -88,20 +81,20 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_LINEEND_DEF ), rInAttrs ),
-
-    aFlTip              ( this, SVX_RES( FL_TIP ) ),
-    aFTTitle            ( this, SVX_RES( FT_TITLE ) ),
-    aEdtName            ( this, SVX_RES( EDT_NAME ) ),
-    aFTLineEndStyle     ( this, SVX_RES( FT_LINE_END_STYLE ) ),
-    aLbLineEnds         ( this, SVX_RES( LB_LINEENDS ) ),
-    aBtnAdd             ( this, SVX_RES( BTN_ADD ) ),
-    aBtnModify          ( this, SVX_RES( BTN_MODIFY ) ),
-    aBtnDelete          ( this, SVX_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, SVX_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, SVX_RES( BTN_SAVE ) ),
-    aFiTip              ( this, SVX_RES( FI_TIP ) ),
-    aCtlPreview         ( this, SVX_RES( CTL_PREVIEW ) ),
+    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_LINEEND_DEF ), rInAttrs ),
+
+    aFlTip              ( this, CUI_RES( FL_TIP ) ),
+    aFTTitle            ( this, CUI_RES( FT_TITLE ) ),
+    aEdtName            ( this, CUI_RES( EDT_NAME ) ),
+    aFTLineEndStyle     ( this, CUI_RES( FT_LINE_END_STYLE ) ),
+    aLbLineEnds         ( this, CUI_RES( LB_LINEENDS ) ),
+    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
+    aFiTip              ( this, CUI_RES( FI_TIP ) ),
+    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
 
     rOutAttrs           ( rInAttrs ),
     pPolyObj( NULL ),
@@ -114,8 +107,8 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     rXLSet              ( aXLineAttr.GetItemSet() ),
     pLineEndList( NULL )
 {
-    aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
 
     FreeResource();
 
@@ -201,7 +194,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 /*          // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().Len() > 18 )
             {
@@ -244,8 +237,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
         if( aString != aLbLineEnds.GetSelectEntry() )
         {
             QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//!             SVX_RES( RID_SVXSTR_LINEEND ),
-                String( SVX_RES( RID_SVXSTR_ASK_CHANGE_LINEEND ) ) );
+                CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_LINEEND ) );
 
             if ( aQueryBox.Execute() == RET_YES )
                 ClickModifyHdl_Impl( this );
@@ -367,7 +359,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = DIALOG_MGR();
+        ResMgr& rMgr = CUI_MGR();
         String aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
         String aName( aEdtName.GetText() );
         long nCount = pLineEndList->Count();
@@ -386,10 +378,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
             aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
             aWarningBox.Execute();
 
-            //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-            AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+            AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
             DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
             BOOL bLoop = TRUE;
 
@@ -474,8 +465,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 
         XLineEndEntry* pEntry;
 
-        ResMgr& rMgr = DIALOG_MGR();
-        String aNewName( ResId( RID_SVXSTR_LINEEND, rMgr ) );
+        ResMgr& rMgr = CUI_MGR();
+        String aNewName( SVX_RES( RID_SVXSTR_LINEEND ) );
         String aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
         String aName;
 
@@ -495,10 +486,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
                     bDifferent = FALSE;
         }
 
-        //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+        AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
         BOOL bLoop = TRUE;
 
@@ -562,8 +552,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//!         SVX_RES( RID_SVXSTR_DEL_LINEEND ),
-            String( SVX_RES( RID_SVXSTR_ASK_DEL_LINEEND ) ) );
+            String( CUI_RES( RID_SVXSTR_ASK_DEL_LINEEND ) ) );
 
         if ( aQueryBox.Execute() == RET_YES )
         {
@@ -594,7 +583,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 {
-    ResMgr& rMgr = DIALOG_MGR();
+    ResMgr& rMgr = CUI_MGR();
     USHORT nReturn = RET_YES;
 
     if ( *pnLineEndListState & CT_MODIFIED )
@@ -721,7 +710,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         {
 /*          // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().Len() > 18 )
@@ -741,7 +730,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
         else
         {
             ErrorBox( DLGWIN, WinBits( WB_OK ),
-                String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+                String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
         }
     }
     return( 0L );
diff --git a/svx/source/cui/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 4515f1f39a31..48d6d627230d 100644
--- a/svx/source/cui/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -29,32 +29,25 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
+#include <svx/dialogs.hrc>
 
 #define _SVX_TPSHADOW_CXX
 
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "tabarea.hrc"
-
-
-
 #include <svx/svdattr.hxx>
-
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include "cuitabarea.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <cuitabline.hxx>
 
 #include <svx/xlineit0.hxx>
@@ -81,19 +74,19 @@ static USHORT pShadowRanges[] =
 
 SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
 
-    SvxTabPage          ( pParent, SVX_RES( RID_SVXPAGE_SHADOW ), rInAttrs ),
-
-    aFlProp             ( this, SVX_RES( FL_PROP ) ),
-    aTsbShowShadow      ( this, SVX_RES( TSB_SHOW_SHADOW ) ),
-    aFtPosition         ( this, SVX_RES( FT_POSITION ) ),
-    aCtlPosition        ( this, SVX_RES( CTL_POSITION ) ),
-    aFtDistance         ( this, SVX_RES( FT_DISTANCE ) ),
-    aMtrDistance        ( this, SVX_RES( MTR_FLD_DISTANCE ) ),
-    aFtShadowColor      ( this, SVX_RES( FT_SHADOW_COLOR ) ),
-    aLbShadowColor      ( this, SVX_RES( LB_SHADOW_COLOR ) ),
-    aFtTransparent      ( this, SVX_RES( FT_TRANSPARENT ) ),
-    aMtrTransparent      ( this, SVX_RES( MTR_SHADOW_TRANSPARENT ) ),
-    aCtlXRectPreview    ( this, SVX_RES( CTL_COLOR_PREVIEW ) ),
+    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ),
+
+    aFlProp             ( this, CUI_RES( FL_PROP ) ),
+    aTsbShowShadow      ( this, CUI_RES( TSB_SHOW_SHADOW ) ),
+    aFtPosition         ( this, CUI_RES( FT_POSITION ) ),
+    aCtlPosition        ( this, CUI_RES( CTL_POSITION ) ),
+    aFtDistance         ( this, CUI_RES( FT_DISTANCE ) ),
+    aMtrDistance        ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+    aFtShadowColor      ( this, CUI_RES( FT_SHADOW_COLOR ) ),
+    aLbShadowColor      ( this, CUI_RES( LB_SHADOW_COLOR ) ),
+    aFtTransparent      ( this, CUI_RES( FT_TRANSPARENT ) ),
+    aMtrTransparent      ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ),
+    aCtlXRectPreview    ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
     rOutAttrs           ( rInAttrs ),
     pColorTab( NULL ),
     bDisable            ( FALSE ),
diff --git a/svx/source/cui/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index ba1bee46e1a1..57e82898a947 100644
--- a/svx/source/cui/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -29,15 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
 
-
 #include <tools/shl.hxx>
 #include <sfx2/app.hxx>
 #include <svx/svdview.hxx>
@@ -45,20 +40,19 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/sderitm.hxx>
-
-#include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "transfrm.hrc"
 #include <svx/sizeitem.hxx>
 
 #include "transfrm.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
 #include <svx/svxenum.hxx>
-#include "anchorid.hxx"
+#include "svx/anchorid.hxx"
 #include <sfx2/module.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/aeitem.hxx>
 #include <swpossizetabpage.hxx>
 
 // Toleranz fuer WorkingArea
@@ -131,7 +125,7 @@ void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale)
 
 SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr,
                                 const SdrView* pSdrView, USHORT nAnchorTypes ) :
-    SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_TRANSFORM ), pAttr ),
+    SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_TRANSFORM ), pAttr ),
     pView       ( pSdrView ),
     nAnchorCtrls(nAnchorTypes)
 {
@@ -233,20 +227,20 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
 \************************************************************************/
 
 SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  ) :
-    SvxTabPage              ( pParent, SVX_RES( RID_SVXPAGE_ANGLE ), rInAttrs ),
-    aFlPosition             ( this, SVX_RES( FL_POSITION ) ),
-    aFtPosX                 ( this, SVX_RES( FT_POS_X ) ),
-    aMtrPosX                ( this, SVX_RES( MTR_FLD_POS_X ) ),
-    aFtPosY                 ( this, SVX_RES( FT_POS_Y ) ),
-    aMtrPosY                ( this, SVX_RES( MTR_FLD_POS_Y ) ),
-    aFtPosPresets           ( this, SVX_RES(FT_POSPRESETS) ),
-    aCtlRect                ( this, SVX_RES( CTL_RECT ) ),
-
-    aFlAngle                ( this, SVX_RES( FL_ANGLE ) ),
-    aFtAngle                ( this, SVX_RES( FT_ANGLE ) ),
-    aMtrAngle               ( this, SVX_RES( MTR_FLD_ANGLE ) ),
-    aFtAnglePresets         ( this, SVX_RES(FT_ANGLEPRESETS) ),
-    aCtlAngle               ( this, SVX_RES( CTL_ANGLE ),
+    SvxTabPage              ( pParent, CUI_RES( RID_SVXPAGE_ANGLE ), rInAttrs ),
+    aFlPosition             ( this, CUI_RES( FL_POSITION ) ),
+    aFtPosX                 ( this, CUI_RES( FT_POS_X ) ),
+    aMtrPosX                ( this, CUI_RES( MTR_FLD_POS_X ) ),
+    aFtPosY                 ( this, CUI_RES( FT_POS_Y ) ),
+    aMtrPosY                ( this, CUI_RES( MTR_FLD_POS_Y ) ),
+    aFtPosPresets           ( this, CUI_RES(FT_POSPRESETS) ),
+    aCtlRect                ( this, CUI_RES( CTL_RECT ) ),
+
+    aFlAngle                ( this, CUI_RES( FL_ANGLE ) ),
+    aFtAngle                ( this, CUI_RES( FT_ANGLE ) ),
+    aMtrAngle               ( this, CUI_RES( MTR_FLD_ANGLE ) ),
+    aFtAnglePresets         ( this, CUI_RES(FT_ANGLEPRESETS) ),
+    aCtlAngle               ( this, CUI_RES( CTL_ANGLE ),
                                 RP_RB, 200, 80, CS_ANGLE ),
     rOutAttrs               ( rInAttrs )
 {
@@ -524,14 +518,14 @@ IMPL_LINK( SvxAngleTabPage, ModifiedHdl, void *, EMPTYARG )
 \************************************************************************/
 
 SvxSlantTabPage::SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs  ) :
-    SvxTabPage              ( pParent, SVX_RES( RID_SVXPAGE_SLANT ), rInAttrs ),
-
-    aFlRadius               ( this, SVX_RES( FL_RADIUS ) ),
-    aFtRadius               ( this, SVX_RES( FT_RADIUS ) ),
-    aMtrRadius              ( this, SVX_RES( MTR_FLD_RADIUS ) ),
-    aFlAngle                ( this, SVX_RES( FL_SLANT ) ),
-    aFtAngle                ( this, SVX_RES( FT_ANGLE ) ),
-    aMtrAngle               ( this, SVX_RES( MTR_FLD_ANGLE ) ),
+    SvxTabPage              ( pParent, CUI_RES( RID_SVXPAGE_SLANT ), rInAttrs ),
+
+    aFlRadius               ( this, CUI_RES( FL_RADIUS ) ),
+    aFtRadius               ( this, CUI_RES( FT_RADIUS ) ),
+    aMtrRadius              ( this, CUI_RES( MTR_FLD_RADIUS ) ),
+    aFlAngle                ( this, CUI_RES( FL_SLANT ) ),
+    aFtAngle                ( this, CUI_RES( FT_ANGLE ) ),
+    aMtrAngle               ( this, CUI_RES( MTR_FLD_ANGLE ) ),
     rOutAttrs               ( rInAttrs )
 {
     FreeResource();
@@ -714,34 +708,34 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT  )
 \************************************************************************/
 
 SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  ) :
-    SvxTabPage      ( pParent, SVX_RES( RID_SVXPAGE_POSITION_SIZE ), rInAttrs ),
-    maFlPosition        ( this, SVX_RES( FL_POSITION ) ),
-    maFtPosX            ( this, SVX_RES( FT_POS_X ) ),
-    maMtrPosX           ( this, SVX_RES( MTR_FLD_POS_X ) ),
-    maFtPosY            ( this, SVX_RES( FT_POS_Y ) ),
-    maMtrPosY           ( this, SVX_RES( MTR_FLD_POS_Y ) ),
-    maFtPosReference    ( this, SVX_RES( FT_POSREFERENCE ) ),
-    maCtlPos            ( this, SVX_RES( CTL_POSRECT ), RP_LT ),
-
-    maFlSize                         ( this, SVX_RES( FL_SIZE ) ),
-    maFtWidth                        ( this, SVX_RES( FT_WIDTH ) ),
-    maMtrWidth                       ( this, SVX_RES( MTR_FLD_WIDTH ) ),
-    maFtHeight                       ( this, SVX_RES( FT_HEIGHT ) ),
-    maMtrHeight                      ( this, SVX_RES( MTR_FLD_HEIGHT ) ),
-    maCbxScale                       ( this, SVX_RES( CBX_SCALE ) ),
-    maFtSizeReference                ( this, SVX_RES( FT_SIZEREFERENCE) ),
-    maCtlSize                        ( this, SVX_RES( CTL_SIZERECT ), RP_LT ),
-
-    maFlProtect         ( this, SVX_RES( FL_PROTECT) ),
-    maTsbPosProtect     ( this, SVX_RES( TSB_POSPROTECT ) ),
-    maTsbSizeProtect                 ( this, SVX_RES( TSB_SIZEPROTECT ) ),
-
-
-    maFlAdjust                       ( this, SVX_RES( FL_ADJUST ) ),
-    maTsbAutoGrowWidth              ( this, SVX_RES( TSB_AUTOGROW_WIDTH ) ),
-    maTsbAutoGrowHeight             ( this, SVX_RES( TSB_AUTOGROW_HEIGHT ) ),
-
-    maFlDivider                     (this, SVX_RES( FL_DIVIDER ) ),
+    SvxTabPage      ( pParent, CUI_RES( RID_SVXPAGE_POSITION_SIZE ), rInAttrs ),
+    maFlPosition        ( this, CUI_RES( FL_POSITION ) ),
+    maFtPosX            ( this, CUI_RES( FT_POS_X ) ),
+    maMtrPosX           ( this, CUI_RES( MTR_FLD_POS_X ) ),
+    maFtPosY            ( this, CUI_RES( FT_POS_Y ) ),
+    maMtrPosY           ( this, CUI_RES( MTR_FLD_POS_Y ) ),
+    maFtPosReference    ( this, CUI_RES( FT_POSREFERENCE ) ),
+    maCtlPos            ( this, CUI_RES( CTL_POSRECT ), RP_LT ),
+
+    maFlSize                         ( this, CUI_RES( FL_SIZE ) ),
+    maFtWidth                        ( this, CUI_RES( FT_WIDTH ) ),
+    maMtrWidth                       ( this, CUI_RES( MTR_FLD_WIDTH ) ),
+    maFtHeight                       ( this, CUI_RES( FT_HEIGHT ) ),
+    maMtrHeight                      ( this, CUI_RES( MTR_FLD_HEIGHT ) ),
+    maCbxScale                       ( this, CUI_RES( CBX_SCALE ) ),
+    maFtSizeReference                ( this, CUI_RES( FT_SIZEREFERENCE) ),
+    maCtlSize                        ( this, CUI_RES( CTL_SIZERECT ), RP_LT ),
+
+    maFlProtect         ( this, CUI_RES( FL_PROTECT) ),
+    maTsbPosProtect     ( this, CUI_RES( TSB_POSPROTECT ) ),
+    maTsbSizeProtect                 ( this, CUI_RES( TSB_SIZEPROTECT ) ),
+
+
+    maFlAdjust                       ( this, CUI_RES( FL_ADJUST ) ),
+    maTsbAutoGrowWidth              ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
+    maTsbAutoGrowHeight             ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
+
+    maFlDivider                     (this, CUI_RES( FL_DIVIDER ) ),
 
     mrOutAttrs       ( rInAttrs ),
     mnProtectSizeState( STATE_NOCHECK ),
diff --git a/svx/source/cui/transfrm.hrc b/cui/source/tabpages/transfrm.hrc
index a49a8c3f3985..a49a8c3f3985 100644
--- a/svx/source/cui/transfrm.hrc
+++ b/cui/source/tabpages/transfrm.hrc
diff --git a/svx/source/cui/transfrm.src b/cui/source/tabpages/transfrm.src
index 1a64d5962f85..8b7e754dda81 100644
--- a/svx/source/cui/transfrm.src
+++ b/cui/source/tabpages/transfrm.src
@@ -30,9 +30,9 @@
  // include ------------------------------------------------------------------
 #include <svtools/controldims.hrc>
 #include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
 #include "transfrm.hrc"
- // pragma -------------------------------------------------------------------
+#include <svx/dialogs.hrc>
 
 #define MA_TABPAGE_HEIGHT       185
 
diff --git a/svx/util/cui.map b/cui/util/cui.map
index b43a11bd5096..b43a11bd5096 100644
--- a/svx/util/cui.map
+++ b/cui/util/cui.map
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
new file mode 100644
index 000000000000..313161f7c3cd
--- /dev/null
+++ b/cui/util/hidother.src
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: hidother.src,v $
+ * $Revision: 1.45 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "../source/inc/helpid.hrc"            // HID_XXX
+
+hidspecial HID_AUTOCORR_LANGUAGE                    { HelpId = HID_AUTOCORR_LANGUAGE; };
+hidspecial HID_CLB_EDIT_MODULES_DICS            { HelpID =  HID_CLB_EDIT_MODULES_DICS       ;};
+hidspecial HID_CLB_EDIT_MODULES_MODULES         { HelpID =  HID_CLB_EDIT_MODULES_MODULES    ;};
+hidspecial HID_CLB_LINGU_MODULES                { HelpID =  HID_CLB_LINGU_MODULES           ;};
+hidspecial HID_CLB_LINGU_OPTIONS                { HelpID =  HID_CLB_LINGU_OPTIONS           ;};
+hidspecial HID_COLORPAGE_ANCHOR_CB                     { HelpID =  HID_COLORPAGE_ANCHOR_CB                      ; };
+hidspecial HID_COLORPAGE_ANCHOR_LB                     { HelpID =  HID_COLORPAGE_ANCHOR_LB                      ; };
+hidspecial HID_COLORPAGE_APPBACKGROUND_CB              { HelpID =  HID_COLORPAGE_APPBACKGROUND_CB               ; };
+hidspecial HID_COLORPAGE_APPBACKGROUND_LB              { HelpID =  HID_COLORPAGE_APPBACKGROUND_LB               ; };
+hidspecial HID_COLORPAGE_BASICCOMMENT_CB               { HelpID =  HID_COLORPAGE_BASICCOMMENT_CB                ; };
+hidspecial HID_COLORPAGE_BASICCOMMENT_LB               { HelpID =  HID_COLORPAGE_BASICCOMMENT_LB                ; };
+hidspecial HID_COLORPAGE_BASICERROR_CB                 { HelpID =  HID_COLORPAGE_BASICERROR_CB                  ; };
+hidspecial HID_COLORPAGE_BASICERROR_LB                 { HelpID =  HID_COLORPAGE_BASICERROR_LB                  ; };
+hidspecial HID_COLORPAGE_BASICIDENTIFIER_CB            { HelpID =  HID_COLORPAGE_BASICIDENTIFIER_CB             ; };
+hidspecial HID_COLORPAGE_BASICIDENTIFIER_LB            { HelpID =  HID_COLORPAGE_BASICIDENTIFIER_LB             ; };
+hidspecial HID_COLORPAGE_BASICKEYWORD_CB               { HelpID =  HID_COLORPAGE_BASICKEYWORD_CB                ; };
+hidspecial HID_COLORPAGE_BASICKEYWORD_LB               { HelpID =  HID_COLORPAGE_BASICKEYWORD_LB                ; };
+hidspecial HID_COLORPAGE_BASICNUMBER_CB                { HelpID =  HID_COLORPAGE_BASICNUMBER_CB                 ; };
+hidspecial HID_COLORPAGE_BASICNUMBER_LB                { HelpID =  HID_COLORPAGE_BASICNUMBER_LB                 ; };
+hidspecial HID_COLORPAGE_BASICOPERATOR_CB              { HelpID =  HID_COLORPAGE_BASICOPERATOR_CB               ; };
+hidspecial HID_COLORPAGE_BASICOPERATOR_LB              { HelpID =  HID_COLORPAGE_BASICOPERATOR_LB               ; };
+hidspecial HID_COLORPAGE_BASICSTRING_CB                { HelpID =  HID_COLORPAGE_BASICSTRING_CB                 ; };
+hidspecial HID_COLORPAGE_BASICSTRING_LB                { HelpID =  HID_COLORPAGE_BASICSTRING_LB                 ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_CB         { HelpID =  HID_COLORPAGE_CALCDETECTIVEERROR_CB          ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_LB         { HelpID =  HID_COLORPAGE_CALCDETECTIVEERROR_LB          ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVE_CB              { HelpID =  HID_COLORPAGE_CALCDETECTIVE_CB               ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVE_LB              { HelpID =  HID_COLORPAGE_CALCDETECTIVE_LB               ; };
+hidspecial HID_COLORPAGE_CALCGRID_CB                   { HelpID =  HID_COLORPAGE_CALCGRID_CB                    ; };
+hidspecial HID_COLORPAGE_CALCGRID_LB                   { HelpID =  HID_COLORPAGE_CALCGRID_LB                    ; };
+hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_CB        { HelpID =  HID_COLORPAGE_CALCNOTESBACKGROUND_CB         ; };
+hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_LB        { HelpID =  HID_COLORPAGE_CALCNOTESBACKGROUND_LB         ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB     { HelpID =  HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB      ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB     { HelpID =  HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB      ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB        { HelpID =  HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB         ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB        { HelpID =  HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB         ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAK_CB              { HelpID =  HID_COLORPAGE_CALCPAGEBREAK_CB               ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAK_LB              { HelpID =  HID_COLORPAGE_CALCPAGEBREAK_LB               ; };
+hidspecial HID_COLORPAGE_CALCREFERENCE_CB              { HelpID =  HID_COLORPAGE_CALCREFERENCE_CB               ; };
+hidspecial HID_COLORPAGE_CALCREFERENCE_LB              { HelpID =  HID_COLORPAGE_CALCREFERENCE_LB               ; };
+hidspecial HID_COLORPAGE_DOCBOUNDARIES_CB              { HelpID =  HID_COLORPAGE_DOCBOUNDARIES_CB               ; };
+hidspecial HID_COLORPAGE_DOCBOUNDARIES_LB              { HelpID =  HID_COLORPAGE_DOCBOUNDARIES_LB               ; };
+hidspecial HID_COLORPAGE_DOCCOLOR_CB                   { HelpID =  HID_COLORPAGE_DOCCOLOR_CB                    ; };
+hidspecial HID_COLORPAGE_DOCCOLOR_LB                   { HelpID =  HID_COLORPAGE_DOCCOLOR_LB                    ; };
+hidspecial HID_COLORPAGE_DRAWDRAWING_CB                { HelpID =  HID_COLORPAGE_DRAWDRAWING_CB                 ; };
+hidspecial HID_COLORPAGE_DRAWDRAWING_LB                { HelpID =  HID_COLORPAGE_DRAWDRAWING_LB                 ; };
+hidspecial HID_COLORPAGE_DRAWFILL_CB                   { HelpID =  HID_COLORPAGE_DRAWFILL_CB                    ; };
+hidspecial HID_COLORPAGE_DRAWFILL_LB                   { HelpID =  HID_COLORPAGE_DRAWFILL_LB                    ; };
+hidspecial HID_COLORPAGE_DRAWGRID_CB                   { HelpID =  HID_COLORPAGE_DRAWGRID_CB                    ; };
+hidspecial HID_COLORPAGE_DRAWGRID_LB                   { HelpID =  HID_COLORPAGE_DRAWGRID_LB                    ; };
+hidspecial HID_COLORPAGE_FONTCOLOR_CB                  { HelpID =  HID_COLORPAGE_FONTCOLOR_CB                   ; };
+hidspecial HID_COLORPAGE_FONTCOLOR_LB                  { HelpID =  HID_COLORPAGE_FONTCOLOR_LB                   ; };
+hidspecial HID_COLORPAGE_HTMLCOMMENT_CB                { HelpID =  HID_COLORPAGE_HTMLCOMMENT_CB                 ; };
+hidspecial HID_COLORPAGE_HTMLCOMMENT_LB                { HelpID =  HID_COLORPAGE_HTMLCOMMENT_LB                 ; };
+hidspecial HID_COLORPAGE_HTMLKEYWORD_CB                { HelpID =  HID_COLORPAGE_HTMLKEYWORD_CB                 ; };
+hidspecial HID_COLORPAGE_HTMLKEYWORD_LB                { HelpID =  HID_COLORPAGE_HTMLKEYWORD_LB                 ; };
+hidspecial HID_COLORPAGE_HTMLSGML_CB                   { HelpID =  HID_COLORPAGE_HTMLSGML_CB                    ; };
+hidspecial HID_COLORPAGE_HTMLSGML_LB                   { HelpID =  HID_COLORPAGE_HTMLSGML_LB                    ; };
+hidspecial HID_COLORPAGE_HTMLUNKNOWN_CB                { HelpID =  HID_COLORPAGE_HTMLUNKNOWN_CB                 ; };
+hidspecial HID_COLORPAGE_HTMLUNKNOWN_LB                { HelpID =  HID_COLORPAGE_HTMLUNKNOWN_LB                 ; };
+hidspecial HID_COLORPAGE_LINKSVISITED_CB               { HelpID =  HID_COLORPAGE_LINKSVISITED_CB                ; };
+hidspecial HID_COLORPAGE_LINKSVISITED_LB               { HelpID =  HID_COLORPAGE_LINKSVISITED_LB                ; };
+hidspecial HID_COLORPAGE_LINKS_CB                      { HelpID =  HID_COLORPAGE_LINKS_CB                       ; };
+hidspecial HID_COLORPAGE_LINKS_LB                      { HelpID =  HID_COLORPAGE_LINKS_LB                       ; };
+hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_CB           { HelpID =  HID_COLORPAGE_OBJECTBOUNDARIES_CB            ; };
+hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_LB           { HelpID =  HID_COLORPAGE_OBJECTBOUNDARIES_LB            ; };
+hidspecial HID_COLORPAGE_SPELL_CB                      { HelpID =  HID_COLORPAGE_SPELL_CB                       ; };
+hidspecial HID_COLORPAGE_SPELL_LB                      { HelpID =  HID_COLORPAGE_SPELL_LB                       ; };
+hidspecial HID_COLORPAGE_TABLEBOUNDARIES_CB            { HelpID =  HID_COLORPAGE_TABLEBOUNDARIES_CB             ; };
+hidspecial HID_COLORPAGE_TABLEBOUNDARIES_LB            { HelpID =  HID_COLORPAGE_TABLEBOUNDARIES_LB             ; };
+hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_CB         { HelpID =  HID_COLORPAGE_WRITERDIRECTCURSOR_CB          ; };
+hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_LB         { HelpID =  HID_COLORPAGE_WRITERDIRECTCURSOR_LB          ; };
+hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_CB        { HelpID =  HID_COLORPAGE_WRITERFIELDSHADINGS_CB         ; };
+hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_LB        { HelpID =  HID_COLORPAGE_WRITERFIELDSHADINGS_LB         ; };
+hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_CB          { HelpID =  HID_COLORPAGE_WRITERIDXSHADINGS_CB           ; };
+hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_LB          { HelpID =  HID_COLORPAGE_WRITERIDXSHADINGS_LB           ; };
+hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_CB       { HelpID =  HID_COLORPAGE_WRITERNOTESINDICATOR_CB        ; };
+hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_LB       { HelpID =  HID_COLORPAGE_WRITERNOTESINDICATOR_LB        ; };
+hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_CB           { HelpID =  HID_COLORPAGE_WRITERPAGEBREAKS_CB            ; };
+hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_LB           { HelpID =  HID_COLORPAGE_WRITERPAGEBREAKS_LB            ; };
+hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB      { HelpID =  HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB       ; };
+hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB      { HelpID =  HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB       ; };
+hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB    { HelpID =  HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB     ; };
+hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB    { HelpID =  HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB     ; };
+hidspecial HID_COLORPAGE_WRITERTEXTGRID_CB             { HelpID =  HID_COLORPAGE_WRITERTEXTGRID_CB              ; };
+hidspecial HID_COLORPAGE_WRITERTEXTGRID_LB             { HelpID =  HID_COLORPAGE_WRITERTEXTGRID_LB              ; };
+hidspecial HID_DBPATH_CTL_PATH                      { HelpId = HID_DBPATH_CTL_PATH; };
+hidspecial HID_DBPATH_HEADERBAR                     { HelpId = HID_DBPATH_HEADERBAR; };
+hidspecial HID_GALLERY_EDIT_MSNAME                     { HelpID =  HID_GALLERY_EDIT_MSNAME ; };
+hidspecial HID_GALLERY_NEWTHEME_ADDFILES        { HelpID = HID_GALLERY_NEWTHEME_ADDFILES; };
+hidspecial HID_GALLERY_NEWTHEME_FINDFILES       { HelpID = HID_GALLERY_NEWTHEME_FINDFILES; };
+hidspecial HID_HANGULDLG_BUTTON_CHANGE          { HelpID =  HID_HANGULDLG_BUTTON_CHANGE   ; };
+hidspecial HID_HANGULDLG_BUTTON_CHANGEALL       { HelpID =  HID_HANGULDLG_BUTTON_CHANGEALL; };
+hidspecial HID_HANGULDLG_BUTTON_CLOSE           { HelpID =  HID_HANGULDLG_BUTTON_CLOSE    ; };
+hidspecial HID_HANGULDLG_BUTTON_IGNORE          { HelpID =  HID_HANGULDLG_BUTTON_IGNORE   ; };
+hidspecial HID_HANGULDLG_BUTTON_IGNOREALL       { HelpID =  HID_HANGULDLG_BUTTON_IGNOREALL; };
+hidspecial HID_HANGULDLG_BUTTON_OPTIONS             { HelpId = HID_HANGULDLG_BUTTON_OPTIONS; };
+hidspecial HID_HANGULDLG_EDIT_NEWWORD       { HelpID =  HID_HANGULDLG_EDIT_NEWWORD ; };
+hidspecial HID_HANGULDLG_SUGGESTIONS { HelpId = HID_HANGULDLG_SUGGESTIONS; };
+hidspecial HID_HANGULDLG_SUGGESTIONS_GRID { HelpId = HID_HANGULDLG_SUGGESTIONS_GRID; };
+hidspecial HID_HANGULDLG_SUGGESTIONS_LIST { HelpId = HID_HANGULDLG_SUGGESTIONS_LIST; };
+hidspecial HID_HYPERDLG_DOC_PATH            { HelpID = HID_HYPERDLG_DOC_PATH ;};
+hidspecial HID_HYPERDLG_INET_PATH           { HelpID = HID_HYPERDLG_INET_PATH ;};
+hidspecial HID_HYPERDLG_MAIL_PATH           { HelpID = HID_HYPERDLG_MAIL_PATH ;};
+hidspecial HID_ICCDIALOG_CANCEL_BTN         { HelpID = HID_ICCDIALOG_CANCEL_BTN ;};
+hidspecial HID_ICCDIALOG_CHOICECTRL         { HelpID = HID_ICCDIALOG_CHOICECTRL ;};
+hidspecial HID_ICCDIALOG_OK_BTN             { HelpID = HID_ICCDIALOG_OK_BTN ;};
+hidspecial HID_ICCDIALOG_RESET_BTN          { HelpID = HID_ICCDIALOG_RESET_BTN ;};
+hidspecial HID_LINKDLG_TABLB    { HelpId = HID_LINKDLG_TABLB; };
+hidspecial HID_NUMBERINGOPT_SEL_GRF_FROM_FILE   { HelpID = HID_NUMBERINGOPT_SEL_GRF_FROM_FILE; };
+hidspecial HID_OFADLG_TREELISTBOX                   { HelpId = HID_OFADLG_TREELISTBOX; };
+hidspecial HID_OFAPAGE_AUTOCORR_CLB                 { HelpId = HID_OFAPAGE_AUTOCORR_CLB; };
+hidspecial HID_OFAPAGE_AUTOFORMAT_CLB               { HelpId = HID_OFAPAGE_AUTOFORMAT_CLB; };
+hidspecial HID_OFAPAGE_MSFLTR2_CLB                   { HelpId = HID_OFAPAGE_MSFLTR2_CLB             ; };
+hidspecial HID_OFA_CONNPOOL_DRIVERLIST              { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; };
+hidspecial HID_OFA_FONT_SUBST_CLB                   { HelpId = HID_OFA_FONT_SUBST_CLB; };
+hidspecial HID_OPTIONS_COLORCONFIG_COLORLIST_WIN    { HelpID = HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ;};
+hidspecial HID_OPTIONS_COLORCONFIG_NAME_SCHEME  { HelpID = HID_OPTIONS_COLORCONFIG_NAME_SCHEME ;};
+hidspecial HID_OPTIONS_COLORCONFIG_SAVE_SCHEME  { HelpID = HID_OPTIONS_COLORCONFIG_SAVE_SCHEME ;};
+hidspecial HID_OPTIONS_JAVA_LIST { HelpId = HID_OPTIONS_JAVA_LIST; };
+hidspecial HID_OPTIONS_PATHS_SELECTFOLDER       { HelpID = HID_OPTIONS_PATHS_SELECTFOLDER; };
+hidspecial HID_OPTPATH_CTL_PATH             { HelpId = HID_OPTPATH_CTL_PATH     ;};
+hidspecial HID_OPTPATH_HEADERBAR            { HelpId = HID_OPTPATH_HEADERBAR    ;};
+hidspecial HID_PASTE_DLG        { HelpId = HID_PASTE_DLG; };
+hidspecial HID_REDLINING_DLG                { HelpID = HID_REDLINING_DLG; };
+hidspecial HID_REDLINING_EDIT               { HelpID = HID_REDLINING_EDIT; };
+hidspecial HID_REDLINING_NEXT               { HelpID = HID_REDLINING_NEXT; };
+hidspecial HID_REDLINING_PREV               { HelpID = HID_REDLINING_PREV; };
+hidspecial HID_SCRIPTSBOX             { HelpId = HID_SCRIPTSBOX; };
+hidspecial HID_SELECTOR_CATEGORIES    { HelpId = HID_SELECTOR_CATEGORIES; };
+hidspecial HID_SELECTOR_COMMANDS      { HelpId = HID_SELECTOR_COMMANDS; };
+hidspecial HID_SELECTOR_DIALOG        { HelpId = HID_SELECTOR_DIALOG; };
+hidspecial HID_SPLDLG_BUTTON_CHANGE             { HelpID =  HID_SPLDLG_BUTTON_CHANGE      ; };
+hidspecial HID_SPLDLG_BUTTON_CHANGEALL          { HelpID =  HID_SPLDLG_BUTTON_CHANGEALL   ; };
+hidspecial HID_SPLDLG_BUTTON_CLOSE              { HelpID =  HID_SPLDLG_BUTTON_CLOSE       ; };
+hidspecial HID_SPLDLG_BUTTON_EXPLAIN            { HelpID =  HID_SPLDLG_BUTTON_EXPLAIN     ; };
+hidspecial HID_SPLDLG_BUTTON_IGNORE             { HelpID =  HID_SPLDLG_BUTTON_IGNORE      ; };
+hidspecial HID_SPLDLG_BUTTON_IGNOREALL          { HelpID =  HID_SPLDLG_BUTTON_IGNOREALL   ; };
+hidspecial HID_SPLDLG_BUTTON_IGNORERULE          { HelpID =  HID_SPLDLG_BUTTON_IGNORERULE   ; };
+hidspecial HID_SVX_CONFIG_EVENT       { HelpId = HID_SVX_CONFIG_EVENT; };
+hidspecial HID_SVX_CONFIG_ICON_SELECTOR { HelpId = HID_SVX_CONFIG_ICON_SELECTOR; };
+hidspecial HID_SVX_CONFIG_MENU        { HelpId = HID_SVX_CONFIG_MENU; };
+hidspecial HID_SVX_CONFIG_MENU_CONTENTS { HelpId = HID_SVX_CONFIG_MENU_CONTENTS; };
+hidspecial HID_SVX_CONFIG_MENU_ORGANIZER { HelpId = HID_SVX_CONFIG_MENU_ORGANIZER; };
+hidspecial HID_SVX_CONFIG_NAME_SUBMENU { HelpId = HID_SVX_CONFIG_NAME_SUBMENU; };
+hidspecial HID_SVX_CONFIG_RENAME_MENU  { HelpId = HID_SVX_CONFIG_RENAME_MENU; };
+hidspecial HID_SVX_CONFIG_RENAME_MENU_ITEM  { HelpId = HID_SVX_CONFIG_RENAME_MENU_ITEM; };
+hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR    { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR; };
+hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM  { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM; };
+hidspecial HID_SVX_CONFIG_TOOLBAR     { HelpId = HID_SVX_CONFIG_TOOLBAR; };
+hidspecial HID_SVX_CONFIG_TOOLBAR_CONTENTS { HelpId = HID_SVX_CONFIG_TOOLBAR_CONTENTS; };
+hidspecial HID_SVX_MACRO_LB_EVENT     { HelpId = HID_SVX_MACRO_LB_EVENT; };
+hidspecial HID_SVX_MODIFY_TOOLBAR      { HelpId = HID_SVX_MODIFY_TOOLBAR; };
+hidspecial HID_SVX_MODIFY_TOOLBAR_ITEM { HelpId = HID_SVX_MODIFY_TOOLBAR_ITEM; };
+hidspecial HID_SVX_NEW_TOOLBAR         { HelpId = HID_SVX_NEW_TOOLBAR; };
+hidspecial HID_SVX_NEW_TOOLBAR_ITEM    { HelpId = HID_SVX_NEW_TOOLBAR_ITEM; };
+hidspecial HID_SVX_SAVE_IN             { HelpId = HID_SVX_SAVE_IN; };
+hidspecial HID_TPCOLOR_CMYK_1               { HelpID = HID_TPCOLOR_CMYK_1; };
+hidspecial HID_TPCOLOR_CMYK_2               { HelpID = HID_TPCOLOR_CMYK_2; };
+hidspecial HID_TPCOLOR_CMYK_3               { HelpID = HID_TPCOLOR_CMYK_3; };
+hidspecial HID_TPCOLOR_RGB_1                { HelpID = HID_TPCOLOR_RGB_1; };
+hidspecial HID_TPCOLOR_RGB_2                { HelpID = HID_TPCOLOR_RGB_2; };
+hidspecial HID_TPCOLOR_RGB_3                { HelpID = HID_TPCOLOR_RGB_3; };
+hidspecial HID_VALUESET_BULLET              { HelpID = HID_VALUESET_BULLET   ;};
+hidspecial HID_VALUESET_NUM                 { HelpID = HID_VALUESET_NUM      ;};
+hidspecial HID_VALUESET_NUMBMP              { HelpID = HID_VALUESET_NUMBMP   ;};
+hidspecial HID_VALUESET_SINGLENUM           { HelpID = HID_VALUESET_SINGLENUM ;};
+hidspecial HID_WARN_NAME_DUPLICATE              { HelpID = HID_WARN_NAME_DUPLICATE ;};
+hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK         { HelpId = UID_OFA_CONNPOOL_DRIVERLIST_BACK; };
+hidspecial UID_SEARCH_RECORDSTATUS          { HelpID = UID_SEARCH_RECORDSTATUS ;};
+hidspecial HID_MACRO_HEADERTABLISTBOX       { HelpID = HID_MACRO_HEADERTABLISTBOX ;};
+
diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk
new file mode 100644
index 000000000000..bedd1cee6407
--- /dev/null
+++ b/cui/util/makefile.mk
@@ -0,0 +1,110 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.61 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=cui
+TARGET=cui
+GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(OS)"=="IRIX"
+LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
+.ENDIF
+
+SHL1TARGET= cui$(DLLPOSTFIX)
+SHL1VERSIONMAP= cui.map
+SHL1IMPLIB=icui
+SHL1DEPN=
+SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
+DEF1NAME=       $(SHL1TARGET)
+
+SHL1LIBS=	\
+            $(SLB)$/options.lib  \
+            $(SLB)$/customize.lib  \
+            $(SLB)$/dialogs.lib  \
+            $(SLB)$/tabpages.lib \
+            $(SLB)$/factory.lib
+
+
+SHL1STDLIBS= \
+            $(SVXCORELIB) \
+            $(SVXLIB) \
+            $(AVMEDIALIB) \
+            $(SFX2LIB) \
+            $(GOODIESLIB) \
+            $(BASEGFXLIB) \
+            $(BASICLIB) \
+            $(LNGLIB) \
+            $(SVTOOLLIB) \
+            $(TKLIB) \
+            $(VCLLIB) \
+            $(SVLLIB) \
+            $(UNOTOOLSLIB) \
+            $(TOOLSLIB) \
+            $(I18NISOLANGLIB) \
+            $(COMPHELPERLIB) \
+            $(UCBHELPERLIB) \
+            $(CPPUHELPERLIB)        \
+            $(CPPULIB) \
+            $(VOSLIB) \
+            $(SALLIB) \
+            $(JVMFWKLIB) \
+            $(ICUUCLIB)
+
+.IF "$(GUI)"=="WNT"
+SHL1STDLIBS+= \
+             $(SHLWAPILIB) \
+             $(ADVAPI32LIB)
+.ENDIF # WNT
+
+# ------------------------------------------------------------------------------
+
+# Resource files
+SRSFILELIST=\
+        $(SRS)$/options.srs \
+        $(SRS)$/dialogs.srs \
+        $(SRS)$/tabpages.srs \
+        $(SRS)$/customize.srs \
+
+
+RESLIB1NAME=cui
+RESLIB1IMAGES=$(SOLARSRC)/$(RSCDEFIMG)/svx/res
+RESLIB1SRSFILES= $(SRSFILELIST)
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/cui/util/makefile.pmk b/cui/util/makefile.pmk
new file mode 100644
index 000000000000..b2aae3329111
--- /dev/null
+++ b/cui/util/makefile.pmk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.pmk,v $
+#
+# $Revision: 1.6 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h)
+CDEFS += -DSVX_DLLIMPLEMENTATION
+
+.IF "$(ENABLE_GTK)" != ""
+CFLAGS+=-DENABLE_GTK
+.ENDIF
+
+.IF "$(ENABLE_KDE)" != ""
+CFLAGS+=-DENABLE_KDE
+.ENDIF
+
+.IF "$(ENABLE_KDE4)" != ""
+CFLAGS+=-DENABLE_KDE4
+.ENDIF
+
+VISIBILITY_HIDDEN=TRUE
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 28771fad05b1..8016124f894d 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -32,7 +32,7 @@
 #define _DBA_DBACCESS_HELPID_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>    // HID_DBACCESS_START
+#include <svl/solar.hrc>    // HID_DBACCESS_START
 #endif
 
 #define HID_DSADMIN_CHARSET                         (HID_DBACCESS_START +  9)
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx
index e9e8edf46f80..28e749191284 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx
@@ -458,19 +458,19 @@
 #include "comphelper/classids.hxx"
 
 
-#include "svtools/cjkoptions.hxx"
-#include "svtools/filenotation.hxx"
-#include "svtools/historyoptions.hxx"
+#include "svl/cjkoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "unotools/historyoptions.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/imgdef.hxx"
-#include "svtools/internaloptions.hxx"
+#include "unotools/internaloptions.hxx"
 #include "svtools/menuoptions.hxx"
 #include "svtools/miscopt.hxx"
 #include "svtools/rtfkeywd.hxx"
 #include "svtools/rtftoken.h"
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 #include "svtools/toolboxcontroller.hxx"
-#include "svtools/viewoptions.hxx"
+#include "unotools/viewoptions.hxx"
 
 #include "svx/dataaccessdescriptor.hxx"
 #include "svx/dbexch.hrc"
diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx
index f63d1c02fdf2..1d6773961972 100644
--- a/dbaccess/inc/singledoccontroller.hxx
+++ b/dbaccess/inc/singledoccontroller.hxx
@@ -48,7 +48,7 @@
 #include <comphelper/propertycontainer.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 #include <memory>
 
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst
index f9cc1523bf84..c52076ffa4a6 100644
--- a/dbaccess/prj/build.lst
+++ b/dbaccess/prj/build.lst
@@ -1,4 +1,4 @@
-ba	dbaccess	:	l10n BOOST:boost connectivity svx stoc uui QADEVOOO:qadevOOo xmlscript NULL
+ba      dbaccess        :       l10n BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript NULL
 ba	dbaccess								usr1	-	all	ba_mkout NULL
 ba	dbaccess\inc							nmake	-	all	ba_inc NULL
 ba	dbaccess\source\ui\inc					nmake	-	all	ba_uiinc ba_inc NULL
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 9cc2c6172cf4..b3e815928bff 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -310,7 +310,10 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet)
     const ::rtl::OUString sOldFilter = xAnalyzer->getFilter();
     if ( sOldFilter.getLength() )
     {
-        aFilter = sOldFilter + aAnd + aFilter.makeStringAndClear();
+        FilterCreator aFilterCreator;
+        aFilterCreator.append( aFilter.makeStringAndClear() );
+        aFilterCreator.append( sOldFilter );
+        aFilter = aFilterCreator.getComposedAndClear();
     }
     xAnalyzer->setFilter(aFilter.makeStringAndClear());
     m_xStatement = m_xConnection->prepareStatement(xAnalyzer->getQueryWithSubstitution());
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 52670f7a9776..d3df4552126c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -81,7 +81,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/logfile.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/configmgr.hxx>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index c8a8f9ba01d1..10878f599c4f 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -58,7 +58,7 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/logfile.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/configmgr.hxx>
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 2e30ceaa7fe8..6b17ad97e12a 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -86,7 +86,7 @@
 #include <com/sun/star/i18n/XLocaleData.hpp>
 #endif
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #endif
 #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
 #include <com/sun/star/container/XChild.hpp>
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 70237b67e1b1..84dbdff17d13 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -69,8 +69,8 @@
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/fsys.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 7f74aa3a5f34..5b3add2dcf82 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -73,7 +73,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <framework/titlehelper.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/errcode.hxx>
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
index 2f97249b5b0c..20e0eb280233 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@ -32,7 +32,7 @@
 #define _DBA_CORE_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index ba605eb8ddfe..d64671c9e2d1 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -42,7 +42,7 @@
 //---------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //.........................................................................
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index 963437d3b20a..9c8fbe7e09a8 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -37,7 +37,7 @@
 #include <tools/resmgr.hxx>
 #endif
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 638de55757dd..f189dec2c46c 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -75,7 +75,7 @@
 #include <vcl/waitobj.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc
index 70f2b7920c12..4bcc9f40274a 100644
--- a/dbaccess/source/ext/adabas/adabasui_resource.hrc
+++ b/dbaccess/source/ext/adabas/adabasui_resource.hrc
@@ -32,7 +32,7 @@
 #define _ADABASUI_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START                RID_DB_EXTENSIONS_START
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 3ce7577426c7..8afb08b919e2 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -31,7 +31,7 @@
 #ifndef DBACCESS_DBMM_GLOBAL_HRC
 #define DBACCESS_DBMM_GLOBAL_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 //=====================================================================
 //= bases
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 36ddf714f9bc..a1320d3ca24b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -56,7 +56,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ref.hxx>
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #include <tools/diagnose_ex.h>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx
index 182bd9acbed9..f9e281c74e49 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -79,7 +79,7 @@
 #include <tools/urlobj.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
 #include <com/sun/star/frame/XComponentLoader.hpp>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 7310c2ca10ec..df10a98cc1a2 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -75,7 +75,7 @@
 #include <cppuhelper/implbase2.hxx>
 #include <osl/file.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 8008416956f4..489b0af7d718 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -103,8 +103,8 @@
 #ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #endif
-#include <svtools/filenotation.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/diagnose_ex.h>
 #include <connectivity/DriversConfig.hxx>
 
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 4cc82ad5e772..35b4b84e8b90 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -58,8 +58,8 @@
 #include <tools/diagnose_ex.h>
 #endif
 #include <comphelper/sequence.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <unotools/pathoptions.hxx>
 #include "dsntypes.hxx"
 namespace dbaxml
 {
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index ed31ce7ef6c1..4fa30ee6885d 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -124,7 +124,7 @@
 #include <vos/mutex.hxx>
 #endif
 #include <svtools/sfxecode.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
index 6baefaad2942..b13a1ada7390 100644
--- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
+++ b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
@@ -32,7 +32,7 @@
 #define DBACCESS_SDBT_RESOURCE_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index b87b7706d87f..57f38d324b5c 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -87,7 +87,7 @@
 #include <tools/diagnose_ex.h>
 #endif
 #ifndef SVTOOLS_URIHELPER_HXX
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>
@@ -135,10 +135,10 @@
 #include <vcl/menu.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX
-#include <svtools/internaloptions.hxx>
+#include <unotools/internaloptions.hxx>
 #endif
 #ifndef _COMPHELPER_UNO3_HXX_
 #include <comphelper/uno3.hxx>
@@ -178,7 +178,7 @@
 #include <sfx2/mailmodelapi.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 #ifndef _SVTREEBOX_HXX
 #include <svtools/svtreebx.hxx>
@@ -219,10 +219,10 @@
 #include <sfx2/QuerySaveDocument.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 2d39783cdb87..ed8c5a15dd89 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -204,7 +204,7 @@
 #include <sfx2/filedlghelper.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _SFX_DOCFILT_HACK_HXX
 #include <sfx2/docfilt.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 0b1be1189bd4..a0f61642dbf0 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -545,7 +545,7 @@ void OApplicationController::previewChanged( sal_Int32 _nMode )
 //
 //  String sTitle = String(ModuleRes(STR_APP_TITLE));
 //  sName = sName + sTitle;
-//#ifndef PRODUCT
+//#ifdef DBG_UTIL
 //    ::rtl::OUString aDefault;
 //  sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ["));
 //    sName += utl::Bootstrap::getBuildIdData( aDefault );
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 1f9288bf489a..e8076eba2907 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -70,7 +70,7 @@
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #endif
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #endif
 #ifndef DBAUI_TOOLS_HXX
 #include "UITools.hxx"
@@ -106,7 +106,7 @@
 #include "browserids.hxx"
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #include "IApplicationController.hxx"
 
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 9d81d9c47c86..dc2734a0414a 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -105,13 +105,13 @@
 #include <tools/urlobj.hxx>
 #endif
 #ifndef SVTOOLS_URIHELPER_HXX
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #endif
 #ifndef _DBAUI_DATASOURCECONNECTOR_HXX_
 #include "datasourceconnector.hxx"
 #endif
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 1ca1a737dfd2..5440be1b5046 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -121,7 +121,7 @@
 #endif
 
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 
 #ifndef _SVX_ALGITEM_HXX //autogen
@@ -137,19 +137,19 @@
 #endif
 
 #ifndef _NUMUNO_HXX
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #endif
 
 #ifndef _SFXITEMPOOL_HXX //autogen wg. SfxItemInfo
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
 
 #ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 
 #ifndef _SFXRNGITEM_HXX
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #endif
 
 #ifndef _SV_WAITOBJ_HXX
@@ -160,7 +160,7 @@
 #endif
 
 #ifndef _ZFORLIST_HXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #endif
 #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
 #include <cppuhelper/queryinterface.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index aad25f1cd7ab..3e37fe1fc75a 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -114,9 +114,9 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sot/storage.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <svl/intitem.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/svtreebx.hxx>
 #include <svx/algitem.hxx>
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 0b9da9cfd69e..c1331a69c10e 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -37,7 +37,7 @@
 #include "FieldControls.hxx"
 #endif
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #endif
 #ifndef _CONNECTIVITY_DBTOOLS_HXX_
 #include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 4d9e81bc1f83..972d6c92c355 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -53,12 +53,12 @@
 #include <svx/numfmtsh.hxx>
 #include <svx/svxids.hrc>
 #include <svx/algitem.hxx>
-#include <svtools/itempool.hxx>
-#define _ZFORLIST_DECLARE_TABLE     // ohne das bekomme ich einen Compiler-Fehler in <svtools/zforlist.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/rngitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/itempool.hxx>
+#define _ZFORLIST_DECLARE_TABLE     // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/rngitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/numuno.hxx>
 #include <svtools/transfer.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index c2c893ec8d1a..05c19378d407 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -36,8 +36,8 @@
 /** === begin UNO includes === **/
 /** === end UNO includes === **/
 
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 
 //........................................................................
 namespace dbaui
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 12c25ef58a87..136f51ffd76c 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -72,7 +72,7 @@
 #include <vcl/help.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 #endif
 #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_
 #include <comphelper/sequenceashashmap.hxx>
@@ -81,7 +81,7 @@
 #include <tools/urlobj.hxx>
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 
 //........................................................................
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 61bc0882570f..3889d091f737 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -40,7 +40,7 @@
 #include "undosqledit.hxx"
 #include "QueryDesignView.hxx"
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 //////////////////////////////////////////////////////////////////////////
 // OSqlEdit
@@ -67,8 +67,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent,  WinBits nWinStyle ) :
 
     ImplSetFont();
     // listen for change of Font and Color Settings
-    StartListening(m_SourceViewConfig);
-    StartListening(m_ColorConfig);
+    m_SourceViewConfig.AddListener( this );
+    m_ColorConfig.AddListener(this);
 
     //#i97044#
     EnableFocusSelectionHide( FALSE );
@@ -80,8 +80,8 @@ OSqlEdit::~OSqlEdit()
     DBG_DTOR(OSqlEdit,NULL);
     if (m_timerUndoActionCreation.IsActive())
         m_timerUndoActionCreation.Stop();
-    EndListening(m_SourceViewConfig);
-    EndListening(m_ColorConfig);
+    m_SourceViewConfig.RemoveListener(this);
+    m_ColorConfig.RemoveListener(this);
 }
 //------------------------------------------------------------------------------
 void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
@@ -196,11 +196,11 @@ void OSqlEdit::startTimer()
         m_timerInvalidate.Start();
 }
 
-void OSqlEdit::Notify( SfxBroadcaster& rBC, const SfxHint& /*rHint*/ )
+void OSqlEdit::ConfigurationChanged( utl::ConfigurationBroadcaster* pOption, sal_uInt32 )
 {
-    if (&rBC == &m_SourceViewConfig)
+    if ( pOption == &m_SourceViewConfig )
         ImplSetFont();
-    else if (&rBC == &m_ColorConfig)
+    else if ( pOption == &m_ColorConfig )
         MultiLineEditSyntaxHighlight::UpdateData();
 }
 
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 86f5d02f5054..6a22d8303a29 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -73,7 +73,7 @@
 #include <svtools/miscopt.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 #ifndef TOOLS_DIAGNOSE_EX_H
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 1f7d45706391..256016d77dea 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -106,7 +106,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #endif
 #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #endif
 #ifndef _OSL_THREAD_H_
 #include <osl/thread.h>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index ba0925d224ad..bae7abb63fc8 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -45,25 +45,25 @@
 #include "dbu_misc.hrc"
 #endif
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 #ifndef _SFX_FCONTNR_HXX
 #include <sfx2/fcontnr.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _DBAUI_DATASOURCEITEMS_HXX_
 #include "dsitems.hxx"
@@ -102,7 +102,7 @@
 #include "dsselect.hxx"
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index db21de4d9a76..4bd644cc835b 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -44,22 +44,22 @@
 #include "dsmeta.hxx"
 #endif
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 #ifndef _DBAUI_DATASOURCEITEMS_HXX_
 #include "dsitems.hxx"
@@ -98,7 +98,7 @@
 #include "dsselect.hxx"
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 6b22d79e4b18..867d5a7fed50 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -44,19 +44,19 @@
 #include "dbu_dlg.hrc"
 #endif
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _DBAUI_DATASOURCEITEMS_HXX_
 #include "dsitems.hxx"
@@ -98,7 +98,7 @@
 #include "dsselect.hxx"
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 759054d4495e..bb9e85d3871d 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -46,16 +46,16 @@
 #include "dbadminsetup.hrc"
 #endif
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _DBAUI_DATASOURCEITEMS_HXX_
 #include "dsitems.hxx"
@@ -74,7 +74,7 @@
 #include <vcl/mnemonic.hxx>
 #endif
 #ifndef _SVTOOLS_CJKOPTIONS_HXX
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #endif
 #include <jvmaccess/virtualmachine.hxx>
 #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
@@ -100,7 +100,7 @@
 #include <com/sun/star/sdbc/XDriverAccess.hpp>
 #include "dbustrings.hrc"
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 
 #include <unotools/localfilehelper.hxx>
@@ -109,7 +109,7 @@
 #include "finteraction.hxx"
 #include <connectivity/CommonTools.hxx>
 #include "dbaccess_helpid.hrc"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/roadmapwizard.hxx>
 #include "TextConnectionHelper.hxx"
 
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 28a9b83fca35..30f67e7fb5b1 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -35,19 +35,19 @@
 #include "dsmeta.hxx"
 
 #ifndef _SFXPOOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #endif
 #ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _COMPHELPER_PROPERTY_HXX_
 #include <comphelper/property.hxx>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index a194ebc7b23c..9794e6e21bfb 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -59,12 +59,12 @@
 #include "dsntypes.hxx"
 #endif
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
 #include <com/sun/star/frame/XModel.hpp>
 #endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class Window;
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index 154013a11bda..015ded56a042 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -33,7 +33,7 @@
 #ifndef _DBAUI_DSNTYPES_HXX_
 #include "dsntypes.hxx"
 #endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <vector>
 
 class SfxTabPage;
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
index f9bd1e007341..33f65f50cb39 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
@@ -44,7 +44,7 @@
 /** === end UNO includes === **/
 
 #include <connectivity/dbconversion.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <svx/globlmn.hrc>
 #include <svx/svxids.hrc>
 #include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index d183f97acba5..ca73fabfe8ac 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -51,16 +51,16 @@
 #endif
 
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _DBAUI_DATASOURCEITEMS_HXX_
 #include "dsitems.hxx"
@@ -81,7 +81,7 @@
 #include <vcl/mnemonic.hxx>
 #endif
 #ifndef _SVTOOLS_CJKOPTIONS_HXX
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #endif
 #include <jvmaccess/virtualmachine.hxx>
 #ifndef _DBAUI_ADASTAT_HXX_
@@ -109,7 +109,7 @@
 #endif
 
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 
 #ifndef _UNOTOOLS_LOCALFILEHELPER_HXX
@@ -141,7 +141,7 @@
 #endif
 
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 
 #ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 204a57dc8758..0697124b69da 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -45,9 +45,9 @@
 #include <comphelper/componentcontext.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/stdtext.hxx>
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 8af119b127b0..5139b1e77895 100755..100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -32,9 +32,9 @@
 #include "dsitems.hxx"
 #include "moduledbu.hxx"
 
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 
 //........................................................................
 namespace dbaui
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index c67d34311147..b55e271a0988 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -41,13 +41,13 @@
 #include "dbu_dlg.hrc"
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _DBAUI_DATASOURCEITEMS_HXX_
 #include "dsitems.hxx"
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 7f0b5ee16515..1540b562f9af 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -47,9 +47,9 @@
 /** === begin UNO includes === **/
 /** === end UNO includes === **/
 
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 
 #include <vcl/msgbox.hxx>
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index d535a0afab02..048635edd07f 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -45,13 +45,13 @@
 #include "dsitems.hxx"
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 558c454b5d05..0dde529246bb 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -60,13 +60,13 @@
 #include <tools/urlobj.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _UCBHELPER_CONTENT_HXX
 #include <ucbhelper/content.hxx>
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 
 
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index c0b460cbb329..8c84ba0a03d4 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -45,13 +45,13 @@
 #endif
 #include "dsnItem.hxx"
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index bab1dcca3694..149d0c2d2f7a 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -40,16 +40,16 @@
 #include "dsnItem.hxx"
 
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
@@ -169,7 +169,7 @@
 
 /** === end UNO includes === **/
 
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/sequenceashashmap.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 69b91b2456a9..c6af345de4f8 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -46,16 +46,16 @@
 #include "dbadmin.hrc"
 
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
@@ -64,7 +64,7 @@
 #include <vcl/mnemonic.hxx>
 #endif
 #ifndef _SVTOOLS_CJKOPTIONS_HXX
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #endif
 #include <jvmaccess/virtualmachine.hxx>
 #ifndef DBAUI_ADABASPAGE_HRC
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index b6f18fc77c45..c24ca75efc4e 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -66,16 +66,16 @@
 #include "dbu_dlg.hrc"
 #endif
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #define _ZFORLIST_DECLARE_TABLE
 #ifndef _ZFORLIST_HXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #endif
 #include <svx/svxids.hrc> //CHINA001
 #include <svx/flagsdef.hxx> //CHINA001
 #ifndef _SFXINTITEM_HXX //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
 #endif //CHINA001
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx
index fce1df04b3bc..a1b002190f2f 100644
--- a/dbaccess/source/ui/dlg/dsnItem.hxx
+++ b/dbaccess/source/ui/dlg/dsnItem.hxx
@@ -32,7 +32,7 @@
 #ifndef _DBAUI_DSNITEM_HXX_
 #define _DBAUI_DSNITEM_HXX_
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //.........................................................................
 namespace dbaccess
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index e21417ffdb0c..a15924e2fccd 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -84,16 +84,16 @@
 #include "dsitems.hxx"
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index c9f145f795f5..6bf7a877cf9e 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -44,7 +44,7 @@
 #include <vcl/stdtext.hxx>
 #include "localresaccess.hxx"
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/waitobj.hxx>
 #include <com/sun/star/sdbc/XDriverAccess.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 9ebdb683e4a4..1b94bff730d5 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -72,7 +72,7 @@
 #include "localresaccess.hxx"
 #endif
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #endif
 
 #define EF_VISITED      0x0001
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index bbcd265c5f34..4625448be9fa 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -62,10 +62,10 @@
 #include "stringlistitem.hxx"
 #endif
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 956709c00a23..91e128342161 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -31,7 +31,7 @@
 #define DBAUI_GENERALUNDO_HXX
 
 #ifndef _UNDO_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #endif
 #ifndef _DBAUI_MODULE_DBU_HXX_
 #include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 1e796fbed624..d94f76b8dcc9 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -56,7 +56,7 @@
 #include <svtools/transfer.hxx>
 #include <osl/mutex.hxx>
 #include <vos/thread.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 #include <cppuhelper/implbase9.hxx>
 #include <svtools/cliplistener.hxx>
 
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 4686b540e936..e537f51df6bb 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -32,7 +32,7 @@
 #define _DBU_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START                RID_DBACCESS_START
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index b8a89b0dbf8d..26ee146ca237 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -62,7 +62,7 @@
 #include <svtools/svtreebx.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #endif
 #ifndef _DBAUI_INDEXES_HXX_
 #include "indexes.hxx"
diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx
index 7d104fcce714..70defabbb2e2 100644
--- a/dbaccess/source/ui/inc/propertysetitem.hxx
+++ b/dbaccess/source/ui/inc/propertysetitem.hxx
@@ -32,7 +32,7 @@
 #define _DBAUI_PROPERTYSETITEM_HXX_
 
 #ifndef _SFXPOOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #endif
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 70be5b60407a..6db721095c15 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -54,7 +54,7 @@
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/sqlparse.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 class VCLXWindow;
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 039ea9f8404b..57bb75a0b927 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -31,14 +31,14 @@
 #define DBAUI_SQLEDIT_HXX
 
 #include <svtools/editsyntaxhighlighter.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/sourceviewconfig.hxx>
+#include <unotools/sourceviewconfig.hxx>
 
 namespace dbaui
 {
     class OQueryTextView;
-    class OSqlEdit : public MultiLineEditSyntaxHighlight, SfxListener
+    class OSqlEdit : public MultiLineEditSyntaxHighlight, utl::ConfigurationListener
     {
     private:
         Timer                   m_timerInvalidate;
@@ -48,7 +48,7 @@ namespace dbaui
         OQueryTextView*         m_pView;
         BOOL                    m_bAccelAction;     // Wird bei Cut, Copy, Paste gesetzt
         BOOL                    m_bStopTimer;
-        svt::SourceViewConfig   m_SourceViewConfig;
+        utl::SourceViewConfig   m_SourceViewConfig;
         svtools::ColorConfig    m_ColorConfig;
 
         DECL_LINK(OnUndoActionTimer, void*);
@@ -82,7 +82,7 @@ namespace dbaui
         void stopTimer();
         void startTimer();
 
-        virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+        virtual void    ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
         using MultiLineEditSyntaxHighlight::Notify;
     };
 }
diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx
index 09a4792ceb63..3f27dc797e15 100644
--- a/dbaccess/source/ui/inc/stringlistitem.hxx
+++ b/dbaccess/source/ui/inc/stringlistitem.hxx
@@ -32,7 +32,7 @@
 #define _DBAUI_STRINGLISTITEM_HXX_
 
 #ifndef _SFXPOOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #endif
 
 #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index f533c719160e..6c750f40ee61 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -50,7 +50,7 @@
 #include "dbu_misc.hrc"
 #include <connectivity/dbconversion.hxx>
 #include <sfx2/sfxhtml.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
 #include "TypeInfo.hxx"
@@ -65,8 +65,8 @@
 #include "WCopyTable.hxx"
 #include "WExtendPages.hxx"
 #include "WCPage.hxx"
-#include <svtools/syslocale.hxx>
-#include <svtools/zforlist.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/zforlist.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/FValue.hxx>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index b95423b77c24..4c9fb3ded1bb 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -63,7 +63,7 @@
 #include "QEnumTypes.hxx"
 #include "WCPage.hxx"
 #include <tools/inetmime.hxx>
-#include <svtools/inettype.hxx>
+#include <svl/inettype.hxx>
 #include <rtl/tencinfo.h>
 #include "UITools.hxx"
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 02765c333c21..d872590b3763 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -55,7 +55,7 @@
 #include <tools/color.hxx>
 #include <svtools/htmlout.hxx>
 #include <sfx2/frmhtmlw.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <vcl/svapp.hxx>
 #include "UITools.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
@@ -63,7 +63,7 @@
 #include <svtools/rtfout.hxx>
 #include <svx/htmlcfg.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <comphelper/componentcontext.hxx>
 #include <rtl/logfile.hxx>
 
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index 8982ae4571da..a9029301741c 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -61,13 +61,13 @@ namespace dbaui
         DBG_CTOR(OToolBoxHelper,NULL);
 
         OSL_ENSURE(m_nSymbolsSize != SvtMiscOptions().GetCurrentSymbolsSize(),"SymbolsSize should not be identical");
-        SvtMiscOptions().AddListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
+        SvtMiscOptions().AddListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
         Application::AddEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) );
     }
     // -----------------------------------------------------------------------------
     OToolBoxHelper::~OToolBoxHelper()
     {
-        SvtMiscOptions().RemoveListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
+        SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
         Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) );
         DBG_DTOR(OToolBoxHelper,NULL);
     }
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 20cb7cb9308e..55691d4164ff 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -198,7 +198,7 @@
 #define ITEMID_NUMBERINFO       SID_ATTR_NUMBERFORMAT_INFO
 
 #ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
 #ifndef _STRING_HXX
 #include <tools/string.hxx>
@@ -207,16 +207,16 @@
 #include "dbaccess_helpid.hrc"
 #endif
 #ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #endif
 #ifndef DBACCESS_SBA_GRID_HRC
 #include "sbagrid.hrc"
 #endif
 #ifndef _SFXRNGITEM_HXX
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #endif
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SVX_ALGITEM_HXX
 #include <svx/algitem.hxx>
@@ -229,7 +229,7 @@
 #include <svx/numinf.hxx>
 #endif
 #ifndef _ZFORLIST_HXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #endif
 #ifndef DBAUI_SBATTRDLG_HXX
 #include "dlgattr.hxx"
@@ -283,13 +283,13 @@
 #include <tools/diagnose_ex.h>
 #endif
 #ifndef _NUMUNO_HXX
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #endif
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #ifndef _SVT_FILEVIEW_HXX
 #include <svtools/fileview.hxx>
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx
index 470ab5f08ba3..409e86150843 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -86,7 +86,7 @@
 #include <vcl/button.hxx>
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #ifndef TOOLS_DIAGNOSE_EX_H
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 5869f6102eeb..a7be84b5e497 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -92,7 +92,7 @@
 #include "dbu_misc.hrc"
 #endif
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx
index 69845372114f..6d3cae9fc6ed 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -39,7 +39,7 @@
 #include <tools/resmgr.hxx>
 #endif
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx
index 0ae5631b5803..26172eab9364 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -36,9 +36,9 @@
 /** === begin UNO includes === **/
 /** === end UNO includes === **/
 
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 
 #include <memory>
 
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index bd0a593cfe89..11eb8e36f3ee 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -40,7 +40,7 @@
 #include "JoinController.hxx"
 #endif
 #ifndef _UNDO_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #endif
 #ifndef DBAUI_QYDLGTAB_HXX
 #include "adtabdlg.hxx"
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 16f4990cb5b5..c240363c69e7 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -70,7 +70,7 @@
 #include "browserids.hxx"
 #endif
 #ifndef _URLBMK_HXX
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #endif
 #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 6c94d9bc869c..b8fd1f5f972f 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -49,7 +49,7 @@
 #include <vcl/split.hxx>
 #endif
 #ifndef _UNDO_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #endif
 #ifndef TOOLS_DIAGNOSE_EX_H
 #include <tools/diagnose_ex.h>
@@ -133,7 +133,7 @@
 #include "sqlmessage.hxx"
 #endif
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #endif
 
 using namespace ::dbaui;
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index f95ee9561946..207513489d47 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -40,7 +40,7 @@
 #include "RelationController.hxx"
 #endif
 #ifndef _UNDO_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #endif
 #ifndef _SV_SVAPP_HXX
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index cfd70afc2b95..ca533d84062a 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -78,7 +78,7 @@
 #include <connectivity/dbexception.hxx>
 #include "RTableWindow.hxx"
 #include "JAccess.hxx"
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index c1b6ddb9978c..27fac41c5bdf 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -64,7 +64,7 @@
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #endif
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #endif
 #ifndef DBAUI_TOOLS_HXX
 #include "UITools.hxx"
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 995c7e65e999..353a3e045719 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -186,6 +186,7 @@ class Desktop : public Application
         static sal_Bool         _bTasksSaved;
 
         static void             retrieveCrashReporterState();
+        static sal_Bool         isUIOnSessionShutdownAllowed();
 
         // on-demand acceptors
         static void                         createAcceptor(const OUString& aDescription);
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 3f51d13cec1b..d9213aed12d6 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :       l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
+dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 39e80ddb1c76..f673f27e49cb 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_dp_version.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
@@ -54,4 +54,4 @@ SLOFILES = $(SHL1OBJS)
 ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN)
-    testshl2 $(SHL1TARGETN)
+    $(TESTSHL2) $(SHL1TARGETN)
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index b1de394e0cd6..728ed52c37b1 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -35,7 +35,7 @@
 
 #include <cstddef>
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index ede5fdf7511a..14422298b2aa 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -114,18 +114,19 @@
 #include <unotools/ucbhelper.hxx>
 #include <tools/tempfile.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <osl/module.h>
 #include <osl/file.hxx>
 #include <osl/signal.h>
 #include <rtl/uuid.h>
-#include <svtools/pathoptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <unotools/internaloptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
-#include <svtools/folderrestriction.hxx>
+#include <unotools/syslocaleoptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/folderrestriction.hxx>
 #include <unotools/tempfile.hxx>
 #include <rtl/logfile.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -147,9 +148,9 @@
 #include <svtools/fontsubstconfig.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <svtools/apearcfg.hxx>
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/regoptions.hxx>
+#include <unotools/regoptions.hxx>
 
 #include "langselect.hxx"
 
@@ -937,6 +938,29 @@ void Desktop::retrieveCrashReporterState()
     _bCrashReporterEnabled = bEnabled;
 }
 
+sal_Bool Desktop::isUIOnSessionShutdownAllowed()
+{
+    static const ::rtl::OUString CFG_PACKAGE_RECOVERY = ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery/");
+    static const ::rtl::OUString CFG_PATH_SESSION     = ::rtl::OUString::createFromAscii("SessionShutdown"                );
+    static const ::rtl::OUString CFG_ENTRY_UIENABLED  = ::rtl::OUString::createFromAscii("DocumentStoreUIEnabled"         );
+
+    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
+
+    sal_Bool bResult = sal_False;
+    if ( xSMGR.is() )
+    {
+        css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
+                                    xSMGR,
+                                    CFG_PACKAGE_RECOVERY,
+                                    CFG_PATH_SESSION,
+                                    CFG_ENTRY_UIENABLED,
+                                    ::comphelper::ConfigurationHelper::E_READONLY);
+        aVal >>= bResult;
+    }
+
+    return bResult;
+}
+
 //-----------------------------------------------
 /** @short  check if crash reporter feature is enabled or
             disabled.
@@ -1323,13 +1347,15 @@ void Desktop::Main()
         }
         String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
         delete pLabelResMgr;
-
+/*
+        // locale and UI locale in AppSettings are now retrieved from configuration or system directly via SvtSysLocale
+        // no reason to set while starting
         // set UI language and locale
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ set locale settings" );
         //LanguageSelection langselect;
         OUString aUILocaleString = LanguageSelection::getLanguageString();
         Locale aUILocale = LanguageSelection::IsoStringToLocale(aUILocaleString);
-        LanguageType eLanguage = SvtSysLocaleOptions().GetLocaleLanguageType();
+        LanguageType eLanguage = SvtSysLocale().GetLanguage();
 
         // #i39040#, do not call anything between GetSettings and SetSettings that might have
         // a side effect on the settings (like, eg, SvtSysLocaleOptions().GetLocaleLanguageType(),
@@ -1339,7 +1365,7 @@ void Desktop::Main()
         aSettings.SetLanguage( eLanguage );
         Application::SetSettings( aSettings );
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} set locale settings" );
-
+*/
 
         // Check for StarOffice/Suite specific extensions runs also with OpenOffice installation sets
         OUString aTitleString( aTitle );
@@ -1349,7 +1375,7 @@ void Desktop::Main()
         else
             aTitle = aTitleString;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         //include version ID in non product builds
         ::rtl::OUString aDefault;
         aTitle += DEFINE_CONST_UNICODE(" [");
@@ -1400,7 +1426,7 @@ void Desktop::Main()
 
             if (IsFirstStartWizardNeeded())
             {
-                ::svt::RegOptions().removeReminder(); // remove patch registration reminder
+                ::utl::RegOptions().removeReminder(); // remove patch registration reminder
                 Reference< XJob > xFirstStartJob( xSMgr->createInstance(
                     DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
                 if (xFirstStartJob.is())
@@ -1834,10 +1860,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
 
     hStyleSettings.SetDragFullOptions( nDragFullOptions );
     rSettings.SetStyleSettings ( hStyleSettings );
-
-    MiscSettings aMiscSettings( rSettings.GetMiscSettings() );
-    aMiscSettings.SetTwoDigitYearStart( (USHORT) SfxMiscCfg().GetYear2000() );
-    rSettings.SetMiscSettings( aMiscSettings );
 }
 
 // ========================================================================
@@ -2458,7 +2480,15 @@ void Desktop::OpenClients()
         {
             xSessionListener = Reference< XInitialization >(::comphelper::getProcessServiceFactory()->createInstance(
                         OUString::createFromAscii("com.sun.star.frame.SessionListener")), UNO_QUERY_THROW);
-            xSessionListener->initialize(Sequence< Any >(0));
+
+            // specifies whether the UI-interaction on Session shutdown is allowed
+            sal_Bool bAllowUI = isUIOnSessionShutdownAllowed();
+            css::beans::NamedValue aProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowUserInteractionOnQuit" ) ),
+                                              css::uno::makeAny( bAllowUI ) );
+            css::uno::Sequence< css::uno::Any > aArgs( 1 );
+            aArgs[0] <<= aProperty;
+
+            xSessionListener->initialize( aArgs );
         }
         catch(const com::sun::star::uno::Exception& e)
         {
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index e87701b4addf..b81923a48d9c 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -75,9 +75,9 @@
 #include <unotools/tempfile.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/startoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/internaloptions.hxx>
 
 
 #define DEFINE_CONST_OUSTRING(CONSTASCII)       OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 0f1b62d707f2..5220d60bc02c 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include "tools/getprocessworkingdir.hxx"
 
-#include <svtools/documentlockfile.hxx>
+#include <svl/documentlockfile.hxx>
 
 using namespace rtl;
 using namespace com::sun::star::lang;
diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index 6c49ba9d9f86..7b58f1a60f7e 100644
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
@@ -9,8 +9,8 @@ extern const char copyright_text_2[];
 extern const char copyright_text_21[];
 extern const char copyright_text_22[];
 
-const char copyright_text_1[] = "Copyright � 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright � 2010 Sun Microsystems, Inc., All rights reserved.";
 const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
-const char copyright_text_21[] = "Copyright � 2008 Sun Microsystems, Tous droits r�serv�s.";
+const char copyright_text_21[] = "Copyright � 2010 Sun Microsystems, Tous droits r�serv�s.";
 const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
 
diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c
index 70d7d53f4b9c..6284744db94f 100644
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
@@ -4,12 +4,12 @@
   *
   */
 
-const char copyright_text_1[] = "Copyright � 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright � 2010 Sun Microsystems, Inc., All rights reserved.";
 const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
 const char copyright_text_3[] = "U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.  Use is subject to license terms.";
 const char copyright_text_4[] = "This distribution may include materials developed by third parties.Sun, Sun Microsystems, the Sun logo, Java, Solaris and StarOffice are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries.";
 const char copyright_text_5[] = "UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.";
-const char copyright_text_21[] = "Copyright � 2008 Sun Microsystems, Tous droits r�serv�s.";
+const char copyright_text_21[] = "Copyright � 2010 Sun Microsystems, Tous droits r�serv�s.";
 const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
 const char copyright_text_23[] = "Ce produit ou document est prot�g� par un copyright et distribu� avec des licences qui en restreignent l'utilisation, la copie, la distribution, et la d�compilation. Aucune partie de ce produit ou document ne peut �tre reproduite sous aucune forme, par quelque moyen que ce soit, sans l'autorisation pr�alable et �crite de Sun et de ses bailleurs de licence, s'il y ena.";
 const char copyright_text_24[] = "L'utilisation est soumise aux termes du contrat de licence.";
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 1edb20e58dd2..81110d665868 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -32,7 +32,7 @@
 #define _DESKTOP_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DESKTOP_DIALOG_START            2000
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index e9a39207cb50..e8b50cdd295e 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -39,7 +39,7 @@
 #include <rtl/string.hxx>
 #endif
 #ifndef _SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #include <tools/resid.hxx>
 #include <i18npool/mslangid.hxx>
@@ -143,6 +143,18 @@ bool LanguageSelection::prepareLanguage()
             xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString));
             Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
 
+            MsLangId::setConfiguredSystemUILanguage( MsLangId::convertLocaleToLanguage(loc) );
+
+            OUString sLocale;
+            xProp->getPropertyValue(OUString::createFromAscii("ooSetupSystemLocale")) >>= sLocale;
+            if ( sLocale.getLength() )
+            {
+                loc = LanguageSelection::IsoStringToLocale(aLocaleString);
+                MsLangId::setConfiguredSystemLanguage( MsLangId::convertLocaleToLanguage(loc) );
+            }
+            else
+                MsLangId::setConfiguredSystemLanguage( MsLangId::getSystemLanguage() );
+
             bSuccess = sal_True;
         }
         catch ( PropertyVetoException& )
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index d0867529ab1b..e9753ae4ab73 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -33,14 +33,10 @@
 #include <tools/string.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/resid.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 
 namespace desktop
 {
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index 238685649cf9..ffaf68c0fbad 100644
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -50,7 +50,6 @@ SHL1OBJS = \
     $(SLO)$/appfirststart.obj \
     $(SLO)$/appinit.obj \
     $(SLO)$/appsys.obj \
-    $(SLO)$/cfgfilter.obj \
     $(SLO)$/checkinstall.obj \
     $(SLO)$/check_ext_deps.obj \
     $(SLO)$/cmdlineargs.obj \
@@ -62,12 +61,12 @@ SHL1OBJS = \
     $(SLO)$/langselect.obj \
     $(SLO)$/lockfile.obj \
     $(SLO)$/lockfile2.obj \
-    $(SLO)$/migration.obj \
     $(SLO)$/officeipcthread.obj \
-    $(SLO)$/pages.obj \
     $(SLO)$/sofficemain.obj \
-    $(SLO)$/userinstall.obj \
-    $(SLO)$/wizard.obj
+    $(SLO)$/userinstall.obj
+
+SHL1LIBS = $(SLB)$/mig.lib
+
 SHL1STDLIBS = \
     $(COMPHELPERLIB) \
     $(CPPUHELPERLIB) \
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index cb2856fb897d..6777bbd52fe6 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -47,7 +47,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 #include <osl/conditn.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 920da5613382..ccdeadbd7c53 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -50,9 +50,9 @@
 #include <tools/resmgr.hxx>
 #endif
 #include <unotools/bootstrap.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #ifndef _SVTOOLS_SYSLOCALEOPTIONSOPTIONS_HXX
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #endif
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 39ea6f016dbf..75005b728465 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -104,7 +104,7 @@ PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
             OSL_ASSERT( false );
         }
         OString cstr_sysPath(
-            OUStringToOString( m_sysPath, osl_getThreadTextEncoding() ) );
+            OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) );
         char const * pcstr_sysPath = cstr_sysPath.getStr();
 
         u_int32_t flags = DB_CREATE;
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index 7338a377de5d..9a0b76773f27 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -33,7 +33,7 @@
 
 
 #include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/xtextedt.hxx"
 #include "vcl/scrbar.hxx"
 
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index 98fa0050584a..3353bd42f04d 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -31,7 +31,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_AUTOSCROLLEDIT_HXX
 
 #include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 
 namespace dp_gui {
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index f09d906a840e..b2620703a44a 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -34,7 +34,7 @@
 
 #include "dp_gui.hrc"
 #include "svtools/controldims.hrc"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 555b7578b327..5a503b57c89d 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -43,7 +43,7 @@
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/task/XJobExecutor.hpp"
 #include "svtools/svmedit.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/xtextedt.hxx"
 #include <vcl/scrbar.hxx>
 #include "vcl/threadex.hxx"
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index 8ee3efd34f63..f63661df4cd5 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -82,6 +82,7 @@ SHL1STDLIBS = \
         $(TOOLSLIB) \
         $(XMLSCRIPTLIB) \
         $(SVLLIB) \
+        $(UNOTOOLSLIB) \
         $(DEPLOYMENTMISCLIB) \
     $(HELPLINKERLIB)
 
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index d7177f90dc77..f0635eec3d72 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -49,7 +49,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/sequence.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/lang/DisposedException.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/beans/UnknownPropertyException.hpp"
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index e9f8a07a96ae..361004b353a3 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -45,7 +45,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/sequence.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/container/XNameContainer.hpp"
 #include "com/sun/star/container/XHierarchicalNameAccess.hpp"
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index b24000d43dbb..b1c67f642efb 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -45,7 +45,7 @@
 #include "comphelper/anytostring.hxx"
 #include "comphelper/servicedecl.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/ucb/NameClash.hpp"
 #include "com/sun/star/io/XActiveDataSink.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 3afcb8d35636..690549db0119 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -38,7 +38,7 @@
 #include "osl/file.hxx"
 #include "ucbhelper/content.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "cppuhelper/implbase1.hxx"
 
 using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index dd9e009e90cc..7daa9adb277e 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -38,7 +38,8 @@
 #include "osl/file.hxx"
 #include "ucbhelper/content.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
+#include "unotools/pathoptions.hxx"
 
 #include <transex3/compilehelp.hxx>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -350,8 +351,12 @@ void BackendImpl::implProcessHelp
                     pXhpFiles[iXhp] = aXhpRelFile;
                 }
 
+                rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
+                rtl::OUString aOfficeHelpPathFileURL;
+                ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL );
+
                 HelpProcessingErrorInfo aErrorInfo;
-                bool bSuccess = compileExtensionHelp( aHelpStr, aLangURL,
+                bool bSuccess = compileExtensionHelp( aOfficeHelpPathFileURL, aHelpStr, aLangURL,
                     nXhpFileCount, pXhpFiles, aErrorInfo );
 
                 if( bSuccess && xInvocation.is() )
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 14075d0fca38..1771cc93ec07 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -44,7 +44,7 @@
 #include "cppuhelper/exc_hlp.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "ucbhelper/content.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "comphelper/anytostring.hxx"
 #include "comphelper/makesequence.hxx"
 #include "comphelper/sequence.hxx"
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index ba8a972d0624..dbc644e60f44 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -40,7 +40,7 @@
 #include "cppuhelper/exc_hlp.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/util/XUpdatable.hpp"
 #include "com/sun/star/script/XLibraryContainer.hpp"
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index ff17da268dff..de515dd78372 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -38,7 +38,7 @@
 #include "ucbhelper/content.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <memory>
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index f2d096460bed..c6c18e4bfc01 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -31,7 +31,7 @@
 #if ! defined INCLUDED_DESKTOP_HELPID_HRC
 #define INCLUDED_DESKTOP_HELPID_HRC
 
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 
 #define HID_GLOBAL_FALLBACK                         0xFFFFFFFF
 
diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk
index d5aaf884ac5e..31af71f83fee 100644
--- a/desktop/source/migration/makefile.mk
+++ b/desktop/source/migration/makefile.mk
@@ -33,7 +33,6 @@ PRJ=..$/..
 
 PRJNAME=desktop
 TARGET=mig
-LIBTARGET=NO
 AUTOSEG=true
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 2c85828f540f..c21767a0f83d 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -43,8 +43,8 @@
 #include <osl/file.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
-#include <svtools/regoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/regoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -548,7 +548,7 @@ sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason )
 {
     if ( _eReason == eFinish )
     {
-        ::svt::RegOptions aOptions;
+        ::utl::RegOptions aOptions;
         rtl::OUString aEvent;
 
         if ( m_rbNow.IsChecked())
@@ -605,7 +605,7 @@ void RegistrationPage::prepareSingleMode()
 
 bool RegistrationPage::hasReminderDateCome()
 {
-    return ::svt::RegOptions().hasReminderDateCome();
+    return ::utl::RegOptions().hasReminderDateCome();
 }
 
 void RegistrationPage::executeSingleMode()
@@ -622,7 +622,7 @@ void RegistrationPage::executeSingleMode()
     if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater )
         pPage->commitPage( IWizardPage::eFinish );
     if ( eMode != RegistrationPage::rmLater )
-        ::svt::RegOptions().removeReminder();
+        ::utl::RegOptions().removeReminder();
 }
 
 // -----------------------------------------------------------------------
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 97d4282d1d76..b5e89860792c 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -38,7 +38,7 @@
 #include <vcl/scrbar.hxx>
 #include <svtools/wizardmachine.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/xtextedt.hxx>
 
 namespace desktop
diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
index c97d5f2cd4f0..060ef6cb7f6d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
+++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BrowserSupport.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
index 02825dfec69d..e4daf959c19d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Installer.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Installer.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -794,7 +793,7 @@ public class Installer {
             reader.close();
         }
 
-        String resourceFilename = "/com/sun/star/servicetag/resources/register";
+        String resourceFilename = "/com/sun/servicetag/resources/register";
         for (Locale locale : supportedLocales) {
             String name = REGISTRATION_HTML_NAME;
             String resource = resourceFilename;
diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
index 90e38021c103..4129e440099f 100644
--- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LinuxSystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,6 +28,7 @@
  *
  ************************************************************************/
 
+
 package com.sun.star.servicetag;
 
 // The Service Tags team maintains the latest version of the implementation
@@ -40,6 +40,7 @@ package com.sun.star.servicetag;
 // (e.g. NetBeans and SunStudio) will use the version in JDK.
 
 import java.io.*;
+import java.util.*;
 
 /**
  * Linux implementation of the SystemEnvironment class.
@@ -47,16 +48,25 @@ import java.io.*;
 class LinuxSystemEnvironment extends SystemEnvironment {
     LinuxSystemEnvironment() {
         setHostId(getLinuxHostId());
-        setSystemModel(getCommandOutput("/bin/uname", "-i"));
+
+        setSystemModel(getLinuxModel());
         setSystemManufacturer(getLinuxSystemManufacturer());
         setCpuManufacturer(getLinuxCpuManufacturer());
         setSerialNumber(getLinuxSN());
+        setPhysMem(getLinuxPhysMem());
+        setSockets(getLinuxSockets());
+        setCores(getLinuxCores());
+        setVirtCpus(getLinuxVirtCpus());
+        setCpuName(getLinuxCpuName());
+        setClockRate(getLinuxClockRate());
     }
     private String dmiInfo = null;
+    private String kstatCpuInfo = null;
 
     private static final int SN  = 1;
     private static final int SYS = 2;
     private static final int CPU = 3;
+    private static final int MODEL = 4;
 
     private String getLinuxHostId() {
         String output = getCommandOutput("/usr/bin/hostid");
@@ -91,6 +101,21 @@ class LinuxSystemEnvironment extends SystemEnvironment {
         return getLinuxDMIInfo("dmi type 4", "manufacturer");
     }
 
+    private String getLinuxModel() {
+        String tmp = getLinuxPSNInfo(MODEL);
+        if (tmp.length() > 0) {
+            return tmp + "::" + getCommandOutput("/bin/uname","-v");
+        }
+
+        tmp = getLinuxDMIInfo("dmi type 1", "product name");
+        if (tmp.length() > 0) {
+            return tmp + "::" + getCommandOutput("/bin/uname","-v");
+        }
+
+        return getCommandOutput("/bin/uname","-i")
+            + "::" + getCommandOutput("/bin/uname","-v");
+    }
+
 
     /**
      * Tries to obtain and return the system manufacturer.
@@ -158,7 +183,7 @@ class LinuxSystemEnvironment extends SystemEnvironment {
             dmidecodeThread.start();
 
             try {
-                dmidecodeThread.join(2000);
+                dmidecodeThread.join(3000);
                 if (dmidecodeThread.isAlive()) {
                     dmidecodeThread.interrupt();
                     dmiInfo = "";
@@ -191,4 +216,111 @@ class LinuxSystemEnvironment extends SystemEnvironment {
         return "";
     }
 
+    private String getLinuxClockRate() {
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "cpu MHz";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    return key[1].trim();
+                }
+            }
+        }
+        return "";
+    }
+
+    private String getLinuxCpuName() {
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "model name";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    return key[1].trim();
+                }
+            }
+        }
+        return "";
+    }
+
+    private String getLinuxVirtCpus() {
+        Set<String> set = new HashSet<String>();
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "processor";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    set.add(key[1].trim());
+                }
+            }
+        }
+        return "" + set.size();
+    }
+
+    private String getLinuxCores() {
+        Set<String> set = new HashSet<String>();
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "core id";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    set.add(key[1].trim());
+                }
+            }
+        }
+        if (set.size() == 0) {
+            return "1";
+        }
+        return "" + set.size();
+    }
+
+    private String getLinuxPhysMem() {
+        String contents = getFileContent("/proc/meminfo");
+        for (String line : contents.split("\n")) {
+            if (line.contains("MemTotal")) {
+                String[] total = line.split(":", 2);
+                if (total.length > 1) {
+                    String[] mem = total[1].trim().split(" ");
+                    if (mem.length >= 1) {
+                        return mem[0].trim();
+                    } else {
+                        return total[1].trim();
+                    }
+                }
+            }
+        }
+
+        return "";
+    }
+
+    private String getLinuxSockets() {
+        Set<String> physIdSet = new HashSet<String>();
+        Set<String> procSet = new HashSet<String>();
+        String contents = getFileContent("/proc/cpuinfo");
+        String physIdToken = "physical id";
+        String procToken = "processor";
+
+        for (String line : contents.split("\n")) {
+            if (line.contains(physIdToken)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    physIdSet.add(key[1].trim());
+                }
+            }
+
+            if (line.contains(procToken)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    procSet.add(key[1].trim());
+                }
+            }
+        }
+        if (physIdSet.size() != 0) {
+            return "" + physIdSet.size();
+        }
+        return "" + procSet.size();
+    }
 }
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
index 57be724a78a3..c58d83a33dd8 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
@@ -1,473 +1,531 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: RegistrationData.java,v $
- *
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.servicetag;
-
-import java.io.*;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import static com.sun.star.servicetag.RegistrationDocument.*;
-
-/**
- * A {@code RegistrationData} object is a container of one or more
- * {@link #getServiceTags service tags} that identify the
- * components for product registration.
- * Each {@code RegistrationData} object has a {@link #getRegistrationURN
- * uniform resource name} (URN) as its identifier.
- * <a name="EnvMap"></a>
- * It also has an <i>environment map</i> with
- * the following elements:
- * <blockquote>
- *       <table border=0>
- *       <tr>
- *          <td><tt>hostname</tt></td>
- *          <td>Hostname of the system</td>
- *          <td>e.g. woody</td>
- *       </tr>
- *       <tr>
- *          <td><tt>hostId</tt></td>
- *          <td>Host ID of the system</td>
- *          <td>e.g. 83abc1ab</td>
- *       </tr>
- *       <tr>
- *          <td><tt>osName</tt></td>
- *          <td>Operating system name</td>
- *          <td> e.g. SunOS</td>
- *       </tr>
- *       <tr>
- *          <td><tt>osVersion</tt></td>
- *          <td>Operating system version</td>
- *          <td> e.g. 5.10</td>
- *       </tr>
- *       <tr>
- *          <td><tt>osArchitecture</tt></td>
- *          <td>Operating system architecture</td>
- *          <td> e.g. sparc</td>
- *       </tr>
- *       <tr>
- *          <td><tt>systemModel</tt></td>
- *          <td>System model</td>
- *          <td> e.g. SUNW,Sun-Fire-V440</td>
- *       </tr>
- *       <tr>
- *          <td><tt>systemManufacturer</tt></td>
- *          <td>System manufacturer</td>
- *          <td> e.g. Sun Microsystems</td>
- *       </tr>
- *       <tr>
- *          <td><tt>cpuManufacturer</tt></td>
- *          <td>CPU manufacturer</td>
- *          <td> e.g. Sun Microsystems</td>
- *       </tr>
- *       <tr>
- *          <td><tt>serialNumber</tt></td>
- *          <td>System serial number</td>
- *          <td> e.g. BEL078932</td>
- *       </tr>
- *       </table>
- *  </blockquote>
- * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.
- * If an element is not available on a system and their value will be
- * empty.
- * <p>
- * <a name="XMLSchema">
- * <b>Registration XML Schema</b></a>
- * <p>
- * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from
- * and {@link #storeToXML stored} into an XML file in the format described
- * by the
- * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">
- * registration data schema</a>.  The registration data schema is defined by the
- * Service Tags Technology.
- * <p>
- * Typically the registration data is constructed at installation time
- * and stored in an XML file for later service tag lookup or registration.
- *
- * <p>
- * <b>Example Usage</b>
- * <p>
- * The examples below show how the {@code RegistrationData} can be
- * used for product registration.
- * Exception handling is not shown in these examples for clarity.
- * <ol>
- * <li>This example shows how the JDK creates a JDK service tag, installs it
- * in the system service tag registry and adds it to the registration data.
- * <br>
- * <blockquote><pre>
- *   // create a service tag object with an instance_urn
- *   ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
- *                                          ....);
- *   // Adds to the system service tag registry if supported
- *   if (Registry.isSupported()) {
- *       Registry.getSystemRegistry().addServiceTag(st);
- *   }
- *
- *   // add to the registration data
- *   RegistrationData registration  = new RegistrationData();
- *   registration.addServiceTag(st);
- * </pre></blockquote>
- * </li>
- * <li>At this point, the registration data is ready to
- * send to Sun Connection for registration. This example shows how to register
- * the JDK via the <i>Registration Relay Service</i>.
- * <p>
- * There are several registration services for Sun Connection. For example,
- * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">
- * Registration Relay Service</a> is a web application interface that
- * processes the registration data payload sent via HTTP post
- * and hosts the registration user interface for a specified
- * registration URL.  Refer to the
- * Registration Relay Service Specification for details.
- * <p>
- * <blockquote><pre>
- *   // Open the connection to the URL of the registration service
- *   HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
- *   con.setDoInput(true);
- *   con.setDoOutput(true);
- *   con.setUseCaches(false);
- *   con.setAllowUserInteraction(false);
- *   con.setRequestMethod("POST");
- *   con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
- *   con.connect();
- *
- *   // send the registration data to the registration service
- *   OutputStream out = con.getOutputStream();
- *   registration.storeToXML(out);
- *   out.close();
- * </pre></blockquote>
- * </li>
- * <li>This example shows how to store the registration data in an XML file.
- *     for later service tag lookup or registration.
- * <br>
- * <blockquote><pre>
- *   BufferedOutputStream out = new BufferedOutputStream(
- *       new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));
- *   registration.storeToXML(out);
- *   out.close();
- * </pre></blockquote>
- * </li>
- * <li>This example shows how to install service tags that are in the
- * registration data in the system service tag registry when determined
- * to be available.  The system service tag registry might not have existed
- * when the registration data was constructed.
- * <br>
- * <blockquote><pre>
- *   if (Registry.isSupported()) {
- *       Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();
- *       for (ServiceTag st : svctags) {
- *           Registry.getSystemRegistry().addServiceTag(st);
- *       }
- *   }
- * </pre></blockquote>
- * </li>
- * </ol>
- *
- * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>
- */
-public class RegistrationData {
-    private final Map<String, String> environment;
-    private final Map<String, ServiceTag> svcTagMap;
-    private final String urn;
-
-    /**
-     * Creates a {@code RegistrationData} object with a generated
-     * {@link #getRegistrationURN registration URN}.
-     * The following keys in the {@link #getEnvironmentMap environment map}
-     * will be initialized for the configuration of the
-     * running system:
-     * <blockquote>
-     * <tt>hostname</tt>, <tt>osName</tt>,  <tt>osVersion</tt> and
-     * <tt>osArchitecture</tt>
-     * </blockquote>
-     * and the value of other keys may be empty.
-     */
-    public RegistrationData() {
-        this(Util.generateURN());
-    }
-
-    // package private
-    RegistrationData(String urn) {
-        this.urn = urn;
-        this.environment = initEnvironment();
-        this.svcTagMap = new LinkedHashMap<String, ServiceTag>();
-    }
-
-    private Map<String, String> initEnvironment() {
-        Map<String, String> map = new LinkedHashMap<String, String>();
-        SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();
-        map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());
-        map.put(ST_NODE_HOST_ID, sysEnv.getHostId());
-        map.put(ST_NODE_OS_NAME, sysEnv.getOsName());
-        map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());
-        map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());
-        map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());
-        map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());
-        map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());
-        map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());
-        return map;
-    }
-
-    /**
-     * Returns the uniform resource name of this registration data
-     * in this format:
-     * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>
-     *
-     * @return the URN of this registration data.
-     */
-    public String getRegistrationURN() {
-        return urn;
-    }
-
-    /**
-     * Returns a map containing the environment information for this
-     * registration data.  See the set of <a href="#EnvMap">keys</a>
-     * in the environment map. Subsequent update to the environment
-     * map via the {@link #setEnvironment setEnvironment} method will not be reflected
-     * in the returned map.
-     *
-     * @return an environment map for this registration data.
-     */
-    public Map<String, String> getEnvironmentMap() {
-        return new LinkedHashMap<String,String>(environment);
-    }
-
-    /**
-     * Sets an element of the specified {@code name} in the environment map
-     * with the given {@code value}.
-     *
-     * @throws IllegalArgumentException if {@code name} is not a valid key
-     * in the environment map, or {@code value} is not valid.
-     */
-    public void setEnvironment(String name, String value) {
-        if (name == null) {
-            throw new NullPointerException("name is null");
-        }
-        if (value == null) {
-            throw new NullPointerException("value is null");
-        }
-        if (environment.containsKey(name)) {
-            if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {
-                if (value.length() == 0) {
-                    throw new IllegalArgumentException("\"" +
-                        name + "\" requires non-empty value.");
-                }
-            }
-            environment.put(name, value);
-        } else {
-            throw new IllegalArgumentException("\"" +
-                 name + "\" is not an environment element.");
-        }
-    }
-
-    /**
-     * Returns all service tags in this registration data.
-     *
-     * @return  a {@link Set Set} of the service tags
-     * in this registration data.
-     */
-    public Set<ServiceTag> getServiceTags() {
-        return new HashSet<ServiceTag>(svcTagMap.values());
-    }
-
-    /**
-     * Adds a service tag to this registration data.
-     * If the given service tag has an empty <tt>instance_urn</tt>,
-     * this method will generate a URN and place it in the copy
-     * of the service tag in this registration data.
-     * This method will return the {@code ServiceTag} object
-     * added to this registration data.
-     *
-     * @param st {@code ServiceTag} object to be added.
-     * @return a {@code ServiceTag} object added to this registration data.
-     *
-     * @throws IllegalArgumentException if
-     *   a service tag of the same {@link ServiceTag#getInstanceURN
-     *   <tt>instance_urn</tt>} already exists in the registry.
-     */
-    public synchronized ServiceTag addServiceTag(ServiceTag st) {
-        ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);
-
-        String instanceURN = svcTag.getInstanceURN();
-        if (svcTagMap.containsKey(instanceURN)) {
-            throw new IllegalArgumentException("Instance_urn = " + instanceURN +
-                    " already exists in the registration data.");
-        } else {
-            svcTagMap.put(instanceURN, svcTag);
-        }
-        return svcTag;
-    }
-
-    /**
-     * Returns a service tag of the given <tt>instance_urn</tt> in this registration
-     * data.
-     *
-     * @param instanceURN the <tt>instance_urn</tt> of the service tag
-     * @return the {@code ServiceTag} object of the given  <tt>instance_urn</tt>
-     *         if exists; otherwise return {@code null}.
-     */
-    public synchronized ServiceTag getServiceTag(String instanceURN) {
-        if (instanceURN == null) {
-            throw new NullPointerException("instanceURN is null");
-        }
-        return svcTagMap.get(instanceURN);
-    }
-
-    /**
-     * Removes a service tag of the given <tt>instance_urn</tt> from this
-     * registration data.
-     *
-     * @param instanceURN the <tt>instance_urn</tt> of
-     * the service tag to be removed.
-     *
-     * @return the removed {@code ServiceTag} object;
-     * or {@code null} if the service tag does not exist in this
-     * registration data.
-     */
-    public synchronized ServiceTag removeServiceTag(String instanceURN) {
-        if (instanceURN == null) {
-            throw new NullPointerException("instanceURN is null");
-        }
-
-        ServiceTag svcTag = null;
-        if (svcTagMap.containsKey(instanceURN)) {
-            svcTag = svcTagMap.remove(instanceURN);
-        }
-        return svcTag;
-    }
-
-     /**
-     * Updates the <tt>product_defined_instance_id</tt> in the service tag
-     * of the given <tt>instance_urn</tt> in this registration data.
-     *
-     * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.
-     * @param productDefinedInstanceID the value of the
-     * <tt>product_defined_instance_id</tt> to be set.
-     *
-     * @return the updated {@code ServiceTag} object;
-     * or {@code null} if the service tag does not exist in this
-     * registration data.
-     */
-    public synchronized ServiceTag updateServiceTag(String instanceURN,
-                                                    String productDefinedInstanceID) {
-        ServiceTag svcTag = getServiceTag(instanceURN);
-        if (svcTag == null) {
-            return null;
-        }
-
-        svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);
-        // update the product defined instance ID field
-        svcTag.setProductDefinedInstanceID(productDefinedInstanceID);
-        svcTagMap.put(instanceURN, svcTag);
-        return svcTag;
-    }
-
-    /**
-     * Reads the registration data from the XML document on the
-     * specified input stream.  The XML document must be
-     * in the format described by the <a href="#XMLSchema">
-     * registration data schema</a>.
-     * The specified stream is closed after this method returns.
-     *
-     * @param in the input stream from which to read the XML document.
-     * @return a {@code RegistrationData} object read from the input
-     * stream.
-     *
-     * @throws IllegalArgumentException if the input stream
-     * contains an invalid registration data.
-     *
-     * @throws IOException if an error occurred when reading from the input stream.
-     */
-    public static RegistrationData loadFromXML(InputStream in) throws IOException {
-        try {
-            return RegistrationDocument.load(in);
-        } finally {
-            in.close();
-        }
-    }
-
-    /**
-     * Writes the registration data to the specified output stream
-     * in the format described by the <a href="#XMLSchema">
-     * registration data schema</a> with "UTF-8" encoding.
-     * The specified stream remains open after this method returns.
-     *
-     * @param os the output stream on which to write the XML document.
-     *
-     * @throws IOException if an error occurred when writing to the output stream.
-     */
-    public void storeToXML(OutputStream os) throws IOException {
-        RegistrationDocument.store(os, this);
-        os.flush();
-    }
-
-    /**
-     * Returns a newly allocated byte array containing the registration
-     * data in XML format.
-     *
-     * @return a newly allocated byte array containing the registration
-     * data in XML format.
-     */
-    public byte[] toXML() {
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            storeToXML(out);
-            return out.toByteArray();
-        } catch (IOException e) {
-            // should not reach here
-            return new byte[0];
-        }
-    }
-
-    /**
-     * Returns a string representation of this registration data in XML
-     * format.
-     *
-     * @return a string representation of this registration data in XML
-     *         format.
-     */
-    @Override
-    public String toString() {
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            storeToXML(out);
-            return out.toString("UTF-8");
-        } catch (IOException e) {
-            // should not reach here
-            return "Error creating the return string.";
-        }
-    }
-}
+

+/*

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

+ *

+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+ *

+ * The contents of this file are subject to the terms of either the GNU

+ * General Public License Version 2 only ("GPL") or the Common Development

+ * and Distribution License("CDDL") (collectively, the "License").  You

+ * may not use this file except in compliance with the License. You can obtain

+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html

+ * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific

+ * language governing permissions and limitations under the License.

+ *

+ * When distributing the software, include this License Header Notice in each

+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.

+ * Sun designates this particular file as subject to the "Classpath" exception

+ * as provided by Sun in the GPL Version 2 section of the License file that

+ * accompanied this code.  If applicable, add the following below the License

+ * Header, with the fields enclosed by brackets [] replaced by your own

+ * identifying information: "Portions Copyrighted [year]

+ * [name of copyright owner]"

+ *

+ * Contributor(s):

+ *

+ * If you wish your version of this file to be governed by only the CDDL or

+ * only the GPL Version 2, indicate your decision by adding "[Contributor]

+ * elects to include this software in this distribution under the [CDDL or GPL

+ * Version 2] license."  If you don't indicate a single choice of license, a

+ * recipient has the option to distribute your version of this file under

+ * either the CDDL, the GPL Version 2 or to extend the choice of license to

+ * its licensees as provided above.  However, if you add GPL Version 2 code

+ * and therefore, elected the GPL Version 2 license, then the option applies

+ * only if the new code is made subject to such option by the copyright

+ * holder.

+ */

+

+package com.sun.star.servicetag;

+

+import java.io.*;

+import java.net.UnknownHostException;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashSet;

+import java.util.LinkedHashMap;

+import java.util.Map;

+import java.util.Set;

+

+import static com.sun.star.servicetag.RegistrationDocument.*;

+

+/**

+ * A {@code RegistrationData} object is a container of one or more 

+ * {@link #getServiceTags service tags} that identify the 

+ * components for product registration.

+ * Each {@code RegistrationData} object has a {@link #getRegistrationURN

+ * uniform resource name} (URN) as its identifier.

+ * <a name="EnvMap"></a>

+ * It also has an <i>environment map</i> with

+ * the following elements:

+ * <blockquote>

+ *       <table border=0>

+ *       <tr>

+ *          <td><tt>hostname</tt></td>

+ *          <td>Hostname of the system</td>

+ *          <td>e.g. woody</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>hostId</tt></td>

+ *          <td>Host ID of the system</td>

+ *          <td>e.g. 83abc1ab</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>osName</tt></td>

+ *          <td>Operating system name</td>

+ *          <td> e.g. SunOS</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>osVersion</tt></td>

+ *          <td>Operating system version</td>

+ *          <td> e.g. 5.10</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>osArchitecture</tt></td>

+ *          <td>Operating system architecture</td>

+ *          <td> e.g. sparc</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>systemModel</tt></td>

+ *          <td>System model</td>

+ *          <td> e.g. SUNW,Sun-Fire-V440</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>systemManufacturer</tt></td>

+ *          <td>System manufacturer</td>

+ *          <td> e.g. Sun Microsystems</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>cpuManufacturer</tt></td>

+ *          <td>CPU manufacturer</td>

+ *          <td> e.g. Sun Microsystems</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>serialNumber</tt></td>

+ *          <td>System serial number</td>

+ *          <td> e.g. BEL078932</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>physmem</tt></td>

+ *          <td>Physical memory for the system (in MB)</td>

+ *          <td> e.g. 4096</td>

+ *       </tr>

+ *       </table>

+ *  </blockquote>

+ * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.

+ * If an element is not available on a system and their value will be

+ * empty.

+ * <p>

+ * <a name="XMLSchema">

+ * <b>Registration XML Schema</b></a>

+ * <p>

+ * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from 

+ * and {@link #storeToXML stored} into an XML file in the format described 

+ * by the

+ * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">

+ * registration data schema</a>.  The registration data schema is defined by the 

+ * Service Tags Technology.

+ * <p>

+ * Typically the registration data is constructed at installation time

+ * and stored in an XML file for later service tag lookup or registration.

+ * 

+ * <p>

+ * <b>Example Usage</b>

+ * <p>

+ * The examples below show how the {@code RegistrationData} can be 

+ * used for product registration.

+ * Exception handling is not shown in these examples for clarity.

+ * <ol>

+ * <li>This example shows how the JDK creates a JDK service tag, installs it

+ * in the system service tag registry and adds it to the registration data.

+ * <br>

+ * <blockquote><pre>

+ *   // create a service tag object with an instance_urn

+ *   ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),

+ *                                          ....);

+ *   // Adds to the system service tag registry if supported

+ *   if (Registry.isSupported()) {

+ *       Registry.getSystemRegistry().addServiceTag(st);

+ *   }

+ * 

+ *   // add to the registration data

+ *   RegistrationData registration  = new RegistrationData();

+ *   registration.addServiceTag(st); 

+ * </pre></blockquote>

+ * </li>

+ * <li>At this point, the registration data is ready to 

+ * send to Sun Connection for registration. This example shows how to register 

+ * the JDK via the <i>Registration Relay Service</i>.

+ * <p>

+ * There are several registration services for Sun Connection. For example,

+ * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">

+ * Registration Relay Service</a> is a web application interface that

+ * processes the registration data payload sent via HTTP post

+ * and hosts the registration user interface for a specified 

+ * registration URL.  Refer to the 

+ * Registration Relay Service Specification for details.

+ * <p>

+ * <blockquote><pre>

+ *   // Open the connection to the URL of the registration service

+ *   HttpsURLConnection con = (HttpsURLConnection) url.openConnection();

+ *   con.setDoInput(true);

+ *   con.setDoOutput(true);

+ *   con.setUseCaches(false);

+ *   con.setAllowUserInteraction(false);

+ *   con.setRequestMethod("POST");

+ *   con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");

+ *   con.connect();

+ *

+ *   // send the registration data to the registration service

+ *   OutputStream out = con.getOutputStream();

+ *   registration.storeToXML(out);

+ *   out.close();

+ * </pre></blockquote>

+ * </li>

+ * <li>This example shows how to store the registration data in an XML file.

+ *     for later service tag lookup or registration.

+ * <br>

+ * <blockquote><pre>

+ *   BufferedOutputStream out = new BufferedOutputStream(

+ *       new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));

+ *   registration.storeToXML(out);

+ *   out.close();

+ * </pre></blockquote>

+ * </li> 

+ * <li>This example shows how to install service tags that are in the 

+ * registration data in the system service tag registry when determined

+ * to be available.  The system service tag registry might not have existed 

+ * when the registration data was constructed.

+ * <br>

+ * <blockquote><pre>

+ *   if (Registry.isSupported()) {

+ *       Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();

+ *       for (ServiceTag st : svctags) {

+ *           Registry.getSystemRegistry().addServiceTag(st);

+ *       }

+ *   }

+ * </pre></blockquote>

+ * </li>

+ * </ol>

+ * 

+ * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>

+ */

+public class RegistrationData {

+    private final Map<String, String> environment;

+    private final Map<String, String> cpuInfo;

+    private final Map<String, ServiceTag> svcTagMap;

+    private final String urn;

+

+    /**

+     * Creates a {@code RegistrationData} object with a generated

+     * {@link #getRegistrationURN registration URN}.

+     * The following keys in the {@link #getEnvironmentMap environment map}

+     * will be initialized for the configuration of the 

+     * running system:

+     * <blockquote>

+     * <tt>hostname</tt>, <tt>osName</tt>,  <tt>osVersion</tt> and

+     * <tt>osArchitecture</tt>

+     * </blockquote>

+     * and the value of other keys may be empty.

+     */

+    public RegistrationData() {

+        this(Util.generateURN());

+    }

+    

+    // package private

+    RegistrationData(String urn) {

+        this.urn = urn;

+        SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();

+        this.environment = initEnvironment(sysEnv);

+        this.cpuInfo = initCpuInfo(sysEnv);

+        this.svcTagMap = new LinkedHashMap<String, ServiceTag>();

+    }

+    

+    private Map<String, String> initEnvironment(SystemEnvironment sysEnv) {

+        Map<String, String> map = new LinkedHashMap<String, String>();

+        map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());

+        map.put(ST_NODE_HOST_ID, sysEnv.getHostId());

+        map.put(ST_NODE_OS_NAME, sysEnv.getOsName());

+        map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());

+        map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());

+        map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());

+        map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());

+        map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());

+        map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());

+        map.put(ST_NODE_PHYS_MEM, sysEnv.getPhysMem());

+        return map;

+    }  

+

+    private Map<String, String> initCpuInfo(SystemEnvironment sysEnv) {

+        Map<String, String> map = new LinkedHashMap<String, String>();

+        map.put(ST_NODE_SOCKETS, sysEnv.getSockets());

+        map.put(ST_NODE_CORES, sysEnv.getCores());

+        map.put(ST_NODE_VIRT_CPUS, sysEnv.getVirtCpus());

+        map.put(ST_NODE_CPU_NAME, sysEnv.getCpuName());

+        map.put(ST_NODE_CLOCK_RATE, sysEnv.getClockRate());

+        return map;

+    }  

+    

+    /**

+     * Returns the uniform resource name of this registration data

+     * in this format:

+     * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>

+     * 

+     * @return the URN of this registration data.

+     */

+    public String getRegistrationURN() {

+        return urn;

+    }

+

+    /**

+     * Returns a map containing the environment information for this

+     * registration data.  See the set of <a href="#EnvMap">keys</a>

+     * in the environment map. Subsequent update to the environment

+     * map via the {@link #setEnvironment setEnvironment} method will not be reflected

+     * in the returned map.

+     * 

+     * @return an environment map for this registration data. 

+     */

+    public Map<String, String> getEnvironmentMap() {

+        return new LinkedHashMap<String,String>(environment);

+    }

+

+    /**

+     * Returns a map containing the cpu information for this

+     * registration data.  Subsequent update to the cpu info

+     * map via the {@link #setCpuInfo setCpuInfo} method will not be reflected

+     * in the returned map.

+     *

+     * @return a cpu info map for this registration data.

+     */

+    public Map<String, String> getCpuInfoMap() {

+        return new LinkedHashMap<String,String>(cpuInfo);

+    }

+

+    /**

+     * Sets an element of the specified {@code name} in the environment map 

+     * with the given {@code value}.

+     * 

+     * @throws IllegalArgumentException if {@code name} is not a valid key

+     * in the environment map, or {@code value} is not valid.

+     */

+    public void setEnvironment(String name, String value) {    

+        if (name == null) {

+            throw new NullPointerException("name is null");

+        }

+        if (value == null) {

+            throw new NullPointerException("value is null");

+        }

+        if (environment.containsKey(name)) {

+            if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {

+                if (value.length() == 0) {

+                    throw new IllegalArgumentException("\"" +

+                        name + "\" requires non-empty value.");

+                }

+            }

+            environment.put(name, value);

+        } else {

+            throw new IllegalArgumentException("\"" +

+                 name + "\" is not an environment element.");

+        }   

+    }

+

+    /**

+     * Sets an element of the specified {@code name} in the cpu info map

+     * with the given {@code value}.

+     *

+     * @throws IllegalArgumentException if {@code name} is not a valid key

+     * in the cpu info map, or {@code value} is not valid.

+     */

+    public void setCpuInfo(String name, String value) {    

+        if (name == null) {

+            throw new NullPointerException("name is null");

+        }

+        if (value == null) {

+            throw new NullPointerException("value is null");

+        }

+        if (cpuInfo.containsKey(name)) {

+            cpuInfo.put(name, value);

+        } else {

+            throw new IllegalArgumentException("\"" +

+                 name + "\" is not an cpuinfo element.");

+        }   

+    }

+

+    /**

+     * Returns all service tags in this registration data.

+     * 

+     * @return  a {@link Set Set} of the service tags

+     * in this registration data.

+     */

+    public Set<ServiceTag> getServiceTags() {

+        return new HashSet<ServiceTag>(svcTagMap.values());

+    }

+

+    /**

+     * Adds a service tag to this registration data. 

+     * If the given service tag has an empty <tt>instance_urn</tt>,

+     * this method will generate a URN and place it in the copy 

+     * of the service tag in this registration data. 

+     * This method will return the {@code ServiceTag} object

+     * added to this registration data.

+     * 

+     * @param st {@code ServiceTag} object to be added.

+     * @return a {@code ServiceTag} object added to this registration data.

+     * 

+     * @throws IllegalArgumentException if 

+     *   a service tag of the same {@link ServiceTag#getInstanceURN 

+     *   <tt>instance_urn</tt>} already exists in the registry.

+     */

+    public synchronized ServiceTag addServiceTag(ServiceTag st) {

+        ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);

+        

+        String instanceURN = svcTag.getInstanceURN();

+        if (svcTagMap.containsKey(instanceURN)) {

+            throw new IllegalArgumentException("Instance_urn = " + instanceURN +

+                    " already exists in the registration data.");

+        } else {

+            svcTagMap.put(instanceURN, svcTag);

+        }

+        return svcTag;

+    }

+

+    /**

+     * Returns a service tag of the given <tt>instance_urn</tt> in this registration

+     * data.

+     *

+     * @param instanceURN the <tt>instance_urn</tt> of the service tag

+     * @return the {@code ServiceTag} object of the given  <tt>instance_urn</tt>

+     *         if exists; otherwise return {@code null}.

+     */

+    public synchronized ServiceTag getServiceTag(String instanceURN) {

+        if (instanceURN == null) {

+            throw new NullPointerException("instanceURN is null");

+        }

+        return svcTagMap.get(instanceURN);

+    }

+

+    /**

+     * Removes a service tag of the given <tt>instance_urn</tt> from this 

+     * registration data.

+     *

+     * @param instanceURN the <tt>instance_urn</tt> of 

+     * the service tag to be removed.

+     *

+     * @return the removed {@code ServiceTag} object;

+     * or {@code null} if the service tag does not exist in this 

+     * registration data.

+     */

+    public synchronized ServiceTag removeServiceTag(String instanceURN) {

+        if (instanceURN == null) {

+            throw new NullPointerException("instanceURN is null");

+        }

+

+        ServiceTag svcTag = null;

+        if (svcTagMap.containsKey(instanceURN)) {

+            svcTag = svcTagMap.remove(instanceURN);

+        }

+        return svcTag;

+    }

+

+     /**

+     * Updates the <tt>product_defined_instance_id</tt> in the service tag 

+     * of the given <tt>instance_urn</tt> in this registration data.

+     * 

+     * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.

+     * @param productDefinedInstanceID the value of the

+     * <tt>product_defined_instance_id</tt> to be set.

+     * 

+     * @return the updated {@code ServiceTag} object;

+     * or {@code null} if the service tag does not exist in this 

+     * registration data.

+     */

+    public synchronized ServiceTag updateServiceTag(String instanceURN,

+                                                    String productDefinedInstanceID) {

+        ServiceTag svcTag = getServiceTag(instanceURN);

+        if (svcTag == null) {

+            return null;

+        }

+

+        svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);

+        // update the product defined instance ID field

+        svcTag.setProductDefinedInstanceID(productDefinedInstanceID);

+        svcTagMap.put(instanceURN, svcTag);

+        return svcTag;

+    }

+    

+    /**

+     * Reads the registration data from the XML document on the 

+     * specified input stream.  The XML document must be 

+     * in the format described by the <a href="#XMLSchema">

+     * registration data schema</a>.

+     * The specified stream is closed after this method returns.

+     * 

+     * @param in the input stream from which to read the XML document.

+     * @return a {@code RegistrationData} object read from the input

+     * stream.

+     * 

+     * @throws IllegalArgumentException if the input stream 

+     * contains an invalid registration data.

+     * 

+     * @throws IOException if an error occurred when reading from the input stream.

+     */

+    public static RegistrationData loadFromXML(InputStream in) throws IOException {

+        try {

+            return RegistrationDocument.load(in);

+        } finally {

+            in.close();

+        }

+    }

+    

+    /**

+     * Writes the registration data to the specified output stream 

+     * in the format described by the <a href="#XMLSchema">

+     * registration data schema</a> with "UTF-8" encoding.

+     * The specified stream remains open after this method returns.

+     * 

+     * @param os the output stream on which to write the XML document.

+     * 

+     * @throws IOException if an error occurred when writing to the output stream.

+     */

+    public void storeToXML(OutputStream os) throws IOException {

+        RegistrationDocument.store(os, this);

+        os.flush();

+    }

+

+    /** 

+     * Returns a newly allocated byte array containing the registration

+     * data in XML format.

+     *

+     * @return a newly allocated byte array containing the registration

+     * data in XML format.

+     */

+    public byte[] toXML() {

+        try {

+            ByteArrayOutputStream out = new ByteArrayOutputStream();

+            storeToXML(out);

+            return out.toByteArray();

+        } catch (IOException e) {

+            // should not reach here

+            return new byte[0];

+        }

+    }

+

+    /**

+     * Returns a string representation of this registration data in XML

+     * format.

+     * 

+     * @return a string representation of this registration data in XML

+     *         format.

+     */

+    @Override

+    public String toString() {

+        try {

+            ByteArrayOutputStream out = new ByteArrayOutputStream();

+            storeToXML(out);

+            return out.toString("UTF-8");

+        } catch (IOException e) {

+            // should not reach here

+            return "Error creating the return string.";

+        }

+    }

+}

diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
index 240eebf4e65c..93a1f25a6c2f 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
@@ -1,374 +1,440 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: RegistrationDocument.java,v $
- *
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.servicetag;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-// For write operation
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-/**
- * XML Support Class for Product Registration.
- */
-class RegistrationDocument {
-
-    private static final String REGISTRATION_DATA_SCHEMA =
-            "/com/sun/star/servicetag/resources/product_registration.xsd";
-    private static final String REGISTRATION_DATA_VERSION = "1.0";
-    private static final String SERVICE_TAG_VERSION = "1.0";
-    final static String ST_NODE_REGISTRATION_DATA = "registration_data";
-    final static String ST_ATTR_REGISTRATION_VERSION = "version";
-    final static String ST_NODE_ENVIRONMENT = "environment";
-    final static String ST_NODE_HOSTNAME = "hostname";
-    final static String ST_NODE_HOST_ID = "hostId";
-    final static String ST_NODE_OS_NAME = "osName";
-    final static String ST_NODE_OS_VERSION = "osVersion";
-    final static String ST_NODE_OS_ARCH = "osArchitecture";
-    final static String ST_NODE_SYSTEM_MODEL = "systemModel";
-    final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";
-    final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";
-    final static String ST_NODE_SERIAL_NUMBER = "serialNumber";
-    final static String ST_NODE_REGISTRY = "registry";
-    final static String ST_ATTR_REGISTRY_URN = "urn";
-    final static String ST_ATTR_REGISTRY_VERSION = "version";
-    final static String ST_NODE_SERVICE_TAG = "service_tag";
-    final static String ST_NODE_INSTANCE_URN = "instance_urn";
-    final static String ST_NODE_PRODUCT_NAME = "product_name";
-    final static String ST_NODE_PRODUCT_VERSION = "product_version";
-    final static String ST_NODE_PRODUCT_URN = "product_urn";
-    final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";
-    final static String ST_NODE_PRODUCT_PARENT = "product_parent";
-    final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";
-    final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";
-    final static String ST_NODE_PLATFORM_ARCH = "platform_arch";
-    final static String ST_NODE_TIMESTAMP = "timestamp";
-    final static String ST_NODE_CONTAINER = "container";
-    final static String ST_NODE_SOURCE = "source";
-    final static String ST_NODE_INSTALLER_UID = "installer_uid";
-
-    static RegistrationData load(InputStream in) throws IOException {
-        Document document = initializeDocument(in);
-
-        // Gets the registration URN
-        Element root = getRegistrationDataRoot(document);
-        Element registryRoot =
-                getSingletonElementFromRoot(root, ST_NODE_REGISTRY);
-        String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);
-
-        // Construct a new RegistrationData object from the DOM tree
-        // Initialize the environment map and service tags
-        RegistrationData regData = new RegistrationData(urn);
-        addServiceTags(registryRoot, regData);
-
-        Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);
-        buildEnvironmentMap(envRoot, regData);
-        return regData;
-    }
-
-    static void store(OutputStream os, RegistrationData registration)
-            throws IOException {
-        // create a new document with the root node
-        Document document = initializeDocument();
-
-        // create the nodes for the environment map and the service tags
-        // in the registration data
-        addEnvironmentNodes(document,
-                            registration.getEnvironmentMap());
-        addServiceTagRegistry(document,
-                              registration.getRegistrationURN(),
-                              registration.getServiceTags());
-        transform(document, os);
-    }
-
-    // initialize a document from an input stream
-    private static Document initializeDocument(InputStream in) throws IOException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        try {
-            // XML schema for validation
-            SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);
-            Schema schema = sf.newSchema(xsdUrl);
-            Validator validator = schema.newValidator();
-
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.parse(new InputSource(in));
-            validator.validate(new DOMSource(doc));
-            return doc;
-        } catch (SAXException sxe) {
-            IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");
-            e.initCause(sxe);
-            throw e;
-        } catch (ParserConfigurationException pce) {
-            // Parser with specific options can't be built
-            // should not reach here
-            InternalError x = new InternalError("Error in creating the new document");
-            x.initCause(pce);
-            throw x;
-        }
-    }
-
-    // initialize a new document for the registration data
-    private static Document initializeDocument() throws IOException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        try {
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.newDocument();
-
-            // initialize the document with the registration_data root
-            Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);
-            doc.appendChild(root);
-            root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);
-
-            return doc;
-        } catch (ParserConfigurationException pce) {
-            // Parser with specified options can't be built
-            // should not reach here
-            InternalError x = new InternalError("Error in creating the new document");
-            x.initCause(pce);
-            throw x;
-        }
-    }
-
-    // Transform the current DOM tree with the given output stream.
-    private static void transform(Document document, OutputStream os) {
-        try {
-            // Use a Transformer for output
-            TransformerFactory tFactory = TransformerFactory.newInstance();
-            tFactory.setAttribute("indent-number", new Integer(3));
-
-            Transformer transformer = tFactory.newTransformer();
-
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
-            transformer.transform(new DOMSource(document),
-                new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));
-        } catch (UnsupportedEncodingException ue) {
-            // Should not reach here
-            InternalError x = new InternalError("Error generated during transformation");
-            x.initCause(ue);
-            throw x;
-        } catch (TransformerConfigurationException tce) {
-            // Error generated by the parser
-            // Should not reach here
-            InternalError x = new InternalError("Error in creating the new document");
-            x.initCause(tce);
-            throw x;
-        } catch (TransformerException te) {
-            // Error generated by the transformer
-            InternalError x = new InternalError("Error generated during transformation");
-            x.initCause(te);
-            throw x;
-        }
-    }
-
-    private static void addServiceTagRegistry(Document document,
-                                              String registryURN,
-                                              Set<ServiceTag> svcTags) {
-        // add service tag registry node and its attributes
-        Element reg = document.createElement(ST_NODE_REGISTRY);
-        reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);
-        reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);
-
-        Element root = getRegistrationDataRoot(document);
-        root.appendChild(reg);
-
-        // adds the elements for the service tags
-        for (ServiceTag st : svcTags) {
-            addServiceTagElement(document, reg, st);
-        }
-    }
-
-    private static void addServiceTagElement(Document document,
-                                             Element registryRoot,
-                                             ServiceTag st) {
-        Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);
-        registryRoot.appendChild(svcTag);
-        addChildElement(document, svcTag,
-                        ST_NODE_INSTANCE_URN, st.getInstanceURN());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_NAME, st.getProductName());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_VERSION, st.getProductVersion());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_URN, st.getProductURN());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_PARENT, st.getProductParent());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_DEFINED_INST_ID,
-                        st.getProductDefinedInstanceID());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_VENDOR, st.getProductVendor());
-        addChildElement(document, svcTag,
-                        ST_NODE_PLATFORM_ARCH, st.getPlatformArch());
-        addChildElement(document, svcTag,
-                        ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));
-        addChildElement(document, svcTag,
-                        ST_NODE_CONTAINER, st.getContainer());
-        addChildElement(document, svcTag,
-                        ST_NODE_SOURCE, st.getSource());
-        addChildElement(document, svcTag,
-                        ST_NODE_INSTALLER_UID,
-                        String.valueOf(st.getInstallerUID()));
-    }
-
-    private static void addChildElement(Document document, Element root,
-                                        String element, String text) {
-        Element node = document.createElement(element);
-        node.appendChild(document.createTextNode(text));
-        root.appendChild(node);
-    }
-
-    // Constructs service tags from the document
-    private static void addServiceTags(Element registryRoot,
-                                       RegistrationData registration) {
-        NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);
-        int length = (children == null ? 0 : children.getLength());
-        for (int i = 0; i < length; i++) {
-            Element svcTagElement = (Element) children.item(i);
-            ServiceTag st = getServiceTag(svcTagElement);
-            registration.addServiceTag(st);
-        }
-    }
-
-    // build environment map from the document
-    private static void buildEnvironmentMap(Element envRoot,
-                                         RegistrationData registration) {
-        registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));
-        registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));
-        registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));
-        registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));
-        registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));
-        registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));
-        registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));
-        registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));
-        registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));
-    }
-
-    // add the nodes representing the environment map in the document
-    private static void addEnvironmentNodes(Document document,
-                                            Map<String, String> envMap) {
-        Element root = getRegistrationDataRoot(document);
-        Element env = document.createElement(ST_NODE_ENVIRONMENT);
-        root.appendChild(env);
-        Set<Map.Entry<String, String>> keys = envMap.entrySet();
-        for (Map.Entry<String, String> entry : keys) {
-            addChildElement(document, env, entry.getKey(), entry.getValue());
-        }
-    }
-
-    private static Element getRegistrationDataRoot(Document doc) {
-        Element root = doc.getDocumentElement();
-        if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {
-            throw new IllegalArgumentException("Not a " +
-                    ST_NODE_REGISTRATION_DATA +
-                    " node \"" + root.getNodeName() + "\"");
-        }
-        return root;
-    }
-
-    private static Element getSingletonElementFromRoot(Element root, String name) {
-        NodeList children = root.getElementsByTagName(name);
-        int length = (children == null ? 0 : children.getLength());
-        if (length != 1) {
-            throw new IllegalArgumentException("Invalid number of " + name +
-                    " nodes = " + length);
-        }
-        Element e = (Element) children.item(0);
-        if (!e.getNodeName().equals(name)) {
-            throw new IllegalArgumentException("Not a  " + name +
-                    " node \"" + e.getNodeName() + "\"");
-        }
-        return e;
-    }
-
-    // Constructs one ServiceTag instance from a service tag element root
-    private static ServiceTag getServiceTag(Element svcTagElement) {
-        return new ServiceTag(
-            getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),
-            getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),
-            getTextValue(svcTagElement, ST_NODE_CONTAINER),
-            getTextValue(svcTagElement, ST_NODE_SOURCE),
-            Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)),
-            Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP))
-        );
-    }
-
-    private static String getTextValue(Element e, String tagName) {
-        String value = "";
-        NodeList nl = e.getElementsByTagName(tagName);
-        if (nl != null && nl.getLength() > 0) {
-            Element el = (Element) nl.item(0);
-            Node node = el.getFirstChild();
-            if (node != null) {
-                value = node.getNodeValue();
-            }
-        }
-        return value;
-    }
-}
+

+/*

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

+ *

+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+ *

+ * The contents of this file are subject to the terms of either the GNU

+ * General Public License Version 2 only ("GPL") or the Common Development

+ * and Distribution License("CDDL") (collectively, the "License").  You

+ * may not use this file except in compliance with the License. You can obtain

+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html

+ * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific

+ * language governing permissions and limitations under the License.

+ *

+ * When distributing the software, include this License Header Notice in each

+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.

+ * Sun designates this particular file as subject to the "Classpath" exception

+ * as provided by Sun in the GPL Version 2 section of the License file that

+ * accompanied this code.  If applicable, add the following below the License

+ * Header, with the fields enclosed by brackets [] replaced by your own

+ * identifying information: "Portions Copyrighted [year]

+ * [name of copyright owner]"

+ *

+ * Contributor(s):

+ *

+ * If you wish your version of this file to be governed by only the CDDL or

+ * only the GPL Version 2, indicate your decision by adding "[Contributor]

+ * elects to include this software in this distribution under the [CDDL or GPL

+ * Version 2] license."  If you don't indicate a single choice of license, a

+ * recipient has the option to distribute your version of this file under

+ * either the CDDL, the GPL Version 2 or to extend the choice of license to

+ * its licensees as provided above.  However, if you add GPL Version 2 code

+ * and therefore, elected the GPL Version 2 license, then the option applies

+ * only if the new code is made subject to such option by the copyright

+ * holder.

+ */

+

+package com.sun.star.servicetag;

+

+import java.io.*;

+import java.net.URL;

+import java.util.Collection;

+import java.util.Map;

+import java.util.Set;

+

+import org.w3c.dom.Document;

+import org.w3c.dom.Element;

+import org.w3c.dom.Node;

+import org.w3c.dom.NodeList;

+import org.xml.sax.SAXException;

+import org.xml.sax.InputSource;

+

+import javax.xml.XMLConstants;

+import javax.xml.parsers.DocumentBuilder;

+import javax.xml.parsers.DocumentBuilderFactory;

+

+import javax.xml.parsers.ParserConfigurationException;

+import javax.xml.validation.Schema;

+import javax.xml.validation.SchemaFactory;

+import javax.xml.validation.Validator;

+

+// For write operation

+import javax.xml.transform.OutputKeys;

+import javax.xml.transform.Transformer;

+import javax.xml.transform.TransformerException;

+import javax.xml.transform.TransformerFactory;

+import javax.xml.transform.TransformerConfigurationException;

+import javax.xml.transform.dom.DOMSource;

+import javax.xml.transform.stream.StreamResult;

+

+/**

+ * XML Support Class for Product Registration.

+ */

+class RegistrationDocument {

+

+    private static final String REGISTRATION_DATA_SCHEMA =

+            "/com/sun/star/servicetag/resources/product_registration.xsd";

+    private static final String REGISTRATION_DATA_VERSION = "1.0";

+    private static final String SERVICE_TAG_VERSION = "1.0";

+    final static String ST_NODE_REGISTRATION_DATA = "registration_data";

+    final static String ST_ATTR_REGISTRATION_VERSION = "version";

+    final static String ST_NODE_ENVIRONMENT = "environment";

+    final static String ST_NODE_HOSTNAME = "hostname";

+    final static String ST_NODE_HOST_ID = "hostId";

+    final static String ST_NODE_OS_NAME = "osName";

+    final static String ST_NODE_OS_VERSION = "osVersion";

+    final static String ST_NODE_OS_ARCH = "osArchitecture";

+    final static String ST_NODE_SYSTEM_MODEL = "systemModel";

+    final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";

+    final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";

+    final static String ST_NODE_SERIAL_NUMBER = "serialNumber";

+    final static String ST_NODE_PHYS_MEM = "physmem";

+    final static String ST_NODE_CPU_INFO = "cpuinfo";

+    final static String ST_NODE_SOCKETS = "sockets";

+    final static String ST_NODE_CORES = "cores";

+    final static String ST_NODE_VIRT_CPUS = "virtcpus";

+    final static String ST_NODE_CPU_NAME = "name";

+    final static String ST_NODE_CLOCK_RATE = "clockrate";

+    final static String ST_NODE_REGISTRY = "registry";

+    final static String ST_ATTR_REGISTRY_URN = "urn";

+    final static String ST_ATTR_REGISTRY_VERSION = "version";

+    final static String ST_NODE_SERVICE_TAG = "service_tag";

+    final static String ST_NODE_INSTANCE_URN = "instance_urn";

+    final static String ST_NODE_PRODUCT_NAME = "product_name";

+    final static String ST_NODE_PRODUCT_VERSION = "product_version";

+    final static String ST_NODE_PRODUCT_URN = "product_urn";

+    final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";

+    final static String ST_NODE_PRODUCT_PARENT = "product_parent";

+    final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";

+    final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";

+    final static String ST_NODE_PLATFORM_ARCH = "platform_arch";

+    final static String ST_NODE_TIMESTAMP = "timestamp";

+    final static String ST_NODE_CONTAINER = "container";

+    final static String ST_NODE_SOURCE = "source";

+    final static String ST_NODE_INSTALLER_UID = "installer_uid";

+

+    static RegistrationData load(InputStream in) throws IOException {

+        Document document = initializeDocument(in);

+        

+        // Gets the registration URN

+        Element root = getRegistrationDataRoot(document);

+        Element registryRoot =

+                getSingletonElementFromRoot(root, ST_NODE_REGISTRY);

+        String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);

+        

+        // Construct a new RegistrationData object from the DOM tree

+        // Initialize the environment map and service tags

+        RegistrationData regData = new RegistrationData(urn);

+        addServiceTags(registryRoot, regData);

+

+        Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);

+        buildEnvironmentMap(envRoot, regData);

+

+        Element cpuInfo = getSingletonElementFromRoot(envRoot, ST_NODE_CPU_INFO);

+        buildCpuInfoMap(cpuInfo, regData);

+        return regData;

+    }

+

+    static void store(OutputStream os, RegistrationData registration) 

+            throws IOException {

+        // create a new document with the root node

+        Document document = initializeDocument();

+

+        // create the nodes for the environment map and the service tags

+        // in the registration data

+        addEnvironmentNodes(document,

+                            registration.getEnvironmentMap(),

+                            registration.getCpuInfoMap());

+        addServiceTagRegistry(document, 

+                              registration.getRegistrationURN(),

+                              registration.getServiceTags());

+        transform(document, os);

+    }

+

+    // initialize a document from an input stream 

+    private static Document initializeDocument(InputStream in) throws IOException {

+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

+        SchemaFactory sf = null;

+        try {

+            // Some Java versions (e.g., 1.5.0_06-b05) fail with a

+            // NullPointerException if SchemaFactory.newInstance is called with

+            // a null context class loader, so work around that here (and the

+            // class loader of this class hopefully is not the null bootstrap

+            // class loader):

+            ClassLoader cl = Thread.currentThread().getContextClassLoader();

+            if (cl == null) {

+                Thread.currentThread().setContextClassLoader(

+                    RegistrationDocument.class.getClassLoader());

+            }

+            try {

+               sf = SchemaFactory.newInstance(

+                   XMLConstants.W3C_XML_SCHEMA_NS_URI);

+            } finally {

+               Thread.currentThread().setContextClassLoader(cl);

+            }

+

+            Schema schema = null;

+            try {

+                // Even using the workaround above is not enough on some

+                // Java versions. Therefore try to workaround the validation

+                // completely!

+                URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);

+                schema = sf.newSchema(xsdUrl);

+            }

+        catch (NullPointerException nex) {

+        }

+            

+            Validator validator = null;

+            if (schema != null)

+                validator = schema.newValidator();

+

+            DocumentBuilder builder = factory.newDocumentBuilder();

+            Document doc = builder.parse(new InputSource(in));

+            

+            if (validator != null)

+                validator.validate(new DOMSource(doc));

+            

+            return doc;

+        } catch (SAXException sxe) {

+            IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");

+            e.initCause(sxe);

+            throw e;

+        } catch (ParserConfigurationException pce) {

+            // Parser with specific options can't be built

+            // should not reach here

+            InternalError x = new InternalError("Error in creating the new document");

+            x.initCause(pce);

+            throw x;

+        }

+    }

+

+    // initialize a new document for the registration data

+    private static Document initializeDocument() throws IOException {

+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

+        try {

+            DocumentBuilder builder = factory.newDocumentBuilder();

+            Document doc = builder.newDocument();

+

+            // initialize the document with the registration_data root

+            Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);

+            doc.appendChild(root);

+            root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);

+

+            return doc;

+        } catch (ParserConfigurationException pce) {

+            // Parser with specified options can't be built

+            // should not reach here

+            InternalError x = new InternalError("Error in creating the new document");

+            x.initCause(pce);

+            throw x;

+        }

+    }

+

+    // Transform the current DOM tree with the given output stream.

+    private static void transform(Document document, OutputStream os) {

+        try {

+            // Use a Transformer for output

+            TransformerFactory tFactory = TransformerFactory.newInstance();

+            tFactory.setAttribute("indent-number", new Integer(3));

+

+            Transformer transformer = tFactory.newTransformer();

+

+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");

+            transformer.setOutputProperty(OutputKeys.METHOD, "xml");

+            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");

+            transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");

+            transformer.transform(new DOMSource(document),

+                new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));

+        } catch (UnsupportedEncodingException ue) {

+            // Should not reach here

+            InternalError x = new InternalError("Error generated during transformation");

+            x.initCause(ue);

+            throw x;

+        } catch (TransformerConfigurationException tce) {

+            // Error generated by the parser

+            // Should not reach here

+            InternalError x = new InternalError("Error in creating the new document");

+            x.initCause(tce);

+            throw x;

+        } catch (TransformerException te) {

+            // Error generated by the transformer

+            InternalError x = new InternalError("Error generated during transformation");

+            x.initCause(te);

+            throw x;

+        }

+    }

+

+    private static void addServiceTagRegistry(Document document, 

+                                              String registryURN,

+                                              Set<ServiceTag> svcTags) {

+        // add service tag registry node and its attributes

+        Element reg = document.createElement(ST_NODE_REGISTRY);

+        reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);

+        reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);

+        

+        Element root = getRegistrationDataRoot(document);

+        root.appendChild(reg);

+        

+        // adds the elements for the service tags

+        for (ServiceTag st : svcTags) {

+            addServiceTagElement(document, reg, st);

+        }

+    }

+

+    private static void addServiceTagElement(Document document, 

+                                             Element registryRoot,

+                                             ServiceTag st) {

+        Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);

+        registryRoot.appendChild(svcTag);

+        addChildElement(document, svcTag,

+                        ST_NODE_INSTANCE_URN, st.getInstanceURN());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_NAME, st.getProductName());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_VERSION, st.getProductVersion());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_URN, st.getProductURN());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_PARENT, st.getProductParent());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_DEFINED_INST_ID,

+                        st.getProductDefinedInstanceID());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_VENDOR, st.getProductVendor());

+        addChildElement(document, svcTag,

+                        ST_NODE_PLATFORM_ARCH, st.getPlatformArch());

+        addChildElement(document, svcTag,

+                        ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));

+        addChildElement(document, svcTag,

+                        ST_NODE_CONTAINER, st.getContainer());

+        addChildElement(document, svcTag,

+                        ST_NODE_SOURCE, st.getSource());

+        addChildElement(document, svcTag,

+                        ST_NODE_INSTALLER_UID,

+                        String.valueOf(st.getInstallerUID()));

+    }

+

+    private static void addChildElement(Document document, Element root,

+                                        String element, String text) {

+        Element node = document.createElement(element);

+        node.appendChild(document.createTextNode(text));

+        root.appendChild(node);

+    }

+

+    // Constructs service tags from the document

+    private static void addServiceTags(Element registryRoot,

+                                       RegistrationData registration) {

+        NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);

+        int length = (children == null ? 0 : children.getLength());

+        for (int i = 0; i < length; i++) {

+            Element svcTagElement = (Element) children.item(i);

+            ServiceTag st = getServiceTag(svcTagElement);

+            registration.addServiceTag(st);

+        }

+    }

+

+    // build environment map from the document

+    private static void buildEnvironmentMap(Element envRoot, 

+                                         RegistrationData registration) {

+        registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));

+        registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));

+        registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));

+        registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));

+        registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));

+        registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));

+        registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));

+        registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));

+        registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));

+        registration.setEnvironment(ST_NODE_PHYS_MEM, getTextValue(envRoot, ST_NODE_PHYS_MEM));

+    }

+

+    private static void buildCpuInfoMap(Element cpuInfoRoot, 

+                                         RegistrationData registration) {

+        registration.setCpuInfo(ST_NODE_SOCKETS, getTextValue(cpuInfoRoot, ST_NODE_SOCKETS));

+        registration.setCpuInfo(ST_NODE_CORES, getTextValue(cpuInfoRoot, ST_NODE_CORES));

+        registration.setCpuInfo(ST_NODE_VIRT_CPUS, getTextValue(cpuInfoRoot, ST_NODE_VIRT_CPUS));

+        registration.setCpuInfo(ST_NODE_CPU_NAME, getTextValue(cpuInfoRoot, ST_NODE_CPU_NAME));

+        registration.setCpuInfo(ST_NODE_CLOCK_RATE, getTextValue(cpuInfoRoot, ST_NODE_CLOCK_RATE));

+    }

+

+    // add the nodes representing the environment map in the document

+    private static void addEnvironmentNodes(Document document,

+                                            Map<String, String> envMap,

+                                            Map<String, String> cpuInfoMap) {

+        Element root = getRegistrationDataRoot(document);

+

+        Element env = document.createElement(ST_NODE_ENVIRONMENT);

+        root.appendChild(env);

+        Set<Map.Entry<String, String>> keys = envMap.entrySet();

+        for (Map.Entry<String, String> entry : keys) {

+            addChildElement(document, env, entry.getKey(), entry.getValue());

+        }

+

+        Element cpuInfo = document.createElement(ST_NODE_CPU_INFO);

+        env.appendChild(cpuInfo);

+        keys = cpuInfoMap.entrySet();

+        for (Map.Entry<String, String> entry : keys) {

+            addChildElement(document, cpuInfo, entry.getKey(), entry.getValue());

+        }

+    }

+

+    private static Element getRegistrationDataRoot(Document doc) {

+        Element root = doc.getDocumentElement();

+        if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {

+            throw new IllegalArgumentException("Not a " + 

+                    ST_NODE_REGISTRATION_DATA +

+                    " node \"" + root.getNodeName() + "\"");

+        }

+        return root;

+    }

+

+    private static Element getSingletonElementFromRoot(Element root, String name) {

+        NodeList children = root.getElementsByTagName(name);

+        int length = (children == null ? 0 : children.getLength());

+        if (length != 1) {

+            throw new IllegalArgumentException("Invalid number of " + name +

+                    " nodes = " + length);

+        }

+        Element e = (Element) children.item(0);

+        if (!e.getNodeName().equals(name)) {

+            throw new IllegalArgumentException("Not a  " + name +

+                    " node \"" + e.getNodeName() + "\"");

+        }

+        return e;

+    }

+

+    // Constructs one ServiceTag instance from a service tag element root

+    private static ServiceTag getServiceTag(Element svcTagElement) {

+        return new ServiceTag(

+            getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),

+            getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),

+            getTextValue(svcTagElement, ST_NODE_CONTAINER),

+            getTextValue(svcTagElement, ST_NODE_SOURCE),   

+            Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)),

+            Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP))

+        );

+    }

+

+    private static String getTextValue(Element e, String tagName) {

+        String value = "";

+        NodeList nl = e.getElementsByTagName(tagName);

+        if (nl != null && nl.getLength() > 0) {

+            Element el = (Element) nl.item(0);

+            Node node = el.getFirstChild();

+            if (node != null) {

+                value = node.getNodeValue();

+            }

+        }

+        return value;

+    }

+}

diff --git a/desktop/source/registration/com/sun/star/servicetag/Registry.java b/desktop/source/registration/com/sun/star/servicetag/Registry.java
index c118dc2e2575..81e4ed41142d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Registry.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Registry.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Registry.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
index 4b2be9ff8cc2..73e83b172008 100644
--- a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ServiceTag.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
index 245b993b086e..8d38e70f8b7e 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SolarisServiceTag.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
index 1ce5f5697bcb..684b8224d2af 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SolarisSystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,17 +39,180 @@ package com.sun.star.servicetag;
 // (e.g. NetBeans and SunStudio) will use the version in JDK.
 
 import java.io.*;
+import java.util.Set;
+import java.util.HashSet;
 
 /**
  * Solaris implementation of the SystemEnvironment class.
  */
 class SolarisSystemEnvironment extends SystemEnvironment {
+    private static final int SN  = 1;
+    private static final int SYS = 2;
+    private static final int CPU = 3;
+    private static final int MODEL = 4;
+    private String kstatCpuInfo = null;
+
     SolarisSystemEnvironment() {
         setHostId(getCommandOutput("/usr/bin/hostid"));
-        setSystemModel(getCommandOutput("/usr/bin/uname", "-i"));
+        setSystemModel(getSolarisModel());
         setSystemManufacturer(getSolarisSystemManufacturer());
         setCpuManufacturer(getSolarisCpuManufacturer());
         setSerialNumber(getSolarisSN());
+        setPhysMem(getSolarisPhysMem());
+        setSockets(getSolarisSockets());
+        setCores(getSolarisCores());
+        setVirtCpus(getSolarisVirtCpus());
+        setCpuName(getSolarisCpuName());
+        setClockRate(getSolarisClockRate());
+    }
+
+    private String getSolarisClockRate() {
+        String data = getSolarisKstatCpuInfo();
+
+        String lines[] = data.split("\n");
+        String token = "clock_MHz";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                return line.substring(line.indexOf(token) + token.length()).trim();
+            }
+        }
+        return "";
+    }
+
+    private String getSolarisCpuName() {
+        String data = getSolarisKstatCpuInfo();
+
+        String lines[] = data.split("\n");
+        String token = "brand";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                return line.substring(line.indexOf(token) + token.length()).trim();
+            }
+        }
+        return "";
+    }
+
+    private String getSolarisVirtCpus() {
+        String data = getSolarisKstatCpuInfo();
+
+        int cnt = 0;
+        String lines[] = data.split("\n");
+        String token = " cpu_info ";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.indexOf(token) != -1) {
+                cnt++;
+            }
+        }
+        return "" + cnt;
+    }
+
+    private String getSolarisCores() {
+        String data = getSolarisKstatCpuInfo();
+
+        Set<String> set = new HashSet<String>();
+        String lines[] = data.split("\n");
+        String coreIdToken = "core_id";
+        String coreId = "";
+        String chipIdToken = "chip_id";
+        String chipId = "";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(chipIdToken)) {
+                chipId = line.substring(line.indexOf(chipIdToken) + chipIdToken.length()).trim();
+            }
+            if (line.startsWith(coreIdToken)) {
+                coreId = line.substring(line.indexOf(coreIdToken) + coreIdToken.length()).trim();
+                set.add(chipId + "," + coreId);
+            }
+        }
+        return "" + set.size();
+    }
+
+    private String getSolarisPhysMem() {
+        String data = getCommandOutput("/usr/sbin/prtconf");
+
+        int cnt = 0;
+        String lines[] = data.split("\n");
+        String token = "Memory size:";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                line = line.substring(line.indexOf(token) + token.length()).trim();
+                if (line.indexOf(" ") != -1) {
+                    return line.substring(0, line.indexOf(" ")).trim();
+                }
+            }
+        }
+        return "";
+    }
+
+    private String getSolarisSockets() {
+        String data = getSolarisKstatCpuInfo();
+
+        Set<String> set = new HashSet<String>();
+        String lines[] = data.split("\n");
+        String token = "chip_id";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                String id = line.substring(line.indexOf(token) + token.length()).trim();
+                set.add(id);
+            }
+        }
+        return "" + set.size();
+    }
+
+    private synchronized String getSolarisKstatCpuInfo() {
+        // only try to get kstat cpu_info information once, after that, we can
+        // reuse the output
+        if (kstatCpuInfo == null) {
+            Thread thread = new Thread() {
+                public void run() {
+                    kstatCpuInfo = getCommandOutput("/usr/bin/kstat", "cpu_info");
+                }
+            };
+            thread.start();
+
+            try {
+                thread.join(2000);
+                if (thread.isAlive()) {
+                    thread.interrupt();
+                    kstatCpuInfo = "";
+                }
+            } catch (InterruptedException ie) {
+                thread.interrupt();
+            }
+        }
+        return kstatCpuInfo;
+    }
+
+    private String getSolarisModel() {
+        String tmp = getFileContent("/var/run/psn");
+        if (tmp.length() > 0) {
+            String[] lines = tmp.split("\n");
+            if (MODEL <= lines.length) {
+                return lines[MODEL-1] + "::"
+                    + getCommandOutput("/usr/bin/uname", "-v");
+            }
+        }
+
+        if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+            return getCommandOutput("/usr/bin/uname", "-i") + "::"
+                + getCommandOutput("/usr/bin/uname", "-v");
+        } else {
+            String model = getSmbiosData("1", "Product: ");
+            if (model == null || model.trim().equals("")) {
+                model = getCommandOutput("/usr/bin/uname", "-i");
+            }
+            if (model == null) {
+                model = "";
+            }
+            return model.trim() + "::"
+                + getCommandOutput("/usr/bin/uname", "-v");
+        }
     }
 
     /**
@@ -58,13 +220,21 @@ class SolarisSystemEnvironment extends SystemEnvironment {
      * @return The cpu manufacturer (an empty string if not found or an error occurred)
      */
     private String getSolarisCpuManufacturer() {
+        String tmp = getFileContent("/var/run/psn");
+        if (tmp.length() > 0) {
+            String[] lines = tmp.split("\n");
+            if (CPU <= lines.length) {
+                return lines[CPU-1];
+            }
+        }
+
         // not fully accurate, this could be another manufacturer (fujitsu for example)
         if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
             return "Sun Microsystems, Inc";
         }
 
-        // if we're here, then we'll try smbios (type 3)
-        return getSmbiosData("3", "Manufacturer: ");
+        // if we're here, then we'll try smbios (type 4)
+        return getSmbiosData("4", "Manufacturer: ");
     }
 
     /**
@@ -72,8 +242,19 @@ class SolarisSystemEnvironment extends SystemEnvironment {
      * @return The system manufacturer (an empty string if not found or an error occurred)
      */
     private String getSolarisSystemManufacturer() {
+        String tmp = getFileContent("/var/run/psn");
+        if (tmp.length() > 0) {
+            String[] lines = tmp.split("\n");
+            if (SYS <= lines.length) {
+                return lines[SYS-1];
+            }
+        }
+
         // not fully accurate, this could be another manufacturer (fujitsu for example)
         if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+            if (getCommandOutput("/usr/bin/uname", "-m").equals("sun4us")) {
+                return "Fujitsu";
+            }
             return "Sun Microsystems, Inc";
         }
 
@@ -89,7 +270,10 @@ class SolarisSystemEnvironment extends SystemEnvironment {
         // try to read from the psn file if it exists
         String tmp = getFileContent("/var/run/psn");
         if (tmp.length() > 0) {
-            return tmp.trim();
+            String[] lines = tmp.split("\n");
+            if (SN <= lines.length) {
+                return lines[SN-1];
+            }
         }
 
         // if we're here, then we'll try sneep
@@ -110,6 +294,17 @@ class SolarisSystemEnvironment extends SystemEnvironment {
             return tmpSN;
         }
 
+        if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+            tmpSN = getSNViaPrtfruX();
+            if (tmpSN.length() > 0) {
+                return tmpSN;
+            }
+            tmpSN = getSNViaPrtfru();
+            if (tmpSN.length() > 0) {
+                return tmpSN;
+            }
+        }
+
         // give up and return
         return "";
     }
@@ -156,4 +351,74 @@ class SolarisSystemEnvironment extends SystemEnvironment {
         }
     }
 
+    private String getSNViaPrtfruX() {
+        String data = getCommandOutput("/usr/sbin/prtfru", "-x");
+
+        boolean FRUTREE_FLAG = false;
+        boolean FRUNAME_FLAG = false;
+        boolean MB_LABEL_FLAG = false;
+        boolean SYSTEM_BOARD_FLAG = false;
+
+        String lines[] = data.split("\n");
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i];
+            if (SYSTEM_BOARD_FLAG) {
+                String tok = "<Sun_Serial_No value=\"";
+                int index = line.indexOf(tok);
+                if (index != -1) {
+                    String val = line.substring(index+tok.length());
+                    String vals[] = val.split("\"");
+                    if (vals.length > 0) {
+                        return vals[0].trim();
+                    }
+                    break;
+                }
+            }
+
+            if (line.indexOf("</ContainerData>") != -1) {
+                FRUTREE_FLAG = false;
+                FRUNAME_FLAG = false;
+                SYSTEM_BOARD_FLAG = false;
+            }
+
+            if (FRUNAME_FLAG && line.indexOf("<Container name=\"system-board\">") != -1 ) {
+                SYSTEM_BOARD_FLAG = true;
+            }
+
+            if (FRUTREE_FLAG && line.indexOf("<Fru name=\"chassis\">") != -1 ) {
+                FRUNAME_FLAG = true;
+            }
+
+            if (line.indexOf("<Location name=\"frutree\">") != -1) {
+                FRUTREE_FLAG = true;
+            }
+        }
+
+        return "";
+    }
+
+    private String getSNViaPrtfru() {
+        String data = getCommandOutput("/usr/sbin/prtfru");
+        boolean CHASSIS_FLAG = false;
+
+        String lines[] = data.split("\n");
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i];
+            if (CHASSIS_FLAG) {
+                String tok = "/ManR/Sun_Serial_No:";
+                int index = line.indexOf(tok);
+                if (index != -1) {
+                    String val = line.substring(index+tok.length());
+                    return val.trim();
+                }
+            }
+
+            if (line.indexOf("/frutree/chassis/system-board (container)") != -1) {
+                CHASSIS_FLAG = true;
+            } else if (line.indexOf("/frutree/chassis/MB?Label=MB/system-board (container)") != -1) {
+                CHASSIS_FLAG = true;
+            }
+        }
+        return "";
+    }
 }
diff --git a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
index 4a3d2ee9722f..417489410148 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SunConnection.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
index d50104e827ed..0af25ec35d58 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SysnetRegistryHelper.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
index e5b9e0e3b4fe..4628034723e1 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -57,6 +56,12 @@ public class SystemEnvironment {
     private String systemManufacturer;
     private String cpuManufacturer;
     private String serialNumber;
+    private String physmem;
+    private String sockets;
+    private String cores;
+    private String virtcpus;
+    private String cpuname;
+    private String clockrate;
     private static SystemEnvironment sysEnv = null;
 
     public static synchronized SystemEnvironment getSystemEnvironment() {
@@ -90,6 +95,12 @@ public class SystemEnvironment {
         this.systemManufacturer = "";
         this.cpuManufacturer = "";
         this.serialNumber = "";
+        this.physmem = "";
+        this.sockets = "";
+        this.cores = "";
+        this.virtcpus = "";
+        this.cpuname = "";
+        this.clockrate = "";
     }
 
 
@@ -158,6 +169,56 @@ public class SystemEnvironment {
     }
 
     /**
+     * Sets the physmem
+     * @param physmem The physmem to set.
+     */
+    public void setPhysMem(String physmem) {
+        this.physmem = physmem;
+    }
+
+    /**
+     * Sets the sockets
+     * @param sockets The sockets to set.
+     */
+    public void setSockets(String sockets) {
+        this.sockets = sockets;
+    }
+
+    /**
+     * Sets the cores
+     * @param cores The cores to set.
+     */
+    public void setCores(String cores) {
+        this.cores = cores;
+    }
+
+    /**
+     * Sets the virtcpus
+     * @param virtcpus The virtcpus to set.
+     */
+    public void setVirtCpus(String virtcpus) {
+        this.virtcpus = virtcpus;
+    }
+
+    /**
+     * Sets the cpuname
+     * @param cpuname The cpuname to set.
+     */
+    public void setCpuName(String cpuname) {
+        this.cpuname = cpuname;
+    }
+
+    /**
+     * Sets the clockrate
+     * @param clockrate The clockrate to set.
+     */
+    public void setClockRate(String clockrate) {
+        Float f = Float.parseFloat(clockrate);
+        Integer nClockrate = f.intValue();
+        this.clockrate = nClockrate.toString();
+    }
+
+    /**
      * Sets the hostid.  Truncates to a max length of 16 chars.
      * @param hostId The hostid to set.
      */
@@ -227,6 +288,30 @@ public class SystemEnvironment {
         return serialNumber;
     }
 
+    public String getPhysMem() {
+        return physmem;
+    }
+
+    public String getSockets() {
+        return sockets;
+    }
+
+    public String getCores() {
+        return cores;
+    }
+
+    public String getVirtCpus() {
+        return virtcpus;
+    }
+
+    public String getCpuName() {
+        return cpuname;
+    }
+
+    public String getClockRate() {
+        return clockrate;
+    }
+
     /**
      * Returns the hostId.
      * @return The hostId.
diff --git a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
index 785cb35777ae..fe2762fc560b 100644
--- a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
+++ b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnauthorizedAccessException.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/Util.java b/desktop/source/registration/com/sun/star/servicetag/Util.java
index 55fa097297e6..3e9ad224ba97 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Util.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Util.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Util.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,7 +39,7 @@ import java.util.UUID;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-// Utility class for com.sun.star.servicetag package
+// Utility class for com.sun.servicetag package
 class Util {
     private static boolean verbose = (System.getProperty("servicetag.verbose") != null);
     private static String jrepath = null;
diff --git a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
index cdc374f4a993..6d78357074fb 100644
--- a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WindowsSystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,7 +32,7 @@ package com.sun.star.servicetag;
 
 // The Service Tags team maintains the latest version of the implementation
 // for system environment data collection.  JDK will include a copy of
-// the most recent released version for a JDK release.  We rename
+// the most recent released version for a JDK release.        We rename
 // the package to com.sun.servicetag so that the Sun Connection
 // product always uses the latest version from the com.sun.scn.servicetags
 // package. JDK and users of the com.sun.servicetag API
@@ -42,6 +41,8 @@ package com.sun.star.servicetag;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Windows implementation of the SystemEnvironment class.
@@ -71,6 +72,13 @@ class WindowsSystemEnvironment extends SystemEnvironment {
         }
         setCpuManufacturer(cpuMfr);
 
+        setSockets(getWindowsSockets());
+        setCores(getWindowsCores());
+        setVirtCpus(getWindowsVirtCpus());
+        setPhysMem(getWindowsPhysMem());
+        setCpuName(getWmicResult("cpu", "get", "Name"));
+        setClockRate(getWmicResult("cpu", "get", "MaxClockSpeed"));
+
         // try to remove the temp file that gets created from running wmic cmds
         try {
             // look in the current working directory
@@ -83,6 +91,44 @@ class WindowsSystemEnvironment extends SystemEnvironment {
         }
     }
 
+    private String getWindowsVirtCpus() {
+        String res = getWmicResult("cpu", "get", "NumberOfLogicalProcessors");
+        if (res == null || res.equals("")) {
+            res = "1";
+        }
+        return res;
+    }
+
+    private String getWindowsCores() {
+        String res = getWmicResult("cpu", "get", "NumberOfCores");
+        if (res == null || res.equals("")) {
+            res = "1";
+        }
+        return res;
+    }
+
+    private String getWindowsSockets() {
+        String res = getFullWmicResult("cpu", "get", "DeviceID");
+        Set<String> set = new HashSet<String>();
+        for (String line : res.split("\n")) {
+            line = line.trim();
+            if (line.equals("")) {
+                continue;
+            }
+            set.add(line);
+        }
+        if (set.size() == 0) {
+            return "1";
+        }
+        return "" + set.size();
+    }
+
+    private String getWindowsPhysMem() {
+        String mem = getWmicResult("computersystem", "get", "TotalPhysicalMemory");
+        long l = Long.parseLong(mem);
+        return "" + ((long) (l / (1024*1024)));
+    }
+
 
     /**
      * This method invokes wmic outside of the normal environment
@@ -142,4 +188,48 @@ class WindowsSystemEnvironment extends SystemEnvironment {
         }
         return res.trim();
     }
+
+    private String getFullWmicResult(String alias, String verb, String property) {
+        String res = "";
+        BufferedReader in = null;
+        try {
+            ProcessBuilder pb = new ProcessBuilder("cmd", "/C", "WMIC", alias, verb, property);
+            Process p = pb.start();
+            // need this for executing windows commands (at least
+            // needed for executing wmic command)
+            BufferedWriter bw = new BufferedWriter(
+                new OutputStreamWriter(p.getOutputStream()));
+            bw.write(13);
+            bw.flush();
+            bw.close();
+
+            p.waitFor();
+            if (p.exitValue() == 0) {
+                in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+                String line = null;
+                while ((line = in.readLine()) != null) {
+                    line = line.trim();
+                    if (line.length() == 0) {
+                        continue;
+                    }
+                    if (line.toLowerCase().indexOf(property.toLowerCase()) != -1) {
+                        continue;
+                    }
+                    res += line + "\n";
+                }
+            }
+
+        } catch (Exception e) {
+            // ignore the exception
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    // ignore
+                }
+            }
+        }
+        return res;
+    }
 }
diff --git a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
index e9b34417d9ae..bb48ba90844d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
+++ b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
@@ -1,301 +1,366 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-<xs:element name="registration_data">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element name="environment"
-                  minOccurs="1"
-                  maxOccurs="1">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element ref="hostname"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="hostId"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="osName"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="osVersion"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="osArchitecture"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="systemModel"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="systemManufacturer"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="cpuManufacturer"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="serialNumber"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="registry"
-                  minOccurs="1"
-                  maxOccurs="1">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="service_tag"
-                        minOccurs="0"
-                        maxOccurs="1024">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element ref="instance_urn"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_name"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_version"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_urn"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_parent_urn"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_parent"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_defined_inst_id"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_vendor"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="platform_arch"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="timestamp"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="container"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="source"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="installer_uid"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                </xs:sequence>
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-          <xs:attribute name="urn"
-                        type="xs:string"
-                        use="required"/>
-          <xs:attribute name="version"
-                        type="xs:string"
-                        use="required"/>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-    <xs:attribute name="version"
-                  type="xs:string"
-                  use="required"/>
-  </xs:complexType>
-</xs:element>
-
-  <!-- definition of simple elements -->
-  <xs:element name="hostname">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="hostId">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="16"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="osName">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="256"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="osVersion">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="osArchitecture">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="256"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="systemModel">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="systemManufacturer">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="cpuManufacturer">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="serialNumber">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="256"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="instance_urn">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="product_name">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_version">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_urn">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_parent_urn">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_parent">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_defined_inst_id">
-      <xs:simpleType>
-          <xs:restriction base="xs:string">
-              <xs:minLength value="0"/>
-              <xs:maxLength value="255"/>
-          </xs:restriction>
-      </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_vendor">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="platform_arch">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="timestamp">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="24"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="container">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element> 
-
-  <xs:element name="source">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element> 
-
-  <xs:element name="installer_uid">
-    <xs:simpleType>
-      <xs:restriction base="xs:integer">
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">

+

+<xs:element name="registration_data">

+  <xs:complexType>

+    <xs:sequence>

+      <xs:element name="environment"

+                  minOccurs="1"

+                  maxOccurs="1">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element ref="hostname"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="hostId"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="osName"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="osVersion"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="osArchitecture"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="systemModel"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="systemManufacturer"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="cpuManufacturer"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="serialNumber"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="physmem"

+                        minOccurs='0'

+                        maxOccurs='1'/>

+            <xs:element name="cpuinfo"

+                        minOccurs='0'

+                        maxOccurs='1'>

+              <xs:complexType>

+                <xs:sequence>

+                  <xs:element ref="sockets"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="cores"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="virtcpus"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="name"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="clockrate"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                </xs:sequence>

+              </xs:complexType>

+            </xs:element>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="registry"

+                  minOccurs="1"

+                  maxOccurs="1">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element name="service_tag"

+                        minOccurs="0"

+                        maxOccurs="1024">

+              <xs:complexType>

+                <xs:sequence>

+                  <xs:element ref="instance_urn"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_name"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_version"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_urn"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_parent_urn"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_parent"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_defined_inst_id"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_vendor"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="platform_arch"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="timestamp"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="container"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="source"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="installer_uid"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                </xs:sequence>

+              </xs:complexType>

+            </xs:element>

+          </xs:sequence>

+          <xs:attribute name="urn"

+                        type="xs:string"

+                        use="required"/>

+          <xs:attribute name="version"

+                        type="xs:string"

+                        use="required"/>

+        </xs:complexType>

+      </xs:element>

+    </xs:sequence>

+    <xs:attribute name="version"

+                  type="xs:string"

+                  use="required"/>

+  </xs:complexType>

+</xs:element>

+

+  <!-- definition of simple elements -->

+  <xs:element name="hostname">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="hostId">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="16"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="osName">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="256"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="osVersion">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="osArchitecture">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="256"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="systemModel">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="systemManufacturer">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="cpuManufacturer">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="serialNumber">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="256"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="instance_urn">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="product_name">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_version">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_urn">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_parent_urn">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_parent">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_defined_inst_id">

+      <xs:simpleType>

+          <xs:restriction base="xs:string">

+              <xs:minLength value="0"/>

+              <xs:maxLength value="255"/>

+          </xs:restriction>

+      </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_vendor">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="platform_arch">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="timestamp">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="24"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="container">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element> 

+

+  <xs:element name="source">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element> 

+

+  <xs:element name="installer_uid">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer">

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="physmem">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="sockets">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="cores">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="virtcpus">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="name">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="128"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="clockrate">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+</xs:schema>

diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index a60162de6ee0..43e40183bc6e 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -46,7 +46,7 @@
 #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <canvas/canvastools.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <vcl/svapp.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index ede5aee730cf..3412b5db5598 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -58,7 +58,7 @@
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
 #include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
 #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <vcl/svapp.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
new file mode 100644
index 000000000000..9ed7413d40de
--- /dev/null
+++ b/expat/expat-2.0.1.patch
@@ -0,0 +1,97 @@
+--- misc/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:26:42 2008
+@@ -1 +1,93 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: header.hxx,v $
++#
++# $Revision: 1.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=expat
++TARGET=expat
++LIBTARGET=NO
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings -----------------------------------------------------
++.INCLUDE :  settings.mk
++# --- Files --------------------------------------------------------
++
++CFLAGS+=-I..
++
++.IF "$(OS)"=="WNT"
++CDEFS+=-DCOMPILED_FROM_DSP
++.ELSE
++CDEFS+=-DHAVE_EXPAT_CONFIG_H
++.ENDIF
++
++.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!=""
++CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
++.ENDIF # "$(OS)"=="MACOSX"
++
++SLOFILES=$(SLO)$/xmlparse.obj \
++         $(SLO)$/xmlrole.obj \
++         $(SLO)$/xmltok.obj
++
++SECOND_BUILD=UNICODE
++UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
++UNICODECDEFS+=-DXML_UNICODE
++
++LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
++LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
++LIB1OBJFILES=$(SLO)$/xmlparse.obj
++
++LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a
++LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib
++LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
++
++LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a
++LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib
++LIB3OBJFILES=$(SLO)$/xmlrole.obj $(SLO)$/xmltok.obj
++
++.IF "$(BUILD_X64)"!=""
++# ---------------- X64 stuff special ---------------------
++#  use UNICODE only because shell/shlxthandler
++#  doesn't link against ascii_expat_xmlparse
++#---------------------------------------------------------
++SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
++             $(SLO_X64)$/xmlrole.obj \
++             $(SLO_X64)$/xmltok.obj
++CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP
++CFLAGS_X64+=-I..
++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
++LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
++LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
++.ENDIF # "$(BUILD_X64)"!=""
++
++# --- Targets ------------------------------------------------------
++.INCLUDE :  set_wntx64.mk
++.INCLUDE :	target.mk
++.INCLUDE :  tg_wntx64.mk
diff --git a/expat/expat-winapi.patch b/expat/expat-winapi.patch
new file mode 100644
index 000000000000..dfac519f2ed2
--- /dev/null
+++ b/expat/expat-winapi.patch
@@ -0,0 +1,13 @@
+--- misc/expat-2.0.1/lib/expat_external.h	2009-11-16 08:53:17.375000000 +0000
++++ misc/build/expat-2.0.1/lib/expat_external.h	2009-11-16 08:53:34.703125000 +0000
+@@ -7,10 +7,6 @@
+ 
+ /* External API definitions */
+ 
+-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
+-#define XML_USE_MSC_EXTENSIONS 1
+-#endif
+-
+ /* Expat tries very hard to make the API boundary very specifically
+    defined.  There are two macros defined to control this boundary;
+    each of these can be defined before including this header to
diff --git a/expat/expat.patch b/expat/expat.patch
deleted file mode 100644
index 4e5336c55786..000000000000
--- a/expat/expat.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- misc/expat/makefile.mk	Wed Aug 20 14:33:55 2008
-+++ misc/build/expat/makefile.mk	Wed Aug 20 14:26:42 2008
-@@ -1,1 +1,34 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: header.hxx,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+target:
-+	cd xmltok && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+	cd xmlparse && $(MAKE) $(MFLAGS) $(CALLMACROS)
---- misc/expat/xmlparse/makefile.mk	Wed Aug 20 14:33:54 2008
-+++ misc/build/expat/xmlparse/makefile.mk	Wed Aug 20 14:40:52 2008
-@@ -1,1 +1,73 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: header.hxx,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=expat
-+TARGET=expat_xmlparse
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE :  settings.mk
-+# --- Files --------------------------------------------------------
-+
-+CFLAGS+=-I..$/xmltok
-+
-+SLOFILES=	$(SLO)$/xmlparse.obj
-+
-+SECOND_BUILD=UNICODE
-+UNICODE_SLOFILES=	$(SLO)$/xmlparse.obj
-+UNICODECDEFS+=-DXML_UNICODE
-+
-+LIB1ARCHIV=   $(LB)$/libascii_$(TARGET).a
-+LIB1TARGET= $(SLB)$/ascii_$(TARGET).lib
-+LIB1OBJFILES = $(SLOFILES)
-+
-+LIB2ARCHIV=   $(LB)$/lib$(TARGET).a
-+LIB2TARGET= $(SLB)$/$(TARGET).lib
-+LIB2OBJFILES = $(REAL_UNICODE_SLOFILES)
-+
-+.IF "$(BUILD_X64)"!=""
-+# ---------------- X64 stuff special ---------------------
-+#  use UNICODE only because shell/shlxthandler
-+#  doesn't link against ascii_expat_xmlparse
-+#---------------------------------------------------------
-+SLOFILES_X64= $(SLO_X64)$/xmlparse.obj
-+CDEFS_X64+=-DXML_UNICODE
-+CFLAGS_X64+=-I..$/xmltok
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
-+LIB1OBJFILES_X64=$(SLOFILES_X64)
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE :  set_wntx64.mk
-+.INCLUDE :	target.mk
-+.INCLUDE :  tg_wntx64.mk
---- misc/expat/xmltok/makefile.mk	Wed Aug 20 14:33:54 2008
-+++ misc/build/expat/xmltok/makefile.mk	Wed Aug 20 14:33:12 2008
-@@ -1,1 +1,64 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: header.hxx,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=expat
-+TARGET=expat_xmltok
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE :  settings.mk
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES =  \
-+	$(SLO)$/xmlrole.obj\
-+	$(SLO)$/xmltok.obj
-+
-+LIB1ARCHIV= $(LB)$/lib$(TARGET).a
-+LIB1TARGET= $(SLB)$/$(TARGET).lib
-+LIB1OBJFILES = $(SLOFILES)
-+
-+.IF "$(BUILD_X64)"!=""
-+# ---------------- X64 stuff special ---------------------
-+SLOFILES_X64=        \
-+     $(SLO_X64)$/xmlrole.obj\
-+     $(SLO_X64)$/xmltok.obj
-+
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
-+LIB1OBJFILES_X64=$(SLOFILES_X64)
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE :  set_wntx64.mk
-+.INCLUDE :	target.mk
-+.INCLUDE :  tg_wntx64.mk
diff --git a/expat/makefile.mk b/expat/makefile.mk
index 1b5abd365ef3..a7e9a6fe5d68 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -46,15 +46,19 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=expat
-ADDITIONAL_FILES=xmlparse$/makefile.mk xmltok$/makefile.mk makefile.mk
-
-PATCH_FILES=expat.patch
+TARFILE_NAME=expat-2.0.1
+ADDITIONAL_FILES=lib$/makefile.mk
+PATCH_FILES=expat-2.0.1.patch \
+            expat-winapi.patch
 
 CONFIGURE_DIR=
+.IF "$(OS)"=="WNT"
 CONFIGURE_ACTION=
+.ELSE
+CONFIGURE_ACTION=.$/configure
+.ENDIF
 
-BUILD_DIR=
+BUILD_DIR=lib
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 
 # --- Targets ------------------------------------------------------
@@ -62,4 +66,3 @@ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
-
diff --git a/expat/prj/d.lst b/expat/prj/d.lst
index e20e81ed4bda..62e29c2c6005 100644
--- a/expat/prj/d.lst
+++ b/expat/prj/d.lst
@@ -1,6 +1,7 @@
 mkdir: %_DEST%\inc%_EXT%\external\expat
 mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat\xmlparse\xmlparse.h %_DEST%\inc%_EXT%\external\expat\xmlparse.h
+..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
 ..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
 ..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
 ..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc
index ee84e9a560f6..532e9b664c9b 100644
--- a/extensions/inc/extensio.hrc
+++ b/extensions/inc/extensio.hrc
@@ -30,7 +30,7 @@
 #ifndef EXTENSIONS_INC_EXTENSIO_HRC
 #define EXTENSIONS_INC_EXTENSIO_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // -----------------------------------------------------------------------
 // - resource id ranges
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 45763b2dccdb..dc490b49c28e 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -507,11 +507,11 @@
 
 
 
-#include "svtools/filenotation.hxx"
+#include "svl/filenotation.hxx"
 #include "svtools/imgdef.hxx"
 #include "svtools/miscopt.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/numuno.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
 
 #include "svx/flagsdef.hxx"
 
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 4ea4cd755658..1489e2a4e0e4 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,5 @@
-ex  extensions :    l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc uui officecfg ZLIB:zlib NULL
+ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib NULL
+
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
 ex  extensions\inc\ucbhelper                    get     -   all ex_incucbh ex_inc NULL
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index ac6c01693c2d..a12003e5d1a9 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -37,9 +37,9 @@
 #include <tools/urlobj.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #include <sfx2/docfilt.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index 8830b9144409..9ecf96b89246 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp
index 7db1c67e1585..9c10fadadb06 100644
--- a/extensions/source/activex/main/so_activex.cpp
+++ b/extensions/source/activex/main/so_activex.cpp
@@ -35,6 +35,9 @@ END_OBJECT_MAP()
 #ifndef KEY_WOW64_64KEY
     #define KEY_WOW64_64KEY (0x0100)
 #endif
+#ifndef KEY_WOW64_32KEY
+    #define KEY_WOW64_32KEY (0x0200)
+#endif
 
 const REGSAM n64KeyAccess = KEY_ALL_ACCESS | KEY_WOW64_64KEY;
 const REGSAM n32KeyAccess = KEY_ALL_ACCESS;
@@ -46,7 +49,9 @@ const BOOL bX64 = FALSE;
 #endif
 
 // 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502.
+extern "C" {
 WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD);
+}
 
 /////////////////////////////////////////////////////////////////////////////
 // DLL Entry Point
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 4cab6ef50526..218d15455cbd 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_extensions.hxx"
 
 #include <bibconfig.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -244,6 +244,10 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc)
     SetModified();
 };
 //---------------------------------------------------------------------------
+void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+{
+}
+
 void    BibConfig::Commit()
 {
     const Sequence<OUString> aPropertyNames = GetPropertyNames();
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index 178da765818f..7237b0a12695 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -114,6 +114,7 @@ public:
     ~BibConfig();
 
     virtual void    Commit();
+    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
     BibDBDescriptor         GetBibliographyURL();
     void                    SetBibliographyURL(const BibDBDescriptor& rDesc);
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index a554741c666a..03cdb8a80201 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -36,9 +36,9 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/weak.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <uno/environment.h>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 573c5756132b..3b9d7e53b8d7 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -34,7 +34,7 @@
 
 #include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XLocalizedAliases.hpp>
 #include <com/sun/star/lang/XLocalizable.hpp>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 1d322a9b383f..5a95f61f50c1 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -60,7 +60,7 @@
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <comphelper/container.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/headbar.hxx>
 #include <vcl/dialog.hxx>
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index ac7ce58a8f49..99304c394021 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <cppuhelper/implbase5.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include "bibmod.hxx"
 class BibDataManager;
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index 468fbf5837db..1db38bcb647b 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svx/svxids.hrc>
 #ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 416ff1e1845b..d00eecfa1350 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -238,7 +238,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
     aLBSource.Show();
     aLBSource.SetSelectHdl(LINK( this, BibToolBar, SelHdl));
 
-    SvtMiscOptions().AddListener( LINK( this, BibToolBar, OptionsChanged_Impl ) );
+    SvtMiscOptions().AddListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) );
     Application::AddEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) );
 
     aTimer.SetTimeoutHdl(LINK( this, BibToolBar, SendSelHdl));
@@ -271,7 +271,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
 
 BibToolBar::~BibToolBar()
 {
-    SvtMiscOptions().RemoveListener( LINK( this, BibToolBar, OptionsChanged_Impl ) );
+    SvtMiscOptions().RemoveListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) );
     Application::RemoveEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) );
     ::bib::RemoveFromTaskPaneList( this );
 }
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 899154682264..f3a322f038e8 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -39,7 +39,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/timer.hxx>
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 1d02cac88a4b..176efc59d35f 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -50,10 +50,10 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/waitobj.hxx>
 #include <sfx2/docfilt.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 //.........................................................................
 namespace dbp
diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk
index 5591a11b9d36..aba20a2f105a 100644
--- a/extensions/source/dbpilots/makefile.mk
+++ b/extensions/source/dbpilots/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -89,6 +89,7 @@ SHL1STDLIBS= \
         $(SVLLIB) \
         $(SFXLIB)		\
         $(DBTOOLSLIB) \
+                $(UNOTOOLSLIB) \
         $(COMPHELPERLIB) \
         $(CPPUHELPERLIB) \
         $(CPPULIB) \
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index 33bc61be819a..653006035eae 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -31,7 +31,7 @@
 #include "componentmodule.hxx"
 #include <tools/resmgr.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <comphelper/sequence.hxx>
 #include <tools/debug.hxx>
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index df23100e3859..92bcab19bd59 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -310,7 +310,8 @@ char* NSP_getProductName()
     char *pEnd = 0;
     while(!feof(fp))
     {
-        fgets( line, sizeof(line), fp );
+        if (fgets( line, sizeof(line), fp ) == NULL)
+            continue;
         if (NULL == (pStart = strstr( line, "ProductKey=" )))
             continue;
         pStart += strlen("ProductKey=");
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index 2d6fc581f3a6..1893b1579dc2 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -46,8 +46,8 @@
 #include <svx/svxdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index bb5422c69a51..1cc09221e67e 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -38,7 +38,7 @@
 #include "plugin/impl.hxx"
 
 #include "osl/mutex.hxx"
-#include "svtools/pathoptions.hxx"
+#include "unotools/pathoptions.hxx"
 #include "vcl/configsettings.hxx"
 
 #include "com/sun/star/container/XEnumerationAccess.hpp"
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index e965a5696f94..c3ba2a4fd605 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -102,8 +102,13 @@ NPNetscapeFuncs aNPNFuncs =
     NPN_MemFree,
     NPN_MemFlush,
     NPN_ReloadPlugins,
+#ifdef OJI
     NPN_GetJavaEnv,
     NPN_GetJavaPeer,
+#else
+    0,
+    0,
+#endif
     NPN_GetURLNotify,
     NPN_PostURLNotify,
     NPN_GetValue,
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 1f1d291daf8d..bce8cd76a7ac 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -175,6 +175,12 @@ static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rD
     return nDescriptions > 0;
 }
 
+union maxDirent
+{
+    char aBuffer[ sizeof( struct dirent ) + _PC_NAME_MAX +1 ];
+    struct dirent asDirent;
+};
+
 static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions )
 {
     rtl::OStringBuffer aPath( 1024 );
@@ -200,14 +206,13 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
     }
 
     // check subdirectories
-    long aBuffer[ sizeof( struct dirent ) + _PC_NAME_MAX +1 ];
-
     DIR* pDIR = opendir( rPath.getStr() );
     struct dirent* pDirEnt = NULL;
     struct stat aStat;
-    while( pDIR && ! readdir_r( pDIR, (struct dirent*)aBuffer, &pDirEnt ) && pDirEnt )
+    maxDirent u;
+    while( pDIR && ! readdir_r( pDIR, &u.asDirent, &pDirEnt ) && pDirEnt )
     {
-        char* pBaseName = ((struct dirent*)aBuffer)->d_name;
+        char* pBaseName = u.asDirent.d_name;
         if( rtl_str_compare( ".", pBaseName ) && rtl_str_compare( "..", pBaseName ) )
         {
             rtl::OStringBuffer aBuf( 1024 );
@@ -262,9 +267,8 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
             aSearchPath += ByteString( String( rPaths.getConstArray()[i] ), aEncoding );
         }
 
-
-        long aBuffer[ sizeof( struct dirent ) + _PC_NAME_MAX +1 ];
         int nPaths = aSearchPath.GetTokenCount( ':' );
+        maxDirent u;
         for( i = 0; i < nPaths; i++ )
         {
             ByteString aPath( aSearchPath.GetToken( i, ':' ) );
@@ -272,9 +276,9 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
             {
                 DIR* pDIR = opendir( aPath.GetBuffer() );
                 struct dirent* pDirEnt = NULL;
-                while( pDIR && ! readdir_r( pDIR, (struct dirent*)aBuffer, &pDirEnt ) && pDirEnt )
+                while( pDIR && ! readdir_r( pDIR, &u.asDirent, &pDirEnt ) && pDirEnt )
                 {
-                    char* pBaseName = ((struct dirent*)aBuffer)->d_name;
+                    char* pBaseName = u.asDirent.d_name;
                     if( pBaseName[0] != '.' ||
                         pBaseName[1] != '.' ||
                         pBaseName[2] != 0 )
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index dfba6a755201..b4ac6686a71e 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -89,6 +89,7 @@ SHL1STDLIBS= \
 SHL1STDLIBS+= \
     $(VCLLIB)			\
     $(SVLLIB)			\
+        $(UNOTOOLSLIB)                     \
     $(TOOLSLIB)			\
     $(VOSLIB)			\
     $(UCBHELPERLIB)		\
diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk
index db8b58b6e118..143d866773b7 100644
--- a/extensions/source/preload/makefile.mk
+++ b/extensions/source/preload/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -69,6 +69,7 @@ SHL1STDLIBS= \
         $(VCLLIB)    \
         $(SVLLIB)	\
         $(TOOLSLIB)  \
+        $(UNOTOOLSLIB)                     \
         $(COMPHELPERLIB)     \
         $(CPPUHELPERLIB) 	 \
         $(CPPULIB)   \
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index 8456c1a05c37..0279dbc3f4ab 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -34,10 +34,10 @@
 #include "componentmodule.hxx"
 #include <tools/debug.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_
 #include "preload.hrc"
 #endif
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index 49b43114d20e..cde464dd88cb 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -40,7 +40,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/scrbar.hxx>
 
 //.........................................................................
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 197a1cfb41f9..e6ef80f5ba6b 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -71,8 +71,8 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
 #include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index f21e70a20f47..440d5237f3b1 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -89,14 +89,14 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <svtools/colrdlg.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/numuno.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/filenotation.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/numuno.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/numinf.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 8d730d3e8c9c..d81966e39257 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -45,7 +45,7 @@
 #include <tools/debug.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc
index 705638accf98..338b0eebab88 100644
--- a/extensions/source/propctrlr/propresid.hrc
+++ b/extensions/source/propctrlr/propresid.hrc
@@ -31,7 +31,7 @@
 #ifndef EXTENSIONS_PROPRESID_HRC
 #define EXTENSIONS_PROPRESID_HRC
 
-// TODO: create a new resource range in <svtools/solar.hrc>
+// TODO: create a new resource range in <svl/solar.hrc>
 
 #define RID_PROPCONTROLLER_START        1000
     // arbitrary at the moment
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 26d46aa7dec9..dac5ccca77d5 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -55,7 +55,7 @@
 #include <vcl/floatwin.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/datetime.hxx>
 #include <i18npool/mslangid.hxx>
 #ifndef _SV_BUTTON_HXX
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 005659f3576a..b27afa750fa6 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -36,10 +36,10 @@
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 /** === end UNO includes === **/
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/util/Time.hpp>
 #include "modulepcr.hxx"
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 70759e9c5ad7..ea34b2678d14 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
 /** === end UNO includes === **/
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
 
 //........................................................................
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index 9aa0ee22f794..80ebe1dd9f13 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -43,11 +43,6 @@
 #include <tools/string.hxx>
 #include <vos/conditn.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-
 #include <smart/com/sun/star/io/XOutputStream.hxx>
 #include <smart/com/sun/star/xml/sax/SAXParseException.hxx>
 #include <smart/com/sun/star/xml/sax/XParser.hxx>
@@ -309,12 +304,12 @@ Sequence< UString > OSaxParserTest::getWarnings(void)                       THRO
 XInputStreamRef createStreamFromSequence( const Sequence<BYTE> seqBytes , XMultiServiceFactoryRef &xSMgr )
 {
     XInterfaceRef xOutStreamService = xSMgr->createInstance( L"com.sun.star.io.Pipe" );
-    assert( xOutStreamService.is() );
+    OSL_ASSERT( xOutStreamService.is() );
     XOutputStreamRef rOutStream( xOutStreamService , USR_QUERY );
-    assert( rOutStream.is() );
+    OSL_ASSERT( rOutStream.is() );
 
     XInputStreamRef rInStream( xOutStreamService , USR_QUERY );
-    assert( rInStream.is() );
+    OSL_ASSERT( rInStream.is() );
 
     rOutStream->writeBytes( seqBytes );
     rOutStream->flush();
@@ -442,7 +437,7 @@ public: // ExtendedDocumentHandler
     }
     virtual void endElement(const UString& aName) THROWS( (SAXException,UsrSystemException) )
     {
-        assert( m_iLevel );
+        OSL_ASSERT( m_iLevel );
         m_iLevel --;
         if( m_bPrint ) {
             int i;
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
index e27601c92d34..b4ab9d3f73ea 100644
--- a/extensions/test/sax/testwriter.cxx
+++ b/extensions/test/sax/testwriter.cxx
@@ -50,11 +50,6 @@
 #include <usr/weak.hxx>
 #include <tools/string.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-
 #include <usr/factoryhlp.hxx>
 
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
@@ -401,7 +396,7 @@ void AttributeListImpl::clear()
     vector<struct TagAttribute> dummy;
     m_pImpl->vecAttribute.swap( dummy );
 
-    assert( ! getLength() );
+    OSL_ASSERT( ! getLength() );
 }
 
 
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 5edc414e7f2c..be302d877432 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -52,10 +52,6 @@
 #include <vos/mutex.hxx>
 #include <vos/thread.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <string.h>
 
 #include "testfactreg.hxx"
@@ -206,13 +202,13 @@ INT32 ODataStreamTest::test(    const UString& TestName,
                     x->queryInterface( XActiveDataSource::getSmartUik() , rSource );
                 }
 
-                assert( rPipeInput.is() );
-                assert( rPipeOutput.is() );
+                OSL_ASSERT( rPipeInput.is() );
+                OSL_ASSERT( rPipeOutput.is() );
                 rSink->setInputStream( rPipeInput );
                 rSource->setOutputStream( rPipeOutput );
 
-                assert( rSink->getInputStream().is() );
-                assert( rSource->getOutputStream().is() );
+                OSL_ASSERT( rSink->getInputStream().is() );
+                OSL_ASSERT( rSource->getOutputStream().is() );
 
                 if( 1 == hTestHandle ) {
                     testSimple( rInput , rOutput );
@@ -767,10 +763,10 @@ INT32 OObjectStreamTest::test(  const UString& TestName,
                 XOutputStreamRef    markableOutput( x , USR_QUERY );
                 XActiveDataSourceRef    markableSource( x , USR_QUERY );
 
-                assert( markableInput.is()  );
-                assert( markableOutput.is() );
-                assert( markableSink.is()   );
-                assert( markableSource.is() );
+                OSL_ASSERT( markableInput.is()  );
+                OSL_ASSERT( markableOutput.is() );
+                OSL_ASSERT( markableSink.is()   );
+                OSL_ASSERT( markableSource.is() );
 
                 markableSink->setInputStream( rPipeInput );
                 markableSource->setOutputStream( rPipeOutput );
@@ -786,14 +782,14 @@ INT32 OObjectStreamTest::test(  const UString& TestName,
                     x->queryInterface( XActiveDataSource::getSmartUik() , rSource );
                 }
 
-                assert( rPipeInput.is() );
-                assert( rPipeOutput.is() );
+                OSL_ASSERT( rPipeInput.is() );
+                OSL_ASSERT( rPipeOutput.is() );
 
                 rSink->setInputStream( markableInput );
                 rSource->setOutputStream( markableOutput );
 
-                assert( rSink->getInputStream().is() );
-                assert( rSource->getOutputStream().is() );
+                OSL_ASSERT( rSink->getInputStream().is() );
+                OSL_ASSERT( rSource->getOutputStream().is() );
 
                 if( 1 + DATASTREAM_TEST_MAX_HANDLE == hTestHandle ) {
                     testObject( rOutput , rInput);
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 8bba9bbebc86..2cc19c2ae265 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -48,10 +48,6 @@
 #include <vos/mutex.hxx>
 #include <vos/thread.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <string.h>
 
 #include "testfactreg.hxx"
@@ -166,8 +162,8 @@ INT32 OMarkableOutputStreamTest::test(  const UString& TestName,
 
                 XOutputStreamRef rOutput( TestObject , USR_QUERY );
 
-                assert( rPipeInput.is() );
-                assert( rOutput.is() );
+                OSL_ASSERT( rPipeInput.is() );
+                OSL_ASSERT( rOutput.is() );
                 if( 1 == hTestHandle ) {
                     // checks usual streaming
                     testSimple( rOutput , rPipeInput );
@@ -533,8 +529,8 @@ INT32 OMarkableInputStreamTest::test(   const UString& TestName,
 
                 XInputStreamRef rInput( TestObject , USR_QUERY );
 
-                assert( rPipeOutput.is() );
-                assert( rInput.is() );
+                OSL_ASSERT( rPipeOutput.is() );
+                OSL_ASSERT( rInput.is() );
                 if( 1 == hTestHandle ) {
                     // checks usual streaming
                     testSimple( rPipeOutput , rInput );
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index 4f4337ceff45..233979230708 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -45,10 +45,6 @@
 #include <vos/mutex.hxx>
 #include <vos/thread.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <string.h>
 
 #include "testfactreg.hxx"
@@ -404,7 +400,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
             XInputStreamRef input( x , USR_QUERY );
             XOutputStreamRef output( x , USR_QUERY );
 
-            assert( output.is() );
+            OSL_ASSERT( output.is() );
             while(  TRUE ) {
                 // basic read/write
                 Sequence<BYTE> seqWrite( 500 );
diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src
index 308e4ed2ab88..7fe4a237e896 100644
--- a/extensions/util/hidother.src
+++ b/extensions/util/hidother.src
@@ -424,7 +424,6 @@ hidspecial UID_PROP_DLG_XSD_READONLY            { HelpId = UID_PROP_DLG_XSD_READ
 hidspecial UID_PROP_DLG_XSD_RELEVANT            { HelpId = UID_PROP_DLG_XSD_RELEVANT; }
 hidspecial UID_PROP_DLG_XSD_REQUIRED            { HelpId = UID_PROP_DLG_XSD_REQUIRED; }
 hidspecial UID_PROP_REMOVE_DATA_TYPE            { HelpId = UID_PROP_REMOVE_DATA_TYPE; }
-
 hidspecial HID_FM_PROPDLG_TABCTR                { HelpId = HID_FM_PROPDLG_TABCTR; }
 hidspecial HID_FM_PROPDLG_TAB_GENERAL           { HelpId = HID_FM_PROPDLG_TAB_GENERAL; }
 hidspecial HID_FM_PROPDLG_TAB_DATA              { HelpId = HID_FM_PROPDLG_TAB_DATA; }
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index ad38869c4c38..9cb61f00b3e8 100644
--- a/extensions/workben/pythonautotest.cxx
+++ b/extensions/workben/pythonautotest.cxx
@@ -44,10 +44,6 @@
 #include <usr/weak.hxx>
 #include <tools/string.hxx>
 #include <vos/conditn.hxx>
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
 
 using namespace rtl;
 using namespace vos;
@@ -302,7 +298,7 @@ void TestListener::cmdLine()
 
 void TestListener::detach()
 {
-    assert( m_pDebuggingRef );
+    OSL_ASSERT( m_pDebuggingRef );
 
        m_pDebuggingRef = 0;
 }
@@ -322,15 +318,15 @@ void checkInvokation( const XInvokationRef &xInvoke )
     UsrAny anyList;
 
     // check exporting an object as an invokation
-    assert( xInvoke->hasProperty( L"list" ) );
+    OSL_ASSERT( xInvoke->hasProperty( L"list" ) );
     anyList = xInvoke->getValue( L"list" );
 
-    assert( anyList.getReflection() == XInvokation_getReflection() );
+    OSL_ASSERT( anyList.getReflection() == XInvokation_getReflection() );
     XInvokationRef *pRef = ( XInvokationRef * ) anyList.get();
-    assert( (*pRef).is() );
+    OSL_ASSERT( (*pRef).is() );
 
-    assert( (*pRef)->hasMethod( L"append"  ) );
-    assert( (*pRef)->hasMethod( L"count" ) );
+    OSL_ASSERT( (*pRef)->hasMethod( L"append"  ) );
+    OSL_ASSERT( (*pRef)->hasMethod( L"count" ) );
 
     Sequence<UsrAny> seq(1);
     UsrAny any( (INT32) 1);
@@ -342,7 +338,7 @@ void checkInvokation( const XInvokationRef &xInvoke )
     any = (*pRef)->invoke( L"append" , seq  , Sequence<INT16>(), Sequence<UsrAny>() );
     any = (*pRef)->invoke( L"count" , seq , Sequence<INT16>(), Sequence<UsrAny>() );
 
-    assert( nOldSize + 1 == any.getINT32() );
+    OSL_ASSERT( nOldSize + 1 == any.getINT32() );
 }
 
 // just for testing !
@@ -448,30 +444,30 @@ int __LOADONCALLAPI main (int argc, char **argv)
     *****/
     // get/set an int !
     {
-        assert( xInvoke->hasProperty( L"nIntTest" ) );
+        OSL_ASSERT( xInvoke->hasProperty( L"nIntTest" ) );
         UsrAny any = xInvoke->getValue( L"nIntTest" );
 
-        assert( any.getReflection()->getTypeClass() == TypeClass_LONG );
-        assert( any.getINT32() == 5 );
+        OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG );
+        OSL_ASSERT( any.getINT32() == 5 );
 
         // simple test: set an int !
         xInvoke->setValue( L"nIntTest" , UsrAny( (INT32) 10 ) );
         any = xInvoke->getValue( L"nIntTest" );
 
-        assert( any.getReflection()->getTypeClass() == TypeClass_LONG );
-        assert( any.getINT32() == 10 );
+        OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG );
+        OSL_ASSERT( any.getINT32() == 10 );
     }
 
     //  call a python method !
     {
         xEngine->run( L"def foo():\n"
                       L"    return 'this is foo'\n" , XInterfaceRef() , Sequence<UsrAny> () );
-        assert( xInvoke->hasMethod( L"foo" ) );
+        OSL_ASSERT( xInvoke->hasMethod( L"foo" ) );
         UsrAny any = xInvoke->invoke(   L"foo" ,
                                         Sequence<UsrAny>(),
                                         Sequence<INT16>() ,
                                         Sequence<UsrAny> () );
-        assert( any.getString() == L"this is foo" );
+        OSL_ASSERT( any.getString() == L"this is foo" );
     }
 
 
@@ -480,7 +476,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
         try {
             xInvoke->invoke( L"foo" , Sequence<UsrAny>(1) , Sequence<INT16>(), Sequence<UsrAny> () );
             // wrong number of arguments
-            assert( 0 );
+            OSL_ASSERT( 0 );
         }
         catch ( IllegalArgumentException& e ) {
         }
@@ -501,21 +497,21 @@ int __LOADONCALLAPI main (int argc, char **argv)
     *******/
     {
         XIntrospectionAccessRef xIntrospection = xInvoke->getIntrospection();
-        assert( xIntrospection.is() );
+        OSL_ASSERT( xIntrospection.is() );
 
         // no further test, simply call them
         xIntrospection->getMethods(0);
         xIntrospection->getProperties(0);
 
-        assert( xIntrospection->getSuppliedMethodConcepts() == 0 );
-        assert( xIntrospection->getSuppliedPropertyConcepts() == 0 );
+        OSL_ASSERT( xIntrospection->getSuppliedMethodConcepts() == 0 );
+        OSL_ASSERT( xIntrospection->getSuppliedPropertyConcepts() == 0 );
 
         Property prop = xIntrospection->getProperty( L"nIntTest" ,0 );
-        assert( prop.Name == L"nIntTest" );
-        assert( prop.Type->getTypeClass() == TypeClass_LONG );
+        OSL_ASSERT( prop.Name == L"nIntTest" );
+        OSL_ASSERT( prop.Type->getTypeClass() == TypeClass_LONG );
 
         XIdlMethodRef method = xIntrospection->getMethod( L"foo" , 0 );
-        assert( method->getName() == L"foo" );
+        OSL_ASSERT( method->getName() == L"foo" );
     }
 
 
@@ -567,8 +563,8 @@ int __LOADONCALLAPI main (int argc, char **argv)
         xEngine->run(   L"import testmodul\n"
                         L"x = testmodul.testmethod()\n" , XInterfaceRef() , Sequence<UsrAny>() );
         UsrAny any = xInvoke->getValue( L"x" );
-        assert( any.getReflection()->getTypeClass() == TypeClass_LONG );
-        assert( any.getINT32() == 42 );
+        OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG );
+        OSL_ASSERT( any.getINT32() == 42 );
     }
 
     // check other imports
@@ -577,11 +573,11 @@ int __LOADONCALLAPI main (int argc, char **argv)
         xEngine->run(   L"import math\n"
                         L"dMathTest = math.exp(0)\n"  , XInterfaceRef() , Sequence<UsrAny> () );
 
-        assert( xInvoke->hasProperty( L"dMathTest" ) );
+        OSL_ASSERT( xInvoke->hasProperty( L"dMathTest" ) );
         UsrAny any = xInvoke->getValue( L"dMathTest" );
 
-        assert( any.getReflection()->getTypeClass() == TypeClass_DOUBLE );
-        assert( any.getDouble() == 1. );
+        OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_DOUBLE );
+        OSL_ASSERT( any.getDouble() == 1. );
     }
 
     // Test connection to root object !
@@ -592,36 +588,36 @@ int __LOADONCALLAPI main (int argc, char **argv)
                         L"z = y.value\n" , XInterfaceRef() , Sequence<UsrAny> () );
 
         UsrAny any = xInvoke->getValue( L"x" );
-        assert( any.getReflection()->getTypeClass() == TypeClass_LONG );
-        assert( any.getINT32() == 15 );
+        OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG );
+        OSL_ASSERT( any.getINT32() == 15 );
 
         any = xInvoke->getValue( L"z" );
-        assert( any.getReflection()->getTypeClass() == TypeClass_LONG );
-        assert( any.getINT32() == 15 );
+        OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG );
+        OSL_ASSERT( any.getINT32() == 15 );
     }
 
     // Test exactName interface
     {
         UsrAny any = xInvoke->getValue( L"__builtins__" );
-        assert( any.getReflection()->getTypeClass() == TypeClass_INTERFACE );
+        OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_INTERFACE );
 
         XInvokationRef rInv( *((XInterfaceRef *) any.get() ), USR_QUERY );
-        assert( rInv.is() );
+        OSL_ASSERT( rInv.is() );
 
         XExactNameRef rName( *((XInterfaceRef*) any.get() ), USR_QUERY );
-        assert( rName.is() );
+        OSL_ASSERT( rName.is() );
 
         UString str = rName->getExactName( L"SYNTAXERROR" );
-        assert( str.len() );
+        OSL_ASSERT( str.len() );
     }
 
 
     // Test exactName interface of the engine itself
     {
         XExactNameRef rName( xInvoke , USR_QUERY );
-        assert( rName.is() );
+        OSL_ASSERT( rName.is() );
         UString str = rName->getExactName( L"STARDIV" );
-        assert( str.len() );
+        OSL_ASSERT( str.len() );
     }
 
 
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index 5e2efff66f26..796884dff8aa 100644
--- a/extensions/workben/pythontest.cxx
+++ b/extensions/workben/pythontest.cxx
@@ -45,10 +45,6 @@
 #include <usr/weak.hxx>
 #include <tools/string.hxx>
 #include <vos/conditn.hxx>
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
 
 using namespace rtl;
 using namespace vos;
@@ -453,7 +449,7 @@ void CmdDebugger::dumpVarToStream( const char *pc , const UsrAny &aValue, FILE *
 
 void CmdDebugger::detach()
 {
-    assert( m_pDebuggingRef );
+    OSL_ASSERT( m_pDebuggingRef );
 
        m_bIsRunning = FALSE;
        m_pDebuggingRef = 0;
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 869f5331752e..08d8af4831b8 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -52,11 +52,6 @@
 #include <tools/string.hxx>
 #include <vos/conditn.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-
 #include <smart/com/sun/star/test/XSimpleTest.hxx>
 
 using namespace rtl;
@@ -84,7 +79,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
     // create service manager
 //  XMultiServiceFactoryRef xSMgr = getProcessServiceManager();
     XMultiServiceFactoryRef xSMgr = createRegistryServiceManager();
-    assert( xSMgr.is() );
+    OSL_ASSERT( xSMgr.is() );
     registerUsrServices( xSMgr );
     setProcessServiceManager( xSMgr );
 
@@ -98,9 +93,9 @@ int __LOADONCALLAPI main (int argc, char **argv)
         x->queryInterface( XImplementationRegistration::getSmartUik() , xReg );
 
 /*      x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" );
-        assert( x.is() );
+        OSL_ASSERT( x.is() );
         x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg );
-        assert( xSimpleReg.is() );
+        OSL_ASSERT( xSimpleReg.is() );
         xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE );
 */  }
     catch( Exception& e ) {
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index 2de43b4576c5..60d626379b1b 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -35,7 +35,7 @@
 
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // Help-Ids --------------------------------------------------------------
diff --git a/svx/inc/countryid.hxx b/filter/inc/filter/msfilter/countryid.hxx
index 20794a355477..0c66f1bf546c 100644
--- a/svx/inc/countryid.hxx
+++ b/filter/inc/filter/msfilter/countryid.hxx
@@ -35,11 +35,11 @@
 
 #include <sal/types.h>
 #include <i18npool/lang.h>
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 
 // ----------------------------------------------------------------------------
 
-namespace svx {
+namespace msfilter {
 
 // Windows Country IDs ========================================================
 
@@ -292,7 +292,7 @@ const CountryId COUNTRY_UZBEKISTAN          = 998;
         The best Windows country ID for the passed language type, or
         COUNTRY_DONTKNOW on error.
  */
-SVX_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage );
+MSFILTER_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage );
 
 /** Converts a Windows country ID to a language type.
 
@@ -309,7 +309,7 @@ SVX_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage );
         The most used language type in the passed country, or LANGUAGE_DONTKNOW
         on error.
  */
-SVX_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry );
+MSFILTER_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry );
 
 // ============================================================================
 
diff --git a/svx/inc/svx/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx
index a93814b2a825..fc36208d1207 100644
--- a/svx/inc/svx/escherex.hxx
+++ b/filter/inc/filter/msfilter/escherex.hxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <svx/msdffdef.hxx>
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 
         /*Record Name       FBT-Value   Instance                  Contents                                                          Wrd Exl PPt Ver*/
 // In der Mickysoft-Doku heissen die msofbt... statt ESCHER_...
@@ -967,7 +967,7 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
-struct SVX_DLLPUBLIC EscherConnectorListEntry
+struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >   mXConnector;
     ::com::sun::star::awt::Point            maPointA;
@@ -991,7 +991,7 @@ struct SVX_DLLPUBLIC EscherConnectorListEntry
     sal_uInt32      GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
 };
 
-struct SVX_DLLPUBLIC EscherExContainer
+struct MSFILTER_DLLPUBLIC EscherExContainer
 {
     sal_uInt32  nContPos;
     SvStream&   rStrm;
@@ -999,7 +999,7 @@ struct SVX_DLLPUBLIC EscherExContainer
     EscherExContainer( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance = 0 );
     ~EscherExContainer();
 };
-struct SVX_DLLPUBLIC EscherExAtom
+struct MSFILTER_DLLPUBLIC EscherExAtom
 {
     sal_uInt32  nContPos;
     SvStream&   rStrm;
@@ -1076,7 +1076,7 @@ class EscherBlibEntry
 #define _E_GRAPH_PROV_USE_INSTANCES             1
 #define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES   2
 
-class SVX_DLLPUBLIC EscherGraphicProvider
+class MSFILTER_DLLPUBLIC EscherGraphicProvider
 {
         sal_uInt32              mnFlags;
 
@@ -1107,7 +1107,7 @@ class SVX_DLLPUBLIC EscherGraphicProvider
 
 };
 
-class SVX_DLLPUBLIC EscherSolverContainer
+class MSFILTER_DLLPUBLIC EscherSolverContainer
 {
     List                maShapeList;
     List                maConnectorList;
@@ -1148,7 +1148,7 @@ struct EscherPropSortStruct
 
 typedef std::vector< EscherPropSortStruct > EscherProperties;
 
-class SVX_DLLPUBLIC EscherPropertyContainer
+class MSFILTER_DLLPUBLIC EscherPropertyContainer
 {
         EscherGraphicProvider*  pGraphicProvider;
         SvStream*               pPicOutStrm;
@@ -1256,7 +1256,7 @@ class SVX_DLLPUBLIC EscherPropertyContainer
 
 // ---------------------------------------------------------------------------------------------
 
-class SVX_DLLPUBLIC EscherPersistTable
+class MSFILTER_DLLPUBLIC EscherPersistTable
 {
 
     public:
@@ -1279,7 +1279,7 @@ class SVX_DLLPUBLIC EscherPersistTable
 class EscherEx;
 
 /// abstract base class for ESCHER_ClientTextbox, ESCHER_ClientData
-class SVX_DLLPUBLIC EscherExClientRecord_Base
+class MSFILTER_DLLPUBLIC EscherExClientRecord_Base
 {
 public:
                                 EscherExClientRecord_Base() {}
@@ -1293,7 +1293,7 @@ public:
 
 
 /// abstract base class for ESCHER_ClientAnchor
-class SVX_DLLPUBLIC EscherExClientAnchor_Base
+class MSFILTER_DLLPUBLIC EscherExClientAnchor_Base
 {
 public:
                                 EscherExClientAnchor_Base() {}
@@ -1358,7 +1358,7 @@ class Graphic;
 class SvMemoryStream;
 class SvStream;
 
-class SVX_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGraphicProvider
+class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGraphicProvider
 {
     protected :
 
@@ -1510,4 +1510,4 @@ class SVX_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGraphicPr
 };
 
 
-#endif // _SVX_ESCHEREX_HXX
+#endif
diff --git a/svx/inc/mscodec.hxx b/filter/inc/filter/msfilter/mscodec.hxx
index 4ee508d661dd..a42e360d0f96 100644
--- a/svx/inc/mscodec.hxx
+++ b/filter/inc/filter/msfilter/mscodec.hxx
@@ -33,15 +33,15 @@
 
 #include "rtl/cipher.h"
 #include "rtl/digest.h"
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 
-namespace svx {
+namespace msfilter {
 
 // ============================================================================
 
 /** Encodes and decodes data from protected MSO 95- documents.
  */
-class SVX_DLLPUBLIC MSCodec_Xor95
+class MSFILTER_DLLPUBLIC MSCodec_Xor95
 {
 public:
     explicit            MSCodec_Xor95(int nRotateDistance);
@@ -123,8 +123,8 @@ protected:
     sal_Size            mnOffset;       /// Key offset.
 
 private:
-                        SVX_DLLPRIVATE MSCodec_Xor95( const MSCodec_Xor95& );
-    SVX_DLLPRIVATE MSCodec_Xor95&      operator=( const MSCodec_Xor95& );
+                        MSFILTER_DLLPRIVATE MSCodec_Xor95( const MSCodec_Xor95& );
+    MSFILTER_DLLPRIVATE MSCodec_Xor95&      operator=( const MSCodec_Xor95& );
 
     sal_uInt16          mnKey;          /// Base key from password.
     sal_uInt16          mnHash;         /// Hash value from password.
@@ -133,7 +133,7 @@ private:
 
 /** Encodes and decodes data from protected MSO XLS 95- documents.
  */
-class SVX_DLLPUBLIC MSCodec_XorXLS95 : public MSCodec_Xor95
+class MSFILTER_DLLPUBLIC MSCodec_XorXLS95 : public MSCodec_Xor95
 {
 public:
     explicit            MSCodec_XorXLS95() : MSCodec_Xor95(2) {}
@@ -154,7 +154,7 @@ public:
 
 /** Encodes and decodes data from protected MSO Word 95- documents.
  */
-class SVX_DLLPUBLIC MSCodec_XorWord95 : public MSCodec_Xor95
+class MSFILTER_DLLPUBLIC MSCodec_XorWord95 : public MSCodec_Xor95
 {
 public:
     explicit            MSCodec_XorWord95() : MSCodec_Xor95(7) {}
@@ -182,7 +182,7 @@ public:
     Implementation is based on the wvDecrypt package by Caolan McNamara:
     http://www.csn.ul.ie/~caolan/docs/wvDecrypt.html
  */
-class SVX_DLLPUBLIC MSCodec_Std97
+class MSFILTER_DLLPUBLIC MSCodec_Std97
 {
 public:
     explicit            MSCodec_Std97();
@@ -327,8 +327,8 @@ private:
     void                GetDigestFromSalt( const sal_uInt8 pSaltData[16], sal_uInt8 pDigest[16] );
 
 private:
-                        SVX_DLLPRIVATE MSCodec_Std97( const MSCodec_Std97& );
-    SVX_DLLPRIVATE MSCodec_Std97&      operator=( const MSCodec_Std97& );
+                        MSFILTER_DLLPRIVATE MSCodec_Std97( const MSCodec_Std97& );
+    MSFILTER_DLLPRIVATE MSCodec_Std97&      operator=( const MSCodec_Std97& );
 
     rtlCipher           m_hCipher;
     rtlDigest           m_hDigest;
@@ -337,7 +337,7 @@ private:
 
 // ============================================================================
 
-} // namespace svx
+} // namespace msfilter
 
 #endif
 
diff --git a/svx/inc/svx/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 603a6831fe30..eadb6328b1de 100644
--- a/svx/inc/svx/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -34,20 +34,17 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <tools/solar.h>        // UINTXX
-#include <svtools/svarray.hxx>
-
+#include <svl/svarray.hxx>
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 #include <tools/table.hxx>
 #include <svx/msdffdef.hxx>
-#include <svx/msfiltertracer.hxx>
+#include <filter/msfilter/msfiltertracer.hxx>
 #include <vcl/graph.hxx>
 #include <string.h>
-
 #include <map>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svx/svxdllapi.h>
-
+#include <filter/msfilter/msfilterdllapi.h>
 #include <sot/storage.hxx>
 
 class Graphic;
@@ -67,6 +64,100 @@ struct SvxMSDffBLIPInfo;
 struct SvxMSDffShapeInfo;
 struct SvxMSDffShapeOrder;
 
+class MSFILTER_DLLPUBLIC DffRecordHeader
+{
+
+public:
+    BYTE    nRecVer; // may be DFF_PSFLAG_CONTAINER
+    UINT16  nRecInstance;
+    UINT16  nImpVerInst;
+    UINT16  nRecType;
+    UINT32  nRecLen;
+    ULONG   nFilePos;
+public:
+    DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0), nRecType(0), nRecLen(0), nFilePos(0) {}
+    FASTBOOL IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; }
+    ULONG    GetRecBegFilePos() const { return nFilePos; }
+    ULONG    GetRecEndFilePos() const { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; }
+    void SeekToEndOfRecord(SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen ); }
+    void SeekToContent(    SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE ); }
+    void SeekToBegOfRecord(SvStream& rIn) const { rIn.Seek( nFilePos ); }
+
+    MSFILTER_DLLPUBLIC friend SvStream& operator>>(SvStream& rIn, DffRecordHeader& rRec);
+
+};
+
+struct DffPropFlags
+{
+    BYTE    bSet        : 1;
+    BYTE    bComplex    : 1;
+    BYTE    bBlip       : 1;
+    BYTE    bSoftAttr   : 1;
+};
+
+class SvxMSDffManager;
+
+class MSFILTER_DLLPUBLIC DffPropSet : public Table
+{
+    protected :
+
+        UINT32          mpContents[ 1024 ];
+        DffPropFlags    mpFlags[ 1024 ];
+
+    public :
+
+        DffPropSet( BOOL bInitialize = FALSE ){ if ( bInitialize )
+                                                memset( mpFlags, 0, 0x400 * sizeof( DffPropFlags ) ); };
+
+        inline BOOL IsProperty( UINT32 nRecType ) const { return ( mpFlags[ nRecType & 0x3ff ].bSet ); };
+        BOOL        IsHardAttribute( UINT32 nId ) const;
+        UINT32      GetPropertyValue( UINT32 nId, UINT32 nDefault = 0 ) const;
+        /** Returns a boolean property by its real identifier. */
+        bool        GetPropertyBool( UINT32 nId, bool bDefault = false ) const;
+        /** Returns a string property. */
+        ::rtl::OUString GetPropertyString( UINT32 nId, SvStream& rStrm ) const;
+        void        SetPropertyValue( UINT32 nId, UINT32 nValue ) const;
+        BOOL        SeekToContent( UINT32 nRecType, SvStream& rSt ) const;
+        void        Merge( DffPropSet& rMasterPropSet ) const;
+        void        InitializePropSet() const;
+        friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet );
+};
+
+class SfxItemSet;
+class SdrObject;
+struct DffObjData;
+
+class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet
+{
+    const SvxMSDffManager&  rManager;
+    DffPropSet*             pDefaultPropSet;
+
+    void        ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const;
+    void        ApplyCustomShapeAdjustmentAttributes( SfxItemSet& rSet ) const;
+    void        ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
+    void        ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eShapeType ) const; // #i28269#
+    void        ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
+
+public:
+
+    INT32                   mnFix16Angle;
+
+    DffPropertyReader( const SvxMSDffManager& rManager );
+    ~DffPropertyReader();
+    INT32       Fix16ToAngle( INT32 nAngle ) const;
+
+#ifdef DBG_CUSTOMSHAPE
+    void        ReadPropSet( SvStream& rIn, void* pClientData, UINT32 nShapeType = 0 ) const;
+#else
+    void        ReadPropSet( SvStream& rIn, void* pClientData ) const;
+#endif
+
+    void        SetDefaultPropSet( SvStream& rIn, UINT32 nOffDgg ) const;
+    void        ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const;
+    void        ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
+};
+
+
 #define COL_DEFAULT RGB_COLORDATA( 0xFA, 0xFB, 0xFC )
 
 typedef SvxMSDffBLIPInfo*  SvxMSDffBLIPInfo_Ptr;
@@ -87,9 +178,9 @@ SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders, SvxMSDffShapeOrder_Ptr, 16,16)
 
 // explizit sortiert werden:
 //
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos,  SvxMSDffShapeInfo_Ptr,  16,16, SVX_DLLPUBLIC)
+SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos,  SvxMSDffShapeInfo_Ptr,  16,16, MSFILTER_DLLPUBLIC)
 
-SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort,   SvxMSDffShapeOrder_Ptr, 16,16, SVX_DLLPUBLIC)
+SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort,   SvxMSDffShapeOrder_Ptr, 16,16, MSFILTER_DLLPUBLIC)
 
 #define SVXMSDFF_SETTINGS_CROP_BITMAPS      1
 #define SVXMSDFF_SETTINGS_IMPORT_PPT        2
@@ -136,14 +227,14 @@ struct SvxMSDffConnectorRule
 
     friend SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rAtom );
 };
-struct SVX_DLLPUBLIC SvxMSDffSolverContainer
+struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer
 {
     List    aCList;
 
             SvxMSDffSolverContainer();
             ~SvxMSDffSolverContainer();
 
-    SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rAtom );
+    MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rAtom );
 };
 
 struct FIDCL
@@ -167,7 +258,7 @@ struct MSDffTxId
               nSequence(          rCopy.nSequence ){}
 };
 
-struct SVX_DLLPUBLIC SvxMSDffImportRec
+struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
 {
     SdrObject*  pObj;
     Polygon*    pWrapPolygon;
@@ -219,7 +310,7 @@ struct SVX_DLLPUBLIC SvxMSDffImportRec
 typedef SvxMSDffImportRec* MSDffImportRec_Ptr;
 
 // Liste aller SvxMSDffImportRec fuer eine Gruppe
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY(MSDffImportRecords, MSDffImportRec_Ptr, 16,16, SVX_DLLPUBLIC)
+SV_DECL_PTRARR_SORT_DEL_VISIBILITY(MSDffImportRecords, MSDffImportRec_Ptr, 16,16, MSFILTER_DLLPUBLIC)
 
 //---------------------------------------------------------------------------
 //   Import-/Export-Parameterblock fuer 1 x ImportObjAtCurrentStreamPos()
@@ -305,7 +396,7 @@ enum DffSeekToContentMode
     SEEK_FROM_CURRENT_AND_RESTART
 };
 
-class SVX_DLLPUBLIC DffRecordManager : public DffRecordList
+class MSFILTER_DLLPUBLIC DffRecordManager : public DffRecordList
 {
     public :
 
@@ -339,7 +430,7 @@ class SVX_DLLPUBLIC DffRecordManager : public DffRecordList
              MUSS jeweils die Methode ProcessUserDefinedRecord()
              implementiert werden!
 */
-class SVX_DLLPUBLIC SvxMSDffManager : public DffPropertyReader
+class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader
 {
     FmFormModel*            pFormModel;
     SvxMSDffBLIPInfos*      pBLIPInfos;
diff --git a/svtools/inc/svtool.h b/filter/inc/filter/msfilter/msfilterdllapi.h
index d088daa44249..ada4c8e853a9 100644
--- a/svtools/inc/svtool.h
+++ b/filter/inc/filter/msfilter/msfilterdllapi.h
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svtool.h,v $
+ * $RCSfile: dllapi.h,v $
  * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
@@ -28,13 +28,17 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOL_H
-#define _SVTOOL_H
+#ifndef INCLUDED_MSFILTER_DLLAPI_H
+#define INCLUDED_MSFILTER_DLLAPI_H
 
-#if defined( W30 ) && defined( _MSC_VER )
-#define SVEXPORT    _export
+#include "sal/types.h"
+
+#if defined MSFILTER_DLLIMPLEMENTATION
+#define MSFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
 #else
-#define SVEXPORT
+#define MSFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#endif // _SVTOOL_H
+#define MSFILTER_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
diff --git a/svx/inc/svx/msfiltertracer.hxx b/filter/inc/filter/msfilter/msfiltertracer.hxx
index 5cd3079e1587..13417175dc52 100644
--- a/svx/inc/svx/msfiltertracer.hxx
+++ b/filter/inc/filter/msfilter/msfiltertracer.hxx
@@ -42,10 +42,10 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 
 class FilterConfigItem;
-class SVX_DLLPUBLIC MSFilterTracer
+class MSFILTER_DLLPUBLIC MSFilterTracer
 {
         FilterConfigItem*   mpCfgItem;
         SvXMLAttributeList* mpAttributeList;
diff --git a/svx/inc/svx/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index a32179a43eb4..cf06e8378541 100644
--- a/svx/inc/svx/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -37,7 +37,7 @@
 //#ifndef C2U
 //#define C2U(cChar)    rtl::OUString::createFromAscii(cChar)
 //#endif
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 #include <vector>
 #include <hash_map>
 
@@ -90,7 +90,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SvxMSConvertOCXControls
+class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls
 {
 public:
     SvxMSConvertOCXControls( SfxObjectShell *pDSh,SwPaM *pP );
@@ -226,7 +226,7 @@ private:
     sal_Bool bHasFont;
 };
 
-class SVX_DLLPUBLIC OCX_Control
+class MSFILTER_DLLPUBLIC OCX_Control
 {
 public:
     OCX_Control(UniString sN, OCX_Control* parent = NULL ) : nWidth( 0 ), nHeight( 0 ), mnLeft(0), mnTop(0),
diff --git a/svx/inc/msoleexp.hxx b/filter/inc/filter/msfilter/msoleexp.hxx
index 830a36f4bbca..8053928780f4 100644
--- a/svx/inc/msoleexp.hxx
+++ b/filter/inc/filter/msfilter/msoleexp.hxx
@@ -31,7 +31,7 @@
 #define _MSOLEEXP_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 
 // for the CreateSdrOLEFromStorage we need the information, how we handle
 // convert able OLE-Objects - this ist stored in
@@ -44,7 +44,7 @@ class SotStorage;
 
 #include <svtools/embedhlp.hxx>
 
-class SVX_DLLPUBLIC SvxMSExportOLEObjects
+class MSFILTER_DLLPUBLIC SvxMSExportOLEObjects
 {
     UINT32 nConvertFlags;
 public:
diff --git a/svx/inc/svx/msvbahelper.hxx b/filter/inc/filter/msfilter/msvbahelper.hxx
index b1db44237fa6..93f2de413291 100644
--- a/svx/inc/svx/msvbahelper.hxx
+++ b/filter/inc/filter/msfilter/msvbahelper.hxx
@@ -31,11 +31,11 @@
 #define _MSVBAHELPER_HXX
 
 #include <sfx2/objsh.hxx>
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 
 namespace ooo { namespace vba
 {
-    class SVX_DLLPUBLIC VBAMacroResolvedInfo
+    class MSFILTER_DLLPUBLIC VBAMacroResolvedInfo
     {
         SfxObjectShell* mpDocContext;
         bool mbFound;
@@ -50,9 +50,9 @@ namespace ooo { namespace vba
         void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
     };
 
-    SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName );
-    SVX_DLLPUBLIC  VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
-    SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
+    MSFILTER_DLLPUBLIC String makeMacroURL( const String& sMacroName );
+    MSFILTER_DLLPUBLIC  VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
+    MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
 } }
 
 #endif
diff --git a/svx/inc/svx/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index fb7f75598c4e..8d9b85c7301f 100644
--- a/svx/inc/svx/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -34,23 +34,21 @@
 #ifndef SVX_LIGHT
 
 #include <tools/solar.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/gen.hxx>
-#ifndef _SV_COLOR_HXX
 #include <tools/color.hxx>
-#endif
 #include <svx/svdobj.hxx>
 #include <svx/numitem.hxx>
 #include <svx/editdata.hxx>
-#include <svx/msdffimp.hxx>         //  Escher-Grafikimport
-#include <svx/msocximex.hxx>
-#include <svx/msfiltertracer.hxx>
+#include <filter/msfilter/msdffimp.hxx>         //  Escher-Grafikimport
+#include <filter/msfilter/msocximex.hxx>
+#include <filter/msfilter/msfiltertracer.hxx>
 #include <svx/eeitem.hxx>
 #define ITEMID_FIELD EE_FEATURE_FIELD
 #include <svx/flditem.hxx>
 #undef ITEMID_FIELD
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 #include <vcl/font.hxx>
 #include <vector>
 #include <boost/optional.hpp>
@@ -75,7 +73,7 @@ class SvxBulletItem;
 
 #define PPT_IMPORTFLAGS_NO_TEXT_ASSERT  1
 
-struct SVX_DLLPUBLIC PptCurrentUserAtom
+struct MSFILTER_DLLPUBLIC PptCurrentUserAtom
 {
     sal_uInt32  nMagic;
     sal_uInt32  nCurrentUserEdit;
@@ -92,10 +90,10 @@ public:
                             nMajorVersion       ( 0 ),
                             nMinorVersion       ( 0 ) {}
 
-    SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom );
+    MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom );
 };
 
-struct SVX_DLLPUBLIC PowerPointImportParam
+struct MSFILTER_DLLPUBLIC PowerPointImportParam
 {
     SvStream&           rDocStream;
     sal_uInt32          nImportFlags;
@@ -124,7 +122,7 @@ struct SdHyperlinkEntry
 };
 
 // Hilfsklasse zum Einlesen der PPT InteractiveInfoAtom
-struct SVX_DLLPUBLIC PptInteractiveInfoAtom
+struct MSFILTER_DLLPUBLIC PptInteractiveInfoAtom
 {
     UINT32          nSoundRef;
     UINT32          nExHyperlinkId;
@@ -141,7 +139,7 @@ struct SVX_DLLPUBLIC PptInteractiveInfoAtom
 
 public:
 
-    SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom );
+    MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom );
 };
 
 enum PptPageKind { PPT_MASTERPAGE, PPT_SLIDEPAGE, PPT_NOTEPAGE };
@@ -188,7 +186,7 @@ const UINT32 PPTInventor =UINT32('P')*0x00000001+
 // Object-Ids fuer StarDraw UserData
 #define PPT_OBJECTINFO_ID       (1)
 
-struct SVX_DLLPUBLIC PptDocumentAtom
+struct MSFILTER_DLLPUBLIC PptDocumentAtom
 {
     Size            aSlidesPageSize;                    // Seitengroesse der Slides in 576DPI
     Size            aNotesPageSize;                     // Seitengroesse der Notes in 576DPI
@@ -370,7 +368,7 @@ SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16,16)
 
 #define PPTSLIDEPERSIST_ENTRY_NOTFOUND 0xFFFF
 
-class SVX_DLLPUBLIC PptSlidePersistList: public _PptSlidePersistList
+class MSFILTER_DLLPUBLIC PptSlidePersistList: public _PptSlidePersistList
 {
 
     public:
@@ -411,7 +409,7 @@ public:
 };
 
 class PPTExtParaProv;
-class SVX_DLLPUBLIC SdrEscherImport : public SvxMSDffManager
+class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager
 {
 
 protected:
@@ -482,7 +480,7 @@ public:
 #define SD_HEADERFOOTER_FOOTER      32
 
 class SvxFieldItem;
-struct SVX_DLLPUBLIC PPTFieldEntry
+struct MSFILTER_DLLPUBLIC PPTFieldEntry
 {
     UINT16          nPos;
     UINT16          nTextRangeEnd;
@@ -499,7 +497,7 @@ struct SVX_DLLPUBLIC PPTFieldEntry
     static void     GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateFormat, SvxTimeFormat& eTimeFormat );
 };
 
-struct SVX_DLLPUBLIC HeaderFooterEntry
+struct MSFILTER_DLLPUBLIC HeaderFooterEntry
 {
     const PptSlidePersistEntry* pMasterPersist;
     String              pPlaceholder[ 4 ];
@@ -532,7 +530,7 @@ struct ProcessData
 
 class SdrTextObj;
 class SfxObjectShell;
-class SVX_DLLPUBLIC SdrPowerPointImport : public SdrEscherImport
+class MSFILTER_DLLPUBLIC SdrPowerPointImport : public SdrEscherImport
 {
 
 protected:
@@ -1007,7 +1005,7 @@ struct PPTStyleTextPropReader
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 class SvxFieldItem;
-class SVX_DLLPUBLIC PPTPortionObj : public PPTCharPropSet
+class MSFILTER_DLLPUBLIC PPTPortionObj : public PPTCharPropSet
 {
 
     friend class PPTParagraphObj;
@@ -1033,7 +1031,7 @@ class SVX_DLLPUBLIC PPTPortionObj : public PPTCharPropSet
         BOOL            HasTabulator();
 };
 
-class SVX_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumberFormatCreator, public PPTTextRulerInterpreter
+class MSFILTER_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumberFormatCreator, public PPTTextRulerInterpreter
 {
     friend class PPTTextObj;
     friend class PPTNumberFormatCreator;
diff --git a/svx/inc/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index cb0b0c607d42..641d71e3ac2d 100644
--- a/svx/inc/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -32,7 +32,7 @@
 #define _SVXMSBAS_HXX
 
 #include <tools/solar.h>
-#include "svx/svxdllapi.h"
+#include "filter/msfilter/msfilterdllapi.h"
 
 #include <sot/storage.hxx>
 
@@ -53,7 +53,7 @@ class SfxObjectShell;
  * probably what the user expects to see when viewing the code
  */
 
-class SVX_DLLPUBLIC SvxImportMSVBasic
+class MSFILTER_DLLPUBLIC SvxImportMSVBasic
 {
 public:
     SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot,
@@ -85,12 +85,12 @@ private:
     BOOL bImport;
     BOOL bCopy;
 
-    SVX_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName,
+    MSFILTER_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName,
                           const String &rSubStorageName,
                           BOOL bAsComment, BOOL bStripped);
-    SVX_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName,
+    MSFILTER_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName,
         const String &rSubStorageName);
-    SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
+    MSFILTER_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
                            const String &rSubStorageName);
 };
 
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 63b7e25c646b..a497bf4c3715 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -4,6 +4,7 @@ fl	filter\prj								get		-	all	fl_prj				NULL
 fl	filter\inc								nmake	-	all	fl_inc				NULL
 fl	filter\source\xmlfilteradaptor			nmake	-	all	fl_xmlfilteradaptor	fl_inc NULL
 fl	filter\source\xmlfilterdetect			nmake	-	all	fl_xmlfilterdetect	fl_inc NULL
+fl	filter\source\msfilter					nmake	-	all	fl_msfilter			fl_inc NULL
 fl	filter\source\msfilter\powerpoint		nmake	-	all	fl_powerpoint		fl_inc NULL
 fl	filter\source\pdf						nmake	-	all	fl_pdf fl_svg		fl_inc NULL
 fl	filter\source\svg						nmake	-	all	fl_svg				fl_inc NULL
diff --git a/filter/prj/d.lst b/filter/prj/d.lst
index 3291c7c1bc4e..e8fdae8a1c58 100644
--- a/filter/prj/d.lst
+++ b/filter/prj/d.lst
@@ -3,6 +3,7 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
+..\%__SRC%\lib\imsfilter.lib %_DEST%\lib%_EXT%\imsfilter.lib
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
 ..\%__SRC%\class\XSLTFilter\*.jar %_DEST%\bin%_EXT%\*.jar
 ..\%__SRC%\class\XSLTValidate\*.jar %_DEST%\bin%_EXT%\*.jar
@@ -48,3 +49,9 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
 ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
 ..\%__SRC%\misc\filters\modulepacks\fcfg_*.xcu %_DEST%\xml%_EXT%\registry\spool\fcfg_*.xcu
 ..\%COMMON_OUTDIR%\bin\fcfg_langpack_*.zip %_DEST%\pck%_EXT%\fcfg_langpack_*.zip
+
+mkdir: %_DEST%\inc%_EXT%\filter
+mkdir: %_DEST%\inc%_EXT%\filter\msfilter
+..\inc\filter\msfilter\*.hxx %_DEST%\inc%_EXT%\filter\msfilter\*.hxx
+..\inc\filter\msfilter\*.h %_DEST%\inc%_EXT%\filter\msfilter\*.h
+
diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index d398e03e5a7d..6503062bc654 100644
--- a/filter/source/config/fragments/makefile.mk
+++ b/filter/source/config/fragments/makefile.mk
@@ -185,8 +185,12 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS)
 
 .IF "$(SOLAR_JAVA)"==""
 #cmc, hack to workaround the java build requirement
+.IF "$(SYSTEM_PYTHON)" == "YES"
 MERGE:=python ../tools/merge/pyAltFCFGMerge
 .ELSE
+MERGE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python ../tools/merge/pyAltFCFGMerge
+.ENDIF
+.ELSE
 MERGE    := $(JAVAI) -jar $(SOLARBINDIR)$/FCFGMerge.jar
 .ENDIF
 
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge
index b143caabcd6b..17fe16fb3445 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -11,7 +11,7 @@
 
 import sys, string, os.path
 
-CFGFILE = "../tools/merge/FCFGMerge.cfg"
+CFGFILE = "../../../../transex3/source/filter/merge/FCFGMerge.cfg"
 
 PROP_XMLVERSION      = "xmlversion"               # // <= global cfg file
 PROP_XMLENCODING     = "xmlencoding"              # // <= global cfg file
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 5770d64ad4ee..5e036df696e6 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -35,7 +35,7 @@
 #include "impswfdialog.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/svx/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx
index ffb18670856f..474fdb5a2823 100644
--- a/svx/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -29,16 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 
 // ============================================================================
-#include "countryid.hxx"
+#include "filter/msfilter/countryid.hxx"
 
 #include <algorithm>
 
 // ----------------------------------------------------------------------------
 
-namespace svx {
+namespace msfilter {
 
 // Mapping table ==============================================================
 
diff --git a/svx/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 5bb1b77efc35..b312988b5397 100644
--- a/svx/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include "impgrf.hxx"
+#include "precompiled_filter.hxx"
+#include "svx/impgrf.hxx"
 #include "eschesdo.hxx"
-#include <svx/escherex.hxx>
-#include <unoapi.hxx>
+#include <filter/msfilter/escherex.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdoole2.hxx>
@@ -48,10 +48,10 @@
 #include <svx/svdopath.hxx>
 #include <stdlib.h>
 #include <svtools/filter.hxx>
-#include "../customshapes/EnhancedCustomShapeTypeNames.hxx"
-#include "../customshapes/EnhancedCustomShapeGeometry.hxx"
-#include <EnhancedCustomShapeFunctionParser.hxx>
-#include "../customshapes/EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
+#include <svx/EnhancedCustomShapeFunctionParser.hxx>
+#include "svx/EnhancedCustomShape2d.hxx"
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/awt/GradientStyle.hpp>
diff --git a/svx/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 65157df81baa..d5a60fff9aa9 100644
--- a/svx/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 #include "eschesdo.hxx"
 #include <svx/svdobj.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/unoshape.hxx>
 #include <vcl/outdev.hxx>
@@ -41,10 +41,7 @@
 #include <vcl/graph.hxx>
 #include <tools/debug.hxx>
 #include <svx/fmdpage.hxx>
-
-#ifndef _TOOLKIT_UNOHLP_HXX //autogen wg. VCLXBitmap
 #include <toolkit/unohlp.hxx>
-#endif
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
diff --git a/svx/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 93e0f459dc2f..b563d0c57ca7 100644
--- a/svx/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 #ifndef _ESCHESDO_HXX
 #define _ESCHESDO_HXX
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 #include <svx/unopage.hxx>
 #include <vcl/mapmod.hxx>
 
diff --git a/svx/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk
index 53eab95a5be8..92a30e05331e 100644
--- a/svx/source/msfilter/makefile.mk
+++ b/filter/source/msfilter/makefile.mk
@@ -29,22 +29,21 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJ=../..
 
-PRJNAME=svx
+PRJNAME=filter
 TARGET=msfilter
+ENABLE_EXCEPTIONS=true
 LIBTARGET=NO
-AUTOSEG=true
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+.INCLUDE :  makefile.pmk
 
 # --- Files --------------------------------------------------------
 
-LIB1TARGET= $(SLB)$/$(TARGET)-msfilter.lib
-LIB1OBJFILES= \
+SLOFILES= \
     $(SLO)$/countryid.obj	\
     $(SLO)$/escherex.obj	\
     $(SLO)$/eschesdo.obj    \
@@ -55,24 +54,37 @@ LIB1OBJFILES= \
     $(SLO)$/msocximex.obj	\
     $(SLO)$/mscodec.obj		\
     $(SLO)$/msfiltertracer.obj \
+    $(SLO)$/svdfppt.obj		\
     $(SLO)$/msvbahelper.obj\
-
-LIB2TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB2OBJFILES= \
     $(SLO)$/svxmsbas2.obj
 
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+SHL1TARGET= msfilter$(DLLPOSTFIX)
+SHL1IMPLIB=	i$(TARGET)
+SHL1OBJS=	$(SLOFILES)
+SHL1USE_EXPORTS=name
+SHL1STDLIBS= \
+             $(SVXCORELIB) \
+             $(SFX2LIB) \
+             $(XMLOFFLIB) \
+             $(GOODIESLIB) \
+             $(BASEGFXLIB) \
+             $(BASICLIB) \
+             $(SVTOOLLIB) \
+             $(TKLIB) \
+             $(VCLLIB) \
+             $(SVLLIB) \
+             $(SOTLIB) \
+             $(UNOTOOLSLIB) \
+             $(TOOLSLIB) \
+             $(XMLSCRIPTLIB) \
+             $(COMPHELPERLIB) \
+             $(CPPUHELPERLIB) \
+             $(CPPULIB) \
+             $(SALLIB)
 
-EXCEPTIONSFILES= \
-    $(SLO)$/eschesdo.obj	\
-    $(SLO)$/escherex.obj	\
-    $(SLO)$/msdffimp.obj	\
-    $(SLO)$/msvbasic.obj	\
-    $(SLO)$/msocximex.obj	\
-    $(SLO)$/msoleexp.obj	\
-    $(SLO)$/svxmsbas.obj	\
-    $(SLO)$/msfiltertracer.obj \
-    $(SLO)$/msvbahelper.obj\
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=	$(SHL1TARGET)
 
 .INCLUDE :  target.mk
 
+
diff --git a/svtools/win/res/makefile.mk b/filter/source/msfilter/makefile.pmk
index 3c33d006edf9..48bcd6746271 100644
--- a/svtools/win/res/makefile.mk
+++ b/filter/source/msfilter/makefile.pmk
@@ -6,7 +6,7 @@
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
+# $RCSfile: makefile.pmk,v $
 #
 # $Revision: 1.3 $
 #
@@ -28,3 +28,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
+# Reduction of exported symbols:
+CDEFS += -DMSFILTER_DLLIMPLEMENTATION
+VISIBILITY_HIDDEN=TRUE
diff --git a/svx/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index 591bce8f4f6d..0c7bb9295290 100644
--- a/svx/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include "mscodec.hxx"
+#include "precompiled_filter.hxx"
+#include "filter/msfilter/mscodec.hxx"
 
 #include <osl/diagnose.h>
 #include <algorithm>
@@ -44,7 +44,7 @@
 #endif
 
 
-namespace svx {
+namespace msfilter {
 
 // ============================================================================
 
diff --git a/svx/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index e787d07f673d..5d1f115e59d8 100644
--- a/svx/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <com/sun/star/embed/Aspects.hpp>
 
@@ -47,47 +47,18 @@
 #include <sot/exchange.hxx>
 #include <sot/storinfo.hxx>
 #include <vcl/cvtgrf.hxx>
-
 #include "viscache.hxx"
 
 // SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen
 #include <svx/eeitem.hxx>
-#ifndef _EDITDATA_HXX
 #include <svx/editdata.hxx>
-#endif
-
-#include <svtools/urihelper.hxx>
-
-//      textitem.hxx        editdata.hxx
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//      paraitem.hxx       editdata.hxx
-
-
+#include <svl/urihelper.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
-#ifndef _TOOLS_ZCODEC_HXX
 #include <tools/zcodec.hxx>
-#endif
-#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
-#endif
 #include <unotools/localfilehelper.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <com/sun/star/container/XIdentifierContainer.hpp>
 #include <com/sun/star/drawing/XGluePointsSupplier.hpp>
@@ -99,28 +70,16 @@
 #include <svx/kernitem.hxx>
 #include <svtools/filter.hxx>
 #include <tools/string.hxx>
-#ifndef _TOOLS_URLOBJ_HXX
 #include <tools/urlobj.hxx>
-#endif
 #include <vcl/virdev.hxx>
 #include <vcl/bmpacc.hxx>
-#ifndef _SVSTOR_HXX //autogen
 #include <sot/storage.hxx>
-#endif
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/module.hxx>
-//#ifndef _SFX_INTERNO_HXX
-//#include <sfx2/interno.hxx>
-//#endif
-
-#ifndef _SDGCPITM_HXX
-
-//#endif
 #include <svx/sdgcpitm.hxx>
-#endif
 #include <svx/sdgmoitm.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/fmmodel.hxx>
@@ -131,9 +90,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdorect.hxx>
-#ifndef _SVDOCAPT_HXX
 #include <svx/svdocapt.hxx>
-#endif
 #include <svx/svdoedge.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdoutl.hxx>
@@ -150,43 +107,36 @@
 #include <svx/udlnitem.hxx>
 #include <svx/crsditem.hxx>
 #include <svx/shdditem.hxx>
-#include <fontitem.hxx>
+#include <svx/fontitem.hxx>
 #include <svx/colritem.hxx>
 #include <svx/sxekitm.hxx>
-#include <bulitem.hxx>
+#include <svx/bulitem.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/extrud3d.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/xpoly.hxx>
-#include "xattr.hxx"
-
-#ifndef _IMPGRF_HXX //autogen
-#include "impgrf.hxx"
-#endif
-#include <svx/msdffimp.hxx> // extern sichtbare Header-Datei
+#include "svx/xattr.hxx"
+#include "svx/impgrf.hxx"
+#include <filter/msfilter/msdffimp.hxx> // extern sichtbare Header-Datei
 #include <svx/outliner.hxx>
 #include <svx/outlobj.hxx>
 #include <svx/editobj.hxx>
 #include <svx/editeng.hxx>
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include <com/sun/star/drawing/ShadeMode.hpp>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svx3ditems.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/sdasaitm.hxx>
-#ifndef _UCBHELPER_CONTENT_HXX_
 #include <ucbhelper/content.hxx>
-#endif
-#ifndef _UCBHELPER_CONTENTBROKER_HXX_
 #include <ucbhelper/contentbroker.hxx>
-#endif
 #include <vos/xception.hxx>
 #ifndef _VOS_NO_NAMESPACE
 using namespace vos;
 #endif
-#include "../customshapes/EnhancedCustomShapeTypeNames.hxx"
-#include "../customshapes/EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
@@ -195,11 +145,9 @@ using namespace vos;
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
-#ifndef __com_sun_star_beans_PropertyValues_hpp__
 #include <com/sun/star/beans/PropertyValues.hpp>
-#endif
 #include <com/sun/star/drawing/ProjectionMode.hpp>
-#include "../customshapes/EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 
 using namespace ::com::sun::star    ;
 using namespace ::com::sun::star::drawing;
diff --git a/svx/source/msfilter/msfiltertracer.cxx b/filter/source/msfilter/msfiltertracer.cxx
index 90c71a456bfc..417fd906f22f 100644
--- a/svx/source/msfilter/msfiltertracer.cxx
+++ b/filter/source/msfilter/msfiltertracer.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <svx/msfiltertracer.hxx>
+#include "precompiled_filter.hxx"
+#include <filter/msfilter/msfiltertracer.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/svx/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index e16c3c118913..f55873c41ebc 100644
--- a/svx/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <com/sun/star/uno/Any.h>
@@ -63,20 +63,14 @@
 #include <vcl/svapp.hxx>
 #include <sfx2/objsh.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
-#include <svx/msocximex.hxx>
-
+#include <filter/msfilter/msocximex.hxx>
 #include <osl/file.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-//#include <sfx2/docfile.hxx>
-
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-
 #include <comphelper/processfactory.hxx> // shouldn't be needed
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-
-
 #include <algorithm>
 #include <memory>
 
@@ -88,15 +82,6 @@
 #endif
 
 using namespace ::com::sun::star;
-#if 0
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::form;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::container;
-#endif
 using namespace ::rtl;
 using namespace cppu;
 
diff --git a/svx/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 7fe138dc06aa..71b01bafd7dd 100644
--- a/svx/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -29,41 +29,32 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#ifndef _COM_SUN_STAR_EMBED_XEmbedPersist_HPP_
 #include <com/sun/star/embed/XEmbedPersist.hpp>
-#endif
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
-
-#ifndef _SO_CLSIDS_HXX
 #include <sot/clsids.hxx>
-#endif
 #include <sfx2/objsh.hxx>
-//#ifndef _SFX_INTERNO_HXX
-//#include <sfx2/interno.hxx>
-//#endif
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sot/formats.hxx>
 #include <comphelper/processfactory.hxx>
-
 #include <unotools/streamwrap.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <svtools/embedhlp.hxx>
-#include <svx/msdffimp.hxx> // extern sichtbare Header-Datei
+#include <filter/msfilter/msdffimp.hxx> // extern sichtbare Header-Datei
 
-#include "msoleexp.hxx"
+#include "filter/msfilter/msoleexp.hxx"
 
 #define CREATE_CONST_ASC(s) String::CreateFromAscii( \
     RTL_CONSTASCII_STRINGPARAM(s))
diff --git a/svx/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 5b24af6bcc2f..2a2939fe123a 100644
--- a/svx/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -28,8 +28,8 @@
  *
  ************************************************************************/
 
-#include "precompiled_svx.hxx"
-#include <svx/msvbahelper.hxx>
+#include "precompiled_filter.hxx"
+#include <filter/msfilter/msvbahelper.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/basmgr.hxx>
diff --git a/svx/source/msfilter/msvbasic.cxx b/filter/source/msfilter/msvbasic.cxx
index 8afe2e5ae04b..b7d5b7da1d1b 100644
--- a/svx/source/msfilter/msvbasic.cxx
+++ b/filter/source/msfilter/msvbasic.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
diff --git a/svx/source/msfilter/msvbasic.hxx b/filter/source/msfilter/msvbasic.hxx
index 7366adcaeeb5..b4ffd8514d4a 100644
--- a/svx/source/msfilter/msvbasic.hxx
+++ b/filter/source/msfilter/msvbasic.hxx
@@ -37,9 +37,7 @@
 #include <tools/solar.h>
 #endif
 #include <tools/debug.hxx>
-#ifndef _SVSTOR_HXX //autogen
 #include <sot/storage.hxx>
-#endif
 #include <tools/dynary.hxx>
 #ifndef __SGI_STL_VECTOR
 #include <vector>
diff --git a/svx/source/svdraw/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 347a5005bd78..2d16541aa59a 100644
--- a/svx/source/svdraw/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 #include <osl/endian.h>
 #include <vcl/svapp.hxx>
 #include <unotools/tempfile.hxx>
@@ -44,10 +44,8 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-
 #include <unotools/streamwrap.hxx>
-
-#include <svx/svdfppt.hxx>
+#include <filter/msfilter/svdfppt.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdmodel.hxx>
@@ -63,10 +61,10 @@
 #include <svx/svdotable.hxx>
 #include <svx/outlobj.hxx>
 #include <svx/svdattr.hxx>
-#include "xattr.hxx"
-#include "svditext.hxx"
+#include "svx/xattr.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdetc.hxx>
-#include <bulitem.hxx>
+#include <svx/bulitem.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/svdoashp.hxx>
@@ -93,7 +91,7 @@
 #include <svx/crsditem.hxx>
 #include <svx/shdditem.hxx>
 #include <svx/charreliefitem.hxx>
-#include <fontitem.hxx>
+#include <svx/fontitem.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/editeng.hxx>
 #include <svx/lspcitem.hxx>
@@ -101,18 +99,18 @@
 #include <svx/lrspitem.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/bmpacc.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <svx/svdoedge.hxx>
 #include <svx/sxekitm.hxx>
 #include <svx/flditem.hxx>
 #include <svtools/sychconv.hxx>
 #include <tools/zcodec.hxx>
-#include <svxmsbas.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/svdoole2.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <toolkit/unohlp.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
diff --git a/svx/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx
index 48823640af61..02370dd75c92 100644
--- a/svx/source/msfilter/svxmsbas.cxx
+++ b/filter/source/msfilter/svxmsbas.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <tools/debug.hxx>
@@ -37,10 +37,10 @@
 #include <sfx2/app.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
-#include <svxerr.hxx>
-#include <svxmsbas.hxx>
+#include <svx/svxerr.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <msvbasic.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <sot/storinfo.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx
index afd772bbd7e4..6e784811dd56 100644
--- a/svx/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_filter.hxx"
 
 #include <basic/basmgr.hxx>
 #include <sfx2/objsh.hxx>
-#include <svxerr.hxx>
-#include <svxmsbas.hxx>
+#include <svx/svxerr.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index ceea10e28f27..ceea10e28f27 100644
--- a/svx/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 78ee2f82dbc5..765741630ea9 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -35,7 +35,7 @@
 #include "impdialog.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <com/sun/star/view/XRenderable.hpp>
 
 using namespace ::rtl;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index bb1537ccd79b..714ed9df7dc4 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -51,10 +51,10 @@
 #include <unotools/processfactory.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <comphelper/string.hxx>
 
-#include <svtools/saveopt.hxx> // only for testing of relative saving options in PDF
+#include <unotools/saveopt.hxx> // only for testing of relative saving options in PDF
 
 #include <vcl/graphictools.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index eea108d39187..631b90021ea5 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -35,7 +35,7 @@
 #include "pdfexport.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include <svtools/outstrm.hxx>
+#include <svl/outstrm.hxx>
 #include <svtools/FilterConfigItem.hxx>
 
 // -------------
diff --git a/filter/source/xsltdialog/xmlfileview.hxx b/filter/source/xsltdialog/xmlfileview.hxx
index c79bf6dfd86f..7131b0b3c092 100644
--- a/filter/source/xsltdialog/xmlfileview.hxx
+++ b/filter/source/xsltdialog/xmlfileview.hxx
@@ -31,7 +31,7 @@
 #define _XMLFILEVIEW_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/timer.hxx>
 
 #ifndef _TABLE_HXX //autogen
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index f8ec267a75f5..3889e6f4a6e1 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -51,7 +51,7 @@
 #include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #include "xmlfiltersettingsdialog.hxx"
 
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 9f21a840cc1c..93ddcaef9d65 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -48,7 +48,7 @@
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <osl/file.hxx>
 
 #include <rtl/uri.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 14974dd6609e..e9b072d4b708 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -40,8 +40,8 @@
 #include <vcl/button.hxx>
 #endif
 #include <svtools/svtabbx.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/poolitem.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include "xmlfiltercommon.hxx"
 
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 8b5ff0435d19..4be391798ebd 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <osl/file.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 #include "xmlfiltertabpagexslt.hxx"
 #include "xmlfiltertabpagexslt.hrc"
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index 3e07f02d8ab4..6c0f29caadec 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -39,7 +39,7 @@
 #include <vcl/button.hxx>
 #endif
 #include <vcl/fixed.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class filter_info_impl;
 class XMLSourceFileDialog;
diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx
index 734020cc1613..402323630361 100644
--- a/forms/inc/pch/precompiled_forms.hxx
+++ b/forms/inc/pch/precompiled_forms.hxx
@@ -335,15 +335,15 @@
 
 #include "svtools/cliplistener.hxx"
 #include "svtools/imageresourceaccess.hxx"
-#include "svtools/inetstrm.hxx"
-#include "svtools/inettype.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/languageoptions.hxx"
-#include "svtools/lingucfg.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/solar.hrc"
+#include "svl/inetstrm.hxx"
+#include "svl/inettype.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "svl/numuno.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/solar.hrc"
 #include "svtools/transfer.hxx"
 
 #include "svx/editdata.hxx"
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 3a4182b82c99..4e59eecd0365 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -1,4 +1,4 @@
-fm	forms	:    l10n svx sfx2 ucb configmgr fileaccess QADEVOOO:qadevOOo NULL
+fm	forms	:    l10n svx sfx2 QADEVOOO:qadevOOo NULL
 fm  forms                                   usr1    -   all fm_mkofrm NULL
 fm	forms\inc								nmake	-	all	fm_inc NULL
 fm	forms\source\inc						get		-	all	fm_sinc NULL
diff --git a/forms/qa/complex/forms/makefile.mk b/forms/qa/complex/forms/makefile.mk
index 7333c58e2381..2ed9c6a512d8 100755
--- a/forms/qa/complex/forms/makefile.mk
+++ b/forms/qa/complex/forms/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/forms
 
 #----- compile .java files -----------------------------------------
 
-JARFILES        = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
 JAVAFILES       = CheckOGroupBoxModel.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 963e8fa165b7..5af83ca2fba1 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 //.........................................................................
 namespace frm
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index d3e2cf6b11bc..081b971fcceb 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -81,8 +81,8 @@
 #include <osl/mutex.hxx>

 #include <rtl/math.hxx>

 #include <rtl/tencinfo.h>

-#include <svtools/inetstrm.hxx>

-#include <svtools/inettype.hxx>

+#include <svl/inetstrm.hxx>

+#include <svl/inettype.hxx>

 #include <tools/debug.hxx>

 #include <tools/diagnose_ex.h>

 #include <tools/fsys.hxx>

diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 0edbf781e786..3add838333b9 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -42,8 +42,8 @@
 #include <comphelper/numbers.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/numuno.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <vcl/wintypes.hxx>
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 5d30c2776659..47391b390958 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -65,7 +65,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/guarding.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 #include <memory>
 
diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc
index b446914fd114..c25ca4f2b6e4 100644
--- a/forms/source/inc/frm_resource.hrc
+++ b/forms/source/inc/frm_resource.hrc
@@ -32,7 +32,7 @@
 #define _FRM_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index aa2df00e28c5..b3369b865475 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -39,7 +39,7 @@
 //---------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //.........................................................................
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 68a3660d65e1..9f6c4c15ed68 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_forms.hxx"
 #include "parametrizedattributedispatcher.hxx"
 #include <svx/editview.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 9f41f68427b1..9150eac63e17 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -53,8 +53,8 @@
 
 #include <svx/svxids.hrc>
 #include <svx/editview.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/msgpool.hxx>
 
 //--------------------------------------------------------------------------
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index b13a6eebc94b..b87d6260b723 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_forms.hxx"
 #include "richtextengine.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/editobj.hxx>
 #define ITEMID_FONTHEIGHT   EE_CHAR_FONTHEIGHT
@@ -44,8 +44,8 @@
 #include <vcl/mapunit.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/undo.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svl/undo.hxx>
 #include <vos/mutex.hxx>
 
 #include <algorithm>
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 9e002d4ed7c0..259197ac71d1 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -43,8 +43,8 @@
 #include <svx/scripttypeitem.hxx>
 
 #include <svx/editobj.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/mapunit.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index f3c56cc6cd88..495a85c02162 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -32,9 +32,9 @@
 #include "precompiled_forms.hxx"
 #include "richtextvclcontrol.hxx"
 #include "richtextimplcontrol.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/languageoptions.hxx>
 #if OSL_DEBUG_LEVEL > 0
     #ifndef _TOOLS_TEMPFILE_HXX
     #include <tools/tempfile.hxx>
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 8760a59bc180..d1090b82d914 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -36,8 +36,8 @@
 #include <svx/svxids.hrc>
 #endif
 #include <svx/eeitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/mapunit.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx
index 3cc79ad7bef3..d5874ea566c2 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/solar.h>
 #include <sal/types.h>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //........................................................................
 namespace frm
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 4346fc80112e..e93368e59f57 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -401,7 +401,7 @@ enum OpCodeEnum
         ocNone              = SC_OPCODE_NONE
 };
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 // save memory since compilers tend to int an enum
 typedef USHORT OpCode;
 #else
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index d2b4c9989a84..a930442ee4f1 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -79,7 +79,7 @@ enum StackVarEnum
     svUnknown                           // unknown StackType
 };
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 // save memory since compilers tend to int an enum
 typedef BYTE StackVar;
 #else
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
index bcbe9b2db85d..9eebceec0482 100644
--- a/formula/inc/helpids.hrc
+++ b/formula/inc/helpids.hrc
@@ -31,7 +31,7 @@
 #define FORMULA_HELPID_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>    // HID_FORMULA_START
+#include <svl/solar.hrc>    // HID_FORMULA_START
 #endif
 
 #define HID_FORMULADLG_FORMULA                          (HID_FORMULA_START + 0)
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 2fd4e08deeb4..07d4a3c41b93 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -35,7 +35,7 @@
 #include "core_resource.hxx"
 #include "core_resource.hrc"
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/rc.hxx>
 #include <tools/rcid.h>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc
index 769067d57839..ee82732ae119 100644
--- a/formula/source/core/inc/core_resource.hrc
+++ b/formula/source/core/inc/core_resource.hrc
@@ -31,7 +31,7 @@
 #ifndef _FORMULA_CORE_RESOURCE_HRC_
 #define _FORMULA_CORE_RESOURCE_HRC_
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 //------------------------------------------------------------------------------
 #define RID_CORE_STRINGS_START                  RID_FORMULA_START
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index de36c962a83e..6663a9470a2e 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -37,7 +37,7 @@
 
 // ---- needed as long as we have no contexts for components ---
 #include <vcl/svapp.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 //.........................................................................
 namespace formula
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 148336a5c3d4..d458a41d10a3 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -31,7 +31,7 @@
 
 #include "formula/formulahelper.hxx"
 #include <unotools/charclass.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 namespace formula
 {
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 37db1d2eb3cb..a63299abad29 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -47,9 +47,9 @@
 #include <svtools/stdctrl.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/svtreebx.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/eitem.hxx>
 
 #include <unotools/charclass.hxx>
 #include <tools/urlobj.hxx>
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index f414cb41fb39..d50ea5a19ccb 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -37,8 +37,8 @@
 
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/stritem.hxx>
 #include "formula/IFunctionDescription.hxx"
 
 #include "funcpage.hxx"
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 3437bc47302b..2b3f8767a270 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -35,8 +35,8 @@
 
 //----------------------------------------------------------------------------
 
-#include <svtools/zforlist.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/stritem.hxx>
 
 #include "parawin.hxx"
 #include "parawin.hrc"
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 3d9c467357ae..c846b15af93f 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -35,8 +35,8 @@
 
 //----------------------------------------------------------------------------
 
-#include <svtools/zforlist.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/stritem.hxx>
 
 #include "structpg.hxx"
 #include "formdlgs.hrc"
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index 43444bb9a112..472564d9f229 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -34,7 +34,7 @@
 // include     -----------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START                RID_FORMULA_START
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index b6ede64b0226..d1bc06c36ace 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -37,7 +37,7 @@
 #include <rtl/uri.hxx>
 #include <tools/debug.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define EXPAND_PROTOCOL     "vnd.sun.star.expand:"
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index d1d78c11bbc2..130bf7f9bd2b 100644
--- a/formula/util/makefile.mk
+++ b/formula/util/makefile.mk
@@ -54,6 +54,7 @@ SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1STDLIBS= \
         $(TOOLSLIB) 			\
         $(SVTOOLLIB)			\
+                $(SVLLIB) \
         $(UNOTOOLSLIB)			\
         $(COMPHELPERLIB) 		\
         $(CPPUHELPERLIB) 		\
@@ -90,6 +91,7 @@ SHL2TARGET=$(TARGET2)$(DLLPOSTFIX)
 SHL2STDLIBS= \
         $(SFXLIB)				\
         $(SVTOOLLIB)			\
+        $(SVLLIB)  \
         $(VCLLIB)				\
         $(UNOTOOLSLIB)			\
         $(TOOLSLIB)				\
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 75dfacbf8f2d..c643ad158279 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
 #ifndef _SVTOOLS_SVTOOLS_HRC_
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_FILEDLG2_HRC_
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 9bdb870ebcc8..d9f0b16fcacb 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -38,7 +38,7 @@
 #endif
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "svtools/miscopt.hxx"
-#include "svtools/pickerhistoryaccess.hxx"
+#include "svl/pickerhistoryaccess.hxx"
 
 #ifndef _SV_APP_HXX
 #include "vcl/svapp.hxx"
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 0a8b5ca76974..15a6f75fd4bb 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -46,7 +46,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
 #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
@@ -58,7 +58,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <unotools/ucbhelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include "vos/mutex.hxx"
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index afcbf275afdf..7f2ff15a48ce 100644
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 
 String STR_SVT_FILEPICKER_AUTO_EXTENSION
 {
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 757ebc0cca7f..d9543a3aeee0 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -39,13 +39,13 @@
 #include <tools/urlobj.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 // using ----------------------------------------------------------------
 
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 5470df6fe409..c296c22dc931 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -44,23 +44,23 @@
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include "svtools/ehdl.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/viewoptions.hxx"
+#include "svl/urihelper.hxx"
+#include "unotools/pathoptions.hxx"
+#include "unotools/viewoptions.hxx"
 #include "svtools/fileview.hxx"
-#include "svtools/inetoptions.hxx"
+#include "unotools/inetoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 #include "svtools/svtabbx.hxx"
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_STRINGSDTOR
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/localfilehelper.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 #endif
 #ifndef _SVT_HELPID_HRC
 #include "svtools/helpid.hrc"
@@ -72,7 +72,7 @@
 #include "asyncfilepicker.hxx"
 #include "iodlgimp.hxx"
 #include "svtools/inettbc.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
 #include "svtools/QueryFolderName.hxx"
 #ifndef  _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index a0643c072724..8ab58036f437 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -32,7 +32,7 @@
 #define _SVTOOLS_IODLGIMPL_HRC
 
 #ifndef _SVTOOLS_HRC
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 #endif
 
 // ModalDialog DLG_SVT_EXPLORERFILE
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 96bcad358edd..00cfe918c04c 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -46,9 +46,9 @@
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
 #include <unotools/confignode.hxx>
-#include "svtools/inettype.hxx"
-#include "svtools/urlfilter.hxx"
-#include <svtools/restrictedpaths.hxx>
+#include "svl/inettype.hxx"
+#include "svl/urlfilter.hxx"
+#include <svl/restrictedpaths.hxx>
 #include "asyncfilepicker.hxx"
 #include "OfficeControlAccess.hxx"
 #include "fpsmartcontent.hxx"
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 116ba9fb540d..2200679dfc7b 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
  // includes ******************************************************************
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 #include "svtools/helpid.hrc"
 #include "iodlg.hrc"
 
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 4d217f518547..8f17704c0e87 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -43,9 +43,9 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 // #97148# ---------------
-#include "svtools/ctypeitm.hxx"
-#include "svtools/eitem.hxx"
-#include "svtools/viewoptions.hxx"
+#include "svl/ctypeitm.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/viewoptions.hxx"
 #include "svtools/fileview.hxx"
 #include "svtools/inettbc.hxx"
 #include "iodlg.hxx"
@@ -54,7 +54,7 @@
 #endif
 #include "svtools/imagemgr.hxx"
 #include <unotools/localfilehelper.hxx>
-#include "svtools/useroptions.hxx"
+#include "unotools/useroptions.hxx"
 #ifndef _RTL_INSTANCE_HXX_
 #include "rtl/instance.hxx"
 #endif
@@ -62,7 +62,7 @@
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_USHORTS
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 5b97455b628a..1ec46130f6e8 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -37,7 +37,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/group.hxx>
 
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 
 #include <vector>
 
diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index 73049c251ad0..920c05d7a8dc 100644
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/filedlg2.hrc>
 
 //------------------------------------------------------------
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 96a14dbcef11..ae3f9ebf86ad 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -65,7 +65,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #include <vos/mutex.hxx>
 
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index fc488c42e3e6..505a647d1ee9 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 //------------------------------------------------------------
 // namespace directives
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 80e4b8144bb0..ecd9acecd7b9 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -125,6 +125,7 @@ public:
     ~FwkTabWindow();
 
     void            AddEventListener( const Link& rEventListener );
+    void            RemoveEventListener( const Link& rEventListener );
     FwkTabPage*     AddTabPage( sal_Int32 nIndex, const css::uno::Sequence< css::beans::NamedValue >& rProperties );
     void            ActivatePage( sal_Int32 nIndex );
     void            RemovePage( sal_Int32 nIndex );
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 4dbafe373117..595b358a789a 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -194,6 +194,7 @@ class HandlerCFGAccess : public ::utl::ConfigItem
 
         void setCache(HandlerCache* pCache) {m_pCache = pCache;};
         virtual void Notify(const css::uno::Sequence< rtl::OUString >& lPropertyNames);
+        virtual void Commit();
 };
 
 } // namespace framework
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index 595f45bfc79a..a62ec3e47890 100644
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
@@ -70,7 +70,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.h>
 /*DRAFT
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 */
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 6f35d20c2d22..57fb2e94b07a 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -31,7 +31,7 @@
 #ifndef _FRAMEWORK_HRC
 #define _FRAMEWORK_HRC
 
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 
 #define RID_FWK_START               260
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 435b87a4f248..1bd908b266c6 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/frame/XFrame.hpp>

 

 #include <i18npool/lang.h>

-#include <svtools/languageoptions.hxx>

+#include <svl/languageoptions.hxx>

 

 namespace framework

 {

diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 22ef1a481ab7..55d356c80806 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -53,7 +53,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <cppuhelper/weak.hxx>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index aa893cd40a57..255229d8e2eb 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -93,7 +93,7 @@
 //_________________________________________________________________________________________________________________
 
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 
 #ifndef _CPPUHELPER_WEAK_HXX_
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 49921efcee37..6195a6372452 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -32,7 +32,7 @@
 
 // include ------------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids -----------------------------------------------------------------
 
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index eaffedbc0e5c..fd211dd81ee9 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -380,32 +380,32 @@
 #include "sot/storage.hxx"
 
 #include "svtools/acceleratorexecute.hxx"
-#include "svtools/cmdoptions.hxx"
+#include "unotools/cmdoptions.hxx"
 #include "svtools/colorcfg.hxx"
 #include "svtools/ctrltool.hxx"
-#include "svtools/dynamicmenuoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/filter.hxx"
 #include "svtools/framestatuslistener.hxx"
 #include "svtools/helpopt.hxx"
-#include "svtools/historyoptions.hxx"
-#include "svtools/imageitm.hxx"
+#include "unotools/historyoptions.hxx"
+#include "svl/imageitm.hxx"
 #include "svtools/imgdef.hxx"
-#include "svtools/inettype.hxx"
-#include "svtools/internaloptions.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/inettype.hxx"
+#include "unotools/internaloptions.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/menuoptions.hxx"
 #include "svtools/miscopt.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/pathoptions.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "unotools/pathoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/solar.hrc"
+#include "svl/smplhint.hxx"
+#include "svl/solar.hrc"
 #include "svtools/statusbarcontroller.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 #include "svtools/svmedit.hxx"
 #include "svtools/toolboxcontroller.hxx"
 #include "svtools/transfer.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include "svtools/xtextedt.hxx"
 
 #include "toolkit/awt/vclxmenu.hxx"
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 8f6c62a2f39e..ed3630ed1583 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -239,7 +239,8 @@ class AutoRecovery  : public  css::lang::XTypeProvider
             E_SESSION_SAVE              =  64,
             E_SESSION_RESTORE           = 128,
             E_DISABLE_AUTORECOVERY      = 256,
-            E_SET_AUTOSAVE_STATE        = 512
+            E_SET_AUTOSAVE_STATE        = 512,
+            E_SESSION_QUIET_QUIT        = 1024
         };
 
         //---------------------------------------
@@ -884,6 +885,10 @@ class AutoRecovery  : public  css::lang::XTypeProvider
 
         //---------------------------------------
         // TODO document me
+        void implts_doSessionQuietQuit(const DispatchParams& aParams);
+
+        //---------------------------------------
+        // TODO document me
         void implts_doSessionRestore(const DispatchParams& aParams);
 
         //---------------------------------------
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 92c575c7b5b5..c1e1e59dc02f 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -80,7 +80,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 32e83aed1974..022bda1786bc 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -87,7 +87,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/string.hxx>
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 86e3f6c7fc57..4f5b9f0c65fa 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -42,7 +42,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/scrbar.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 namespace framework {
 
diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index 46a90015a56e..af81b51d04ac 100644
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
@@ -57,7 +57,7 @@
 #ifndef _VCL_ATOM_HXX
 #include <vcl/threadex.hxx>
 #endif
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index cbb22a322d48..c8e54d4bcbaa 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 
 
-#include <com/sun/star/frame/XSessionManagerListener.hpp>
+#include <com/sun/star/frame/XSessionManagerListener2.hpp>
 #include <com/sun/star/frame/XSessionManagerClient.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
@@ -98,7 +98,7 @@ namespace framework{
 class SessionListener :   // interfaces
                         public css::lang::XTypeProvider,
                         public css::lang::XInitialization,
-                        public css::frame::XSessionManagerListener,
+                        public css::frame::XSessionManagerListener2,
                         public css::frame::XStatusListener,
                         public css::lang::XServiceInfo,
                         // baseclasses (order important for initialization!)
@@ -120,6 +120,18 @@ class SessionListener :   // interfaces
         // restore handling
         sal_Bool m_bRestored;
 
+        sal_Bool m_bSessionStoreRequested;
+
+        sal_Bool m_bAllowUserInteractionOnQuit;
+        sal_Bool m_bTerminated;
+
+
+        // in case of synchronous call the caller should do saveDone() call himself!
+        void StoreSession( sal_Bool bAsync );
+
+        // let session quietly close the documents, remove lock files, store configuration and etc.
+        void QuitSessionQuietly();
+
     public:
 
         //---------------------------------------
@@ -163,6 +175,10 @@ class SessionListener :   // interfaces
        virtual sal_Bool SAL_CALL doRestore()
             throw (css::uno::RuntimeException);
 
+        // XSessionManagerListener2
+        virtual void SAL_CALL doQuit()
+            throw (::com::sun::star::uno::RuntimeException);
+
        // XStatusListener
        virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event)
            throw (css::uno::RuntimeException);
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index a95e913695b0..215def2ea08c 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -139,6 +139,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
         /** is called from the ConfigManager before application ends or from the
             PropertyChangeListener if the sub tree broadcasts changes. */
         virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+        virtual void    Commit();
 
     private:
         // Wrapper methods for low-level functions
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 8423a01f1793..f6b930906ca3 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -48,13 +48,13 @@
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
-#include <general.h>

+#include <general.h>
 #include <stdtypes.h>
-

+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-

+
 #include <com/sun/star/awt/XSimpleTabController.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -62,7 +62,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-

+
 #include <cppuhelper/weak.hxx>
 #include <vcl/window.hxx>
 
@@ -81,31 +81,31 @@ namespace framework{
 //_________________________________________________________________________________________________________________
 
 struct TTabPageInfo
-{

-    public:

-
-        TTabPageInfo()

-            : m_nIndex      ( -1      )

-            , m_bCreated    (sal_False)

-            , m_pPage       ( NULL    )

-            , m_lProperties (         )

-        {}

-    

-        TTabPageInfo(::sal_Int32 nID)

-            : m_nIndex      ( nID     )

-            , m_bCreated    (sal_False)

-            , m_pPage       ( NULL    )

-            , m_lProperties (         )

-        {}

-    

-    public:

-
-        ::sal_Int32                                   m_nIndex;

+{
+    public:
+
+        TTabPageInfo()
+            : m_nIndex      ( -1      )
+            , m_bCreated    (sal_False)
+            , m_pPage       ( NULL    )
+            , m_lProperties (         )
+        {}
+
+        TTabPageInfo(::sal_Int32 nID)
+            : m_nIndex      ( nID     )
+            , m_bCreated    (sal_False)
+            , m_pPage       ( NULL    )
+            , m_lProperties (         )
+        {}
+
+    public:
+
+        ::sal_Int32                                   m_nIndex;
         ::sal_Bool                                    m_bCreated;
         FwkTabPage*                                   m_pPage;
         css::uno::Sequence< css::beans::NamedValue >  m_lProperties;
-};

-

+};
+
 typedef ::std::hash_map< ::sal_Int32                    ,
                          TTabPageInfo                   ,
                          Int32HashCode                  ,
@@ -118,10 +118,11 @@ typedef ::std::hash_map< ::sal_Int32                    ,
 class TabWindowService :  public css::lang::XTypeProvider
                          ,  public css::lang::XServiceInfo
                          ,  public css::awt::XSimpleTabController
+                         ,  public css::lang::XComponent
                          ,  public ThreadHelpBase
                          ,  public TransactionBase
-                         ,  public PropertySetHelper

-                         ,  public ::cppu::OWeakObject

+                         ,  public PropertySetHelper
+                         ,  public ::cppu::OWeakObject
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -132,7 +133,7 @@ class TabWindowService :  public css::lang::XTypeProvider
         //---------------------------------------------------------------------------------------------------------
         //  constructor / destructor
         //---------------------------------------------------------------------------------------------------------
-

+
         TabWindowService( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
         virtual ~TabWindowService();
 
@@ -186,8 +187,8 @@ class TabWindowService :  public css::lang::XTypeProvider
 
         DECL_DLLPRIVATE_LINK( EventListener, VclSimpleEvent * );
 
-        void impl_checkTabIndex (::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);

-        TTabPageInfoHash::iterator impl_getTabPageInfo(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);

+        void impl_checkTabIndex (::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
+        TTabPageInfoHash::iterator impl_getTabPageInfo(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
         FwkTabWindow* mem_TabWin ();
 /*
         ::cppu::IPropertyArrayHelper& SAL_CALL              getInfoHelper();
@@ -203,26 +204,26 @@ class TabWindowService :  public css::lang::XTypeProvider
     private:
 
         /// reference to factory, which has created this instance
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;

-    

+        css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+
         /// the tab window as XWindow ( to hold window* alive !)
-        css::uno::Reference< css::awt::XWindow > m_xTabWin;

-    

-        /// the VCL tab window

-        FwkTabWindow* m_pTabWin;

-    

-        /// container of inserted tab pages

-        TTabPageInfoHash m_lTabPageInfos;

-    

+        css::uno::Reference< css::awt::XWindow > m_xTabWin;
+
+        /// the VCL tab window
+        FwkTabWindow* m_pTabWin;
+
+        /// container of inserted tab pages
+        TTabPageInfoHash m_lTabPageInfos;
+
         /// container of the added TabListener
         ::cppu::OMultiTypeInterfaceContainerHelper m_lListener;
-    

+
         /// counter of the tabpage indexes
-        ::sal_Int32 m_nPageIndexCounter;

-    

+        ::sal_Int32 m_nPageIndexCounter;
+
         /// index of the current active page
         ::sal_Int32 m_nCurrentPageIndex;
-    

+
         /// title of the tabcontrolled window
         ::rtl::OUString m_sTitle;
 
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx
index ca446a7e1386..69e6f85c6f90 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/xml/eventsconfiguration.hxx
@@ -31,7 +31,7 @@
 #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 452d2c045da4..d0961892b96b 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -31,7 +31,7 @@
 #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <tools/color.hxx>
diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx
index 9bcfa9564a33..8619ae423622 100644
--- a/framework/inc/xml/statusbarconfiguration.hxx
+++ b/framework/inc/xml/statusbarconfiguration.hxx
@@ -1,7 +1,7 @@
 #ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <vcl/status.hxx>
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx
index c3f827bc95a1..924c601ac689 100644
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/xml/toolboxconfiguration.hxx
@@ -1,7 +1,7 @@
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk
index 36556d6f03fe..2178f1eefb91 100755
--- a/framework/qa/complex/api_internal/makefile.mk
+++ b/framework/qa/complex/api_internal/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/api_internal
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
 JAVAFILES       = CheckAPI.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk
index 6f20fc5aa474..3fe22b6adb74 100755
--- a/framework/qa/complex/broken_document/makefile.mk
+++ b/framework/qa/complex/broken_document/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/broken_document
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = LoadDocument.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk
index b9cfad982ded..e95e37191138 100644
--- a/framework/qa/complex/contextMenuInterceptor/makefile.mk
+++ b/framework/qa/complex/contextMenuInterceptor/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = contextMenuInterceptor
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = ContextMenuInterceptor.java CheckContextMenuInterceptor.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk
index 1dd1194db1af..7f686ff5f6d8 100755
--- a/framework/qa/complex/disposing/makefile.mk
+++ b/framework/qa/complex/disposing/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/disposing
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = $(TARGET).java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk
index fb08f7438399..0b86efd4d05b 100755
--- a/framework/qa/complex/framework/recovery/makefile.mk
+++ b/framework/qa/complex/framework/recovery/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/framework$/recovery
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES      = RecoveryTest.java RecoveryTools.java CrashThread.java TimeoutThread.java KlickButtonThread.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk
index d9da36437e25..49a28defb9dd 100755
--- a/framework/qa/complex/imageManager/interfaces/makefile.mk
+++ b/framework/qa/complex/imageManager/interfaces/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = imageManager$/interfaces
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = _XComponent.java _XUIConfiguration.java _XImageManager.java \
                   _XUIConfigurationPersistence.java _XInitialization.java _XTypeProvider.java
 
diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk
index eb52b2beba1d..8537d18abc69 100755
--- a/framework/qa/complex/imageManager/makefile.mk
+++ b/framework/qa/complex/imageManager/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = imageManager
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = CheckImageManager.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk
index 605c95a68468..8f6ee0302f87 100755
--- a/framework/qa/complex/path_settings/makefile.mk
+++ b/framework/qa/complex/path_settings/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/path_settings
 
 #----- compile .java files -----------------------------------------
 
-JARFILES =  sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+JARFILES =  ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
 JAVAFILES       = PathSettingsTest.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk
index 3ca7dadd9953..453ae89d270c 100755
--- a/framework/qa/complex/path_substitution/makefile.mk
+++ b/framework/qa/complex/path_substitution/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/path_substitution
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
 JAVAFILES       = PathSubstitutionTest.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/framework/qa/complex/sequence/makefile.mk b/framework/qa/complex/sequence/makefile.mk
index 97b9e7dbb220..959ea5cba57e 100755
--- a/framework/qa/complex/sequence/makefile.mk
+++ b/framework/qa/complex/sequence/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/sequence
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar CheckSequenceOfEnum.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar CheckSequenceOfEnum.jar
 JAVAFILES       = CheckSequenceOfEnum.java
 
 ENUMSEQUENCEIDL =  com.sun.star.enumexample.XEnumSequence
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index efa66b3a6140..44a023d3b70d 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.cxx
@@ -61,7 +61,7 @@
 //_________________________________________________________________________________________________________________
 #include <tools/config.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/dynamicmenuoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
 #include <svtools/menuoptions.hxx>
 #include <rtl/logfile.hxx>
 
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index d737a2d77308..c841e6fb0b8d 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -65,7 +65,6 @@ namespace framework
 {
 
 // class FwkTabControl ---------------------------------------------------
-
 FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
 
     TabControl( pParent, rResId )
@@ -336,6 +335,11 @@ void FwkTabWindow::AddEventListener( const Link& rEventListener )
     m_aTabCtrl.AddEventListener( rEventListener );
 }
 
+void FwkTabWindow::RemoveEventListener( const Link& rEventListener )
+{
+    m_aTabCtrl.RemoveEventListener( rEventListener );
+}
+
 // -----------------------------------------------------------------------
 
 FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties )
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index bb850b876e5c..588c59d8f323 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -66,8 +66,8 @@
 
 #include <comphelper/extract.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/historyoptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/historyoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx
index 034b35259186..f426eb530c90 100644
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/classes/protocolhandlercache.cxx
@@ -357,4 +357,8 @@ void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lProp
     }
 }
 
+void HandlerCFGAccess::Commit()
+{
+}
+
 } // namespace framework
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 25b80650e81a..d1ac0c0e044e 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -58,7 +58,7 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 //_______________________________________________
 // namespace
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 80f02236065f..9326181c6476 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -60,7 +60,7 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 //_______________________________________________
 // namespace
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index c57840b4d442..feec90e5a167 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -371,6 +371,12 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
     {
         WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
         pWorkWindow->SetIcon( (sal_uInt16)nIcon );
+
+        css::uno::Reference< css::frame::XModel > xModel = xController->getModel();
+        rtl::OUString aURL;
+        if( xModel.is() )
+            aURL = xModel->getURL();
+        pWorkWindow->SetRepresentedURL( aURL );
     }
 
     aSolarLock.clear();
diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx
index 88a6484ca92c..b021d4f4de9d 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/helper/titlehelper.cxx
@@ -616,7 +616,7 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle)
 }
 
 //*****************************************************************************************************************
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle)
 {
         ::rtl::OUString sDefault ;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 491738dea73f..01934dfb47df 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -101,7 +101,7 @@
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/uno3.hxx>
 #include <rtl/logfile.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 
 #include <algorithm>
 #include <boost/bind.hpp>
@@ -419,7 +419,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
 
     m_pMiscOptions = new SvtMiscOptions();
 
-    m_pMiscOptions->AddListener( LINK( this, LayoutManager, OptionsChanged ) );
+    m_pMiscOptions->AddListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
     Application::AddEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     m_eSymbolsSize = m_pMiscOptions->GetSymbolsSize();
     m_eSymbolsStyle = m_pMiscOptions->GetCurrentSymbolsStyle();
@@ -442,7 +442,7 @@ LayoutManager::~LayoutManager()
     Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     if ( m_pMiscOptions )
     {
-        m_pMiscOptions->RemoveListener( LINK( this, LayoutManager, OptionsChanged ) );
+        m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
         delete m_pMiscOptions;
         m_pMiscOptions = 0;
     }
@@ -7191,7 +7191,7 @@ throw( RuntimeException )
         Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
         if ( m_pMiscOptions )
         {
-            m_pMiscOptions->RemoveListener( LINK( this, LayoutManager, OptionsChanged ) );
+            m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
             delete m_pMiscOptions;
             m_pMiscOptions = 0;
         }
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index ee39e583e5e7..9fb939e9db0b 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -106,7 +106,7 @@
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
 #endif
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <unotools/processfactory.hxx>
 #include <comphelper/configurationhelper.hxx>
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 9328ed9d9a5c..9b19503f887e 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -80,7 +80,7 @@
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/mediadescriptor.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <unotools/tempfile.hxx>
@@ -91,7 +91,7 @@
 #include <osl/file.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
-#include <svtools/documentlockfile.hxx>
+#include <svl/documentlockfile.hxx>
 
 #include <tools/urlobj.hxx>
 
@@ -170,6 +170,7 @@ static const ::rtl::OUString CMD_DO_RECOVERY                 = ::rtl::OUString::
 static const ::rtl::OUString CMD_DO_ENTRY_BACKUP             = ::rtl::OUString::createFromAscii("/doEntryBackup"          );    // try to store a temp or original file to a user defined location
 static const ::rtl::OUString CMD_DO_ENTRY_CLEANUP            = ::rtl::OUString::createFromAscii("/doEntryCleanUp"         );    // remove the specified entry from the recovery cache
 static const ::rtl::OUString CMD_DO_SESSION_SAVE             = ::rtl::OUString::createFromAscii("/doSessionSave"          );    // save all open documents if e.g. a window manager closes an user session
+static const ::rtl::OUString CMD_DO_SESSION_QUIET_QUIT       = ::rtl::OUString::createFromAscii("/doSessionQuietQuit"     );    // let the current session be quietly closed ( the saving should be done using doSessionSave previously ) if e.g. a window manager closes an user session
 static const ::rtl::OUString CMD_DO_SESSION_RESTORE          = ::rtl::OUString::createFromAscii("/doSessionRestore"       );    // restore a saved user session from disc
 static const ::rtl::OUString CMD_DO_DISABLE_RECOVERY         = ::rtl::OUString::createFromAscii("/disableRecovery"        );    // disable recovery and auto save (!) temp. for this office session
 static const ::rtl::OUString CMD_DO_SET_AUTOSAVE_STATE       = ::rtl::OUString::createFromAscii("/setAutoSaveState"       );    // disable/enable auto save (not crash save) for this office session
@@ -725,6 +726,16 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
         }
         else
         if (
+            ((eJob & AutoRecovery::E_SESSION_QUIET_QUIT    ) == AutoRecovery::E_SESSION_QUIET_QUIT ) &&
+            ((eJob & AutoRecovery::E_DISABLE_AUTORECOVERY) != AutoRecovery::E_DISABLE_AUTORECOVERY)
+            )
+        {
+            LOG_RECOVERY("... do session quiet quit ...")
+            bAllowAutoSaveReactivation = sal_False;
+            implts_doSessionQuietQuit(aParams);
+        }
+        else
+        if (
             ((eJob & AutoRecovery::E_SESSION_RESTORE ) == AutoRecovery::E_SESSION_RESTORE ) &&
             ((eJob & AutoRecovery::E_DISABLE_AUTORECOVERY) != AutoRecovery::E_DISABLE_AUTORECOVERY)
             )
@@ -1987,6 +1998,30 @@ void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible)
 }
 
 //-----------------------------------------------
+/* Currently the document is not closed in case of crash,
+   so the lock file must be removed explicitly
+*/
+void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo)
+{
+    if ( rInfo.Document.is() )
+    {
+        try
+        {
+            css::uno::Reference< css::frame::XStorable > xStore(rInfo.Document, css::uno::UNO_QUERY_THROW);
+            ::rtl::OUString aURL = xStore->getLocation();
+            if ( aURL.getLength() )
+            {
+                ::svt::DocumentLockFile aLockFile( aURL );
+                aLockFile.RemoveFile();
+            }
+        }
+        catch( const css::uno::Exception& )
+        {}
+    }
+}
+
+
+//-----------------------------------------------
 void AutoRecovery::implts_prepareSessionShutdown()
 {
     LOG_RECOVERY("AutoRecovery::implts_prepareSessionShutdown() starts ...")
@@ -2004,6 +2039,10 @@ void AutoRecovery::implts_prepareSessionShutdown()
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
 
+        // WORKAROUND... Since the documents are not closed the lock file must be removed explicitly
+        // it is not done on documents saving since shutdown can be cancelled
+        lc_removeLockFile( rInfo );
+
         // Prevent us from deregistration of these documents.
         // Because we close these documents by ourself (see XClosable below) ...
         // it's fact, that we reach our deregistration method. There we
@@ -2014,31 +2053,38 @@ void AutoRecovery::implts_prepareSessionShutdown()
         // reset modified flag of these documents (ignoring the notification about it!)
         // Otherwise a message box is shown on closing these models.
         implts_stopModifyListeningOnDoc(rInfo);
-        css::uno::Reference< css::util::XModifiable > xModify(rInfo.Document, css::uno::UNO_QUERY);
-        if (xModify.is())
-            xModify->setModified(sal_False);
 
-        // close the model.
-        css::uno::Reference< css::util::XCloseable > xClose(rInfo.Document, css::uno::UNO_QUERY);
-        if (xClose.is())
+        // if the session save is still running the documents should not be thrown away,
+        // actually that would be a bad sign, that means that the SessionManager tryes
+        // to kill the session before the saving is ready
+        if ((m_eJob & AutoRecovery::E_SESSION_SAVE) != AutoRecovery::E_SESSION_SAVE)
         {
-            try
+            css::uno::Reference< css::util::XModifiable > xModify(rInfo.Document, css::uno::UNO_QUERY);
+            if (xModify.is())
+                xModify->setModified(sal_False);
+
+            // close the model.
+            css::uno::Reference< css::util::XCloseable > xClose(rInfo.Document, css::uno::UNO_QUERY);
+            if (xClose.is())
             {
-                xClose->close(sal_False);
-            }
-            /*
-            catch(const css::lang::DisposedException&)
-                {
-                    // closed ... disposed ... always the same .-)
-                }
-            */
-            catch(const css::uno::Exception&)
+                try
                 {
-                    // At least it's only a try to close these documents before anybody else it does.
-                    // So it seams to be possible to ignore any error here .-)
+                    xClose->close(sal_False);
                 }
+                /*
+                catch(const css::lang::DisposedException&)
+                    {
+                        // closed ... disposed ... always the same .-)
+                    }
+                */
+                catch(const css::uno::Exception&)
+                    {
+                        // At least it's only a try to close these documents before anybody else it does.
+                        // So it seams to be possible to ignore any error here .-)
+                    }
 
-            rInfo.Document.clear();
+                rInfo.Document.clear();
+            }
         }
     }
 
@@ -2047,30 +2093,6 @@ void AutoRecovery::implts_prepareSessionShutdown()
 }
 
 //-----------------------------------------------
-/* Currently the document is not closed in case of crash,
-   so the lock file must be removed explicitly
-*/
-void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo)
-{
-    if ( rInfo.Document.is() )
-    {
-        try
-        {
-            css::uno::Reference< css::frame::XStorable > xStore(rInfo.Document, css::uno::UNO_QUERY_THROW);
-            ::rtl::OUString aURL = xStore->getLocation();
-            if ( aURL.getLength() )
-            {
-                ::svt::DocumentLockFile aLockFile( aURL );
-                aLockFile.RemoveFile();
-            }
-        }
-        catch( const css::uno::Exception& )
-        {}
-    }
-}
-
-
-//-----------------------------------------------
 /* TODO WORKAROUND:
 
         #i64599#
@@ -2750,6 +2772,9 @@ void AutoRecovery::implts_informListener(      sal_Int32                      eJ
     if ((eJob & AutoRecovery::E_SESSION_SAVE) == AutoRecovery::E_SESSION_SAVE)
         sFeature.append(CMD_DO_SESSION_SAVE);
     else
+    if ((eJob & AutoRecovery::E_SESSION_QUIET_QUIT) == AutoRecovery::E_SESSION_QUIET_QUIT)
+        sFeature.append(CMD_DO_SESSION_QUIET_QUIT);
+    else
     if ((eJob & AutoRecovery::E_SESSION_RESTORE) == AutoRecovery::E_SESSION_RESTORE)
         sFeature.append(CMD_DO_SESSION_RESTORE);
     else
@@ -2792,6 +2817,9 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
         if (aURL.Path.equals(CMD_DO_SESSION_SAVE))
             return AutoRecovery::E_SESSION_SAVE;
         else
+        if (aURL.Path.equals(CMD_DO_SESSION_QUIET_QUIT))
+            return AutoRecovery::E_SESSION_QUIET_QUIT;
+        else
         if (aURL.Path.equals(CMD_DO_SESSION_RESTORE))
             return AutoRecovery::E_SESSION_RESTORE;
         else
@@ -2968,14 +2996,6 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
 {
     LOG_RECOVERY("AutoRecovery::implts_doSessionSave()")
 
-    // try to make sure next time office will be started user wont be
-    // notified about any other might be running office instance
-    // remove ".lock" file from disc !
-    // it is done as a first action for session save since Gnome sessions
-    // do not provide enough time for shutdown, and the dialog looks to be
-    // confusing for the user
-    AutoRecovery::st_impl_removeLockFile();
-
     // Be sure to know all open documents realy .-)
     implts_verifyCacheAgainstDesktopDocumentList();
 
@@ -2991,7 +3011,8 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
     AutoRecovery::ETimerType eSuggestedTimer    = AutoRecovery::E_DONT_START_TIMER;
     do
     {
-        eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_True, &aParams);
+        // do not remove lock files of the documents, it will be done on session quit
+        eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_False, &aParams);
     }
     while(eSuggestedTimer == AutoRecovery::E_CALL_ME_BACK);
 
@@ -3002,6 +3023,23 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
     // any "handle" state ...
     implts_resetHandleStates(sal_False);
 
+    // flush config cached back to disc.
+    impl_flushALLConfigChanges();
+}
+
+//-----------------------------------------------
+void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/)
+{
+    LOG_RECOVERY("AutoRecovery::implts_doSessionQuietQuit()")
+
+    // try to make sure next time office will be started user wont be
+    // notified about any other might be running office instance
+    // remove ".lock" file from disc !
+    // it is done as a first action for session save since Gnome sessions
+    // do not provide enough time for shutdown, and the dialog looks to be
+    // confusing for the user
+    AutoRecovery::st_impl_removeLockFile();
+
     // reset all modified documents, so the dont show any UI on closing ...
     // and close all documents, so we can shutdown the OS!
     implts_prepareSessionShutdown();
@@ -3020,6 +3058,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
     impl_flushALLConfigChanges();
 }
 
+
 //-----------------------------------------------
 void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams)
 {
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 5a299150611e..7f190a678763 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -75,9 +75,9 @@
 #include <rtl/ustrbuf.hxx>
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <osl/file.hxx>
 #include <unotools/configmgr.hxx>
 
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index c5d845a9d333..a354b01d3c32 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -43,9 +43,9 @@
 
 #include "tools/urlobj.hxx"
 
-#include "svtools/dynamicmenuoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/imagemgr.hxx"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 
 #include "comphelper/processfactory.hxx"
 #include "comphelper/sequenceashashmap.hxx"
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 0b9afa6d38de..e02206cf5f29 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -38,7 +38,7 @@
 #include "vcl/bitmapex.hxx"
 #include "vcl/toolbox.hxx"
 
-#include "svtools/moduleoptions.hxx"
+#include "unotools/moduleoptions.hxx"
 #include "svtools/acceleratorexecute.hxx"
 
 #include "com/sun/star/frame/XDispatchProvider.hpp"
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 0e14404de381..2b615240b594 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -106,7 +106,7 @@
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #ifdef ENABLE_ASSERTIONS
     #ifndef _RTL_STRBUF_HXX_
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 41d57b47899e..aca9b8f79523 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -36,7 +36,7 @@
 //_________________________________________________________________________________________________________________
 #include <services/mediatypedetectionhelper.hxx>
 #include <services.h>
-#include <svtools/inettype.hxx>
+#include <svl/inettype.hxx>
 #include <tools/string.hxx>
 #include <rtl/logfile.hxx>
 
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index ad0016fc0af6..95cbc52dcd04 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -60,14 +60,15 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <osl/time.h>
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/internaloptions.hxx>
 #include <stdio.h>
 //_______________________________________________
 // interface includes
@@ -103,12 +104,13 @@ namespace framework{
 //***********************************************
 // XInterface, XTypeProvider, XServiceInfo
 
-DEFINE_XINTERFACE_5(
+DEFINE_XINTERFACE_6(
         SessionListener,
         OWeakObject,
         DIRECT_INTERFACE(css::lang::XTypeProvider),
         DIRECT_INTERFACE(css::lang::XInitialization),
         DIRECT_INTERFACE(css::frame::XSessionManagerListener),
+        DIRECT_INTERFACE(css::frame::XSessionManagerListener2),
         DIRECT_INTERFACE(css::frame::XStatusListener),
         DIRECT_INTERFACE(css::lang::XServiceInfo))
 
@@ -116,7 +118,7 @@ DEFINE_XTYPEPROVIDER_5(
         SessionListener,
         css::lang::XTypeProvider,
         css::lang::XInitialization,
-        css::frame::XSessionManagerListener,
+        css::frame::XSessionManagerListener2,
         css::frame::XStatusListener,
         css::lang::XServiceInfo)
 
@@ -137,7 +139,10 @@ SessionListener::SessionListener(const css::uno::Reference< css::lang::XMultiSer
         : ThreadHelpBase      (&Application::GetSolarMutex())
         , OWeakObject         (                             )
         , m_xSMGR             (xSMGR                        )
-        , m_bRestored( false )
+        , m_bRestored( sal_False )
+        , m_bSessionStoreRequested( sal_False )
+        , m_bAllowUserInteractionOnQuit( sal_False )
+        , m_bTerminated( sal_False )
 {
 }
 
@@ -150,6 +155,63 @@ SessionListener::~SessionListener()
     }
 }
 
+void SessionListener::StoreSession( sal_Bool bAsync )
+{
+    ResetableGuard aGuard(m_aLock);
+    try
+    {
+        // xd create SERVICENAME_AUTORECOVERY -> XDispatch
+        // xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=bAsync
+        // on stop event m_rSessionManager->saveDone(this); in case of asynchronous call
+        // in case of synchronous call the caller should do saveDone() call himself!
+
+        css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
+        css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
+        URL aURL;
+        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
+        xURLTransformer->parseStrict(aURL);
+
+        // in case of asynchronous call the notification will trigger saveDone()
+        if ( bAsync )
+            xDispatch->addStatusListener(this, aURL);
+
+        Sequence< PropertyValue > args(1);
+        args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
+        xDispatch->dispatch(aURL, args);
+    } catch (com::sun::star::uno::Exception& e) {
+        OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
+        OSL_ENSURE(sal_False, aMsg.getStr());
+        // save failed, but tell manager to go on if we havent yet dispatched the request
+        // in case of synchronous saving the notification is done by the caller
+        if ( bAsync && m_rSessionManager.is() )
+            m_rSessionManager->saveDone(this);
+    }
+}
+
+void SessionListener::QuitSessionQuietly()
+{
+    ResetableGuard aGuard(m_aLock);
+    try
+    {
+        // xd create SERVICENAME_AUTORECOVERY -> XDispatch
+        // xd->dispatch("vnd.sun.star.autorecovery:/doSessionQuietQuit, async=false
+        // it is done synchronously to avoid conflict with normal quit process
+
+        css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
+        css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
+        URL aURL;
+        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionQuietQuit");
+        xURLTransformer->parseStrict(aURL);
+
+        Sequence< PropertyValue > args(1);
+        args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
+        xDispatch->dispatch(aURL, args);
+    } catch (com::sun::star::uno::Exception& e) {
+        OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
+        OSL_ENSURE(sal_False, aMsg.getStr());
+    }
+}
+
 void SAL_CALL SessionListener::disposing(const com::sun::star::lang::EventObject&) throw (RuntimeException)
 {
 }
@@ -170,6 +232,8 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
                     v.Value >>= aSMgr;
                 else if (v.Name.equalsAscii("SessionManager"))
                     v.Value >>= m_rSessionManager;
+                else if (v.Name.equalsAscii("AllowUserInteractionOnQuit"))
+                    v.Value >>= m_bAllowUserInteractionOnQuit;
             }
         }
     }
@@ -235,46 +299,73 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl
 {
     if (bShutdown)
     {
-        sal_Bool bDispatched = sal_False;
-        ResetableGuard aGuard(m_aLock);
-        try
-        {
-            // xd create SERVICENAME_AUTORECOVERY -> XDispatch
-            // xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=true
-            // on stop event m_rSessionManager->saveDone(this);
-
-            css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
-            css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
-            URL aURL;
-            aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
-            xURLTransformer->parseStrict(aURL);
-            xDispatch->addStatusListener(this, aURL);
-            Sequence< PropertyValue > args(1);
-            args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_True),PropertyState_DIRECT_VALUE);
-            xDispatch->dispatch(aURL, args);
-            bDispatched = sal_True;
-            // on stop event set call m_rSessionManager->saveDone(this);
-        } catch (com::sun::star::uno::Exception& e) {
-            OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
-            OSL_ENSURE(sal_False, aMsg.getStr());
-            // save failed, but tell manager to go on if we havent yet dispatched the request
-            if (m_rSessionManager.is() && !bDispatched)
-                m_rSessionManager->saveDone(this);
-        }
+        m_bSessionStoreRequested = sal_True; // there is no need to protect it with mutex
+        if ( m_bAllowUserInteractionOnQuit && m_rSessionManager.is() )
+            m_rSessionManager->queryInteraction( static_cast< css::frame::XSessionManagerListener* >( this ) );
+        else
+            StoreSession( sal_True );
     }
     // we don't have anything to do so tell the session manager we're done
     else if( m_rSessionManager.is() )
         m_rSessionManager->saveDone( this );
 }
 
+void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted )
+    throw (RuntimeException)
+{
+    // do AutoSave as the first step
+    ResetableGuard aGuard(m_aLock);
+
+    if ( bInteractionGranted )
+    {
+        // close the office documents in normal way
+        try
+        {
+            // first of all let the session be stored to be sure that we lose no information
+            StoreSession( sal_False );
 
+            css::uno::Reference< css::frame::XDesktop > xDesktop( m_xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW);
+            m_bTerminated = xDesktop->terminate();
 
-void SAL_CALL SessionListener::approveInteraction( sal_Bool /*bInteractionGranted*/ )
-    throw (RuntimeException)
-{}
+            if ( m_rSessionManager.is() )
+            {
+                // false means that the application closing has been cancelled
+                if ( !m_bTerminated )
+                    m_rSessionManager->cancelShutdown();
+                else
+                    m_rSessionManager->interactionDone( this );
+            }
+        }
+        catch( css::uno::Exception& )
+        {
+            StoreSession( sal_True );
+            m_rSessionManager->interactionDone( this );
+        }
+
+        if ( m_rSessionManager.is() )
+            m_rSessionManager->saveDone(this);
+    }
+    else
+    {
+        StoreSession( sal_True );
+    }
+}
 
 void SessionListener::shutdownCanceled()
     throw (RuntimeException)
-{}
+{
+    // set the state back
+    m_bSessionStoreRequested = sal_False; // there is no need to protect it with mutex
+}
+
+void SessionListener::doQuit()
+    throw (RuntimeException)
+{
+    if ( m_bSessionStoreRequested && !m_bTerminated )
+    {
+        // let the session be closed quietly in this case
+        QuitSessionQuietly();
+    }
+}
 
 }
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 966ce1756c64..21b2be8b1c53 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -319,6 +319,11 @@ void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence<
     // NOT implemented yet!
 }
 
+void SubstitutePathVariables_Impl::Commit()
+{
+}
+
+
 //_________________________________________________________________________________________________________________
 //  private methods
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index fb3c08876687..dfce492ddcd7 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -75,18 +75,20 @@ namespace framework{
 //  css::uno::XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
 
-DEFINE_XINTERFACE_5                 (   TabWindowService                                ,
+DEFINE_XINTERFACE_6                 (   TabWindowService                                ,
                                         OWeakObject                                     ,
                                         DIRECT_INTERFACE(css::lang::XTypeProvider      ),
                                         DIRECT_INTERFACE(css::lang::XServiceInfo       ),
+                                        DIRECT_INTERFACE(css::lang::XComponent),
                                         DIRECT_INTERFACE(css::awt::XSimpleTabController),
                                         DIRECT_INTERFACE(css::beans::XPropertySet      ),
                                         DIRECT_INTERFACE(css::beans::XPropertySetInfo  )
                                     )
 
-DEFINE_XTYPEPROVIDER_5              (   TabWindowService               ,
+DEFINE_XTYPEPROVIDER_6              (   TabWindowService               ,
                                         css::lang::XTypeProvider       ,
                                         css::lang::XServiceInfo        ,
+                                        css::lang::XComponent          ,
                                         css::awt::XSimpleTabController ,
                                         css::beans::XPropertySet       ,
                                         css::beans::XPropertySetInfo
@@ -100,7 +102,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE    (   TabWindowService                   ,
 
 DEFINE_INIT_SERVICE                 (   TabWindowService,
                                         {
-                                            impl_initializePropInfo();

+                                            impl_initializePropInfo();
                                             m_aTransactionManager.setWorkingMode( E_WORK );
                                         }
                                     )
@@ -141,7 +143,12 @@ TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMulti
 //  destructor
 //*****************************************************************************************************************
 TabWindowService::~TabWindowService()
-{

+{
+    // SAFE->
+    ResetableGuard aGuard(m_aLock);
+
+    if (m_pTabWin)
+        m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) );
 }
 
 //*****************************************************************************************************************
@@ -286,8 +293,11 @@ void SAL_CALL TabWindowService::dispose()
 
     m_lListener.disposeAndClear (aEvent);
 
+    if (m_pTabWin)
+        m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) );
+
     m_pTabWin = NULL;
-    m_xTabWin.clear ();
+    m_xTabWin.clear();
 }
 
 //*****************************************************************************************************************
@@ -357,6 +367,7 @@ css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const ::rtl::OUSt
 //*****************************************************************************************************************
 IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
 {
+
     if ( !pEvent && !pEvent->ISA(VclWindowEvent))
         return 0;
 
@@ -369,6 +380,11 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
     if (nEventId == VCLEVENT_OBJECT_DYING)
     {
         m_lListener.disposeAndClear (aEvent);
+
+        m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) );
+        m_pTabWin = NULL;
+        m_xTabWin.clear();
+
         return 0;
     }
 
@@ -454,9 +470,9 @@ FwkTabWindow* TabWindowService::mem_TabWin ()
     FwkTabWindow* pWin = NULL;
 
     if ( ! m_xTabWin.is ())
-    {

-        Window* pFakeParent = dynamic_cast< Window* >(Application::GetDefaultDevice ());

-    

+    {
+        Window* pFakeParent = dynamic_cast< Window* >(Application::GetDefaultDevice ());
+
         m_pTabWin = new FwkTabWindow (pFakeParent);
         m_xTabWin = VCLUnoHelper::GetInterface (m_pTabWin);
 
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 311db615ed2a..caa356d850fa 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -62,7 +62,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <tools/rcid.h>
 #include <vcl/image.hxx>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 555682677e33..ec1508cb0fd7 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -68,7 +68,7 @@
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <map>
 #include <i18npool/mslangid.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <svtools/langtab.hxx>
 #include <classes/fwlresid.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index bccd553b57d3..3a92fa7848b1 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -71,7 +71,7 @@
 #include <toolkit/unohlp.hxx>
 #include <tools/gen.hxx>
 #include <com/sun/star/awt/Command.hpp>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <dispatch/uieventloghelper.hxx>
 
@@ -337,7 +337,7 @@ void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::R
     mRectangle.Y = mMousePos.Y();
     sal_Int16 nId = xPopupMenu->execute( xParent, mRectangle, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
     //click "More..."
-    if ( m_xFrame.is() )
+    if ( nId && m_xFrame.is() )
     {
         uno::Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         util::URL aURL;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 4c20b96f00dc..0b26f96829d2 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -82,9 +82,9 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/historyoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/historyoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 37580f86f546..d4e5228c6b9c 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -68,7 +68,7 @@
 #include <osl/file.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/acceleratorexecute.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 1ca5bf409e6d..9c5ed617b9e0 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -62,7 +62,7 @@
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/file.hxx>
 //#include <tools/solar.hrc>
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 55c8d16af2ec..6463dd634c20 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -85,13 +85,13 @@
 //_________________________________________________________________________________________________________________
 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
 #endif
 #include <comphelper/mediadescriptor.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/imageitm.hxx>
+#include <svl/imageitm.hxx>
 #include <svtools/framestatuslistener.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/menu.hxx>
@@ -99,7 +99,7 @@
 #include <vcl/taskpanelist.hxx>
 #include <rtl/logfile.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <boost/bind.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -341,9 +341,11 @@ void ToolBarManager::Destroy()
             delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( nItemId ));
     }
 
+    // Hide toolbar as lazy delete can destroy the toolbar much later.
+    m_pToolBar->Hide();
     /* #i99167# removed change for i93173 since there is some weird crash */
         // #i93173# delete toolbar lazily as we can still be in one of its handlers
-        m_pToolBar->doLazyDelete();
+    m_pToolBar->doLazyDelete();
 
     Link aEmpty;
     m_pToolBar->SetSelectHdl( aEmpty );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 3b359eea97c2..a697eaeff3b7 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -80,7 +80,7 @@
 #endif
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
 #include <rtl/logfile.hxx>
 
diff --git a/goodies/inc/chtuner.hxx b/goodies/inc/chtuner.hxx
index 4c7e288d2ce3..7a54c1e05a41 100644
--- a/goodies/inc/chtuner.hxx
+++ b/goodies/inc/chtuner.hxx
@@ -38,7 +38,7 @@
 #endif
 
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class ChannelItem;
 class ChannelList;
diff --git a/goodies/inc/goodies.hrc b/goodies/inc/goodies.hrc
index 18584985a603..139987c4f6ee 100644
--- a/goodies/inc/goodies.hrc
+++ b/goodies/inc/goodies.hrc
@@ -31,7 +31,7 @@
 #define _GOODIES_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // Dialoge ---------------------------------------------------------------
diff --git a/goodies/inc/pch/precompiled_goodies.hxx b/goodies/inc/pch/precompiled_goodies.hxx
index b0d1ba09410b..fe6f2ec433e5 100644
--- a/goodies/inc/pch/precompiled_goodies.hxx
+++ b/goodies/inc/pch/precompiled_goodies.hxx
@@ -96,13 +96,13 @@
 #include "rtl/uuid.h"
 
 #include "svtools/FilterConfigItem.hxx"
-#include "svtools/cacheoptions.hxx"
+#include "unotools/cacheoptions.hxx"
 #include "svtools/fltcall.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/solar.hrc"
+#include "svl/itemprop.hxx"
+#include "svl/lstner.hxx"
+#include "svl/solar.hrc"
 #include "svtools/stdctrl.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 
 #include "toolkit/helper/vclunohelper.hxx"
 
diff --git a/goodies/source/filter.vcl/egif/egif.cxx b/goodies/source/filter.vcl/egif/egif.cxx
index e1547c7339d0..9f2aeaddd686 100644
--- a/goodies/source/filter.vcl/egif/egif.cxx
+++ b/goodies/source/filter.vcl/egif/egif.cxx
@@ -35,7 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/window.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include "giflzwc.hxx"
diff --git a/goodies/source/filter.vcl/eos2met/eos2met.cxx b/goodies/source/filter.vcl/eos2met/eos2met.cxx
index e0b6c2bdea43..b818e9cd26ba 100644
--- a/goodies/source/filter.vcl/eos2met/eos2met.cxx
+++ b/goodies/source/filter.vcl/eos2met/eos2met.cxx
@@ -47,7 +47,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include "strings.hrc"
 #include "dlgeos2.hxx"
 
diff --git a/goodies/source/filter.vcl/epbm/epbm.cxx b/goodies/source/filter.vcl/epbm/epbm.cxx
index 92aeb501e141..a624e7f45cfb 100644
--- a/goodies/source/filter.vcl/epbm/epbm.cxx
+++ b/goodies/source/filter.vcl/epbm/epbm.cxx
@@ -35,7 +35,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include "strings.hrc"
diff --git a/goodies/source/filter.vcl/epgm/epgm.cxx b/goodies/source/filter.vcl/epgm/epgm.cxx
index b6056339f11e..32d6e74a5cfe 100644
--- a/goodies/source/filter.vcl/epgm/epgm.cxx
+++ b/goodies/source/filter.vcl/epgm/epgm.cxx
@@ -35,7 +35,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include "strings.hrc"
diff --git a/goodies/source/filter.vcl/epict/epict.cxx b/goodies/source/filter.vcl/epict/epict.cxx
index 73e321a5b5b3..3e4dca455d05 100644
--- a/goodies/source/filter.vcl/epict/epict.cxx
+++ b/goodies/source/filter.vcl/epict/epict.cxx
@@ -33,7 +33,7 @@
 
 #include <vcl/metaact.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 
 #include <math.h>
diff --git a/goodies/source/filter.vcl/eppm/eppm.cxx b/goodies/source/filter.vcl/eppm/eppm.cxx
index 8cd71176e31b..d17b4f7777ae 100644
--- a/goodies/source/filter.vcl/eppm/eppm.cxx
+++ b/goodies/source/filter.vcl/eppm/eppm.cxx
@@ -35,7 +35,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include "strings.hrc"
diff --git a/goodies/source/filter.vcl/eps/eps.cxx b/goodies/source/filter.vcl/eps/eps.cxx
index 8a163659050a..dc8e407b178e 100644
--- a/goodies/source/filter.vcl/eps/eps.cxx
+++ b/goodies/source/filter.vcl/eps/eps.cxx
@@ -46,7 +46,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/gradient.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include <vcl/graphictools.hxx>
diff --git a/goodies/source/filter.vcl/etiff/etiff.cxx b/goodies/source/filter.vcl/etiff/etiff.cxx
index 12289cb8f0a9..3cdec42d0978 100644
--- a/goodies/source/filter.vcl/etiff/etiff.cxx
+++ b/goodies/source/filter.vcl/etiff/etiff.cxx
@@ -35,7 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/bmpacc.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 #include <svtools/FilterConfigItem.hxx>
 
diff --git a/goodies/source/filter.vcl/ipcd/ipcd.cxx b/goodies/source/filter.vcl/ipcd/ipcd.cxx
index f70d1c8b84c5..f7a5f3652cbf 100644
--- a/goodies/source/filter.vcl/ipcd/ipcd.cxx
+++ b/goodies/source/filter.vcl/ipcd/ipcd.cxx
@@ -36,7 +36,7 @@
 #include <vcl/bmpacc.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/fltcall.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/FilterConfigItem.hxx>
 
 //============================ PCDReader ==================================
diff --git a/goodies/source/graphic/grfcache.cxx b/goodies/source/graphic/grfcache.cxx
index 1a2af16ed741..f0a41ceca53f 100644
--- a/goodies/source/graphic/grfcache.cxx
+++ b/goodies/source/graphic/grfcache.cxx
@@ -37,6 +37,8 @@
 #include <tools/poly.hxx>
 #include "grfcache.hxx"
 
+#include <memory>
+
 // -----------
 // - Defines -
 // -----------
@@ -612,7 +614,12 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti
         if( !bInserted )
         {
             GraphicCacheEntry* pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.First() );
-            const GraphicID aID( rObj );
+            ::std::auto_ptr< GraphicID > apID;
+
+            if( !pID )
+            {
+                apID.reset( new GraphicID( rObj ) );
+            }
 
             while( !bInserted && pEntry )
             {
@@ -647,10 +654,13 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti
                         }
                     }
                 }
-                else if( rEntryID == aID )
+                else
                 {
-                    pEntry->AddGraphicObjectReference( rObj, rSubstitute );
-                    bInserted = TRUE;
+                    if( rEntryID == *apID )
+                    {
+                        pEntry->AddGraphicObjectReference( rObj, rSubstitute );
+                        bInserted = TRUE;
+                    }
                 }
 
                 if( !bInserted )
diff --git a/goodies/source/graphic/grfmgr.cxx b/goodies/source/graphic/grfmgr.cxx
index 5cb37a51e81f..39c1e53e7184 100644
--- a/goodies/source/graphic/grfmgr.cxx
+++ b/goodies/source/graphic/grfmgr.cxx
@@ -44,7 +44,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/salbtype.hxx>
-#include <svtools/cacheoptions.hxx>
+#include <unotools/cacheoptions.hxx>
 #include "grfmgr.hxx"
 
 // -----------
diff --git a/goodies/source/inv/invader.cxx b/goodies/source/inv/invader.cxx
index be15ff2e75d4..0aed6e76848f 100644
--- a/goodies/source/inv/invader.cxx
+++ b/goodies/source/inv/invader.cxx
@@ -37,7 +37,7 @@
 #include "invader.hrc"
 #include "strings.hrc"
 #include "score.hxx"
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <cppuhelper/servicefactory.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/goodies/source/unographic/descriptor.cxx b/goodies/source/unographic/descriptor.cxx
index e75b008cfb69..c19318d6e11e 100644
--- a/goodies/source/unographic/descriptor.cxx
+++ b/goodies/source/unographic/descriptor.cxx
@@ -37,7 +37,7 @@
 #include <vos/mutex.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_
 #include <com/sun/star/beans/PropertyState.hpp>
diff --git a/goodies/source/unographic/provider.cxx b/goodies/source/unographic/provider.cxx
index 2eb0aede9bdf..1f7de99d4473 100644
--- a/goodies/source/unographic/provider.cxx
+++ b/goodies/source/unographic/provider.cxx
@@ -46,7 +46,7 @@
 #include <tools/resmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <vcl/salbtype.hxx>
 #include <vcl/virdev.hxx>
 #include <com/sun/star/io/XStream.hpp>
diff --git a/goodies/source/unographic/renderer.cxx b/goodies/source/unographic/renderer.cxx
index 78f006cc69be..d280ed832999 100644
--- a/goodies/source/unographic/renderer.cxx
+++ b/goodies/source/unographic/renderer.cxx
@@ -48,7 +48,7 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include "grfmgr.hxx"
 #include "graphic.hxx"
 #include "renderer.hxx"
diff --git a/goodies/source/unographic/transformer.cxx b/goodies/source/unographic/transformer.cxx
index 4422d161d7c4..7e18c10cdd41 100644
--- a/goodies/source/unographic/transformer.cxx
+++ b/goodies/source/unographic/transformer.cxx
@@ -43,7 +43,7 @@
 #include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <vcl/salbtype.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
index a1e5a356e388..e5198f23b706 100644
--- a/hunspell/hunspell-1.2.8.patch
+++ b/hunspell/hunspell-1.2.8.patch
@@ -343,7 +343,7 @@
 -#include "config.h"
 --- misc/hunspell-1.2.8/src/hunspell/makefile.mk	Tue Jun 17 10:57:55 2008
 +++ misc/build/hunspell-1.2.8/src/hunspell/makefile.mk	Thu Feb 19 18:13:52 2009
-@@ -60,11 +60,12 @@
+@@ -60,11 +60,13 @@
  #
  #*************************************************************************
  
@@ -355,6 +355,7 @@
 -LIBTARGET=NO
 +LIBTARGET=YES
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++UWINAPILIB= 

  
  #----- Settings ---------------------------------------------------------
  
diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst
index ac3a882e88a9..ea87500d1d6d 100644
--- a/hunspell/prj/build.lst
+++ b/hunspell/prj/build.lst
@@ -1,3 +1,3 @@
-hun	hunspell	:	solenv ICU:icu sal NULL
+hun     hunspell        :       solenv ICU:icu NULL
 hun     hunspell              usr1    -       all hun_mkout NULL
 hun     hunspell              nmake   -       all hun_hunspell NULL
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch
index 27f7085946a3..5aef3422d22a 100644
--- a/hyphen/hyphen-2.4.patch
+++ b/hyphen/hyphen-2.4.patch
@@ -110,7 +110,7 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
 diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
 --- misc/hyphen-2.4/makefile.mk	2008-06-04 10:43:21.000000000 +0200
 +++ misc/build/hyphen-2.4/makefile.mk	2008-06-04 12:40:46.000000000 +0200
-@@ -1 +1,57 @@
+@@ -1 +1,58 @@
 -dummy
 +#*************************************************************************
 +#
@@ -151,6 +151,7 @@ diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
 +
 +USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++UWINAPILIB=

 +
 +.INCLUDE : settings.mk
 +
diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst
index dbb21f3325ab..c953a5725f70 100644
--- a/hyphen/prj/build.lst
+++ b/hyphen/prj/build.lst
@@ -1,3 +1,3 @@
-hyp	hyphen	:	solenv sal NULL
+hyp     hyphen  :       soltools solenv NULL
 hyp     hyphen              usr1    -       all hyp_mkout NULL
 hyp     hyphen              nmake   -       all hyp_hyphen NULL
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 27d6443a27fc..39e925cb7eb9 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -1038,7 +1038,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
             if ( !xNatNumSup.is() )
             {
                 throw RuntimeException( OUString(
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     RTL_CONSTASCII_USTRINGPARAM(
                         "cclass_Unicode::parseText: can't instanciate "
                         NATIVENUMBERSUPPLIER_SERVICENAME )
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 9126162d6f36..91d856b19e62 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -39,11 +39,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if OSL_DEBUG_LEVEL == 0 && !defined(NDEBUG)
-#define NDEBUG
-#endif
-#include <assert.h>
-
 // Cyrillic upper case
 #define C_CYR_A "\xD0\x90"
 #define C_CYR_B "\xD0\x91"
@@ -277,7 +272,7 @@ const char* expected_name( int i, int last )
      else if( i==1    ) return "NumberingType";
      else if( i==2    ) return "Suffix";
      else if( i==last ) return "Value";
-     else { assert(0); return ""; }
+     else { OSL_ASSERT(0); return ""; }
 }
 static
 const char* expected_type( int i, int last )
@@ -287,7 +282,7 @@ const char* expected_type( int i, int last )
      else if( i==1    ) return "sal_Int16";
      else if( i==2    ) return "OUString";
      else if( i==last ) return "sal_Int32";
-     else { assert(0); return ""; }
+     else { OSL_ASSERT(0); return ""; }
 }
 static
 void failedToConvert( int i, int last )
@@ -461,7 +456,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                return OUString::createFromAscii(""); // ignore prefix and suffix
           case PAGE_DESCRIPTOR:
           case BITMAP:
-               assert(0);
+               OSL_ASSERT(0);
                throw IllegalArgumentException();
           case CHARS_UPPER_LETTER_N:
                lcl_formatChars1( upperLetter, 26, number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>BB, ...
@@ -480,7 +475,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                } catch (Exception& ) {
                     // When translteration property is missing, return default number (bug #101141#)
                     result += OUString::valueOf( number );
-                    // assert(0);
+                    // OSL_ASSERT(0);
                     // throw IllegalArgumentException();
                }
                break;
@@ -674,7 +669,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
               break;
 
           default:
-               assert(0);
+               OSL_ASSERT(0);
                throw IllegalArgumentException();
       }
 
diff --git a/i18npool/source/isolang/inwnt.cxx b/i18npool/source/isolang/inwnt.cxx
index 7d5e4d3216e7..2550eb3acd10 100644
--- a/i18npool/source/isolang/inwnt.cxx
+++ b/i18npool/source/isolang/inwnt.cxx
@@ -104,11 +104,7 @@ LanguageType MsLangId::getPlatformSystemUILanguage()
 {
     // TODO: this could be distinguished, #if(WINVER >= 0x0500)
     // needs _run_ time differentiation though, not at compile time.
-#if 0
     getPlatformSystemLanguageImpl( nImplSystemUILanguage,
             &GetUserDefaultUILanguage, &GetSystemDefaultUILanguage);
-#endif
-    getPlatformSystemLanguageImpl( nImplSystemUILanguage,
-            &GetUserDefaultLangID, &GetSystemDefaultLangID);
     return nImplSystemUILanguage;
 }
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 3476341fbc79..aab92d717429 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -154,7 +154,7 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
                 if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
                     nLang = LANGUAGE_CHINESE_SIMPLIFIED;
                 else
-                    nLang = nConfiguredComplexFallback;
+                    nLang = nConfiguredAsianFallback;
                 break;
             case ::com::sun::star::i18n::ScriptType::COMPLEX:
                 if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 083fbc548c8c..e119e71ec14c 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -38,13 +38,6 @@
 #include <stdio.h>
 #include "rtl/instance.hxx"
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
-
 using namespace com::sun::star::i18n;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -1136,7 +1129,7 @@ LocaleData::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(Ru
                              rVal.Value <<= (sal_Int16) sVal.toInt32();
                              break;
                         default:
-                             assert(0);
+                             OSL_ASSERT(0);
                         }
                    }
               }
@@ -1260,7 +1253,7 @@ LocaleData::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(Runti
                         case 10: level[j].sTransliteration = tmp; break;
                         case 11: level[j].nNatNum    = tmp.toInt32();   break;
                         default:
-                            assert(0);
+                            OSL_ASSERT(0);
                     }
                 }
             }
diff --git a/icc/README b/icc/README
index 26ec78e40149..672371d411ad 100644
--- a/icc/README
+++ b/icc/README
@@ -31,11 +31,9 @@ are in:
 
 <build>/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
 
-The patches:
-SampleICC-1.3.2.patch is the file to be used for Linux and Windows
-SampleICC-1.3.2-bendian.patch is the file to be used for
-big endian platform, formed from the above patch plus the big endian
-forcing.
+The patchs:
+SampleICC-1.3.2.patch tweaks the build to use the endianness
+detected in sal.
 
 beppec56@openoffice.org
 
diff --git a/icc/SampleICC-1.3.2-bendian.patch b/icc/SampleICC-1.3.2-bendian.patch
deleted file mode 100644
index a4988a2d6287..000000000000
--- a/icc/SampleICC-1.3.2-bendian.patch
+++ /dev/null
@@ -1,5133 +0,0 @@
-*** misc/SampleICC-1.3.2/configure	Mon Aug 20 22:10:59 2007
---- misc/build/SampleICC-1.3.2/configure	Fri Jan 25 14:23:09 2008
-***************
-*** 19991,19997 ****
-  
-  
-  
-!                                                                                                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile IccProfLib/Makefile Tools/Makefile Tools/CmdLine/Makefile Tools/CmdLine/IccApplyNamedCmm/Makefile Tools/CmdLine/IccApplyProfiles/Makefile Tools/CmdLine/IccDumpProfile/Makefile Tools/CmdLine/IccProfLibTest/Makefile Tools/CmdLine/IccStripUnknownTags/Makefile Tools/CmdLine/IccV4ToMPE/Makefile Contrib/Makefile Contrib/CmdLine/Makefile Contrib/CmdLine/create_CLUT_profile/Makefile Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile Contrib/CmdLine/create_display_profile/Makefile Contrib/ICC_utils/Makefile Contrib/Mac_OS_X/Makefile Contrib/Mac_OS_X/create_probe/Makefile Contrib/Mac_OS_X/extract_probe_data/Makefile Contrib/examples/Makefile Contrib/examples/RSR/Makefile Contrib/tests/Makefile Contrib/tests/flatten_AToB_tag/Makefile Contrib/tests/generate_device_codes/Makefile Contrib/tests/reconstruct_measurements/Makefile Contrib/tests/round_trip_PCS_LAB/Makefile"
-  cat >confcache <<\_ACEOF
-  # This file is a shell script that caches the results of configure
-  # tests run on this system so they can be shared between configure
---- 19991,19997 ----
-  
-  
-  
-!                                                                                                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile IccProfLib/Makefile Tools/Makefile Tools/CmdLine/Makefile Tools/CmdLine/IccDumpProfile/Makefile Tools/CmdLine/IccProfLibTest/Makefile Tools/CmdLine/IccStripUnknownTags/Makefile Tools/CmdLine/IccV4ToMPE/Makefile Contrib/Makefile Contrib/CmdLine/Makefile Contrib/ICC_utils/Makefile Contrib/CmdLine/create_sRGB_profile/Makefile"
-  cat >confcache <<\_ACEOF
-  # This file is a shell script that caches the results of configure
-  # tests run on this system so they can be shared between configure
-***************
-*** 20571,20578 ****
-    "IccProfLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES IccProfLib/Makefile" ;;
-    "Tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/Makefile" ;;
-    "Tools/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/Makefile" ;;
--   "Tools/CmdLine/IccApplyNamedCmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyNamedCmm/Makefile" ;;
--   "Tools/CmdLine/IccApplyProfiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyProfiles/Makefile" ;;
-    "Tools/CmdLine/IccDumpProfile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccDumpProfile/Makefile" ;;
-    "Tools/CmdLine/IccProfLibTest/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccProfLibTest/Makefile" ;;
-    "Tools/CmdLine/IccStripUnknownTags/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccStripUnknownTags/Makefile" ;;
---- 20571,20576 ----
-***************
-*** 20579,20598 ****
-    "Tools/CmdLine/IccV4ToMPE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccV4ToMPE/Makefile" ;;
-    "Contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Makefile" ;;
-    "Contrib/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/Makefile" ;;
-!   "Contrib/CmdLine/create_CLUT_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile/Makefile" ;;
-!   "Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ;;
-!   "Contrib/CmdLine/create_display_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_display_profile/Makefile" ;;
-    "Contrib/ICC_utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/ICC_utils/Makefile" ;;
--   "Contrib/Mac_OS_X/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/Makefile" ;;
--   "Contrib/Mac_OS_X/create_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/create_probe/Makefile" ;;
--   "Contrib/Mac_OS_X/extract_probe_data/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/extract_probe_data/Makefile" ;;
--   "Contrib/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/Makefile" ;;
--   "Contrib/examples/RSR/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/RSR/Makefile" ;;
--   "Contrib/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/Makefile" ;;
--   "Contrib/tests/flatten_AToB_tag/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/flatten_AToB_tag/Makefile" ;;
--   "Contrib/tests/generate_device_codes/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/generate_device_codes/Makefile" ;;
--   "Contrib/tests/reconstruct_measurements/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/reconstruct_measurements/Makefile" ;;
--   "Contrib/tests/round_trip_PCS_LAB/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/round_trip_PCS_LAB/Makefile" ;;
-    "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
---- 20577,20584 ----
-    "Tools/CmdLine/IccV4ToMPE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccV4ToMPE/Makefile" ;;
-    "Contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Makefile" ;;
-    "Contrib/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/Makefile" ;;
-!   "Contrib/CmdLine/create_sRGB_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_sRGB_profile/Makefile" ;;
-    "Contrib/ICC_utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/ICC_utils/Makefile" ;;
-    "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-*** misc/SampleICC-1.3.2/Contrib/Makefile.in	Mon Aug 20 22:10:37 2007
---- misc/build/SampleICC-1.3.2/Contrib/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 103,120 ****
-  
-  SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine \
-! 	examples \
-! 	Mac_OS_X \
-! 	tests
-  
-  
-  DIST_SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine \
-! 	examples \
-! 	Mac_OS_X \
-! 	tests
-  
-  subdir = Contrib
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 103,114 ----
-  
-  SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine
-  
-  
-  DIST_SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine
-  
-  subdir = Contrib
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-*** misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in	Mon Aug 20 22:10:34 2007
---- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 102,116 ****
-  install_sh = @install_sh@
-  
-  SUBDIRS = \
-! 	create_CLUT_profile \
-! 	create_CLUT_profile_from_probe \
-! 	create_display_profile
-  
-  
-  DIST_SUBDIRS = \
-! 	create_CLUT_profile \
-! 	create_CLUT_profile_from_probe \
-! 	create_display_profile
-  
-  subdir = Contrib/CmdLine
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 102,112 ----
-  install_sh = @install_sh@
-  
-  SUBDIRS = \
-! 	create_sRGB_profile
-  
-  
-  DIST_SUBDIRS = \
-! 	create_sRGB_profile
-  
-  subdir = Contrib/CmdLine
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in	Mon Aug 20 22:10:35 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 133,139 ****
-  CONFIG_CLEAN_FILES =
-  LTLIBRARIES = $(lib_LTLIBRARIES)
-  
-! libICC_utils_la_LIBADD =
-  am_libICC_utils_la_OBJECTS = Stubs.lo CAT.lo CLUT.lo CLUT_stuffer.lo \
-  	ICC_tool_exception.lo Vetters.lo
-  libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
---- 133,139 ----
-  CONFIG_CLEAN_FILES =
-  LTLIBRARIES = $(lib_LTLIBRARIES)
-  
-! libICC_utils_la_LIBADD = $(LDADD)
-  am_libICC_utils_la_OBJECTS = Stubs.lo CAT.lo CLUT.lo CLUT_stuffer.lo \
-  	ICC_tool_exception.lo Vetters.lo
-  libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h	Mon Aug 20 22:04:53 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h	Fri Jan 25 14:23:09 2008
-***************
-*** 130,136 ****
-  
-    // use one of these to force desired sort order in assoc. containers of DPX
-    bool
-!   DPX::operator<(const DPX& p) const
-    {
-      return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
-    }
---- 130,136 ----
-  
-    // use one of these to force desired sort order in assoc. containers of DPX
-    bool
-!   operator<(const DPX& p) const
-    {
-      return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
-    }
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp	Mon Aug 20 22:04:54 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp	Fri Jan 25 14:57:06 2008
-***************
-*** 1,322 ****
-! /*
-!  File:       Vetters.cpp
-!  
-!  Contains:   Utility functions to handle common argument-checking tasks, in a 
-!              way that hides platform-specific details from higher-level code.
-!  
-!  Version:    V1
-!  
-!  Copyright:  © see below
-!  */
-! 
-! /*
-!  * The ICC Software License, Version 0.1
-!  *
-!  *
-!  * Copyright (c) 2003-2006 The International Color Consortium. All rights 
-!  * reserved.
-!  *
-!  * Redistribution and use in source and binary forms, with or without
-!  * modification, are permitted provided that the following conditions
-!  * are met:
-!  *
-!  * 1. Redistributions of source code must retain the above copyright
-!  *    notice, this list of conditions and the following disclaimer. 
-!  *
-!  * 2. Redistributions in binary form must reproduce the above copyright
-!  *    notice, this list of conditions and the following disclaimer in
-!  *    the documentation and/or other materials provided with the
-!  *    distribution.
-!  *
-!  * 3. The end-user documentation included with the redistribution,
-!  *    if any, must include the following acknowledgment:  
-!  *       "This product includes software developed by the
-!  *        The International Color Consortium (www.color.org)"
-!  *    Alternately, this acknowledgment may appear in the software itself,
-!  *    if and wherever such third-party acknowledgments normally appear.
-!  *
-!  * 4. The names "ICC" and "The International Color Consortium" must
-!  *    not be used to imply that the ICC organization endorses or
-!  *    promotes products derived from this software without prior
-!  *    written permission. For written permission, please see
-!  *    <http://www.color.org/>.
-!  *
-!  *
-!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-!  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-!  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-!  * DISCLAIMED.  IN NO EVENT SHALL THE INTERNATIONAL COLOR CONSORTIUM OR
-!  * ITS CONTRIBUTING MEMBERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-!  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-!  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-!  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-!  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-!  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-!  * SUCH DAMAGE.
-!  * ====================================================================
-!  *
-!  * This software consists of voluntary contributions made by many
-!  * individuals on behalf of the The International Color Consortium. 
-!  *
-!  *
-!  * Membership in the ICC is encouraged when this software is used for
-!  * commercial purposes. 
-!  *
-!  *  
-!  * For more information on The International Color Consortium, please
-!  * see <http://www.color.org/>.
-!  *  
-!  * 
-!  */
-! 
-! ////////////////////////////////////////////////////////////////////// 
-! // HISTORY:
-! //
-! // -Initial implementation by Joseph Goldstone sumer 2007
-! //
-! //////////////////////////////////////////////////////////////////////
-! 
-! #include "Vetters.h"
-! 
-! #include <sstream>
-! using namespace std;
-! 
-! #ifndef WIN32
-! #include <sys/errno.h>
-! #else
-! #include <string.h>
-! int strerror_r(int errnum, char *str, int strsize)
-! {
-!   const char *errstr = strerror(errnum);
-! 
-!   if (errstr) {
-!     strncpy(str, errstr, strsize);
-!     return 0;
-!   }
-! 
-!   return -1;
-! }
-! #define stat _stat
-! #endif
-! 
-! #include "ICC_tool_exception.h"
-! 
-! const char*
-! path_tail(const char* const s)
-! {
-!   const char* tail = strdup(s);
-!   const char* last_slash = strrchr(tail, '/');
-!   if (last_slash != NULL)
-!     tail = last_slash + 1;
-!   return tail;
-! }
-!     
-! void
-! vet_as_int(const char* const s, const string& name,
-!            const string& description)
-! {
-!   istringstream ss(s);
-!   int i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " an integer.  It should be an integer representing "
-!       << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_as_float(const char* const s, const string& name,
-!              const string& description)
-! {
-!   istringstream ss(s);
-!   float i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " a floating-point number.  It should be a floating-point number"
-!       << " representing " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! #define STRERROR_BUF_SIZE 256
-! off_t
-! get_size(const char* const s)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return sb.st_size;
-! }
-! 
-! bool
-! check_mode(const char* const s, mode_t mode)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return (sb.st_mode & mode) != 0;
-! }
-! 
-! bool
-! is_existent_file_pathname(const char* const s)
-! {
-!   struct stat sb;
-!   return stat(s, &sb) == 0;
-! }
-! 
-! bool
-! is_plain_file_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IFREG);
-! }
-! 
-! bool
-! is_directory(const char* const s)
-! {
-!   return check_mode(s, S_IFDIR);
-! }
-! 
-! const char* const
-! containing_directory(const char* const s)
-! {
-!   if (strlen(s) == 0)
-!     throw ICC_tool_exception("name of directory passed to containing_directory"
-!                              " function was zero-length.");
-!   char* tmp = strdup(s);
-!   // lop off any trailing seperator
-!   if (tmp[strlen(tmp) - 1] == '/')
-!     tmp[strlen(tmp) - 1] = 0;
-!   if (strlen(tmp) == 0)
-!     throw ICC_tool_exception("root directory (which has no containing"
-!                              " directory) passed to containing_directory"
-!                              " function");
-!   char* idx = strrchr(tmp, '/');
-!   if (idx != NULL)
-!   {
-!     *idx = 0;
-!     return tmp;
-!   }
-!   char* current_directory = getenv("PWD");
-!   if (current_directory == NULL)
-!     throw ICC_tool_exception("pathname passed to containing_directory has no"
-!                              " embedded seperator, and there is no value for"
-!                              " PWD defined in the environment");
-!   return strdup(current_directory);
-! }
-! 
-! bool
-! is_readable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IRUSR)
-!   || check_mode(s, S_IRGRP)
-!   || check_mode(s, S_IROTH);
-! }
-! 
-! bool
-! is_writable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IWUSR)
-!   || check_mode(s, S_IWGRP)
-!   || check_mode(s, S_IWOTH);
-! }
-! 
-! bool
-! is_pathname_of_empty_file(const char* const s)
-! {
-!   return get_size(s) > 0;
-! }
-! 
-! void
-! vet_input_file_pathname(const char* const s, const string& name,
-!                         const string& description)
-! {
-!   if (! is_plain_file_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a plain file (i.e. it is the pathname of a directory, or of a"
-!       << " symbolic link, or of some other sort of special file.)  It should be"
-!       << " " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_readable_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a readable file (i.e. you do not have permission to read that"
-!       << " file, or you do not have permission to read some directory"
-!       << " containing that file.";
-!       throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_pathname_of_empty_file(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of an existing readable file, but that file is of zero length."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_output_file_pathname(const char* const s, const string& name,
-!                          const string& description,
-!                          bool silent_overwrite_OK)
-! {
-!   const char* const container = containing_directory(s);
-!   if (! is_writable_pathname(container))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', has a directory"
-!       << " component which is not writable."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (is_existent_file_pathname(s))
-!   {
-!     if (is_plain_file_pathname(s))
-!       if (is_writable_pathname(s))
-!       {
-!         if (! silent_overwrite_OK)
-!         {
-!           ostringstream oss;
-!           oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!             << " file."
-!             << " The argument should be " << description << ".";
-!           throw ICC_tool_exception(oss.str());
-!         }
-!       } else {
-!         ostringstream oss;
-!         oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!           << " file which is not writable."
-!           << " The argument should be " << description << ".";
-!         throw ICC_tool_exception(oss.str());
-!       }
-!   }
-! }
---- 1,329 ----
-! /*
-!  File:       Vetters.cpp
-!  
-!  Contains:   Utility functions to handle common argument-checking tasks, in a 
-!              way that hides platform-specific details from higher-level code.
-!  
-!  Version:    V1
-!  
-!  Copyright:  © see below
-!  */
-! 
-! /*
-!  * The ICC Software License, Version 0.1
-!  *
-!  *
-!  * Copyright (c) 2003-2006 The International Color Consortium. All rights 
-!  * reserved.
-!  *
-!  * Redistribution and use in source and binary forms, with or without
-!  * modification, are permitted provided that the following conditions
-!  * are met:
-!  *
-!  * 1. Redistributions of source code must retain the above copyright
-!  *    notice, this list of conditions and the following disclaimer. 
-!  *
-!  * 2. Redistributions in binary form must reproduce the above copyright
-!  *    notice, this list of conditions and the following disclaimer in
-!  *    the documentation and/or other materials provided with the
-!  *    distribution.
-!  *
-!  * 3. The end-user documentation included with the redistribution,
-!  *    if any, must include the following acknowledgment:  
-!  *       "This product includes software developed by the
-!  *        The International Color Consortium (www.color.org)"
-!  *    Alternately, this acknowledgment may appear in the software itself,
-!  *    if and wherever such third-party acknowledgments normally appear.
-!  *
-!  * 4. The names "ICC" and "The International Color Consortium" must
-!  *    not be used to imply that the ICC organization endorses or
-!  *    promotes products derived from this software without prior
-!  *    written permission. For written permission, please see
-!  *    <http://www.color.org/>.
-!  *
-!  *
-!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-!  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-!  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-!  * DISCLAIMED.  IN NO EVENT SHALL THE INTERNATIONAL COLOR CONSORTIUM OR
-!  * ITS CONTRIBUTING MEMBERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-!  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-!  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-!  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-!  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-!  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-!  * SUCH DAMAGE.
-!  * ====================================================================
-!  *
-!  * This software consists of voluntary contributions made by many
-!  * individuals on behalf of the The International Color Consortium. 
-!  *
-!  *
-!  * Membership in the ICC is encouraged when this software is used for
-!  * commercial purposes. 
-!  *
-!  *  
-!  * For more information on The International Color Consortium, please
-!  * see <http://www.color.org/>.
-!  *  
-!  * 
-!  */
-! 
-! ////////////////////////////////////////////////////////////////////// 
-! // HISTORY:
-! //
-! // -Initial implementation by Joseph Goldstone sumer 2007
-! //
-! //////////////////////////////////////////////////////////////////////
-! 
-! #include "Vetters.h"
-! 
-! #include <sstream>
-! using namespace std;
-! 
-! #ifndef WIN32
-! #ifdef sun
-! #include <errno.h>
-! #else
-! #include <sys/errno.h>
-! #endif
-! #else
-! #include <string.h>
-! #define stat _stat
-! #endif
-! 
-! #if defined WIN32 || defined sun
-! int strerror_r(int errnum, char *str, int strsize)
-! {
-!   const char *errstr = strerror(errnum);
-! 
-!   if (errstr) {
-!     strncpy(str, errstr, strsize);
-!     return 0;
-!   }
-! 
-!   return -1;
-! }
-! #endif
-! 
-! #include "ICC_tool_exception.h"
-! 
-! const char*
-! path_tail(const char* const s)
-! {
-!   const char* tail = strdup(s);
-!   const char* last_slash = strrchr(tail, '/');
-!   if (last_slash != NULL)
-!     tail = last_slash + 1;
-!   return tail;
-! }
-!     
-! void
-! vet_as_int(const char* const s, const string& name,
-!            const string& description)
-! {
-!   istringstream ss(s);
-!   int i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " an integer.  It should be an integer representing "
-!       << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_as_float(const char* const s, const string& name,
-!              const string& description)
-! {
-!   istringstream ss(s);
-!   float i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " a floating-point number.  It should be a floating-point number"
-!       << " representing " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! #define STRERROR_BUF_SIZE 256
-! off_t
-! get_size(const char* const s)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return sb.st_size;
-! }
-! 
-! bool
-! check_mode(const char* const s, mode_t mode)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return (sb.st_mode & mode) != 0;
-! }
-! 
-! bool
-! is_existent_file_pathname(const char* const s)
-! {
-!   struct stat sb;
-!   return stat(s, &sb) == 0;
-! }
-! 
-! bool
-! is_plain_file_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IFREG);
-! }
-! 
-! bool
-! is_directory(const char* const s)
-! {
-!   return check_mode(s, S_IFDIR);
-! }
-! 
-! const char* const
-! containing_directory(const char* const s)
-! {
-!   if (strlen(s) == 0)
-!     throw ICC_tool_exception("name of directory passed to containing_directory"
-!                              " function was zero-length.");
-!   char* tmp = strdup(s);
-!   // lop off any trailing seperator
-!   if (tmp[strlen(tmp) - 1] == '/')
-!     tmp[strlen(tmp) - 1] = 0;
-!   if (strlen(tmp) == 0)
-!     throw ICC_tool_exception("root directory (which has no containing"
-!                              " directory) passed to containing_directory"
-!                              " function");
-!   char* idx = strrchr(tmp, '/');
-!   if (idx != NULL)
-!   {
-!     *idx = 0;
-!     return tmp;
-!   }
-!   char* current_directory = getenv("PWD");
-!   if (current_directory == NULL)
-!     throw ICC_tool_exception("pathname passed to containing_directory has no"
-!                              " embedded seperator, and there is no value for"
-!                              " PWD defined in the environment");
-!   return strdup(current_directory);
-! }
-! 
-! bool
-! is_readable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IRUSR)
-!   || check_mode(s, S_IRGRP)
-!   || check_mode(s, S_IROTH);
-! }
-! 
-! bool
-! is_writable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IWUSR)
-!   || check_mode(s, S_IWGRP)
-!   || check_mode(s, S_IWOTH);
-! }
-! 
-! bool
-! is_pathname_of_empty_file(const char* const s)
-! {
-!   return get_size(s) > 0;
-! }
-! 
-! void
-! vet_input_file_pathname(const char* const s, const string& name,
-!                         const string& description)
-! {
-!   if (! is_plain_file_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a plain file (i.e. it is the pathname of a directory, or of a"
-!       << " symbolic link, or of some other sort of special file.)  It should be"
-!       << " " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_readable_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a readable file (i.e. you do not have permission to read that"
-!       << " file, or you do not have permission to read some directory"
-!       << " containing that file.";
-!       throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_pathname_of_empty_file(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of an existing readable file, but that file is of zero length."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_output_file_pathname(const char* const s, const string& name,
-!                          const string& description,
-!                          bool silent_overwrite_OK)
-! {
-!   const char* const container = containing_directory(s);
-!   if (! is_writable_pathname(container))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', has a directory"
-!       << " component which is not writable."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (is_existent_file_pathname(s))
-!   {
-!     if (is_plain_file_pathname(s))
-!       if (is_writable_pathname(s))
-!       {
-!         if (! silent_overwrite_OK)
-!         {
-!           ostringstream oss;
-!           oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!             << " file."
-!             << " The argument should be " << description << ".";
-!           throw ICC_tool_exception(oss.str());
-!         }
-!       } else {
-!         ostringstream oss;
-!         oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!           << " file which is not writable."
-!           << " The argument should be " << description << ".";
-!         throw ICC_tool_exception(oss.str());
-!       }
-!   }
-! }
-*** misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 78,84 ****
-  #include "IccIO.h"
-  #include "IccUtil.h"
-  #include <stdlib.h>
-! #include <memory.h>
-  #include <string.h>
-  
-  #ifndef __max
---- 78,84 ----
-  #include "IccIO.h"
-  #include "IccUtil.h"
-  #include <stdlib.h>
-! #include <memory>
-  #include <string.h>
-  
-  #ifndef __max
-*** misc/SampleICC-1.3.2/IccProfLib/IccIO.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h	Fri Jan 25 14:23:09 2008
-***************
-*** 79,84 ****
---- 79,85 ----
-  #define _ICCIO_H
-  
-  #include "IccDefs.h"
-+ #include "memory"
-  #include "stdio.h"
-  
-  #ifdef USESAMPLEICCNAMESPACE
-*** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 136,152 ****
-    icChar sigBuf[30];
-  
-    if (GetBAcsSig())
-!     sDescription += "ELEM_bACS\r\n";
-    else
-!     sDescription += "ELEM_eACS\r\n";
-  
-    icGetSig(sigBuf, m_signature);
-    sDescription += "  Signature = ";
-    sDescription += sigBuf;
-!   sDescription += "\r\n";
-  
-    if (m_pData) {
-!     sDescription += "\r\nData Follows:\r\n";
-  
-      icMemDump(sDescription, m_pData, m_nDataSize);
-    }
---- 136,152 ----
-    icChar sigBuf[30];
-  
-    if (GetBAcsSig())
-!     sDescription += "ELEM_bACS\n";
-    else
-!     sDescription += "ELEM_eACS\n";
-  
-    icGetSig(sigBuf, m_signature);
-    sDescription += "  Signature = ";
-    sDescription += sigBuf;
-!   sDescription += "\n";
-  
-    if (m_pData) {
-!     sDescription += "\nData Follows:\n";
-  
-      icMemDump(sDescription, m_pData, m_nDataSize);
-    }
-*** misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 218,249 ****
-    sprintf(buf, "%.8f", m_endPoint);
-    sDescription += buf;
-    }
-!   sprintf(buf, "]\r\nFunctionType: %04Xh\r\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-    case 0x0000:
-      if (m_params[1]==0.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f\r\n\r\n", m_params[3]);
-      else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0)
-!       sprintf(buf, "Y = X\r\n\r\n");
-      else if (m_params[0]==1.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f * X + %.8f\r\n\r\n", 
-                m_params[1], m_params[3]);
-      else
-!       sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\r\n\r\n", 
-                m_params[1], m_params[2], m_params[0], m_params[3]);
-      sDescription += buf;
-      return;
-  
-    case 0x0001:
-!     sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f)  + %.8f) + %.8f\r\n\r\n",
-              m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
-  
-    case 0x0002:
-!     sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\r\n\r\n",
-              m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
---- 218,249 ----
-    sprintf(buf, "%.8f", m_endPoint);
-    sDescription += buf;
-    }
-!   sprintf(buf, "]\nFunctionType: %04Xh\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-    case 0x0000:
-      if (m_params[1]==0.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f\n\n", m_params[3]);
-      else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0)
-!       sprintf(buf, "Y = X\n\n");
-      else if (m_params[0]==1.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f * X + %.8f\n\n", 
-                m_params[1], m_params[3]);
-      else
-!       sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\n\n", 
-                m_params[1], m_params[2], m_params[0], m_params[3]);
-      sDescription += buf;
-      return;
-  
-    case 0x0001:
-!     sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f)  + %.8f) + %.8f\n\n",
-              m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
-  
-    case 0x0002:
-!     sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\n\n",
-              m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
-***************
-*** 250,260 ****
-  
-    default:
-      int i;
-!     sprintf(buf, "Unknown Function with %d parameters:\r\n\r\n", m_nParameters);
-      sDescription += buf;
-  
-      for (i=0; i<m_nParameters; i++) {
-!       sprintf(buf, "Param[%d] = %.8lf\r\n\r\n", i, m_params[i]);
-        sDescription += buf;
-      }
-    }
---- 250,260 ----
-  
-    default:
-      int i;
-!     sprintf(buf, "Unknown Function with %d parameters:\n\n", m_nParameters);
-      sDescription += buf;
-  
-      for (i=0; i<m_nParameters; i++) {
-!       sprintf(buf, "Param[%d] = %.8lf\n\n", i, m_params[i]);
-        sDescription += buf;
-      }
-    }
-***************
-*** 496,502 ****
-    if (m_nReserved || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " formula curve has non zero reserved data.\r\n";
-      rv = icValidateWarning;
-    }
-  
---- 496,502 ----
-    if (m_nReserved || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " formula curve has non zero reserved data.\n";
-      rv = icValidateWarning;
-    }
-  
-***************
-*** 505,517 ****
-      if (!m_params || m_nParameters<4) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 4) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
-        rv = icValidateWarning;
-      }
-      break;
---- 505,517 ----
-      if (!m_params || m_nParameters<4) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 4) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\n";
-        rv = icValidateWarning;
-      }
-      break;
-***************
-*** 520,532 ****
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
-        rv = icValidateWarning;
-      }
-      break;
---- 520,532 ----
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\n";
-        rv = icValidateWarning;
-      }
-      break;
-***************
-*** 535,547 ****
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
-        rv = icValidateWarning;
-      }
-      break;
---- 535,547 ----
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\n";
-        rv = icValidateWarning;
-      }
-      break;
-***************
-*** 551,557 ****
-        icChar buf[128];
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\r\n", m_nFunctionType);
-        sReport += buf;
-        rv = icValidateCriticalError;
-      }
---- 551,557 ----
-        icChar buf[128];
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\n", m_nFunctionType);
-        sReport += buf;
-        rv = icValidateCriticalError;
-      }
-***************
-*** 727,733 ****
-      sDescription += buf;
-      }
-  
-!     sprintf(buf, "]\r\n");
-      sDescription += buf;
-    }
-    else {
---- 727,733 ----
-      sDescription += buf;
-      }
-  
-!     sprintf(buf, "]\n");
-      sDescription += buf;
-    }
-    else {
-***************
-*** 744,752 ****
-      sprintf(buf, "%.8f", m_endPoint);
-      sDescription += buf;
-      }
-!     sprintf(buf, "]\r\n");
-      sDescription += buf;
-!     sDescription += "IN  OUT\r\n";
-  
-      icUInt32Number i;
-  
---- 744,752 ----
-      sprintf(buf, "%.8f", m_endPoint);
-      sDescription += buf;
-      }
-!     sprintf(buf, "]\n");
-      sDescription += buf;
-!     sDescription += "IN  OUT\n";
-  
-      icUInt32Number i;
-  
-***************
-*** 754,764 ****
-      icFloatNumber last = (icFloatNumber)(m_nCount-1);
-  
-      for (i=0; i<m_nCount; i++) {
-!       sprintf(buf, "%.8f %.8f\r\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\r\n";
-  }
-  
-  /**
---- 754,764 ----
-      icFloatNumber last = (icFloatNumber)(m_nCount-1);
-  
-      for (i=0; i<m_nCount; i++) {
-!       sprintf(buf, "%.8f %.8f\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\n";
-  }
-  
-  /**
-***************
-*** 910,916 ****
-    if (m_nReserved) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has non zero reserved data.\r\n";
-      rv = icValidateWarning;
-    }
-  
---- 910,916 ----
-    if (m_nReserved) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has non zero reserved data.\n";
-      rv = icValidateWarning;
-    }
-  
-***************
-*** 917,929 ****
-    if (m_nCount<2) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has too few sample points.\r\n";
-      rv = icValidateCriticalError;
-    }
-    else if (m_endPoint-m_startPoint == 0.0) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has a range of zero.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 917,929 ----
-    if (m_nCount<2) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has too few sample points.\n";
-      rv = icValidateCriticalError;
-    }
-    else if (m_endPoint-m_startPoint == 0.0) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has a range of zero.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 1054,1060 ****
-  {
-    CIccCurveSegmentList::iterator i;
-  
-!   sDescription += "BEGIN_CURVE\r\n";
-    for (i=m_list->begin(); i!=m_list->end(); i++) {
-      (*i)->Describe(sDescription);
-    }
---- 1054,1060 ----
-  {
-    CIccCurveSegmentList::iterator i;
-  
-!   sDescription += "BEGIN_CURVE\n";
-    for (i=m_list->begin(); i!=m_list->end(); i++) {
-      (*i)->Describe(sDescription);
-    }
-***************
-*** 1342,1348 ****
-    if (m_nReserved1 || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " Segmented curve has non zero reserved data.\r\n";
-      rv = icValidateWarning;
-    }
-  
---- 1342,1348 ----
-    if (m_nReserved1 || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " Segmented curve has non zero reserved data.\n";
-      rv = icValidateWarning;
-    }
-  
-***************
-*** 1349,1355 ****
-    if (m_list->size()==0) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Has Empty CurveSegment!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1349,1355 ----
-    if (m_list->size()==0) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Has Empty CurveSegment!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 1599,1609 ****
-      icChar buf[81];
-      int i;
-  
-!     sprintf(buf, "BEGIN_CURVE_SET %d\r\n", m_nInputChannels);
-      sDescription += buf;
-  
-      for (i=0; i<m_nInputChannels; i++) {
-!       sprintf(buf, "Curve %d of %d\r\n", i+1, m_nInputChannels);
-        sDescription += buf;
-        if (m_curve[i]) {
-          m_curve[i]->Describe(sDescription);
---- 1599,1609 ----
-      icChar buf[81];
-      int i;
-  
-!     sprintf(buf, "BEGIN_CURVE_SET %d\n", m_nInputChannels);
-      sDescription += buf;
-  
-      for (i=0; i<m_nInputChannels; i++) {
-!       sprintf(buf, "Curve %d of %d\n", i+1, m_nInputChannels);
-        sDescription += buf;
-        if (m_curve[i]) {
-          m_curve[i]->Describe(sDescription);
-***************
-*** 1877,1883 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Curve Element(s)!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1877,1883 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Curve Element(s)!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 2042,2048 ****
-    int i, j;
-    icFloatNumber *data = m_pMatrix;
-  
-!   sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\r\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-  
-    for (j=0; j<m_nOutputChannels; j++) {
---- 2042,2048 ----
-    int i, j;
-    icFloatNumber *data = m_pMatrix;
-  
-!   sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-  
-    for (j=0; j<m_nOutputChannels; j++) {
-***************
-*** 2052,2058 ****
-        sprintf(buf, "%12.8lf", data[i]);
-        sDescription += buf;
-      }
-!     sprintf(buf, "  +  %12.8lf\r\n", m_pConstants[j]);
-      sDescription += buf;
-      data += i;
-    }
---- 2052,2058 ----
-        sprintf(buf, "%12.8lf", data[i]);
-        sDescription += buf;
-      }
-!     sprintf(buf, "  +  %12.8lf\n", m_pConstants[j]);
-      sDescription += buf;
-      data += i;
-    }
-***************
-*** 2273,2279 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Matrix data!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 2273,2279 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Matrix data!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 2620,2626 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has No CLUT!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 2620,2626 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has No CLUT!\n";
-      return icValidateCriticalError;
-    }
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Fri Jan 25 14:23:09 2008
-***************
-*** 112,126 ****
-    #define ICUINT64TYPE unsigned long long
-    #define ICINT64TYPE long long
-  
-!   #if defined(__APPLE__)
-!     #if  defined(__LITTLE_ENDIAN__)
-!       #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-!     #else
-        #define ICC_BYTE_ORDER_BIG_ENDIAN
-!     #endif
-!   #else
-!     #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-!   #endif
-  
-    #define ICCPROFLIB_API
-    #define ICCPROFLIB_EXTERN
---- 112,126 ----
-    #define ICUINT64TYPE unsigned long long
-    #define ICINT64TYPE long long
-  
-! /*   #if defined(__APPLE__) */
-! /*     #if  defined(__LITTLE_ENDIAN__) */
-! /*       #define ICC_BYTE_ORDER_LITTLE_ENDIAN */
-! /*     #else */
-        #define ICC_BYTE_ORDER_BIG_ENDIAN
-! /*     #endif */
-! /*   #else */
-! /*     #define ICC_BYTE_ORDER_LITTLE_ENDIAN */
-! /*   #endif */
-  
-    #define ICCPROFLIB_API
-    #define ICCPROFLIB_EXTERN
-*** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 567,573 ****
-  
-    if (!ReadBasic(pIO)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += " - Unable to read profile!**\r\n\tProfile has invalid structure!\r\n";
-      Cleanup();
-  
-      return icValidateCriticalError;
---- 567,573 ----
-  
-    if (!ReadBasic(pIO)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += " - Unable to read profile!**\n\tProfile has invalid structure!\n";
-      Cleanup();
-  
-      return icValidateCriticalError;
-***************
-*** 576,582 ****
-    // Check profile header
-    if (!CheckFileSize(pIO)) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += "Bad Header File Size\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 576,582 ----
-    // Check profile header
-    if (!CheckFileSize(pIO)) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += "Bad Header File Size\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 588,594 ****
-      CalcProfileID(pIO, &profileID);
-      if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) {
-        sReport += icValidateNonCompliantMsg;
-!       sReport += "Bad Profile ID\r\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 588,594 ----
-      CalcProfileID(pIO, &profileID);
-      if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) {
-        sReport += icValidateNonCompliantMsg;
-!       sReport += "Bad Profile ID\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 601,607 ****
-        sReport += icValidateCriticalErrorMsg;
-        sReport += " - ";
-        sReport += Info.GetTagSigName(i->TagInfo.sig);
-!       sReport += " - Tag has invalid structure!\r\n";
-  
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
---- 601,607 ----
-        sReport += icValidateCriticalErrorMsg;
-        sReport += " - ";
-        sReport += Info.GetTagSigName(i->TagInfo.sig);
-!       sReport += " - Tag has invalid structure!\n";
-  
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-***************
-*** 1026,1032 ****
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown profile class!\r\n", Info.GetProfileClassSigName(m_Header.deviceClass));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
---- 1026,1032 ----
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown profile class!\n", Info.GetProfileClassSigName(m_Header.deviceClass));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-***************
-*** 1033,1039 ****
-  
-    if (!Info.IsValidSpace(m_Header.colorSpace)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown color space!\r\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
---- 1033,1039 ----
-  
-    if (!Info.IsValidSpace(m_Header.colorSpace)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown color space!\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-***************
-*** 1041,1047 ****
-    if (m_Header.deviceClass==icSigLinkClass) {
-      if (!Info.IsValidSpace(m_Header.pcs)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Unknown pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
---- 1041,1047 ----
-    if (m_Header.deviceClass==icSigLinkClass) {
-      if (!Info.IsValidSpace(m_Header.pcs)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Unknown pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-***************
-*** 1049,1055 ****
-    else {
-      if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Invalid pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
---- 1049,1055 ----
-    else {
-      if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Invalid pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-***************
-*** 1068,1074 ****
-    
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unknown platform signature.\r\n", Info.GetPlatformSigName(m_Header.platform));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1068,1074 ----
-    
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unknown platform signature.\n", Info.GetPlatformSigName(m_Header.platform));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1095,1101 ****
-  
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unregisterd CMM signature.\r\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1095,1101 ----
-  
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unregisterd CMM signature.\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1109,1115 ****
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown rendering intent!\r\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
---- 1109,1115 ----
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown rendering intent!\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-***************
-*** 1120,1126 ****
-    icFloatNumber Z = icFtoD(m_Header.illuminant.Z);
-    if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Non D50 Illuminant XYZ values.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 1120,1126 ----
-    icFloatNumber Z = icFtoD(m_Header.illuminant.Z);
-    if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Non D50 Illuminant XYZ values.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 1130,1136 ****
-    }
-    if (sum) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Reserved value must be zero.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 1130,1136 ----
-    }
-    if (sum) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Reserved value must be zero.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 1163,1169 ****
-      {
-        sReport += icValidateWarningMsg;
-        sReport += buf;
-!       sReport += " - Tag exclusion test failed.\r\n";
-        rv = false;
-      }
-    }
---- 1163,1169 ----
-      {
-        sReport += icValidateWarningMsg;
-        sReport += buf;
-!       sReport += " - Tag exclusion test failed.\n";
-        rv = false;
-      }
-    }
-***************
-*** 1177,1183 ****
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\r\n";
-          rv = false;
-        }
-        break;
---- 1177,1183 ----
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\n";
-          rv = false;
-        }
-        break;
-***************
-*** 1192,1198 ****
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\r\n";
-          rv = false;
-        }
-        break;
---- 1192,1198 ----
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\n";
-          rv = false;
-        }
-        break;
-***************
-*** 1234,1240 ****
-      if (!IsTypeValid(tagsig, typesig)) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += buf;
-!       sprintf(buf," - %s: Invalid tag type (Might be critical!).\r\n", Info.GetTagTypeSigName(typesig));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 1234,1240 ----
-      if (!IsTypeValid(tagsig, typesig)) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += buf;
-!       sprintf(buf," - %s: Invalid tag type (Might be critical!).\n", Info.GetTagTypeSigName(typesig));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 1477,1483 ****
-  {
-    if (m_Tags->size() <= 0) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += "No tags present.\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1477,1483 ----
-  {
-    if (m_Tags->size() <= 0) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += "No tags present.\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 1486,1492 ****
-    if (!GetTag(icSigProfileDescriptionTag) ||
-       !GetTag(icSigCopyrightTag)) {
-         sReport += icValidateNonCompliantMsg;
-!        sReport += "Required tags missing.\r\n";
-         rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-    
---- 1486,1492 ----
-    if (!GetTag(icSigProfileDescriptionTag) ||
-       !GetTag(icSigCopyrightTag)) {
-         sReport += icValidateNonCompliantMsg;
-!        sReport += "Required tags missing.\n";
-         rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-    
-***************
-*** 1495,1501 ****
-    if (sig != icSigLinkClass) {
-      if (!GetTag(icSigMediaWhitePointTag)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Media white point tag missing.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-    }
---- 1495,1501 ----
-    if (sig != icSigLinkClass) {
-      if (!GetTag(icSigMediaWhitePointTag)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Media white point tag missing.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-    }
-***************
-*** 1505,1511 ****
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
---- 1505,1511 ----
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
-***************
-*** 1515,1521 ****
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\r\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
---- 1515,1521 ----
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
-***************
-*** 1526,1532 ****
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
---- 1526,1532 ----
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
-***************
-*** 1536,1542 ****
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\r\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
---- 1536,1542 ----
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
-***************
-*** 1547,1553 ****
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
---- 1547,1553 ----
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
-***************
-*** 1556,1568 ****
-             !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) ||
-             !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) {
-               sReport += icValidateCriticalErrorMsg;
-!              sReport += "Critical tag(s) missing.\r\n";
-               rv = icMaxStatus(rv, icValidateCriticalError);
-             }
-  
-          if (!GetTag(icSigGamutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Gamut tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-  
---- 1556,1568 ----
-             !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) ||
-             !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) {
-               sReport += icValidateCriticalErrorMsg;
-!              sReport += "Critical tag(s) missing.\n";
-               rv = icMaxStatus(rv, icValidateCriticalError);
-             }
-  
-          if (!GetTag(icSigGamutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Gamut tag missing.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-  
-***************
-*** 1585,1591 ****
-              case icSig16colorData:
-                if (!GetTag(icSigColorantTableTag)) {
-                  sReport += icValidateNonCompliantMsg;
-!                 sReport += "xCLR output profile is missing colorantTableTag\r\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-  
---- 1585,1591 ----
-              case icSig16colorData:
-                if (!GetTag(icSigColorantTableTag)) {
-                  sReport += icValidateNonCompliantMsg;
-!                 sReport += "xCLR output profile is missing colorantTableTag\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-  
-***************
-*** 1599,1605 ****
-      case icSigLinkClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 1599,1605 ----
-      case icSigLinkClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 1606,1612 ****
-        if (icIsSpaceCLR(m_Header.colorSpace)) {
-          if (!GetTag(icSigColorantTableTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
---- 1606,1612 ----
-        if (icIsSpaceCLR(m_Header.colorSpace)) {
-          if (!GetTag(icSigColorantTableTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
-***************
-*** 1614,1620 ****
-        if (icIsSpaceCLR(m_Header.pcs)) {
-          if (!GetTag(icSigColorantTableOutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
---- 1614,1620 ----
-        if (icIsSpaceCLR(m_Header.pcs)) {
-          if (!GetTag(icSigColorantTableOutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
-***************
-*** 1623,1629 ****
-      case icSigColorSpaceClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
---- 1623,1629 ----
-      case icSigColorSpaceClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
-***************
-*** 1631,1637 ****
-      case icSigAbstractClass:
-        if (!GetTag(icSigAToB0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
---- 1631,1637 ----
-      case icSigAbstractClass:
-        if (!GetTag(icSigAToB0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
-***************
-*** 1639,1645 ****
-      case icSigNamedColorClass:
-        if (!GetTag(icSigNamedColor2Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 1639,1645 ----
-      case icSigNamedColorClass:
-        if (!GetTag(icSigNamedColor2Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 1647,1653 ****
-  
-      default:
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Unknown Profile Class.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-        break;
-    }
---- 1647,1653 ----
-  
-      default:
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Unknown Profile Class.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-        break;
-    }
-***************
-*** 1724,1730 ****
-    // Check for duplicate tags
-    if (!AreTagsUnique()) {
-      sReport += icValidateWarning;
-!     sReport += " - There are duplicate tags.\r\n";
-      rv =icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 1724,1730 ----
-    // Check for duplicate tags
-    if (!AreTagsUnique()) {
-      sReport += icValidateWarning;
-!     sReport += " - There are duplicate tags.\n";
-      rv =icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 1979,1985 ****
-      sReport = icValidateCriticalErrorMsg;
-      sReport += " - ";
-      sReport += szFilename;
-!     sReport += "- Invalid Filename\r\n";
-      delete pFileIO;
-      return NULL;
-    }
---- 1979,1985 ----
-      sReport = icValidateCriticalErrorMsg;
-      sReport += " - ";
-      sReport += szFilename;
-!     sReport += "- Invalid Filename\n";
-      delete pFileIO;
-      return NULL;
-    }
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 166,172 ****
-      CIccInfo Info;
-      sReport += icValidateNonCompliantMsg;
-      sReport += Info.GetSigName(sig);
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icValidateNonCompliant;
-    }
---- 166,172 ----
-      CIccInfo Info;
-      sReport += icValidateNonCompliantMsg;
-      sReport += Info.GetSigName(sig);
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icValidateNonCompliant;
-    }
-***************
-*** 340,346 ****
-    sprintf(buf, "%u Bytes.", m_nSize-4);
-    sDescription += buf;
-  
-!   sDescription += "\r\n\r\nData Follows:\r\n";
-  
-    icMemDump(sDescription, m_pData+4, m_nSize-4);
-  }
---- 340,346 ----
-    sprintf(buf, "%u Bytes.", m_nSize-4);
-    sDescription += buf;
-  
-!   sDescription += "\n\nData Follows:\n";
-  
-    icMemDump(sDescription, m_pData+4, m_nSize-4);
-  }
-***************
-*** 511,517 ****
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\r\n";
-  }
-  
-  
---- 511,517 ----
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\n";
-  }
-  
-  
-***************
-*** 629,635 ****
-        if (m_nBufSize<7) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Tag must have at least seven text characters.\r\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-        break;
---- 629,635 ----
-        if (m_nBufSize<7) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Tag must have at least seven text characters.\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-        break;
-***************
-*** 636,642 ****
-      default:
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Unknown Tag.\r\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-      int i;
---- 636,642 ----
-      default:
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Unknown Tag.\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-      int i;
-***************
-*** 644,650 ****
-        if (m_szText[i]&0x80) {
-          sReport += icValidateWarning;
-          sReport += sSigName;
-!         sReport += " - Text do not contain 7bit data.\r\n";
-        }
-      }
-    }
---- 644,650 ----
-        if (m_szText[i]&0x80) {
-          sReport += icValidateWarning;
-          sReport += sSigName;
-!         sReport += " - Text do not contain 7bit data.\n";
-        }
-      }
-    }
-***************
-*** 651,657 ****
-    else {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 651,657 ----
-    else {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 941,947 ****
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\r\n";
-  }
-  
-  
---- 941,947 ----
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\n";
-  }
-  
-  
-***************
-*** 1101,1107 ****
-    if (m_nScriptSize>67) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - ScriptCode count must not be greater than 67.\r\n";
-  
-      rv =icMaxStatus(rv, icValidateNonCompliant);
-    }
---- 1101,1107 ----
-    if (m_nScriptSize>67) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - ScriptCode count must not be greater than 67.\n";
-  
-      rv =icMaxStatus(rv, icValidateNonCompliant);
-    }
-***************
-*** 1260,1266 ****
-    CIccInfo Fmt;
-  
-    sDescription += Fmt.GetSigName(m_nSig);
-!   sDescription += "\r\n";
-  }
-  
-  
---- 1260,1266 ----
-    CIccInfo Fmt;
-  
-    sDescription += Fmt.GetSigName(m_nSig);
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 1320,1326 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 1320,1326 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 1336,1342 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Reference Medium Gamut.\r\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 1336,1342 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Reference Medium Gamut.\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 1355,1361 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\r\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 1355,1361 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 1686,1692 ****
-  
-    sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-!   sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\r\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
-    sDescription += buf;
-  
-    for (i=0; i<m_nSize; i++) {
---- 1686,1692 ----
-  
-    sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-!   sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
-    sDescription += buf;
-  
-    for (i=0; i<m_nSize; i++) {
-***************
-*** 1717,1723 ****
-          sDescription += buf;
-        }
-      }
-!     sDescription += "\r\n";
-  
-      pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize);
-    }
---- 1717,1723 ----
-          sDescription += buf;
-        }
-      }
-!     sDescription += "\n";
-  
-      pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize);
-    }
-***************
-*** 2082,2088 ****
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 2082,2088 ----
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 2092,2098 ****
-        if (m_nDeviceCoords != nCoords) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of device co-ordinates.\r\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-      }
---- 2092,2098 ----
-        if (m_nDeviceCoords != nCoords) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of device co-ordinates.\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-      }
-***************
-*** 2099,2105 ****
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
---- 2099,2105 ----
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
-***************
-*** 2285,2291 ****
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z));
-      sDescription += buf;
-    }
-    else {
---- 2285,2291 ----
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z));
-      sDescription += buf;
-    }
-    else {
-***************
-*** 2293,2299 ****
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z));
-        sDescription += buf;
-      }
-    }
---- 2293,2299 ----
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z));
-        sDescription += buf;
-      }
-    }
-***************
-*** 2347,2353 ****
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag.\r\n";
-  
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
---- 2347,2353 ----
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag.\n";
-  
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-***************
-*** 2553,2566 ****
-  
-    icUInt32Number i;
-    //sDescription.reserve(sDescription.size() + m_nChannels*79);
-!   sprintf(buf, "Number of Channels : %u\r\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Colorant Encoding : %s\r\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
-    sDescription += buf;
-  
-    for (i=0; i<m_nChannels; i++) {
-!     sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\r\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
-      sDescription += buf;
-    }
-  
---- 2553,2566 ----
-  
-    icUInt32Number i;
-    //sDescription.reserve(sDescription.size() + m_nChannels*79);
-!   sprintf(buf, "Number of Channels : %u\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Colorant Encoding : %s\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
-    sDescription += buf;
-  
-    for (i=0; i<m_nChannels; i++) {
-!     sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
-      sDescription += buf;
-    }
-  
-***************
-*** 2617,2623 ****
-      if (m_nChannels!=3) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - Number of device channels must be three.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-  
---- 2617,2623 ----
-      if (m_nChannels!=3) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - Number of device channels must be three.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-  
-***************
-*** 2629,2635 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) {
-                  sReport += icValidateNonCompliantMsg;
-                  sReport += sSigName;
-!                 sReport += " - Chromaticity data does not match specification.\r\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-            break;
---- 2629,2635 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) {
-                  sReport += icValidateNonCompliantMsg;
-                  sReport += sSigName;
-!                 sReport += " - Chromaticity data does not match specification.\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-            break;
-***************
-*** 2642,2648 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\r\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
---- 2642,2648 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
-***************
-*** 2655,2661 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\r\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
---- 2655,2661 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
-***************
-*** 2668,2674 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\r\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
---- 2668,2674 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
-***************
-*** 2678,2684 ****
-          {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - Invalid colorant type encoding.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-      }
---- 2678,2684 ----
-          {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - Invalid colorant type encoding.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-      }
-***************
-*** 2884,2892 ****
-  
-    if (m_nSize == 1 ) {
-      if (Tsig==icSigS15Fixed16ArrayType) 
-!       sprintf(buf, "Value = %.4lf\r\n", icFtoD(m_Num[0]));
-      else
-!       sprintf(buf, "Value = %.4lf\r\n", icUFtoD(m_Num[0]));
-      sDescription += buf;
-    }
-    else {
---- 2884,2892 ----
-  
-    if (m_nSize == 1 ) {
-      if (Tsig==icSigS15Fixed16ArrayType) 
-!       sprintf(buf, "Value = %.4lf\n", icFtoD(m_Num[0]));
-      else
-!       sprintf(buf, "Value = %.4lf\n", icUFtoD(m_Num[0]));
-      sDescription += buf;
-    }
-    else {
-***************
-*** 2893,2910 ****
-      icUInt32Number i;
-  
-      if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) {
-!       sDescription += "Matrix Form:\r\n";
-        icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num);
-  
-!       sDescription += "\r\nArrayForm:\r\n";
-      }
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-        if (Tsig==icSigS15Fixed16ArrayType) 
-!         sprintf(buf, "Value[%u] = %.4lf\r\n", i, icFtoD(m_Num[i]));
-        else
-!         sprintf(buf, "Value[%u] = %.4lf\r\n", i, icUFtoD(m_Num[i]));
-        sDescription += buf;
-      }
-    }
---- 2893,2910 ----
-      icUInt32Number i;
-  
-      if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) {
-!       sDescription += "Matrix Form:\n";
-        icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num);
-  
-!       sDescription += "\nArrayForm:\n";
-      }
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-        if (Tsig==icSigS15Fixed16ArrayType) 
-!         sprintf(buf, "Value[%u] = %.4lf\n", i, icFtoD(m_Num[i]));
-        else
-!         sprintf(buf, "Value[%u] = %.4lf\n", i, icUFtoD(m_Num[i]));
-        sDescription += buf;
-      }
-    }
-***************
-*** 3172,3178 ****
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "Value = %u (0x%x)\r\n", m_Num[0], m_Num[0]);
-      sDescription += buf;
-    }
-    else {
---- 3172,3178 ----
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "Value = %u (0x%x)\n", m_Num[0], m_Num[0]);
-      sDescription += buf;
-    }
-    else {
-***************
-*** 3180,3186 ****
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "Value[%u] = %u (0x%x)\r\n", i, m_Num[i], m_Num[i]);
-        sDescription += buf;
-      }
-    }
---- 3180,3186 ----
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "Value[%u] = %u (0x%x)\n", i, m_Num[i], m_Num[i]);
-        sDescription += buf;
-      }
-    }
-***************
-*** 3374,3388 ****
-    CIccInfo Fmt;
-    icChar buf[128];
-  
-!    sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\r\n";
-!    sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n",
-             icFtoD(m_Data.backing.X),
-             icFtoD(m_Data.backing.Y),
-             icFtoD(m_Data.backing.Z)); 
-     sDescription += buf;
-!    sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\r\n";
-!    sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\r\n";
-!    sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\r\n";
-  }
-  
-  
---- 3374,3388 ----
-    CIccInfo Fmt;
-    icChar buf[128];
-  
-!    sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\n";
-!    sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\n",
-             icFtoD(m_Data.backing.X),
-             icFtoD(m_Data.backing.Y),
-             icFtoD(m_Data.backing.Z)); 
-     sDescription += buf;
-!    sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\n";
-!    sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\n";
-!    sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\n";
-  }
-  
-  
-***************
-*** 3416,3422 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard observer encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 3416,3422 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard observer encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 3429,3435 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid measurement geometry encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 3429,3435 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid measurement geometry encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 3448,3454 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard illuminant encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 3448,3454 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard illuminant encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 3902,3910 ****
-  
-    for (i=m_Strings->begin(); i!=m_Strings->end(); i++) {
-      if (i!=m_Strings->begin())
-!       sDescription += "\r\n";
-  
-!     sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\r\n",
-        i->m_nLanguageCode>>8, i->m_nLanguageCode,
-        i->m_nCountryCode>>8, i->m_nCountryCode);
-      
---- 3902,3910 ----
-  
-    for (i=m_Strings->begin(); i!=m_Strings->end(); i++) {
-      if (i!=m_Strings->begin())
-!       sDescription += "\n";
-  
-!     sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\n",
-        i->m_nLanguageCode>>8, i->m_nLanguageCode,
-        i->m_nCountryCode>>8, i->m_nCountryCode);
-      
-***************
-*** 3919,3925 ****
-      i->GetAnsi(szBuf, nSize);
-      sDescription += "\"";
-      sDescription += szBuf;
-!     sDescription += "\"\r\n";
-    }
-  }
-  
---- 3919,3925 ----
-      i->GetAnsi(szBuf, nSize);
-      sDescription += "\"";
-      sDescription += szBuf;
-!     sDescription += "\"\n";
-    }
-  }
-  
-***************
-*** 3948,3954 ****
-    if (!m_Strings->size()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 3948,3954 ----
-    if (!m_Strings->size()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 4246,4260 ****
-  {
-    icChar buf[128];
-  
-!   sDescription = "\r\nData:\r\n";
-  
-    if (IsTypeAscii()) {
-!       sprintf(buf, "%s\r\n", (icChar*)m_pData);
-        sDescription += buf;
-    }
-    else
-      for (int i = 0; i<(int)m_nSize; i++) {
-!       sprintf(buf, "%d\r\n", m_pData[i]);
-        sDescription += buf;
-      }
-  
---- 4246,4260 ----
-  {
-    icChar buf[128];
-  
-!   sDescription = "\nData:\n";
-  
-    if (IsTypeAscii()) {
-!       sprintf(buf, "%s\n", (icChar*)m_pData);
-        sDescription += buf;
-    }
-    else
-      for (int i = 0; i<(int)m_nSize; i++) {
-!       sprintf(buf, "%d\n", m_pData[i]);
-        sDescription += buf;
-      }
-  
-***************
-*** 4312,4318 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid data flag encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 4312,4318 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid data flag encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 4477,4487 ****
-    icChar buf[128];
-  
-    sDescription = "Date = ";
-!   sprintf(buf, "%u-%u-%u\r\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
-    sDescription += buf;
-    
-    sDescription += "Time = ";
-!   sprintf(buf, "%u:%u:%u\r\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
-    sDescription += buf;
-  }
-  
---- 4477,4487 ----
-    icChar buf[128];
-  
-    sDescription = "Date = ";
-!   sprintf(buf, "%u-%u-%u\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
-    sDescription += buf;
-    
-    sDescription += "Time = ";
-!   sprintf(buf, "%u:%u:%u\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
-    sDescription += buf;
-  }
-  
-***************
-*** 4697,4708 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "Colorant Count : %u\r\n", m_nCount);
-    sDescription += buf;
-!   sDescription += "Order of Colorants:\r\n";
-    
-    for (int i=0; i<(int)m_nCount; i++) {
-!     sprintf(buf, "%u\r\n", m_pData[i]);
-      sDescription += buf;
-    }
-  }
---- 4697,4708 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "Colorant Count : %u\n", m_nCount);
-    sDescription += buf;
-!   sDescription += "Order of Colorants:\n";
-    
-    for (int i=0; i<(int)m_nCount; i++) {
-!     sprintf(buf, "%u\n", m_pData[i]);
-      sDescription += buf;
-    }
-  }
-***************
-*** 4757,4763 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 4757,4763 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 4765,4771 ****
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 4765,4771 ----
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 4977,4983 ****
-    icUInt32Number i, nLen, nMaxLen=0;
-    icFloatNumber Lab[3];
-  
-!   sprintf(buf, "BEGIN_COLORANTS %u\r\n", m_nCount);
-    sDescription += buf;
-  
-    for (i=0; i<m_nCount; i++) {
---- 4977,4983 ----
-    icUInt32Number i, nLen, nMaxLen=0;
-    icFloatNumber Lab[3];
-  
-!   sprintf(buf, "BEGIN_COLORANTS %u\n", m_nCount);
-    sDescription += buf;
-  
-    for (i=0; i<m_nCount; i++) {
-***************
-*** 4988,4998 ****
-    sDescription += "# NAME ";
-  
-    if (m_PCS == icSigXYZData) {
-!     sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\r\n");
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "Lab_L Lab_a Lab_b\r\n");
-      sDescription += buf;
-    }
-    for (i=0; i<m_nCount; i++) {
---- 4988,4998 ----
-    sDescription += "# NAME ";
-  
-    if (m_PCS == icSigXYZData) {
-!     sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\n");
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "Lab_L Lab_a Lab_b\n");
-      sDescription += buf;
-    }
-    for (i=0; i<m_nCount; i++) {
-***************
-*** 5003,5009 ****
-      sDescription += buf;
-  
-      if (m_PCS == icSigXYZData) {
-!       sprintf(buf, "%7.4lf %7.4lf %7.4lf\r\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2]));
-        sDescription += buf;
-      }
-      else {
---- 5003,5009 ----
-      sDescription += buf;
-  
-      if (m_PCS == icSigXYZData) {
-!       sprintf(buf, "%7.4lf %7.4lf %7.4lf\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2]));
-        sDescription += buf;
-      }
-      else {
-***************
-*** 5011,5017 ****
-        Lab[1] = icU16toF(m_pData[i].data[1]);
-        Lab[2] = icU16toF(m_pData[i].data[2]);
-        icLabFromPcs(Lab);
-!       sprintf(buf, "%7.4lf %8.4lf %8.4lf\r\n", Lab[0], Lab[1], Lab[2]);
-        sDescription += buf;
-      }
-    }
---- 5011,5017 ----
-        Lab[1] = icU16toF(m_pData[i].data[1]);
-        Lab[2] = icU16toF(m_pData[i].data[2]);
-        icLabFromPcs(Lab);
-!       sprintf(buf, "%7.4lf %8.4lf %8.4lf\n", Lab[0], Lab[1], Lab[2]);
-        sDescription += buf;
-      }
-    }
-***************
-*** 5066,5072 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 5066,5072 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 5076,5082 ****
-      if (pProfile->m_Header.deviceClass!=icSigLinkClass) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-!       sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\r\n";
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-    }
---- 5076,5082 ----
-      if (pProfile->m_Header.deviceClass!=icSigLinkClass) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-!       sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\n";
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-    }
-***************
-*** 5084,5090 ****
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 5084,5090 ----
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 5261,5273 ****
-    icChar buf[128];
-    CIccInfo Fmt;
-  
-!   sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n", 
-                 icFtoD(m_XYZIllum.X), 
-                 icFtoD(m_XYZIllum.Y),
-                 icFtoD(m_XYZIllum.Z));
-    sDescription += buf;
-  
-!   sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n",
-                 icFtoD(m_XYZSurround.X),
-                 icFtoD(m_XYZSurround.Y),
-                 icFtoD(m_XYZSurround.Z));
---- 5261,5273 ----
-    icChar buf[128];
-    CIccInfo Fmt;
-  
-!   sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n", 
-                 icFtoD(m_XYZIllum.X), 
-                 icFtoD(m_XYZIllum.Y),
-                 icFtoD(m_XYZIllum.Z));
-    sDescription += buf;
-  
-!   sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n",
-                 icFtoD(m_XYZSurround.X),
-                 icFtoD(m_XYZSurround.Y),
-                 icFtoD(m_XYZSurround.Z));
-***************
-*** 5276,5282 ****
-    sDescription += "Illuminant Type: ";
-  
-    sDescription += Fmt.GetIlluminantName(m_illumType);
-!   sDescription += "\r\n";
-  
-  }
-  
---- 5276,5282 ----
-    sDescription += "Illuminant Type: ";
-  
-    sDescription += Fmt.GetIlluminantName(m_illumType);
-!   sDescription += "\n";
-  
-  }
-  
-***************
-*** 5800,5831 ****
-    icChar buf[128], buf2[28];
-    icUInt32Number count=0;
-  
-!   sprintf(buf, "Number of Profile Description Structures: %u\r\n", m_Descriptions->size());
-    sDescription += buf;
-  
-    for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) {
-!     sDescription += "\r\n";
-  
-!     sprintf(buf, "Profile Description Structure Number [%u] follows:\r\n", count+1);
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Manufacturer Signature: %s\r\n", icGetSig(buf2, i->m_deviceMfg, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Model Signature: %s\r\n", icGetSig(buf2, i->m_deviceModel, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Attributes: %08x%08x\r\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Technology Signature: %s\r\n", icGetSig(buf2, i->m_technology, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Description of device manufacturer: \r\n");
-      sDescription += buf;
-      i->m_deviceMfgDesc.Describe(sDescription);
-  
-!     sprintf(buf, "Description of device model: \r\n");
-      sDescription += buf;
-      i->m_deviceModelDesc.Describe(sDescription);
-    }
---- 5800,5831 ----
-    icChar buf[128], buf2[28];
-    icUInt32Number count=0;
-  
-!   sprintf(buf, "Number of Profile Description Structures: %u\n", m_Descriptions->size());
-    sDescription += buf;
-  
-    for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) {
-!     sDescription += "\n";
-  
-!     sprintf(buf, "Profile Description Structure Number [%u] follows:\n", count+1);
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Manufacturer Signature: %s\n", icGetSig(buf2, i->m_deviceMfg, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Model Signature: %s\n", icGetSig(buf2, i->m_deviceModel, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Attributes: %08x%08x\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Technology Signature: %s\n", icGetSig(buf2, i->m_technology, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Description of device manufacturer: \n");
-      sDescription += buf;
-      i->m_deviceMfgDesc.Describe(sDescription);
-  
-!     sprintf(buf, "Description of device model: \n");
-      sDescription += buf;
-      i->m_deviceModelDesc.Describe(sDescription);
-    }
-***************
-*** 5886,5892 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(i->m_technology));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 5886,5892 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(i->m_technology));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 5896,5902 ****
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceMfgDesc text tag information\r\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 5896,5902 ----
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceMfgDesc text tag information\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 5905,5911 ****
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceModelDesc text tag information\r\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 5905,5911 ----
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceModelDesc text tag information\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 6174,6198 ****
-    CIccResponse16List::iterator j;
-  
-    sDescription += "Measurement Unit: ";
-!   sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\r\n";
-  
-    
-    for (int i=0; i<m_nChannels; i++) {
-      nResponseList = m_Response16ListArray[i];
-  
-!     sDescription += "\r\n";
-!     sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i+1, 
-        icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z));
-      sDescription += buf;
-  
-!     sprintf(buf, "Number of Measurements for Channel-%u : %u\r\n", i+1, nResponseList.size());
-      sDescription += buf;
-  
-!     sprintf(buf, "Measurement Data for Channel-%u follows:\r\n", i+1);
-      sDescription += buf;
-  
-      for (j=nResponseList.begin(); j!=nResponseList.end(); j++) {
-!       sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\r\n", j->deviceCode, icFtoD(j->measurementValue));
-        sDescription += buf;
-      }
-    }
---- 6174,6198 ----
-    CIccResponse16List::iterator j;
-  
-    sDescription += "Measurement Unit: ";
-!   sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\n";
-  
-    
-    for (int i=0; i<m_nChannels; i++) {
-      nResponseList = m_Response16ListArray[i];
-  
-!     sDescription += "\n";
-!     sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\n", i+1, 
-        icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z));
-      sDescription += buf;
-  
-!     sprintf(buf, "Number of Measurements for Channel-%u : %u\n", i+1, nResponseList.size());
-      sDescription += buf;
-  
-!     sprintf(buf, "Measurement Data for Channel-%u follows:\n", i+1);
-      sDescription += buf;
-  
-      for (j=nResponseList.begin(); j!=nResponseList.end(); j++) {
-!       sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\n", j->deviceCode, icFtoD(j->measurementValue));
-        sDescription += buf;
-      }
-    }
-***************
-*** 6234,6240 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Unknown measurement unit signature.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 6234,6240 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Unknown measurement unit signature.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 6241,6247 ****
-    if (!m_nChannels) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-      return rv;
-    }
---- 6241,6247 ----
-    if (!m_nChannels) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-      return rv;
-    }
-***************
-*** 6479,6495 ****
-    CIccResponseCurveSet::iterator i;
-    icChar buf[128];
-  
-!   sprintf(buf, "Number of Channels: %u\r\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Number of Measurement Types used: %u\r\n", m_ResponseCurves->size());
-    sDescription += buf;
-  
-    int count = 0;
-    for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) {
-!      sDescription += "\r\n";
-  
-!     sprintf(buf, "Response Curve for measurement type [%u] follows:\r\n", count+1);
-      sDescription += buf;
-  
-      i->Describe(sDescription);
---- 6479,6495 ----
-    CIccResponseCurveSet::iterator i;
-    icChar buf[128];
-  
-!   sprintf(buf, "Number of Channels: %u\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Number of Measurement Types used: %u\n", m_ResponseCurves->size());
-    sDescription += buf;
-  
-    int count = 0;
-    for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) {
-!      sDescription += "\n";
-  
-!     sprintf(buf, "Response Curve for measurement type [%u] follows:\n", count+1);
-      sDescription += buf;
-  
-      i->Describe(sDescription);
-***************
-*** 6658,6664 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 6658,6664 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 6666,6678 ****
-    if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\r\n";
-    }
-  
-    if (!GetNumResponseCurveTypes()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag!.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-    else {
---- 6666,6678 ----
-    if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\n";
-    }
-  
-    if (!GetNumResponseCurveTypes()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag!.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-    else {
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 323,345 ****
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE In_Out\r\n");
-      sDescription += buf;
-!     sDescription += "Y = X\r\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE In_Out\r\n");
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT In_Out 1 1\r\n");
-      sDescription += buf;
-!     sDescription += "IN OUT\r\n";
-  
-      for (i=0; i<(int)m_nSize; i++) {
-        ptr = buf;
---- 323,345 ----
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE In_Out\n");
-      sDescription += buf;
-!     sDescription += "Y = X\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE In_Out\n");
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT In_Out 1 1\n");
-      sDescription += buf;
-!     sDescription += "IN OUT\n";
-  
-      for (i=0; i<(int)m_nSize; i++) {
-        ptr = buf;
-***************
-*** 354,365 ****
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\r\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\r\n";
-  }
-  
-  
---- 354,365 ----
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 383,405 ****
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
-      sDescription += buf;
-!     sDescription += "Y = X\r\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT %s 1 1\r\n", szName);
-      sDescription += buf;
-!     sDescription += "IN OUT\r\n";
-  
-      sDescription.reserve(sDescription.size() + m_nSize * 20);
-  
---- 383,405 ----
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE %s\n", szName);
-      sDescription += buf;
-!     sDescription += "Y = X\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE %s\n", szName);
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT %s 1 1\n", szName);
-      sDescription += buf;
-!     sDescription += "IN OUT\n";
-  
-      sDescription.reserve(sDescription.size() + m_nSize * 20);
-  
-***************
-*** 416,427 ****
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\r\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\r\n";
-  }
-  
-  
---- 416,427 ----
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 614,620 ****
-          if (m_Curve[0]>0.0 || m_Curve[m_nSize-1]<1.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Curve cannot be accurately inverted.\r\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
---- 614,620 ----
-          if (m_Curve[0]>0.0 || m_Curve[m_nSize-1]<1.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Curve cannot be accurately inverted.\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
-***************
-*** 822,877 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "FunctionType: %04Xh\r\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-  case 0x0000:
-!   sprintf(buf, "Y = X ^ %.4lf\r\n", icFtoD(m_Param[0]));
-    sDescription += buf;
-    return;
-  
-  case 0x0001:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf / %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\r\n",
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0002:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf   when (X >= %.4lf / %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %.4lf   when (X < %.4lf / %.4lf)\r\n", icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0003:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X   when (X < %.4lf)\r\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
-  
-  case 0x0004:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf  when (X >= %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[5]), icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X + %.4lf  when (X < %.4lf)\r\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[6]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
---- 822,877 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "FunctionType: %04Xh\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-  case 0x0000:
-!   sprintf(buf, "Y = X ^ %.4lf\n", icFtoD(m_Param[0]));
-    sDescription += buf;
-    return;
-  
-  case 0x0001:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf / %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\n",
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0002:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf   when (X >= %.4lf / %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %.4lf   when (X < %.4lf / %.4lf)\n", icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0003:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X   when (X < %.4lf)\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
-  
-  case 0x0004:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf  when (X >= %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[5]), icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X + %.4lf  when (X < %.4lf)\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[6]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
-***************
-*** 878,888 ****
-  
-  default:
-    int i;
-!   sprintf(buf, "Unknown Function with %d parameters:\r\n");
-    sDescription += buf;
-  
-    for (i=0; i<m_nNumParam; i++) {
-!     sprintf(buf, "Param[%d] = %.4lf\r\n", i, icFtoD(m_Param[i]));
-      sDescription += buf;
-    }
-    }
---- 878,888 ----
-  
-  default:
-    int i;
-!   sprintf(buf, "Unknown Function with %d parameters:\n", m_nNumParam);
-    sDescription += buf;
-  
-    for (i=0; i<m_nNumParam; i++) {
-!     sprintf(buf, "Param[%d] = %.4lf\n", i, icFtoD(m_Param[i]));
-      sDescription += buf;
-    }
-    }
-***************
-*** 907,916 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
-    sDescription += buf;
-    Describe(sDescription);
-!   sDescription += "\r\n";
-  }
-  
-  
---- 907,916 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_CURVE %s\n", szName);
-    sDescription += buf;
-    Describe(sDescription);
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 1106,1112 ****
-    if (m_nReserved2!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
---- 1106,1112 ----
-    if (m_nReserved2!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-***************
-*** 1116,1122 ****
-    if (m_nNumParam!=1) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1116,1122 ----
-    if (m_nNumParam!=1) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1125,1131 ****
-    if (m_nNumParam!=3) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1125,1131 ----
-    if (m_nNumParam!=3) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1134,1140 ****
-    if (m_nNumParam!=4) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1134,1140 ----
-    if (m_nNumParam!=4) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1143,1149 ****
-    if (m_nNumParam!=5) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1143,1149 ----
-    if (m_nNumParam!=5) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1152,1158 ****
-    if (m_nNumParam!=7) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1152,1158 ----
-    if (m_nNumParam!=7) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1160,1166 ****
-  default:
-    sReport += icValidateCriticalErrorMsg;
-    sReport += sSigName;
-!   sReport += " - Unknown function type.\r\n";
-    rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-  
---- 1160,1166 ----
-  default:
-    sReport += icValidateCriticalErrorMsg;
-    sReport += sSigName;
-!   sReport += " - Unknown function type.\n";
-    rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-  
-***************
-*** 1170,1176 ****
-      if (lval>0.0 || uval<1.0) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Curve cannot be accurately inverted.\r\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
---- 1170,1176 ----
-      if (lval>0.0 || uval<1.0) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Curve cannot be accurately inverted.\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
-***************
-*** 1255,1286 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_MATRIX %s\r\n", szName);
-    sDescription += buf;
-  
-    if (!m_bUseConstants) {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
-        m_e[0], m_e[1], m_e[2]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
-        m_e[3], m_e[4], m_e[5]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
-        m_e[6], m_e[7], m_e[8]);
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
-        m_e[0], m_e[1], m_e[2], m_e[9]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
-        m_e[3], m_e[4], m_e[5], m_e[10]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
-        m_e[6], m_e[7], m_e[8], m_e[11]);
-      sDescription += buf;
-    }
-!   sDescription += "\r\n";
-  }
-  
-  /**
---- 1255,1286 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_MATRIX %s\n", szName);
-    sDescription += buf;
-  
-    if (!m_bUseConstants) {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
-        m_e[0], m_e[1], m_e[2]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
-        m_e[3], m_e[4], m_e[5]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
-        m_e[6], m_e[7], m_e[8]);
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
-        m_e[0], m_e[1], m_e[2], m_e[9]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
-        m_e[3], m_e[4], m_e[5], m_e[10]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
-        m_e[6], m_e[7], m_e[8], m_e[11]);
-      sDescription += buf;
-    }
-!   sDescription += "\n";
-  }
-  
-  /**
-***************
-*** 1377,1383 ****
-        if (m_e[0]!=1.0 || m_e[4]!=1.0 || m_e[9]!=1.0 || sum!=3.0) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Matrix must be identity.\r\n";
-          rv = icValidateNonCompliant;
-        }
-      }
---- 1377,1383 ----
-        if (m_e[0]!=1.0 || m_e[4]!=1.0 || m_e[9]!=1.0 || sum!=3.0) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Matrix must be identity.\n";
-          rv = icValidateNonCompliant;
-        }
-      }
-***************
-*** 1754,1760 ****
-  
-        ptr += sprintf(ptr, " %s", m_pVal);
-      }
-!     strcpy(ptr, "\r\n");
-      sDescription += (const icChar*)m_pOutText;
-  
-    }
---- 1754,1760 ----
-  
-        ptr += sprintf(ptr, " %s", m_pVal);
-      }
-!     strcpy(ptr, "\n");
-      sDescription += (const icChar*)m_pOutText;
-  
-    }
-***************
-*** 1866,1872 ****
-    icChar szOutText[2048], szColor[40];
-    int i, len;
-  
-!   sprintf(szOutText, "BEGIN_LUT %s %d %d\r\n", szName, m_nInput, m_nOutput);
-    sDescription += szOutText;
-  
-    for (i=0; i<m_nInput; i++) {
---- 1866,1872 ----
-    icChar szOutText[2048], szColor[40];
-    int i, len;
-  
-!   sprintf(szOutText, "BEGIN_LUT %s %d %d\n", szName, m_nInput, m_nOutput);
-    sDescription += szOutText;
-  
-    for (i=0; i<m_nInput; i++) {
-***************
-*** 1883,1889 ****
-      sDescription += szOutText;
-    }
-  
-!   sDescription += "\r\n";
-  
-    len = 0;
-    for (i=0; i<m_nInput; i++) {
---- 1883,1889 ----
-      sDescription += szOutText;
-    }
-  
-!   sDescription += "\n";
-  
-    len = 0;
-    for (i=0; i<m_nInput; i++) {
-***************
-*** 1907,1913 ****
-  
-    Iterate(sDescription, 0, 0);
-    
-!   sDescription += "\r\n";
-  }
-  
-  
---- 1907,1913 ----
-  
-    Iterate(sDescription, 0, 0);
-    
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 2693,2699 ****
-    if (m_nReserved2[0]!=0 || m_nReserved2[1]!=0 || m_nReserved2[2]!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icValidateNonCompliant;
-    }
---- 2693,2699 ----
-    if (m_nReserved2[0]!=0 || m_nReserved2[1]!=0 || m_nReserved2[2]!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icValidateNonCompliant;
-    }
-***************
-*** 2704,2710 ****
-        if (m_GridPoints[i]<2) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\r\n",i );
-          sReport += temp;
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
---- 2704,2710 ----
-        if (m_GridPoints[i]<2) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\n",i );
-          sReport += temp;
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-***************
-*** 3122,3128 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 3122,3128 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 3138,3144 ****
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3138,3144 ----
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3146,3152 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3146,3152 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3160,3166 ****
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3160,3166 ----
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3168,3174 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3168,3174 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3180,3186 ****
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3180,3186 ----
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3188,3194 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3188,3194 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3206,3212 ****
-      if (!m_CLUT) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - CLUT must be present.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);          
-      }
-    }
---- 3206,3212 ----
-      if (!m_CLUT) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - CLUT must be present.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);          
-      }
-    }
-***************
-*** 3748,3754 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3748,3754 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3762,3768 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3762,3768 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3772,3778 ****
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\r\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
---- 3772,3778 ----
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-***************
-*** 3784,3790 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3784,3790 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3876,3882 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-      return rv;
-    }
---- 3876,3882 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-      return rv;
-    }
-***************
-*** 3900,3906 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3900,3906 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3913,3919 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3913,3919 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3927,3933 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3927,3933 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3937,3943 ****
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\r\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
---- 3937,3943 ----
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-***************
-*** 3949,3955 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3949,3955 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4311,4317 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4311,4317 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4319,4325 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4319,4325 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4336,4342 ****
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\r\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
---- 4336,4342 ----
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
-***************
-*** 4351,4357 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4351,4357 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4359,4365 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4359,4365 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4721,4727 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4721,4727 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4729,4735 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4729,4735 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4746,4752 ****
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\r\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
---- 4746,4752 ----
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
-***************
-*** 4761,4767 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4761,4767 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4769,4775 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4769,4775 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 218,224 ****
-            icGetSig(sigbuf, m_sig), m_nSize);
-    sDescription += buf;
-  
-!   sDescription += "\r\n\r\nData Follows:\r\n";
-  
-    icMemDump(sDescription, m_pData, m_nSize);
-  
---- 218,224 ----
-            icGetSig(sigbuf, m_sig), m_nSize);
-    sDescription += buf;
-  
-!   sDescription += "\n\nData Follows:\n";
-  
-    icMemDump(sDescription, m_pData, m_nSize);
-  
-***************
-*** 364,370 ****
-    sReport += " - Contains unknown processing element type (";
-    icGetSig(buf, m_sig, true);
-    sReport += buf;
-!   sReport += ").\r\n";
-  
-    return icValidateCriticalError;
-  }
---- 364,370 ----
-    sReport += " - Contains unknown processing element type (";
-    icGetSig(buf, m_sig, true);
-    sReport += buf;
-!   sReport += ").\n";
-  
-    return icValidateCriticalError;
-  }
-***************
-*** 392,398 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icValidateNonCompliant;
-    }
---- 392,398 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icValidateNonCompliant;
-    }
-***************
-*** 738,755 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\r\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-!   sDescription += "\r\n";
-  
-    CIccMultiProcessElementList::iterator i;
-    int j;
-  
-    for (j=0, i=m_list->begin(); i!=m_list->end(); j++, i++) {
-!     sprintf(buf, "PROCESS_ELEMENT #%d\r\n", j+1);
-      sDescription += buf;
-      i->ptr->Describe(sDescription);
-!     sDescription += "\r\n";
-    }
-  }
-  
---- 738,755 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-!   sDescription += "\n";
-  
-    CIccMultiProcessElementList::iterator i;
-    int j;
-  
-    for (j=0, i=m_list->begin(); i!=m_list->end(); j++, i++) {
-!     sprintf(buf, "PROCESS_ELEMENT #%d\n", j+1);
-      sDescription += buf;
-      i->ptr->Describe(sDescription);
-!     sDescription += "\n";
-    }
-  }
-  
-***************
-*** 1207,1219 ****
-      if (m_nInputChannels != m_nOutputChannels) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements and input and output channels do not match!\r\n";
-        return icValidateCriticalError;
-      }
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements.\r\n";
-        return icValidateWarning;
-      }
-    }
---- 1207,1219 ----
-      if (m_nInputChannels != m_nOutputChannels) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements and input and output channels do not match!\n";
-        return icValidateCriticalError;
-      }
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements.\n";
-        return icValidateWarning;
-      }
-    }
-***************
-*** 1224,1230 ****
-    if (i->ptr->NumInputChannels() != m_nInputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of input channels!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1224,1230 ----
-    if (i->ptr->NumInputChannels() != m_nInputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of input channels!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 1239,1245 ****
-          sReport += "->";
-          sReport += i->ptr->GetClassName();
-  
-!         sReport += " Mis-matching number of channels!\r\n";
-          return icValidateCriticalError;
-        }
-      }
---- 1239,1245 ----
-          sReport += "->";
-          sReport += i->ptr->GetClassName();
-  
-!         sReport += " Mis-matching number of channels!\n";
-          return icValidateCriticalError;
-        }
-      }
-***************
-*** 1251,1257 ****
-    if (last && last->NumOutputChannels() != m_nOutputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of output channels!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1251,1257 ----
-    if (last && last->NumOutputChannels() != m_nOutputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of output channels!\n";
-      return icValidateCriticalError;
-    }
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 234,240 ****
-  {
-    std::string Dump;
-  
-!   sDescription += "ProfileID:\r\n";
-  
-    int i;
-    char buf[20];
---- 234,240 ----
-  {
-    std::string Dump;
-  
-!   sDescription += "ProfileID:\n";
-  
-    int i;
-    char buf[20];
-***************
-*** 244,255 ****
-      sprintf(buf, "%2x", m_profileID.ID8[i]);
-      sDescription += buf;
-    }
-!   sDescription += "\r\n";
-  
-!   sDescription += "Description:\r\n";
-    m_desc.Describe(sDescription);
-  
-!   sDescription += "\r\n";
-  }
-  
-  
---- 244,255 ----
-      sprintf(buf, "%2x", m_profileID.ID8[i]);
-      sDescription += buf;
-    }
-!   sDescription += "\n";
-  
-!   sDescription += "Description:\n";
-    m_desc.Describe(sDescription);
-  
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 434,454 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN ProfileSequenceIdentification_TAG\r\n");
-    sDescription += buf;
-!   sDescription += "\r\n";
-  
-    int i;
-    CIccProfileIdDescList::iterator j;
-    for (i=0, j=m_list->begin(); j!=m_list->end(); i++, j++) {
-!     sprintf(buf, "ProfileDescription_%d:\r\n", i+1);
-      sDescription += buf;
-      j->Describe(sDescription);
-    }
-  
-!   sprintf(buf, "END ProfileSequenceIdentification_TAG\r\n");
-    sDescription += buf;
-!   sDescription += "\r\n";
-  }
-  
-  
---- 434,454 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN ProfileSequenceIdentification_TAG\n");
-    sDescription += buf;
-!   sDescription += "\n";
-  
-    int i;
-    CIccProfileIdDescList::iterator j;
-    for (i=0, j=m_list->begin(); j!=m_list->end(); i++, j++) {
-!     sprintf(buf, "ProfileDescription_%d:\n", i+1);
-      sDescription += buf;
-      j->Describe(sDescription);
-    }
-  
-!   sprintf(buf, "END ProfileSequenceIdentification_TAG\n");
-    sDescription += buf;
-!   sDescription += "\n";
-  }
-  
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h	Fri Jan 25 14:23:09 2008
-***************
-*** 161,164 ****
-  }
-  #endif
-  
-! #endif //_ICCTAGPROFSEQID_H
---- 161,164 ----
-  }
-  #endif
-  
-! #endif //_ICCTAGPROFSEQID_H
-*** misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 79,85 ****
-  #include "IccUtil.h"
-  #include "IccTagFactory.h"
-  #include <stdlib.h>
-! #include <memory.h>
-  #include <ctype.h>
-  #include <math.h>
-  #include <string.h>
---- 79,85 ----
-  #include "IccUtil.h"
-  #include "IccTagFactory.h"
-  #include <stdlib.h>
-! #include <memory>
-  #include <ctype.h>
-  #include <math.h>
-  #include <string.h>
-***************
-*** 678,688 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8]));
-    sDump += buf;
-  }
-  
---- 679,689 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8]));
-    sDump += buf;
-  }
-  
-***************
-*** 1516,1534 ****
-  
-    if (XYZ.X < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative X value!\r\n";
-      rv = icValidateNonCompliant;
-    }
-  
-    if (XYZ.Y < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Y value!\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-    if (XYZ.Z < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Z value!\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 1517,1535 ----
-  
-    if (XYZ.X < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative X value!\n";
-      rv = icValidateNonCompliant;
-    }
-  
-    if (XYZ.Y < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Y value!\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-    if (XYZ.Z < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Z value!\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 1548,1554 ****
-    icChar buf[128];
-    if (dateTime.year<1992) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
-      sReport += buf;
-      rv = icValidateWarning;
-    }
---- 1549,1555 ----
-    icChar buf[128];
-    if (dateTime.year<1992) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid year!\n",dateTime.year);
-      sReport += buf;
-      rv = icValidateWarning;
-    }
-***************
-*** 1557,1563 ****
-    if (newtime->tm_mon==11 && newtime->tm_mday==31) {
-      if (dateTime.year>(year+1)) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
---- 1558,1564 ----
-    if (newtime->tm_mon==11 && newtime->tm_mday==31) {
-      if (dateTime.year>(year+1)) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-***************
-*** 1565,1571 ****
-    else {
-      if (dateTime.year>year) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
---- 1566,1572 ----
-    else {
-      if (dateTime.year>year) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-***************
-*** 1573,1579 ****
-  
-    if (dateTime.month<1 || dateTime.month>12) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid month!\r\n",dateTime.month);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1574,1580 ----
-  
-    if (dateTime.month<1 || dateTime.month>12) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid month!\n",dateTime.month);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1580,1586 ****
-  
-    if (dateTime.day<1 || dateTime.day>31) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid day!\r\n",dateTime.day);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1581,1587 ----
-  
-    if (dateTime.day<1 || dateTime.day>31) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid day!\n",dateTime.day);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1588,1594 ****
-    if (dateTime.month==2) {
-      if (dateTime.day>29) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid day for February!\r\n",dateTime.day);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
---- 1589,1595 ----
-    if (dateTime.month==2) {
-      if (dateTime.day>29) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid day for February!\n",dateTime.day);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-***************
-*** 1596,1602 ****
-      if (dateTime.day==29) {
-        if ((dateTime.year%4)!=0) {
-          sReport += icValidateWarningMsg;
-!         sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\r\n",dateTime.day, dateTime.year);
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateWarning);
-        }
---- 1597,1603 ----
-      if (dateTime.day==29) {
-        if ((dateTime.year%4)!=0) {
-          sReport += icValidateWarningMsg;
-!         sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\n",dateTime.day, dateTime.year);
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateWarning);
-        }
-***************
-*** 1605,1611 ****
-  
-    if (dateTime.hours>23) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid hour!\r\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1606,1612 ----
-  
-    if (dateTime.hours>23) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid hour!\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1612,1618 ****
-  
-    if (dateTime.minutes>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid minutes!\r\n",dateTime.minutes);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1613,1619 ----
-  
-    if (dateTime.minutes>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid minutes!\n",dateTime.minutes);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1619,1625 ****
-  
-    if (dateTime.seconds>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid seconds!\r\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1620,1626 ----
-  
-    if (dateTime.seconds>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid seconds!\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-*** misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h	Fri Jan 25 14:23:09 2008
-***************
-*** 659,668 ****
-  typedef enum {
-      icFlare0                            = 0x00000000,  /* 0% flare */
-      icFlare100                          = 0x00000001,  /* 100% flare */
-  } icMeasurementFlare;
-  
-  /** Convenience Enum Definition - Not defined in ICC specification*/
-! #define icMaxEnumFlare ((icMeasurementFlare) 0xFFFFFFFF)
-  #define icMaxFlare     ((icMeasurementFlare) 0xFFFFFFFF) /* as defined by earlier versions */
-  
-  
---- 659,669 ----
-  typedef enum {
-      icFlare0                            = 0x00000000,  /* 0% flare */
-      icFlare100                          = 0x00000001,  /* 100% flare */
-+     icMaxEnumFlare                      = 0xFFFFFFFF
-  } icMeasurementFlare;
-  
-  /** Convenience Enum Definition - Not defined in ICC specification*/
-! /*#define icMaxEnumFlare ((icMeasurementFlare) 0xFFFFFFFF)*/
-  #define icMaxFlare     ((icMeasurementFlare) 0xFFFFFFFF) /* as defined by earlier versions */
-  
-  
-*** misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in	Mon Aug 20 22:10:42 2007
---- misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 101,117 ****
-  am__quote = @am__quote@
-  install_sh = @install_sh@
-  
-! SUBDIRS = IccApplyNamedCmm \
-! 	@SICC_ICC_APPLY_PROFILES@ \
-! 	IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
-  
-  
-! DIST_SUBDIRS = IccApplyNamedCmm \
-! 	IccApplyProfiles \
-! 	IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
---- 101,113 ----
-  am__quote = @am__quote@
-  install_sh = @install_sh@
-  
-! SUBDIRS = IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
-  
-  
-! DIST_SUBDIRS = IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2007-08-20 22:04:53.000000000 +0200
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2008-01-31 13:53:16.000000000 +0100
-***************
-*** 77,82 ****
---- 77,84 ----
-  //
-  //////////////////////////////////////////////////////////////////////
-  
-+ #include <stdlib.h>
-+ #include <string.h>
-  #include <iostream>
-  #include <fstream>
-  #include <sstream>
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2007-08-20 22:04:54.000000000 +0200
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2008-01-31 13:54:51.000000000 +0100
-***************
-*** 83,88 ****
---- 83,89 ----
-  #ifndef __DEFINED_ICC_TOOL_EXCEPTION_H__
-  #define __DEFINED_ICC_TOOL_EXCEPTION_H__
-  
-+ #include <string.h>
-  #include <exception>
-  #include <string>
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2007-08-20 22:05:00.000000000 +0200
---- misc/build/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2008-01-31 13:49:54.000000000 +0100
-***************
-*** 79,84 ****
---- 79,86 ----
-  #pragma warning( disable: 4786) //disable warning in <list.h>
-  #endif
-  
-+ #include <stdlib.h>
-+ #include <string.h>
-  #include "IccCmm.h"
-  #include "IccTag.h"
-  #include "IccIO.h"
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2007-08-20 22:04:53.000000000 +0200
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2008-01-31 14:05:58.000000000 +0100
-***************
-*** 83,88 ****
---- 83,89 ----
-  #include <string>
-  #include <sys/types.h>
-  #include <sys/stat.h>
-+ #include <stdlib.h>
-  
-  #ifdef WIN32
-  typedef unsigned short mode_t;
diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch
index ed072b63afaa..dadce6f60c56 100644
--- a/icc/SampleICC-1.3.2.patch
+++ b/icc/SampleICC-1.3.2.patch
@@ -1,5 +1,5 @@
 *** misc/SampleICC-1.3.2/configure	Mon Aug 20 22:10:59 2007
---- misc/build/SampleICC-1.3.2/configure	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/configure	Fri Jan 25 14:23:09 2008
 ***************
 *** 19991,19997 ****
   
@@ -60,7 +60,7 @@
     *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
   echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 *** misc/SampleICC-1.3.2/Contrib/Makefile.in	Mon Aug 20 22:10:37 2007
---- misc/build/SampleICC-1.3.2/Contrib/Makefile.in	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/Contrib/Makefile.in	Fri Jan 25 14:23:09 2008
 ***************
 *** 103,120 ****
   
@@ -95,7 +95,7 @@
   subdir = Contrib
   mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 *** misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in	Mon Aug 20 22:10:34 2007
---- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in	Fri Jan 25 14:23:09 2008
 ***************
 *** 102,116 ****
   install_sh = @install_sh@
@@ -126,7 +126,7 @@
   subdir = Contrib/CmdLine
   mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 *** misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in	Mon Aug 20 22:10:35 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in	Fri Jan 25 14:23:09 2008
 ***************
 *** 133,139 ****
   CONFIG_CLEAN_FILES =
@@ -145,7 +145,7 @@
   	ICC_tool_exception.lo Vetters.lo
   libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
 *** misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h	Mon Aug 20 22:04:53 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h	Fri Jan 25 14:23:09 2008
 ***************
 *** 130,136 ****
   
@@ -164,7 +164,7 @@
       return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
     }
 *** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp	Mon Aug 20 22:04:54 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp	Fri Jan 25 14:49:56 2008
+--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp	Fri Jan 25 14:57:06 2008
 ***************
 *** 1,322 ****
 ! /*
@@ -820,7 +820,7 @@
 !   }
 ! }
 *** misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp	Fri Jan 25 14:25:33 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 78,84 ****
   #include "IccIO.h"
@@ -838,8 +838,20 @@
   #include <string.h>
   
   #ifndef __max
+*** misc/SampleICC-1.3.2/IccProfLib/IccIO.h	Mon Aug 20 22:05:00 2007
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h	Fri Jan 25 14:23:09 2008
+***************
+*** 79,84 ****
+--- 79,85 ----
+  #define _ICCIO_H
+  
+  #include "IccDefs.h"
++ #include "memory"
+  #include "stdio.h"
+  
+  #ifdef USESAMPLEICCNAMESPACE
 *** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 136,152 ****
     icChar sigBuf[30];
@@ -878,7 +890,7 @@
       icMemDump(sDescription, m_pData, m_nDataSize);
     }
 *** misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 218,249 ****
     sprintf(buf, "%.8f", m_endPoint);
@@ -1362,8 +1374,56 @@
       return icValidateCriticalError;
     }
   
+*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Mon Aug 20 22:05:00 2007
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Fri Jan 25 14:23:09 2008
+***************
+*** 107,126 ****
+  
+  #else // non-PC, perhaps Mac or Linux
+  
+!   #define ICCUINT64 unsigned long long
+!   #define ICCINT64  long long
+!   #define ICUINT64TYPE unsigned long long
+!   #define ICINT64TYPE long long
+! 
+!   #if defined(__APPLE__)
+!     #if  defined(__LITTLE_ENDIAN__)
+!       #define ICC_BYTE_ORDER_LITTLE_ENDIAN
+!     #else
+!       #define ICC_BYTE_ORDER_BIG_ENDIAN
+!     #endif
+!   #else
+!     #define ICC_BYTE_ORDER_LITTLE_ENDIAN
+!   #endif
+  
+    #define ICCPROFLIB_API
+    #define ICCPROFLIB_EXTERN
+--- 107,129 ----
+  
+  #else // non-PC, perhaps Mac or Linux
+  
+! #include <sal/types.h>
+! #include <osl/endian.h>
+! 
+!   #define ICCUINT64 sal_uInt64
+!   #define ICCINT64 sal_Int64
+!   #define ICUINT64TYPE sal_uInt64
+!   #define ICINT64TYPE sal_Int64
+!   #define ICINT32TYPE sal_Int32
+!   #define ICUINT32TYPE sal_uInt32
+! 
+! #if defined(_LITTLE_ENDIAN)
+! #    define ICC_BYTE_ORDER_LITTLE_ENDIAN
+! #elif defined(_BIG_ENDIAN)
+! #    define ICC_BYTE_ORDER_BIG_ENDIAN
+! #else
+! #    error "ENDIAN unknown"
+! #endif
+  
+    #define ICCPROFLIB_API
+    #define ICCPROFLIB_EXTERN
 *** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 567,573 ****
   
@@ -1989,7 +2049,7 @@
       return NULL;
     }
 *** misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 166,172 ****
       CIccInfo Info;
@@ -3311,7 +3371,7 @@
     }
     else {
 *** misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 323,345 ****
     icChar buf[128], *ptr;
@@ -4443,7 +4503,7 @@
             }
           }
 *** misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 218,224 ****
             icGetSig(sigbuf, m_sig), m_nSize);
@@ -4615,7 +4675,7 @@
     }
   
 *** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 234,240 ****
   {
@@ -4706,7 +4766,7 @@
   
   
 *** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h	Fri Jan 25 14:23:09 2008
 ***************
 *** 161,164 ****
   }
@@ -4719,7 +4779,7 @@
   
 ! #endif //_ICCTAGPROFSEQID_H
 *** misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp	Fri Jan 25 14:27:16 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp	Fri Jan 25 14:23:09 2008
 ***************
 *** 79,85 ****
   #include "IccUtil.h"
@@ -4974,7 +5034,7 @@
       rv = icMaxStatus(rv, icValidateWarning);
     }
 *** misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h	Fri Jan 25 14:23:09 2008
 ***************
 *** 659,668 ****
   typedef enum {
@@ -5000,7 +5060,7 @@
   
   
 *** misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in	Mon Aug 20 22:10:42 2007
---- misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in	Fri Jan 25 14:24:00 2008
+--- misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in	Fri Jan 25 14:23:09 2008
 ***************
 *** 101,117 ****
   am__quote = @am__quote@
diff --git a/icc/makefile.mk b/icc/makefile.mk
index abd8b59165a1..2f353bc4a793 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -41,12 +41,7 @@ TARGET=icc
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=SampleICC-1.3.2
-#checking for endianess
-.IF "$(CPU)"=="I"
 PATCH_FILES=$(TARFILE_NAME).patch
-.ELSE
-PATCH_FILES=$(TARFILE_NAME)-bendian.patch
-.ENDIF
 
 CONVERTFILES= \
     IccProfLib$/IccTagProfSeqId.h \
diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index 7ce035bd4d92..9eace5df121a 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,3 +1,3 @@
-ip     icc :	solenv external NULL
+ip     icc :	solenv stlport external sal NULL
 ip	icc		usr1	-	all	ip_mkout NULL
 ip	icc		nmake	-	all	ip_icc	NULL
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 69ccf08fce6a..29d326170ff1 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -49,12 +49,6 @@
 #include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
 #include <string.h>
 
 
@@ -632,7 +626,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32
                 sal_Int32 nToRead = nBytesToRead - ( m_pBuffer->getSize() - m_nCurrentPos );
                 nRead = m_input->readBytes( aData , nToRead );
 
-                assert( aData.getLength() == nRead );
+                OSL_ASSERT( aData.getLength() == nRead );
 
                 try
                 {
@@ -650,7 +644,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32
                 }
             }
 
-            assert( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead  );
+            OSL_ASSERT( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead  );
 
             m_pBuffer->readAt( m_nCurrentPos , aData , nBytesToRead );
 
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 3de10d5fe63e..b7515b3c5417 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -55,10 +55,6 @@
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
 #include <string.h>
 
 using namespace ::rtl;
@@ -209,13 +205,13 @@ sal_Int32 ODataStreamTest::test(
                     rSource = Reference< XActiveDataSource > ( x, UNO_QUERY );
                 }
 
-                assert( rPipeInput.is() );
-                assert( rPipeOutput.is() );
+                OSL_ASSERT( rPipeInput.is() );
+                OSL_ASSERT( rPipeOutput.is() );
                 rSink->setInputStream( rPipeInput );
                 rSource->setOutputStream( rPipeOutput );
 
-                assert( rSink->getInputStream().is() );
-                assert( rSource->getOutputStream().is() );
+                OSL_ASSERT( rSink->getInputStream().is() );
+                OSL_ASSERT( rSource->getOutputStream().is() );
 
                 if( 1 == hTestHandle ) {
                     testSimple( rInput , rOutput );
@@ -778,10 +774,10 @@ sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
                 Reference <XOutputStream >  markableOutput( x , UNO_QUERY );
                 Reference <XActiveDataSource >  markableSource( x , UNO_QUERY );
 
-                assert( markableInput.is()  );
-                assert( markableOutput.is() );
-                assert( markableSink.is()   );
-                assert( markableSource.is() );
+                OSL_ASSERT( markableInput.is()  );
+                OSL_ASSERT( markableOutput.is() );
+                OSL_ASSERT( markableSink.is()   );
+                OSL_ASSERT( markableSource.is() );
 
                 markableSink->setInputStream( rPipeInput );
                 markableSource->setOutputStream( rPipeOutput );
@@ -799,14 +795,14 @@ sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
                     rSource = Reference <XActiveDataSource>( x, UNO_QUERY );
                 }
 
-                assert( rPipeInput.is() );
-                assert( rPipeOutput.is() );
+                OSL_ASSERT( rPipeInput.is() );
+                OSL_ASSERT( rPipeOutput.is() );
 
                 rSink->setInputStream( markableInput );
                 rSource->setOutputStream( markableOutput );
 
-                assert( rSink->getInputStream().is() );
-                assert( rSource->getOutputStream().is() );
+                OSL_ASSERT( rSink->getInputStream().is() );
+                OSL_ASSERT( rSource->getOutputStream().is() );
 
                 if( 1 + DATASTREAM_TEST_MAX_HANDLE == hTestHandle ) {
                     testObject( rOutput , rInput);
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index 88d52a09c891..20e4015ffa1f 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -46,12 +46,6 @@
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-#include <string.h>
-
 using namespace ::rtl;
 using namespace ::osl;
 using namespace ::cppu;
@@ -159,8 +153,8 @@ sal_Int32 OMarkableOutputStreamTest::test(
 
                 Reference< XOutputStream > rOutput( TestObject , UNO_QUERY );
 
-                assert( rPipeInput.is() );
-                assert( rOutput.is() );
+                OSL_ASSERT( rPipeInput.is() );
+                OSL_ASSERT( rOutput.is() );
                 if( 1 == hTestHandle ) {
                     // checks usual streaming
                     testSimple( rOutput , rPipeInput );
@@ -526,8 +520,8 @@ sal_Int32 OMarkableInputStreamTest::test(
 
                 Reference < XInputStream > rInput( TestObject , UNO_QUERY );
 
-                assert( rPipeOutput.is() );
-                assert( rInput.is() );
+                OSL_ASSERT( rPipeOutput.is() );
+                OSL_ASSERT( rInput.is() );
                 if( 1 == hTestHandle ) {
                     // checks usual streaming
                     testSimple( rPipeOutput , rInput );
diff --git a/libegg/prj/build.lst b/libegg/prj/build.lst
index a4cb56a1c0c9..f9d2c7bd3a57 100644
--- a/libegg/prj/build.lst
+++ b/libegg/prj/build.lst
@@ -1,2 +1,2 @@
-eg  libegg   :  soltools NULL
+eg  libegg   :  soltools stlport NULL
 eg	libegg\source			    nmake	-	u	eg_src NULL
diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c
index 9c2b67355826..603e66fbc99d 100644
--- a/libegg/source/eggtrayicon.c
+++ b/libegg/source/eggtrayicon.c
@@ -76,6 +76,14 @@ static void egg_tray_icon_update_manager_window    (EggTrayIcon *icon,
 static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
 #endif
 
+/*
+ * This is made somewhat more 'interesting' by the facts that:
+ * a) GTypePlugin is a foul & tangled mess
+ * b) We may have been unloaded, and left an invalid
+ *    EggTrayIcon class lying around in the GType database,
+ *    we could use GTypePlugin to fix this, but see a) -
+ *    this is far easier and simpler.
+ */
 GType
 egg_tray_icon_get_type (void)
 {
@@ -88,18 +96,23 @@ egg_tray_icon_get_type (void)
     sizeof (EggTrayIconClass),
     (GBaseInitFunc) NULL,
     (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) egg_tray_icon_class_init,
+    (GClassInitFunc) NULL, /* class_init */
     NULL, /* class_finalize */
     NULL, /* class_data */
     sizeof (EggTrayIcon),
     0,    /* n_preallocs */
-    (GInstanceInitFunc) egg_tray_icon_init,
+    (GInstanceInitFunc) NULL, /* instance_init */
     NULL
       };
 
-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
+      our_type = g_type_from_name ("EggTrayIcon");
+      if (!our_type)
+     our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
     }
 
+  /* always overwrite the function pointers */
+  egg_tray_icon_class_init (g_type_class_ref (our_type));
+
   return our_type;
 }
 
@@ -128,22 +141,15 @@ egg_tray_icon_class_init (EggTrayIconClass *klass)
 
   container_class->add = egg_tray_icon_add;
 
-  g_object_class_install_property (gobject_class,
-                   PROP_ORIENTATION,
-                   g_param_spec_enum ("orientation",
-                              _("Orientation"),
-                              _("The orientation of the tray."),
-                              GTK_TYPE_ORIENTATION,
-                              GTK_ORIENTATION_HORIZONTAL,
-                              G_PARAM_READABLE));
-
-#if defined (GDK_WINDOWING_X11)
-  /* Nothing */
-#elif defined (GDK_WINDOWING_WIN32)
-  g_warning ("Port eggtrayicon to Win32");
-#else
-  g_warning ("Port eggtrayicon to this GTK+ backend");
-#endif
+  if (!g_object_class_find_property (gobject_class, "orientation"))
+    g_object_class_install_property (gobject_class,
+                     PROP_ORIENTATION,
+                     g_param_spec_enum ("orientation",
+                            "Orientation",
+                            "The orientation of the tray.",
+                            GTK_TYPE_ORIENTATION,
+                            GTK_ORIENTATION_HORIZONTAL,
+                            G_PARAM_READABLE));
 }
 
 static void
@@ -471,7 +477,9 @@ egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
 EggTrayIcon*
 egg_tray_icon_new (const gchar *name)
 {
-  return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
+  EggTrayIcon *icon = g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
+  egg_tray_icon_init (icon);
+  return icon;
 }
 
 guint
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index c9ce4add875c..b9124f3df377 100644
--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -932,7 +932,7 @@
 +}
 --- misc/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:30:06 2008
 +++ misc/build/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:29:42 2008
-@@ -1 +1,90 @@
+@@ -1 +1,91 @@
 -dummy
 +#*************************************************************************
 +#
@@ -973,6 +973,7 @@
 +
 +USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++UWINAPILIB=
 +
 +.INCLUDE : settings.mk
 +
diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst
index e4bc4af795aa..da155db3d291 100644
--- a/libtextcat/prj/build.lst
+++ b/libtextcat/prj/build.lst
@@ -1,3 +1,3 @@
-ltc	libtextcat	:	solenv sal NULL
+ltc     libtextcat      :       stlport soltools solenv NULL
 ltc     libtextcat              usr1    -       all ltc_mkout NULL
 ltc     libtextcat              nmake   -       all ltc_libtextcat NULL
diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst
index 1da425b02ab3..7e5ae5ce9ce2 100644
--- a/libwpd/prj/build.lst
+++ b/libwpd/prj/build.lst
@@ -1,3 +1,3 @@
-lw	libwpd	: soltools NULL
+lw	libwpd	: soltools stlport NULL
 lw	libwpd	usr1	-	all	lw_mkout NULL
 lw	libwpd	nmake	-	all	lw_libwpd NULL
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index b557aa31ccb5..a4faaa8f00fa 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -1,3 +1,3 @@
-ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt sal NULL
+ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL
 ls	libxmlsec			    usr1	-	all	ls_mkout NULL
 ls	libxmlsec			    nmake	-	all	ls_xmlsec1 NULL
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 46272c68b69f..65e8459bea3f 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,4 +1,4 @@
-lc  lingucomponent  :      linguistic libtextcat svtools hyphen HUNSPELL:hunspell NULL
+lc  lingucomponent  :      linguistic libtextcat svl hyphen HUNSPELL:hunspell NULL
 lc	lingucomponent								usr1	-	all	lc_mkout NULL
 lc  lingucomponent\inc                                      nmake   -   all lc_inc NULL
 lc  lingucomponent\source\lingutil                          nmake   -   all lc_util lc_inc NULL
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 421c243d82e4..8f43530c5a3a 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -39,8 +39,8 @@
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <i18npool/mslangid.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/debug.hxx>
 #include <unotools/processfactory.hxx>
 #include <osl/mutex.hxx>
@@ -57,9 +57,9 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <linguistic/lngprops.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/lingucfg.hxx>
 #include <osl/file.hxx>
 
 #include "dictmgr.hxx"
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index bd2c29430f76..fd3e123e1d26 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -50,7 +50,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <osl/thread.h>
 
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index d32af21f7e7a..2e00035628bc 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -49,8 +49,8 @@
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/pathoptions.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
 #include <linguistic/misc.hxx>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index d1d8103eedd5..7244a4988236 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -46,8 +46,8 @@
 
 //#include <linguistic/lngprops.hxx>
 #include <linguistic/spelldta.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
index ac3ac3b7d3a0..e4bf1d88d220 100644
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
@@ -71,9 +71,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB) 	 \
         $(VOSLIB)		\
         $(TOOLSLIB)		\
-        $(SVTOOLLIB)	\
         $(SVLLIB)		\
-        $(VCLLIB)		\
         $(SALLIB)		\
         $(UCBHELPERLIB)	\
         $(UNOTOOLSLIB)	\
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
index 623ade9f3f3c..cbc41c00633b 100644
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ b/lingucomponent/source/spellcheck/spell/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -65,6 +65,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB) 	 \
         $(I18NISOLANGLIB)   \
         $(TOOLSLIB)		\
+                $(UNOTOOLSLIB)             \
         $(SVLLIB)		\
         $(SALLIB)		\
         $(LNGLIB) \
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index ed1ddf4ca77b..1a92db58a4dc 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -50,9 +50,9 @@
 #include <linguistic/lngprops.hxx>
 #include <linguistic/spelldta.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/useroptions.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 1ecba30bcb8c..c526d2b07444 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -41,8 +41,8 @@
 #include <tools/debug.hxx>
 #include <unotools/processfactory.hxx>
 #include <osl/mutex.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/lingucfg.hxx>
 
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/lngprops.hxx
index 2714c439d18e..6903d3f1d897 100644
--- a/linguistic/inc/lngprops.hxx
+++ b/linguistic/inc/lngprops.hxx
@@ -31,7 +31,7 @@
 #ifndef _LINGUISTIC_LNGPROPS_HHX_
 #define _LINGUISTIC_LNGPROPS_HHX_
 
-#include <svtools/linguprops.hxx>
+#include <unotools/linguprops.hxx>
 
 // maximal number of suggestions to be returned in spelling  context-menu
 // (may not include results added by looking up user dictionaries)
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx
index 6f06948db4af..683641f045a5 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/misc.hxx
@@ -44,13 +44,12 @@
 
 #include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
 #include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <i18npool/lang.h>
 #include <tools/string.hxx>
 #include <unotools/charclass.hxx>
 #include <osl/thread.h>
 #include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
 
 namespace com { namespace sun { namespace star { namespace beans {
     class XPropertySet;
diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst
index 0b8f5f62fb1c..8e09e3fd4226 100644
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@ -1,4 +1,4 @@
-lg	linguistic	:	xmloff sfx2 NULL
+lg  linguistic  :   svl xmloff ucbhelper vos comphelper ICU:icu NULL
 lg	linguistic								usr1	-	all	lg_mkout NULL
 lg	linguistic\prj							get		-	all	lg_prj NULL
 lg	linguistic\inc							nmake	-	all	lg_inc NULL
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index c58e7d142d47..068f9147f426 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -30,19 +30,21 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
+
+#include <cppuhelper/factory.hxx>
 #include <i18npool/lang.h>
-#include <tools/urlobj.hxx>
+#include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/stream.hxx>
-#include <sfx2/docfile.hxx>
-#include <osl/mutex.hxx>
-#include <unotools/processfactory.hxx>
+#include <tools/string.hxx>
+#include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
+#include <unotools/processfactory.hxx>
+#include <unotools/streamwrap.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
 #include <com/sun/star/linguistic2/XConversionDictionary.hpp>
 #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
 #include <com/sun/star/linguistic2/XConversionPropertyType.hpp>
@@ -50,18 +52,19 @@
 #include <com/sun/star/util/XFlushable.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/uno/Reference.h>
-#endif
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/util/XFlushListener.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
-#include <unotools/streamwrap.hxx>
 
 
 #include "convdic.hxx"
@@ -84,28 +87,31 @@ using namespace linguistic;
 
 
 ///////////////////////////////////////////////////////////////////////////
-
 void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
 {
     if (rMainURL.Len() == 0)
         return;
-
-    // get stream to be used
     DBG_ASSERT(!INetURLObject( rMainURL ).HasError(), "invalid URL");
-    SfxMedium aMedium( rMainURL, STREAM_READ | STREAM_SHARE_DENYWRITE, FALSE );
-    SvStream *pStream = aMedium.GetInStream();
-    DBG_ASSERT( pStream, "input stream missing" );
-    if (!pStream || pStream->GetError())
-        return;
 
-    uno::Reference< lang::XMultiServiceFactory > xServiceFactory(
-            utl::getProcessServiceFactory() );
-    DBG_ASSERT( xServiceFactory.is(), "XMLReader::Read: got no service manager" );
-    if (!xServiceFactory.is())
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
+
+    // get xInputStream stream
+    uno::Reference< io::XInputStream > xIn;
+    try
+    {
+        uno::Reference< ucb::XSimpleFileAccess > xAccess( xServiceFactory->createInstance(
+                A2OU( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW );
+        xIn = xAccess->openFileRead( rMainURL );
+    }
+    catch (uno::Exception & e)
+    {
+        DBG_ASSERT( 0, "failed to get input stream" );
+        (void) e;
+    }
+    if (!xIn.is())
         return;
 
-    uno::Reference< io::XInputStream > xIn = new utl::OInputStreamWrapper( *pStream );
-    DBG_ASSERT( xIn.is(), "input stream missing" );
+    SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xIn ) );
 
     ULONG nError = sal::static_int_cast< ULONG >(-1);
 
@@ -159,7 +165,6 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
     }
 }
 
-
 BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
 {
     BOOL bRes = FALSE;
@@ -259,12 +264,10 @@ void ConvDic::Load()
 
     //!! prevent function from being called recursively via HasEntry, AddEntry
     bNeedEntries = FALSE;
-
     ConvDicXMLImport *pImport = new ConvDicXMLImport( this, aMainURL );
     //!! keep a first reference to ensure the lifetime of the object !!
     uno::Reference< XInterface > xRef( (document::XFilter *) pImport, UNO_QUERY );
     ReadThroughDic( aMainURL, *pImport );    // will implicitly add the entries
-
     bIsModified = FALSE;
 }
 
@@ -274,23 +277,29 @@ void ConvDic::Save()
     DBG_ASSERT( !bNeedEntries, "saving while entries missing" );
     if (aMainURL.Len() == 0 || bNeedEntries)
         return;
-
     DBG_ASSERT(!INetURLObject( aMainURL ).HasError(), "invalid URL");
-    SfxMedium   aMedium( aMainURL, STREAM_WRITE | STREAM_TRUNC | STREAM_SHARE_DENYALL,
-                         FALSE );
-    aMedium.CreateTempFile();   // use temp file to write to...
 
-    SvStream *pStream = aMedium.GetOutStream();
-    DBG_ASSERT( pStream, "output stream missing" );
-    if (!pStream || pStream->GetError())
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
+
+    // get XOutputStream stream
+    uno::Reference< io::XStream > xStream;
+    try
+    {
+        uno::Reference< ucb::XSimpleFileAccess > xAccess( xServiceFactory->createInstance(
+                A2OU( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW );
+        xStream = xAccess->openFileReadWrite( aMainURL );
+    }
+    catch (uno::Exception & e)
+    {
+        DBG_ASSERT( 0, "failed to get input stream" );
+        (void) e;
+    }
+    if (!xStream.is())
         return;
-    uno::Reference< io::XOutputStream > xOut(
-            new utl::OOutputStreamWrapper( *pStream ) );
-    DBG_ASSERT( xOut.is(), "output stream missing" );
+
+    SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
 
     // get XML writer
-    uno::Reference< lang::XMultiServiceFactory > xServiceFactory(
-            utl::getProcessServiceFactory() );
     uno::Reference< io::XActiveDataSource > xSaxWriter;
     if (xServiceFactory.is())
     {
@@ -306,27 +315,21 @@ void ConvDic::Save()
     }
     DBG_ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
 
-    if (xSaxWriter.is() && xOut.is())
+    if (xSaxWriter.is() && xStream.is())
     {
         // connect XML writer to output stream
-        xSaxWriter->setOutputStream( xOut );
+        xSaxWriter->setOutputStream( xStream->getOutputStream() );
 
         // prepare arguments (prepend doc handler to given arguments)
         uno::Reference< xml::sax::XDocumentHandler > xDocHandler( xSaxWriter, UNO_QUERY );
-
         ConvDicXMLExport *pExport = new ConvDicXMLExport( *this, aMainURL, xDocHandler );
         //!! keep a first(!) reference until everything is done to
         //!! ensure the proper lifetime of the object
         uno::Reference< document::XFilter > aRef( (document::XFilter *) pExport );
-        sal_Bool bRet = pExport->Export( aMedium );     // write entries to file
+        sal_Bool bRet = pExport->Export();     // write entries to file
         DBG_ASSERT( !pStream->GetError(), "I/O error while writing to stream" );
         if (bRet)
-        {
-            // flush file, close it and release any lock
-            aMedium.Close();
-            aMedium.Commit();
             bIsModified = FALSE;
-        }
     }
     DBG_ASSERT( !bIsModified, "dictionary still modified after save. Save failed?" );
 }
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index ff68146834bf..831c67b7baa8 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -33,11 +33,9 @@
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/lingucfg.hxx>
-#include <sfx2/docfile.hxx>
-#include <vcl/svapp.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/lingucfg.hxx>
 #include <rtl/instance.hxx>
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <unotools/localfilehelper.hxx>
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 7a7f866a69a1..8467955b4d87 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 
 #include "misc.hxx"
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 34133a4bc2f9..70ada335f57e 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -36,7 +36,6 @@
 #include <tools/string.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/stream.hxx>
-#include <sfx2/docfile.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/processfactory.hxx>
 #include <ucbhelper/content.hxx>
@@ -335,7 +334,7 @@ void ConvDicXMLRightTextContext_Impl::EndElement()
 
 ///////////////////////////////////////////////////////////////////////////
 
-sal_Bool ConvDicXMLExport::Export( SfxMedium & /*rMedium*/ )
+sal_Bool ConvDicXMLExport::Export()
 {
     sal_Bool bRet = sal_False;
 
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 0746b5998589..f0a3ae4417d4 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -79,7 +79,7 @@ public:
     void _ExportContent();
     sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass );
 
-    sal_Bool    Export( SfxMedium &rMedium );
+    sal_Bool    Export();
 };
 
 
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index ca3a611c30ee..48b6dc6d82e7 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -36,10 +36,17 @@
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 
+#include <boost/shared_ptr.hpp>
+
+class SvStream;
+
+
 ///////////////////////////////////////////////////////////////////////////
 
 #define A2OU(x) ::rtl::OUString::createFromAscii( x )
 
+typedef boost::shared_ptr< SvStream > SvStreamPtr;
+
 namespace css = ::com::sun::star;
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 1555fd3df4d7..fa7dd0be3948 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -30,29 +30,30 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
-#include <i18npool/lang.h>
 
-#ifndef _DICIMP_HXX
+#include <cppuhelper/factory.hxx>
 #include <dicimp.hxx>
-#endif
-#ifndef _HYPHIMP_HXX
 #include <hyphdsp.hxx>
-#endif
-#include <tools/urlobj.hxx>
+#include <i18npool/lang.h>
+#include <i18npool/mslangid.hxx>
+#include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <sfx2/docfile.hxx>
-#include <osl/mutex.hxx>
+#include <tools/urlobj.hxx>
 #include <unotools/processfactory.hxx>
-#include <i18npool/mslangid.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/linguistic2/DictionaryType.hpp>
 #include <com/sun/star/linguistic2/DictionaryEventFlags.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+
+#include "defs.hxx"
 
-#include <cppuhelper/factory.hxx>   // helper for factories
 
 using namespace utl;
 using namespace osl;
@@ -88,7 +89,7 @@ static sal_Bool getTag(const ByteString &rLine,
 }
 
 
-INT16 ReadDicVersion( SvStream *pStream, USHORT &nLng, BOOL &bNeg )
+INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
 {
     // Sniff the header
     INT16 nDicVersion;
@@ -97,13 +98,13 @@ INT16 ReadDicVersion( SvStream *pStream, USHORT &nLng, BOOL &bNeg )
     nLng = LANGUAGE_NONE;
     bNeg = FALSE;
 
-    if (!pStream || pStream->GetError())
+    if (!rpStream.get() || rpStream->GetError())
         return -1;
 
-    sal_Size nSniffPos = pStream->Tell();
+    sal_Size nSniffPos = rpStream->Tell();
     static sal_Size nVerOOo7Len = sal::static_int_cast< sal_Size >(strlen( pVerOOo7 ));
     pMagicHeader[ nVerOOo7Len ] = '\0';
-    if ((pStream->Read((void *) pMagicHeader, nVerOOo7Len) == nVerOOo7Len) &&
+    if ((rpStream->Read((void *) pMagicHeader, nVerOOo7Len) == nVerOOo7Len) &&
         !strcmp(pMagicHeader, pVerOOo7))
     {
         sal_Bool bSuccess;
@@ -112,10 +113,10 @@ INT16 ReadDicVersion( SvStream *pStream, USHORT &nLng, BOOL &bNeg )
         nDicVersion = 7;
 
         // 1st skip magic / header line
-        pStream->ReadLine(aLine);
+        rpStream->ReadLine(aLine);
 
         // 2nd line: language all | en-US | pt-BR ...
-        while (sal_True == (bSuccess = pStream->ReadLine(aLine)))
+        while (sal_True == (bSuccess = rpStream->ReadLine(aLine)))
         {
             ByteString aTagValue;
 
@@ -151,13 +152,13 @@ INT16 ReadDicVersion( SvStream *pStream, USHORT &nLng, BOOL &bNeg )
     {
         USHORT nLen;
 
-        pStream->Seek (nSniffPos );
+        rpStream->Seek (nSniffPos );
 
-        *pStream >> nLen;
+        *rpStream >> nLen;
         if (nLen >= MAX_HEADER_LENGTH)
             return -1;
 
-        pStream->Read(pMagicHeader, nLen);
+        rpStream->Read(pMagicHeader, nLen);
         pMagicHeader[nLen] = '\0';
 
         // Check version magic
@@ -175,14 +176,14 @@ INT16 ReadDicVersion( SvStream *pStream, USHORT &nLng, BOOL &bNeg )
             6 == nDicVersion)
         {
             // The language of the dictionary
-            *pStream >> nLng;
+            *rpStream >> nLng;
 
             if (VERS2_NOLANGUAGE == nLng)
                 nLng = LANGUAGE_NONE;
 
             // Negative Flag
             sal_Char nTmp;
-            *pStream >> nTmp;
+            *rpStream >> nTmp;
             bNeg = (BOOL)nTmp;
         }
     }
@@ -271,13 +272,27 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
     if (rMainURL.getLength() == 0)
         return 0;
 
-    ULONG nErr = sal::static_int_cast< ULONG >(-1);
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
 
-    // get stream to use
-    SfxMedium aMedium( rMainURL, STREAM_READ | STREAM_SHARE_DENYWRITE, FALSE );
-    SvStream *pStream = aMedium.GetInStream();
-    if (!pStream)
-        return nErr;
+    // get XInputStream stream
+    uno::Reference< io::XInputStream > xStream;
+    try
+    {
+        uno::Reference< ucb::XSimpleFileAccess > xAccess( xServiceFactory->createInstance(
+                A2OU( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW );
+        xStream = xAccess->openFileRead( rMainURL );
+    }
+    catch (uno::Exception & e)
+    {
+        DBG_ASSERT( 0, "failed to get input stream" );
+        (void) e;
+    }
+    if (!xStream.is())
+        return static_cast< ULONG >(-1);
+
+    SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
+
+    ULONG nErr = sal::static_int_cast< ULONG >(-1);
 
     // Header einlesen
     BOOL bNegativ;
@@ -285,6 +300,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
     nDicVersion = ReadDicVersion(pStream, nLang, bNegativ);
     if (0 != (nErr = pStream->GetError()))
         return nErr;
+
     nLanguage = nLang;
 
     eDicType = bNegativ ? DictionaryType_NEGATIVE : DictionaryType_POSITIVE;
@@ -398,16 +414,29 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
 
     if (rURL.getLength() == 0)
         return 0;
+    DBG_ASSERT(!INetURLObject( rURL ).HasError(), "lng : invalid URL");
 
-    ULONG nErr = sal::static_int_cast< ULONG >(-1);
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() );
 
-    DBG_ASSERT(!INetURLObject( rURL ).HasError(), "lng : invalid URL");
-    SfxMedium   aMedium( rURL, STREAM_WRITE | STREAM_TRUNC | STREAM_SHARE_DENYALL,
-                         FALSE );
-    aMedium.CreateTempFile();   // use temp file to write to...
-    SvStream *pStream = aMedium.GetOutStream();
-    if (!pStream)
-        return nErr;
+    // get XOutputStream stream
+    uno::Reference< io::XStream > xStream;
+    try
+    {
+        uno::Reference< ucb::XSimpleFileAccess > xAccess( xServiceFactory->createInstance(
+                A2OU( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW );
+        xStream = xAccess->openFileReadWrite( rURL );
+    }
+    catch (uno::Exception & e)
+    {
+        DBG_ASSERT( 0, "failed to get input stream" );
+        (void) e;
+    }
+    if (!xStream.is())
+        return static_cast< ULONG >(-1);
+
+    SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
+
+    ULONG nErr = sal::static_int_cast< ULONG >(-1);
 
     rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
     if (nDicVersion >= 6)
@@ -500,10 +529,6 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
     //! get return value before Stream is destroyed
     ULONG nError = pStream->GetError();
 
-    // flush file, close it and release any lock
-    aMedium.Close();
-    aMedium.Commit();
-
     return nError;
 }
 
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 52eada08c486..917890bdd63c 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -42,6 +42,7 @@
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 
+#include "defs.hxx"
 #include "misc.hxx"
 
 
@@ -49,7 +50,7 @@
 
 #define DIC_MAX_ENTRIES     30000
 
-INT16           ReadDicVersion( SvStream *pStream, USHORT &nLng, BOOL &bNeg );
+INT16           ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg );
 const String    GetDicExtension();
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 4da58e270991..80c61e64001b 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -30,27 +30,30 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
-#include "dlistimp.hxx"
-#include "dicimp.hxx"
-#include "lngopt.hxx"
 
 #include <osl/file.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
-#include <sfx2/docfile.hxx>
-#include <vcl/svapp.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <unotools/localfilehelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/linguistic2/DictionaryEventFlags.hpp>
 #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+
+#include "defs.hxx"
+#include "dlistimp.hxx"
+#include "dicimp.hxx"
+#include "lngopt.hxx"
 
 //using namespace utl;
 using namespace osl;
@@ -930,10 +933,28 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg )
         return FALSE;
 
     // get stream to be used
-    SfxMedium aMedium( rFileURL, STREAM_READ | STREAM_SHARE_DENYWRITE, FALSE );
-    SvStream *pStream = aMedium.GetInStream();
+    uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
+
+    // get XInputStream stream
+    uno::Reference< io::XInputStream > xStream;
+    try
+    {
+        uno::Reference< ucb::XSimpleFileAccess > xAccess( xServiceFactory->createInstance(
+                A2OU( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW );
+        xStream = xAccess->openFileRead( rFileURL );
+    }
+    catch (uno::Exception & e)
+    {
+        DBG_ASSERT( 0, "failed to get input stream" );
+        (void) e;
+    }
+    DBG_ASSERT( xStream.is(), "failed to get stream for read" );
+    if (!xStream.is())
+        return FALSE;
+
+    SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
 
-    int nDicVersion = ReadDicVersion (pStream, nLng, bNeg);
+    int nDicVersion = ReadDicVersion(pStream, nLng, bNeg);
     if (2 == nDicVersion || nDicVersion >= 5)
         return TRUE;
 
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index bb63e9bb8c8b..2697d5880b80 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -63,7 +63,6 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/extract.hxx>
 #include <cppuhelper/factory.hxx>
-#include <vcl/unohelp.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/processfactory.hxx>
 
@@ -790,7 +789,10 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence(
     uno::Reference< i18n::XBreakIterator > xBreakIterator;
     if (!m_xBreakIterator.is())
     {
-        m_xBreakIterator = vcl::unohelper::CreateBreakIterator();
+        uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
+        if ( xMSF.is() )
+            xBreakIterator = uno::Reference < i18n::XBreakIterator >( xMSF->createInstance(
+                ::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator") ), uno::UNO_QUERY );
     }
     sal_Int32 nTextLen = rText.getLength();
     sal_Int32 nEndPosition = nTextLen;
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 3d4953b8e17a..5985ffe7d27b 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -34,7 +34,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/linguistic2/XGrammarChecker.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <vcl/unohelp.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 7972c1b208c7..980aabb51bef 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -37,7 +37,6 @@
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <sfx2/docfile.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/processfactory.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index e1ebe970a44f..64907ab04f24 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -41,7 +41,7 @@
 #include <i18npool/lang.h>
 #include <unotools/localedatawrapper.hxx>
 #include <tools/debug.hxx>
-#include <svtools/lngmisc.hxx>
+#include <svl/lngmisc.hxx>
 #include <unotools/processfactory.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 5286a6aada22..ea7d8e7c8233 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -39,7 +39,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
-#include <svtools/lngmisc.hxx>
+#include <svl/lngmisc.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 //using namespace utl;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 995b0686e2f8..6eb59fa09ef4 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -35,8 +35,7 @@
 #include "lngprops.hxx"
 #include "misc.hxx"
 #include <tools/debug.hxx>
-#include <svtools/lingucfg.hxx>
-#include <vcl/svapp.hxx>
+#include <unotools/lingucfg.hxx>
 
 #include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
 #include <cppuhelper/implbase1.hxx> // helper for implementations
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index b424970a929b..f690fc1112c8 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -41,16 +41,16 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <svtools/lingucfg.hxx>
-#include <svtools/itemprop.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svl/itemprop.hxx>
 #include <unotools/configitem.hxx>
 #include <com/sun/star/uno/Any.h>
 #include <tools/solar.h>
 
-#include <vcl/timer.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include "misc.hxx"
 #include "defs.hxx"
+#include <vos/refernce.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace beans {
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 41d805fe9212..3a8e3e017fae 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp>
 
 #include <tools/solar.h>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <unotools/processfactory.hxx>
 #include <i18npool/lang.h>
 #include <i18npool/mslangid.hxx>
@@ -288,7 +288,7 @@ class LngSvcMgrListenerHelper :
     >
 {
     LngSvcMgr  &rMyManager;
-    Timer       aLaunchTimer;
+//    Timer       aLaunchTimer;
 
     //cppu::OMultiTypeInterfaceContainerHelper  aListeners;
     ::cppu::OInterfaceContainerHelper           aLngSvcMgrListeners;
@@ -304,7 +304,8 @@ class LngSvcMgrListenerHelper :
 
     void    LaunchEvent( INT16 nLngSvcEvtFlags );
 
-    DECL_LINK( TimeOut, Timer* );
+//  DECL_LINK( TimeOut, Timer* );
+    long Timeout();
 
 public:
     LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr,
@@ -363,8 +364,8 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper(
     //! listeners, and each of them is launching an event of it's own!)
     //! Thus this behaviour is necessary to avoid unecessary actions of
     //! this objects listeners!
-    aLaunchTimer.SetTimeout( 2000 );
-    aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) );
+//  aLaunchTimer.SetTimeout( 2000 );
+//  aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) );
     nCombinedLngSvcEvt = 0;
 }
 
@@ -385,11 +386,12 @@ void SAL_CALL LngSvcMgrListenerHelper::disposing( const lang::EventObject& rSour
 }
 
 
-IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer )
+//IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer )
+long LngSvcMgrListenerHelper::Timeout()
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    if (&aLaunchTimer == pTimer)
+//  if (&aLaunchTimer == pTimer)
     {
         // change event source to LinguServiceManager since the listeners
         // probably do not know (and need not to know) about the specific
@@ -416,7 +418,8 @@ IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer )
 void LngSvcMgrListenerHelper::AddLngSvcEvt( INT16 nLngSvcEvt )
 {
     nCombinedLngSvcEvt |= nLngSvcEvt;
-    aLaunchTimer.Start();
+//  aLaunchTimer.Start();
+    Timeout();
 }
 
 
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index aa7587527587..9716b082ddd5 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/linguistic2/XAvailableLocales.hpp>
 #include <unotools/configitem.hxx>
 
-#include <vcl/timer.hxx>
+//#include <vcl/timer.hxx>
 
 #include "misc.hxx"
 #include "defs.hxx"
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index 0012a9acd156..bdf0b297d2f2 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -68,17 +68,15 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 SHL1STDLIBS= \
         $(CPPULIB) 	 \
         $(CPPUHELPERLIB) 	 \
+        $(COMPHELPERLIB)   \
         $(VOSLIB)		\
         $(TOOLSLIB)		\
         $(I18NISOLANGLIB) \
-        $(SVTOOLLIB)	\
-        $(SVLLIB)		\
-        $(VCLLIB)		\
-        $(SFXLIB)		\
+        $(SVLLIB)	\
         $(SALLIB)		\
+        $(XMLOFFLIB)    \
         $(UCBHELPERLIB)	\
         $(UNOTOOLSLIB)  \
-        $(XMLOFFLIB)    \
         $(ICUUCLIB)
         
 # build DLL
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 91beaa2e2c9f..1067a9c369c9 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -33,8 +33,8 @@
 #include <tools/string.hxx>
 #include <tools/fsys.hxx>
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/lngmisc.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/lngmisc.hxx>
 #include <ucbhelper/content.hxx>
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -52,6 +52,7 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <unotools/processfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <unotools/syslocale.hxx>
 
 #include <rtl/instance.hxx>
 
@@ -59,7 +60,7 @@
 #include "defs.hxx"
 #include "lngprops.hxx"
 #include "hyphdta.hxx"
-
+#include <i18npool/mslangid.hxx>
 
 using namespace utl;
 using namespace osl;
@@ -92,7 +93,7 @@ LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang )
 {
     static LocaleDataWrapper aLclDtaWrp(
                 getProcessServiceFactory(),
-                CreateLocale( Application::GetSettings().GetUILanguage() ) );
+                CreateLocale( SvtSysLocale().GetUILanguage() ) );
 
     const Locale &rLcl = aLclDtaWrp.getLoadedLocale();
     Locale aLcl( CreateLocale( nLang ) );
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index f89ebc1bc661..ffd54b78f860 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -35,7 +35,7 @@
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/processfactory.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 6009461c7e7c..a89e6368781d 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -40,7 +40,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/processfactory.hxx>
 #include <tools/debug.hxx>
-#include <svtools/lngmisc.hxx>
+#include <svl/lngmisc.hxx>
 #include <osl/mutex.hxx>
 
 #include <vector>
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index b944e3a44d1b..ed537cc20043 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_linguistic.hxx"
 #include <i18npool/lang.h>
 #include <tools/debug.hxx>
-#include <svtools/lngmisc.hxx>
+#include <svl/lngmisc.hxx>
 
 #include <cppuhelper/factory.hxx>   // helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst
index 516f37ae9f1c..e6965a1e25e7 100644
--- a/lpsolve/prj/build.lst
+++ b/lpsolve/prj/build.lst
@@ -1,3 +1,3 @@
-lps	lpsolve	: sal NULL
+lps     lpsolve : NULL
 lps	lpsolve		usr1	-	all	lps_mkout NULL
 lps	lpsolve		nmake	-	all	lps_lpsolve NULL
diff --git a/neon/neon.patch b/neon/neon.patch
index 94769f7cc58f..23a6bba02ebe 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -488,7 +488,7 @@
 +#endif
 --- misc/neon-0.28.2/src/makefile.mk	2009-09-29 10:28:26.687500000 +0200
 +++ misc/build/neon-0.28.2/src/makefile.mk	2009-09-17 13:04:18.031250000 +0200
-@@ -1 +1,91 @@
+@@ -1 +1,92 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
 +
@@ -497,6 +497,7 @@
 +LIBTARGET=NO
 +USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++ UWINAPILIB=
 +
 +# --- Settings -----------------------------------------------------
 +
diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch
index 4e8098eb1eeb..1ee17690c8ed 100644
--- a/neon/neon_exports_unix.patch
+++ b/neon/neon_exports_unix.patch
@@ -1,6 +1,6 @@
 --- misc/neon-0.28.2/src/exports.map	2009-09-29 10:28:13.531250000 +0200
 +++ misc/build/neon-0.28.2/src/exports.map	2009-09-21 12:16:53.453125000 +0200
-@@ -0,0 +1,286 @@
+@@ -0,0 +1,287 @@
 +NEON_0_28_2 {
 +	global:
 +		ne__negotiate_ssl;
@@ -284,6 +284,7 @@
 +		ne_207_set_response_handlers;
 +		ne_accept_207;
 +		ne_simple_request;
++		GetVersionInfo;
 +	local:
 +		*;
 +};
diff --git a/nss/dtoa.patch b/nss/dtoa.patch
deleted file mode 100644
index 3632df335f83..000000000000
--- a/nss/dtoa.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- misc/mozilla/nsprpub/pr/src/misc/prdtoa.c	20 Mar 2009 03:41:21 -0000	4.7
-+++ misc/build/mozilla/nsprpub/pr/src/misc/prdtoa.c	15 Sep 2009 00:10:20 -0000
-@@ -169,17 +169,22 @@ void _PR_CleanupDtoa(void)
-  *	Llong, #define #ULLong to be the corresponding unsigned type.
-  * #define KR_headers for old-style C function headers.
-  * #define Bad_float_h if your system lacks a float.h or if it does not
-  *	define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
-  *	FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
-  * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
-  *	if memory is available and otherwise does something you deem
-  *	appropriate.  If MALLOC is undefined, malloc will be invoked
-- *	directly -- and assumed always to succeed.
-+ *	directly -- and assumed always to succeed.  Similarly, if you
-+ *	want something other than the system's free() to be called to
-+ *	recycle memory acquired from MALLOC, #define FREE to be the
-+ *	name of the alternate routine.  (FREE or free is only called in
-+ *	pathological cases, e.g., in a dtoa call after a dtoa return in
-+ *	mode 3 with thousands of digits requested.)
-  * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
-  *	memory allocations from a private pool of memory when possible.
-  *	When used, the private pool is PRIVATE_MEM bytes long:  2304 bytes,
-  *	unless #defined to be a different length.  This default length
-  *	suffices to get rid of MALLOC calls except for unusual cases,
-  *	such as decimal-to-binary conversion of a very long string of
-  *	digits.  The longest string dtoa can return is about 751 bytes
-  *	long.  For conversions by strtod of strings of 800 digits and
-@@ -553,17 +558,17 @@ extern double rnd_prod(double, double), 
- #endif
- #endif /* NO_LONG_LONG */
- 
- #ifndef MULTIPLE_THREADS
- #define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
- #define FREE_DTOA_LOCK(n)	/*nothing*/
- #endif
- 
--#define Kmax 15
-+#define Kmax 7
- 
-  struct
- Bigint {
- 	struct Bigint *next;
- 	int k, maxwds, sign, wds;
- 	ULong x[1];
- 	};
- 
-@@ -581,27 +586,28 @@ Balloc
- {
- 	int x;
- 	Bigint *rv;
- #ifndef Omit_Private_Memory
- 	unsigned int len;
- #endif
- 
- 	ACQUIRE_DTOA_LOCK(0);
--	if (rv = freelist[k]) {
-+	/* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */
-+	/* but this case seems very unlikely. */
-+	if (k <= Kmax && (rv = freelist[k]))
- 		freelist[k] = rv->next;
--		}
- 	else {
- 		x = 1 << k;
- #ifdef Omit_Private_Memory
- 		rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
- #else
- 		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
- 			/sizeof(double);
--		if (pmem_next - private_mem + len <= PRIVATE_mem) {
-+		if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
- 			rv = (Bigint*)pmem_next;
- 			pmem_next += len;
- 			}
- 		else
- 			rv = (Bigint*)MALLOC(len*sizeof(double));
- #endif
- 		rv->k = k;
- 		rv->maxwds = x;
-@@ -615,20 +621,28 @@ Balloc
- Bfree
- #ifdef KR_headers
- 	(v) Bigint *v;
- #else
- 	(Bigint *v)
- #endif
- {
- 	if (v) {
--		ACQUIRE_DTOA_LOCK(0);
--		v->next = freelist[v->k];
--		freelist[v->k] = v;
--		FREE_DTOA_LOCK(0);
-+		if (v->k > Kmax)
-+#ifdef FREE
-+			FREE((void*)v);
-+#else
-+			free((void*)v);
-+#endif
-+		else {
-+			ACQUIRE_DTOA_LOCK(0);
-+			v->next = freelist[v->k];
-+			freelist[v->k] = v;
-+			FREE_DTOA_LOCK(0);
-+			}
- 		}
- 	}
- 
- #define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
- y->wds*sizeof(Long) + 2*sizeof(int))
- 
-  static Bigint *
- multadd
diff --git a/nss/makefile.mk b/nss/makefile.mk
index cdc7aad019bf..2122a168904d 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -45,11 +45,9 @@ all:
     @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
 .ENDIF	
 
-TARFILE_NAME=nss_3_12_4
+TARFILE_NAME=nss_3_12_5
 TARFILE_ROOTDIR=mozilla
-PATCH_FILES=nss.patch dtoa.patch
-    # Note: dtoa.patch fixes https://bugzilla.mozilla.org/show_bug.cgi?id=516396. It can be removed as soon as
-    # we upgrade to a new NSS version which already contains this fix.
+PATCH_FILES=nss.patch
 
 .IF "$(debug)" != ""
 .ELSE
@@ -57,7 +55,6 @@ BUILD_OPT=1
 .EXPORT: BUILD_OPT
 .ENDIF
 
-
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(BUILD64)"=="1"
@@ -81,6 +78,10 @@ OUT2LIB=dist$/out$/lib$/*$(DLLPOST)
 
 BUILD_DIR=security$/nss
 BUILD_ACTION= $(GNUMAKE) nss_build_all
+#See #i105566# && moz#513024#
+.IF "$(OS)"=="LINUX"
+BUILD_ACTION+=FREEBL_NO_DEPEND=1
+.ENDIF
 
 .ENDIF			# "$(GUI)"=="UNX"
 
diff --git a/nss/nss.patch b/nss/nss.patch
index 32831ea29d52..9605e0d64b1e 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -1,5 +1,5 @@
---- misc/mozilla/nsprpub/config/rules.mk	2009-05-02 01:08:01.000000000 +0200
-+++ misc/build/mozilla/nsprpub/config/rules.mk	2009-10-20 17:03:24.733286198 +0200
+--- misc/mozilla/nsprpub/config/rules.mk	Sat May  2 01:08:01 2009
++++ misc/build/mozilla/nsprpub/config/rules.mk	Wed Nov 25 08:06:47 2009
 @@ -350,7 +350,12 @@
  ifdef NS_USE_GCC
  	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
@@ -14,9 +14,9 @@
  endif # GCC
  	@echo $(RES) finished
  endif
---- misc/mozilla/nsprpub/configure	2009-05-08 15:12:31.000000000 +0200
-+++ misc/build/mozilla/nsprpub/configure	2009-10-20 17:03:24.759501457 +0200
-@@ -3898,7 +3898,7 @@
+--- misc/mozilla/nsprpub/configure	Mon Nov 23 11:44:15 2009
++++ misc/build/mozilla/nsprpub/configure	Wed Nov 25 08:06:47 2009
+@@ -3899,7 +3899,7 @@
      PR_MD_CSRCS=linux.c
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
@@ -25,8 +25,8 @@
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                     # combo is not yet good at debugging inlined
---- misc/mozilla/security/coreconf/Darwin.mk	2009-07-30 23:36:02.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/Darwin.mk	2009-10-20 17:03:24.767804881 +0200
+--- misc/mozilla/security/coreconf/Darwin.mk	Thu Jul 30 23:36:02 2009
++++ misc/build/mozilla/security/coreconf/Darwin.mk	Wed Nov 25 08:06:47 2009
 @@ -39,8 +39,12 @@
  
  DEFAULT_COMPILER = cc
@@ -42,8 +42,8 @@
  RANLIB		= ranlib
  
  ifndef CPU_ARCH
---- misc/mozilla/security/coreconf/Linux.mk	2009-07-30 01:43:41.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/Linux.mk	2009-10-20 17:04:09.972612751 +0200
+--- misc/mozilla/security/coreconf/Linux.mk	Mon Nov 23 11:06:29 2009
++++ misc/build/mozilla/security/coreconf/Linux.mk	Wed Nov 25 08:11:35 2009
 @@ -46,8 +46,11 @@
  	IMPL_STRATEGY = _PTH
  endif
@@ -64,10 +64,10 @@
  ZDEFS_FLAG		= -Wl,-z,defs
 -DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
 +DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN'
- DSO_LDFLAGS		=
  LDFLAGS			+= $(ARCHFLAG)
  
-@@ -161,8 +164,13 @@
+ # INCLUDES += -I/usr/include -Y/usr/include/linux
+@@ -160,8 +163,13 @@
  #
  CPU_TAG = _$(CPU_ARCH)
  
@@ -81,8 +81,8 @@
  
  # The -rpath '$$ORIGIN' linker option instructs this library to search for its
  # dependencies in the same directory where it resides.
---- misc/mozilla/security/coreconf/SunOS5.mk	2009-06-11 02:55:32.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/SunOS5.mk	2009-10-20 17:03:24.786509911 +0200
+--- misc/mozilla/security/coreconf/SunOS5.mk	Thu Jun 11 02:55:32 2009
++++ misc/build/mozilla/security/coreconf/SunOS5.mk	Wed Nov 25 08:06:47 2009
 @@ -89,8 +89,12 @@
  	    # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
  	endif
@@ -98,8 +98,8 @@
  	ASFLAGS   += -Wa,-P
  	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
  	ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/arch.mk	2009-10-20 17:03:24.807236644 +0200
+--- misc/mozilla/security/coreconf/arch.mk	Fri Jun  5 04:14:49 2009
++++ misc/build/mozilla/security/coreconf/arch.mk	Wed Nov 25 08:06:47 2009
 @@ -324,7 +324,12 @@
  # IMPL_STRATEGY may be defined too.
  #
@@ -114,8 +114,8 @@
  
  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/rules.mk	2009-08-11 05:23:39.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/rules.mk	2009-10-20 17:03:24.815121351 +0200
+--- misc/mozilla/security/coreconf/rules.mk	Tue Aug 11 05:23:39 2009
++++ misc/build/mozilla/security/coreconf/rules.mk	Wed Nov 25 08:06:47 2009
 @@ -355,7 +355,12 @@
  ifdef NS_USE_GCC
  	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
@@ -130,9 +130,9 @@
  endif
  	@echo $(RES) finished
  endif
---- misc/mozilla/security/nss/cmd/platlibs.mk	2009-06-18 01:01:48.000000000 +0200
-+++ misc/build/mozilla/security/nss/cmd/platlibs.mk	2009-10-20 17:03:24.831220397 +0200
-@@ -41,27 +41,28 @@
+--- misc/mozilla/security/nss/cmd/platlibs.mk	Thu Jun 18 01:01:48 2009
++++ misc/build/mozilla/security/nss/cmd/platlibs.mk	Wed Nov 25 08:06:47 2009
+@@ -41,12 +41,13 @@
  ifeq ($(OS_ARCH), SunOS) 
  ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
@@ -149,6 +149,7 @@
  endif
  endif
  
+@@ -53,15 +54,15 @@
  ifeq ($(OS_ARCH), Linux)
  ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 70fe224cf6a9..b592790516da 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -51,6 +51,7 @@ SHL1OBJS=  \
 
 SHL1TARGET= tests
 SHL1STDLIBS= 	$(SALLIB)		 \
+    $(TESTSHL2LIB)\
                 $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index 6bb169e951a4..eebbb633f82b 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -1,6 +1,6 @@
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "cow_wrapper_clients.hxx"
 
diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
index 5e247a8b9abc..25f2209c94f5 100644
--- a/o3tl/qa/test-heap_ptr.cxx
+++ b/o3tl/qa/test-heap_ptr.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <o3tl/heap_ptr.hxx>
 
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index 626d9b6e3a90..fa956db96005 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <o3tl/range.hxx>
 #include <vector>
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
index b942f530141e..dd0b0cfcfd10 100755
--- a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
@@ -25,7 +25,6 @@
     <path id="scriptclasspath">
       <pathelement location="${opp}/classes/unoil.jar"/>
       <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/sandbox.jar"/>
       <pathelement location="${opp}/classes/jurt.jar"/>
       <pathelement location="${opp}/classes/juh.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
index e5d4a5664eed..572e7c4c459a 100755
--- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
@@ -25,7 +25,6 @@
     <path id="scriptclasspath">
       <pathelement location="${opp}/classes/unoil.jar"/>
       <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/sandbox.jar"/>
       <pathelement location="${opp}/classes/jurt.jar"/>
       <pathelement location="${opp}/classes/juh.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
diff --git a/odk/pack/copying/apiref-autodoc.since b/odk/pack/copying/apiref-autodoc.since
index 576df44c7708..c374a1d23740 100644
--- a/odk/pack/copying/apiref-autodoc.since
+++ b/odk/pack/copying/apiref-autodoc.since
@@ -1,3 +1,5 @@
+"3.3.0" "OpenOffice 3.3.0"
+"3.3" "OpenOffice 3.3"
 "3.2.0" "OpenOffice 3.2.0"
 "3.2" "OpenOffice 3.2"
 "3.1.0" "OpenOffice 3.1.0"
diff --git a/odk/prj/build.lst b/odk/prj/build.lst
index fbdaab8486bd..bbb8262780cf 100644
--- a/odk/prj/build.lst
+++ b/odk/prj/build.lst
@@ -1,4 +1,4 @@
-od	odk	::	cppuhelper cpputools io jurt javaunohelper sandbox remotebridges stoc udkapi ridljar offapi unoil autodoc unodevtools external cli_ure NULL
+od      odk     ::      cppuhelper jurt javaunohelper udkapi ridljar offapi autodoc unodevtools external NULL
 od	odk					usr1	-	all	od_mkout NULL
 od	odk\inc				nmake	-	all	od_inc NULL
 od	odk\source\com\sun\star\lib\loader	nmake	-	all	od_loader od_inc NULL
diff --git a/svtools/inc/iniadrtk.hxx b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
index 1e42abcc6261..51e8643e459a 100644
--- a/svtools/inc/iniadrtk.hxx
+++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iniadrtk.hxx,v $
- * $Revision: 1.3 $
+ * $RCSfile: XSessionManagerListener.idl,v $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,37 +27,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_frame_XSessionManagerListener2_idl__
+#define __com_sun_star_frame_XSessionManagerListener2_idl__
 
-#ifndef SVTOOLS_INIADRTK_HXX
-#define SVTOOLS_INIADRTK_HXX
+#ifndef __com_sun_star_lang_XEventListener_idl__
+#include <com/sun/star/lang/XEventListener.idl>
+#endif
 
-class String;
+#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
+#include <com/sun/star/frame/XSessionManagerListener.idl>
+#endif
+//=============================================================================
 
-//============================================================================
-enum AddressToken
-{
-    ADDRESS_COMPANY,
-    ADDRESS_STREET,
-    ADDRESS_COUNTRY,
-    ADDRESS_PLZ,
-    ADDRESS_CITY,
-    ADDRESS_TITLE,
-    ADDRESS_POSITION,
-    ADDRESS_TEL_PRIVATE,
-    ADDRESS_TEL_COMPANY,
-    ADDRESS_FAX,
-    ADDRESS_EMAIL,
-    ADDRESS_STATE,
-    ADDRESS_FATHERSNAME,
-    ADDRESS_APARTMENT
-};
+module com {  module sun {  module star {  module frame {
 
-//============================================================================
-class SfxIniManagerAddressEntry
-{
-public:
-    static String get(const String & rAddress, AddressToken eToken);
-};
+    interface XSessionManagerListener2 : XSessionManagerListener
+    {
+        /** doQuit gets called when the session manager has decided
+        the application should quit. Under these circumstances bringing up
+        further UI will usually be impossible and must be avoided.
+        */
+        [oneway] void doQuit();
+    };
 
-#endif // SVTOOLS_INIADRTK_HXX
+}; }; }; };
 
+
+#endif
diff --git a/offapi/com/sun/star/frame/makefile.mk b/offapi/com/sun/star/frame/makefile.mk
index 789a0f6e499e..0d0650a701fb 100644
--- a/offapi/com/sun/star/frame/makefile.mk
+++ b/offapi/com/sun/star/frame/makefile.mk
@@ -142,6 +142,7 @@ IDLFILES=\
     XRecordableDispatch.idl\
     XSessionManagerClient.idl\
     XSessionManagerListener.idl\
+    XSessionManagerListener2.idl\
     XStatusListener.idl\
     XStatusbarController.idl\
     XStorable.idl\
diff --git a/offapi/com/sun/star/util/Duration.idl b/offapi/com/sun/star/util/Duration.idl
new file mode 100644
index 000000000000..39f3ca8114ce
--- /dev/null
+++ b/offapi/com/sun/star/util/Duration.idl
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DateTime.idl,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_util_Duration_idl__
+#define __com_sun_star_util_Duration_idl__
+
+
+//========================================================================
+
+module com {  module sun {  module star {  module util {
+
+//========================================================================
+
+/** represents a duration.
+
+    <p>
+    A duration is the difference of 2 <type>DateTime</type>s.
+    </p>
+
+    <p>
+    Note that there are no constraints on the ranges of the members,
+    except that every member must be non-negative:
+    for example, a Duration of 400 Days is valid.
+    </p>
+
+    @since OOo 3.3
+ */
+struct Duration
+{
+    //--------------------------------------------------------------------
+    /** explicit sign bit.
+     */
+    boolean Negative;
+
+    //--------------------------------------------------------------------
+    /** contains the years.
+     */
+    unsigned short Years;
+
+    //--------------------------------------------------------------------
+    /** contains the months.
+     */
+    unsigned short Months;
+
+    //--------------------------------------------------------------------
+    /** contains the days.
+     */
+    unsigned short Days;
+
+    //--------------------------------------------------------------------
+    /** contains the hours.
+     */
+    unsigned short Hours;
+
+    //--------------------------------------------------------------------
+    /** contains the minutes.
+     */
+    unsigned short Minutes;
+
+    //--------------------------------------------------------------------
+    /** contains the seconds.
+     */
+    unsigned short Seconds;
+
+    //--------------------------------------------------------------------
+    /** contains the hundredth seconds.
+     */
+    unsigned short HundredthSeconds;
+
+};
+
+//========================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/makefile.mk b/offapi/com/sun/star/util/makefile.mk
index 44fbdf9065b2..e5f9aab136c3 100644
--- a/offapi/com/sun/star/util/makefile.mk
+++ b/offapi/com/sun/star/util/makefile.mk
@@ -53,6 +53,7 @@ IDLFILES=\
     DateTime.idl\
     DateTimeRange.idl\
     DiskFullException.idl\
+    Duration.idl\
     ElementChange.idl \
     Endianness.idl \
     FileIOException.idl\
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fa69145371f4..0dced3ed2f88 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2713,7 +2713,7 @@
             </node>
             <node oor:name=".uno:ChineseConversion" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Chinese translation...</value>
+                    <value xml:lang="en-US">Chinese Conversion...</value>
                 </prop>
             </node>
             <node oor:name=".uno:InsertListbox" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
index 41ceb993f87e..b510709bb575 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
@@ -81,6 +81,19 @@
                 <desc>TODO</desc>
             </info>
         </set>
+        <group oor:name="SessionShutdown">
+            <info>
+				<author>MAV</author>
+                <desc>The session shutdown related information.</desc>
+            </info>
+            <prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean">
+                <info>
+                    <author>MAV</author>
+                    <desc>Determines if the office is allowed to show request to store modified documents on session shutdown.</desc>
+                </info>
+                <value>false</value>
+            </prop>
+        </group>
         <group oor:name="RecoveryInfo">
             <info>
                 <desc>TODO</desc>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f681477076bf..011a96d7a0ca 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -60,12 +60,12 @@
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <vcl/graph.hxx>
 #include <goodies/grfmgr.hxx>
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/escherex.hxx>
 #include <svx/svxenum.hxx>
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 68c20cca6b9c..00db2500fd06 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -62,13 +62,13 @@
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
 #include <goodies/grfmgr.hxx>
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/escherex.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svxenum.hxx>
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index 5240960f7a88..67c595d2b9f0 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -1655,13 +1655,16 @@ void FormulaProcessorBase::extractCellRangeList( ApiCellRangeList& orRanges,
         sal_Int32 nOpCode = aIt->OpCode;
         switch( eState )
         {
+            // #i107275# accept OPCODE_SEP and OPCODE_LIST as separator token
             case STATE_REF:
-                     if( nOpCode == OPCODE_LIST )  eState = STATE_SEP;
+                     if( nOpCode == OPCODE_SEP )   eState = STATE_SEP;
+                else if( nOpCode == OPCODE_LIST )  eState = STATE_SEP;
                 else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel );
                 else                               eState = STATE_ERROR;
             break;
             case STATE_SEP:
                      if( nOpCode == OPCODE_PUSH )  eState = lclProcessRef( orRanges, aIt->Data, bAllowRelative, nFilterBySheet );
+                else if( nOpCode == OPCODE_SEP )   eState = STATE_SEP;
                 else if( nOpCode == OPCODE_LIST )  eState = STATE_SEP;
                 else if( nOpCode == OPCODE_OPEN )  eState = lclProcessOpen( nParenLevel );
                 else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel );
@@ -1669,13 +1672,15 @@ void FormulaProcessorBase::extractCellRangeList( ApiCellRangeList& orRanges,
             break;
             case STATE_OPEN:
                      if( nOpCode == OPCODE_PUSH )  eState = lclProcessRef( orRanges, aIt->Data, bAllowRelative, nFilterBySheet );
+                else if( nOpCode == OPCODE_SEP )   eState = STATE_SEP;
                 else if( nOpCode == OPCODE_LIST )  eState = STATE_SEP;
                 else if( nOpCode == OPCODE_OPEN )  eState = lclProcessOpen( nParenLevel );
                 else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel );
                 else                               eState = STATE_ERROR;
             break;
             case STATE_CLOSE:
-                     if( nOpCode == OPCODE_LIST )  eState = STATE_SEP;
+                     if( nOpCode == OPCODE_SEP )   eState = STATE_SEP;
+                else if( nOpCode == OPCODE_LIST )  eState = STATE_SEP;
                 else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel );
                 else                               eState = STATE_ERROR;
             break;
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 6fb48b7ac352..d8446f94f708 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -134,7 +134,11 @@ OUT2BIN += out/libeay32.dll
             # The env. vars CC and PERL are used by nmake, and nmake insists on '\'s
             # If WRAPCMD is set it is prepended before the compiler, don't touch that.
             .IF "$(WRAPCMD)"==""
-                CC!:=$(subst,/,\ $(normpath,1 $(CC)))
+                # relace / with \ first word only
+                cc_first_repl = $(subst,/,\ $(normpath,1 $(CC:1)))
+                cc_first = $(normpath,1 $(CC:1))
+                CC!:=$(subst,$(cc_first),$(cc_first_repl) $(normpath,1 $(CC)))
+#				CC!:=$(subst,/,\ $(normpath,1 $(CC)))
                 .EXPORT : CC
             .ENDIF
             PERL_bak:=$(PERL)
diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk
index a0e49f2096e0..703873f9ca71 100644
--- a/package/source/xstor/makefile.mk
+++ b/package/source/xstor/makefile.mk
@@ -52,6 +52,7 @@ SLOFILES =  \
         $(SLO)$/xstorage.obj\
         $(SLO)$/xfactory.obj\
         $(SLO)$/disposelistener.obj\
+        $(SLO)$/selfterminatefilestream.obj\
         $(SLO)$/switchpersistencestream.obj\
         $(SLO)$/register.obj
 
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 8d540a663098..4f3a912b8c0b 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -48,6 +48,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/ofopxmlhelper.hxx>
 
+#include "selfterminatefilestream.hxx"
 #include "owriteablestream.hxx"
 #include "oseekinstream.hxx"
 #include "mutexholder.hxx"
@@ -850,6 +851,9 @@ void OWriteStream_Impl::Commit()
 
     if ( m_xCacheStream.is() )
     {
+        if ( m_pAntiImpl )
+            m_pAntiImpl->DeInit();
+
         uno::Reference< io::XInputStream > xInStream( m_xCacheStream->getInputStream(), uno::UNO_SET_THROW );
 
         xNewPackageStream = uno::Reference< packages::XDataSinkEncrSupport >(
@@ -861,23 +865,16 @@ void OWriteStream_Impl::Commit()
         m_xCacheStream = uno::Reference< io::XStream >();
         m_xCacheSeek = uno::Reference< io::XSeekable >();
 
-        if ( m_pAntiImpl )
-            m_pAntiImpl->DeInit();
     }
     else if ( m_aTempURL.getLength() )
     {
-        uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
-                        GetServiceFactory()->createInstance (
-                                ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
-                        uno::UNO_QUERY );
-
-        if ( !xTempAccess.is() )
-            throw uno::RuntimeException(); // TODO:
+        if ( m_pAntiImpl )
+            m_pAntiImpl->DeInit();
 
         uno::Reference< io::XInputStream > xInStream;
         try
         {
-            xInStream = xTempAccess->openFileRead( m_aTempURL );
+            xInStream.set( static_cast< io::XInputStream* >( new OSelfTerminateFileStream( GetServiceFactory(), m_aTempURL ) ), uno::UNO_QUERY );
         }
         catch( uno::Exception& )
         {
@@ -893,9 +890,6 @@ void OWriteStream_Impl::Commit()
         // TODO/NEW: Let the temporary file be removed after commit
         xNewPackageStream->setDataStream( xInStream );
         m_aTempURL = ::rtl::OUString();
-
-        if ( m_pAntiImpl )
-            m_pAntiImpl->DeInit();
     }
     else // if ( m_bHasInsertedStreamOptimization )
     {
@@ -2627,6 +2621,8 @@ void SAL_CALL OWriteStream::dispose()
             m_xInStream = uno::Reference< io::XInputStream >();
         }
 
+        m_xSeekable = uno::Reference< io::XSeekable >();
+
         m_pImpl->m_pAntiImpl = NULL;
 
         if ( !m_bInitOnDemand )
diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx
new file mode 100644
index 000000000000..ebb707e59de6
--- /dev/null
+++ b/package/source/xstor/selfterminatefilestream.cxx
@@ -0,0 +1,156 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: ocompinstream.cxx,v $
+ * $Revision: 1.12 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_package.hxx"
+
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+
+#include "selfterminatefilestream.hxx"
+#include <comphelper/processfactory.hxx>
+
+using namespace ::com::sun::star;
+
+//-----------------------------------------------
+OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< lang::XMultiServiceFactory > xFactory, const ::rtl::OUString& aURL )
+: m_aURL( aURL )
+{
+    uno::Reference< lang::XMultiServiceFactory > xOwnFactory = xFactory;
+    if ( !xOwnFactory.is() )
+        xOwnFactory.set( ::comphelper::getProcessServiceFactory(), uno::UNO_SET_THROW );
+
+    // IMPORTANT: The implementation is based on idea that m_xFileAccess, m_xInputStream and m_xSeekable are always set
+    // otherwise an exception is thrown in constructor
+
+    m_xFileAccess.set( xOwnFactory->createInstance (
+                            ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                       uno::UNO_QUERY_THROW );
+
+    m_xInputStream.set( m_xFileAccess->openFileRead( aURL ), uno::UNO_SET_THROW );
+    m_xSeekable.set( m_xInputStream, uno::UNO_QUERY_THROW );
+}
+
+//-----------------------------------------------
+OSelfTerminateFileStream::~OSelfTerminateFileStream()
+{
+    CloseStreamDeleteFile();
+}
+
+//-----------------------------------------------
+void OSelfTerminateFileStream::CloseStreamDeleteFile()
+{
+    try
+    {
+        m_xInputStream->closeInput();
+    }
+    catch( uno::Exception& )
+    {}
+
+    try
+    {
+        m_xFileAccess->kill( m_aURL );
+    }
+    catch( uno::Exception& )
+    {}
+}
+
+//-----------------------------------------------
+sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+        throw ( io::NotConnectedException,
+                io::BufferSizeExceededException,
+                io::IOException,
+                uno::RuntimeException )
+{
+    return m_xInputStream->readBytes( aData, nBytesToRead );
+}
+
+//-----------------------------------------------
+sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+        throw ( io::NotConnectedException,
+                io::BufferSizeExceededException,
+                io::IOException,
+                uno::RuntimeException )
+{
+    return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead );
+}
+
+//-----------------------------------------------
+void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip )
+        throw ( io::NotConnectedException,
+                io::BufferSizeExceededException,
+                io::IOException,
+                uno::RuntimeException )
+{
+    return m_xInputStream->skipBytes( nBytesToSkip );
+}
+
+//-----------------------------------------------
+sal_Int32 SAL_CALL OSelfTerminateFileStream::available(  )
+        throw ( io::NotConnectedException,
+                io::IOException,
+                uno::RuntimeException )
+{
+    return m_xInputStream->available();
+}
+
+//-----------------------------------------------
+void SAL_CALL OSelfTerminateFileStream::closeInput(  )
+        throw ( io::NotConnectedException,
+                io::IOException,
+                uno::RuntimeException )
+{
+    CloseStreamDeleteFile();
+}
+
+//-----------------------------------------------
+void SAL_CALL OSelfTerminateFileStream::seek( sal_Int64 location )
+        throw ( lang::IllegalArgumentException,
+                io::IOException,
+                uno::RuntimeException )
+{
+    m_xSeekable->seek( location );
+}
+
+//-----------------------------------------------
+sal_Int64 SAL_CALL OSelfTerminateFileStream::getPosition()
+        throw ( io::IOException,
+                uno::RuntimeException)
+{
+    return m_xSeekable->getPosition();
+}
+
+//-----------------------------------------------
+sal_Int64 SAL_CALL OSelfTerminateFileStream::getLength()
+        throw ( io::IOException,
+                uno::RuntimeException )
+{
+    return m_xSeekable->getLength();
+}
+
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
new file mode 100644
index 000000000000..6f95ba17ec42
--- /dev/null
+++ b/package/source/xstor/selfterminatefilestream.hxx
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: ocompinstream.hxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SELFTERMINATEFILESTREAM_HXX_
+#define _SELFTERMINATEFILESTREAM_HXX_
+
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <cppuhelper/implbase2.hxx>
+
+struct OWriteStream_Impl;
+
+class OSelfTerminateFileStream : public cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream,
+                                                               ::com::sun::star::io::XSeekable >
+{
+protected:
+    ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > m_xFileAccess;
+
+    ::rtl::OUString m_aURL;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable;
+
+public:
+    OSelfTerminateFileStream( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory, const ::rtl::OUString& aURL );
+
+    virtual ~OSelfTerminateFileStream();
+
+    void CloseStreamDeleteFile();
+
+    // XInputStream
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+        throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+        throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+        throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL available()
+        throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL closeInput()
+        throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+
+    //XSeekable
+    virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif
+
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 759f7d4d7d03..a692586681b5 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -135,25 +135,6 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL )
     return ( aSystemPath.getLength() != 0 );
 }
 
-class PostinitializationGuard
-{
-    uno::Reference< io::XInputStream > m_xTempStream;
-
-    ZipPackage&                        m_rZipPackage;
-
-public:
-    PostinitializationGuard( const uno::Reference< io::XInputStream >& xTempStream,
-                             ZipPackage& rZipPackage )
-    : m_xTempStream( xTempStream )
-    , m_rZipPackage( rZipPackage )
-    {}
-
-    virtual ~PostinitializationGuard()
-    {
-        m_rZipPackage.ConnectTo( m_xTempStream );
-    }
-};
-
 }
 
 //===========================================================================
@@ -1380,8 +1361,8 @@ void SAL_CALL ZipPackage::commitChanges()
                     static_cast < OWeakObject * > ( this ), makeAny ( r ) );
         }
 
-        // switch to the new temporary stream only after the transfer
-        PostinitializationGuard aPostInitGuard( xTempInStream, *this );
+        // connect to the temporary stream
+        ConnectTo( xTempInStream );
 
         if ( m_eMode == e_IMode_XStream )
         {
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index c58900d154b5..d1838b1f41d6 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -41,12 +41,13 @@ RSCCUSTOMIMG*=$(PRJ)
 IMAGES := $(COMMONBIN)$/images.zip
 SORTED_LIST=$(RES)$/img$/sorted.lst
 # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
-CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic
+CUSTOM_IMAGE_SETS=hicontrast industrial crystal oxygen tango classic
 CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
 CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
 CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
 
 CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
+OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
 CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
 
 ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
@@ -89,6 +90,14 @@ $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
 .ENDIF
     @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
 
+# unpack the Oxygen icon set
+$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
+    cd $(MISC) && gzip -d -c $(OXYGEN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+.IF "$(GUI)"=="UNX"
+    chmod -R g+w $(MISC)$/oxygen
+.ENDIF
+    @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
+
 # unpack the classic icon set
 $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
     cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
@@ -102,5 +111,7 @@ images_hicontrast : $(MISC)$/hicontrast.flag $(RES)$/img$/commandimagelist.ilst
 
 images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
 
+images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst
+
 images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst
 
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index c1ea3326b60c..8fd2fe49ba6e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+po      postprocess     ::      accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/redland/prj/build.lst b/redland/prj/build.lst
index 1264756d796b..f6d0562d4bb4 100644
--- a/redland/prj/build.lst
+++ b/redland/prj/build.lst
@@ -1,4 +1,4 @@
-rld	redland	: sal soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
+rld     redland : stlport soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
 rld	redland				usr1	-	all	rld_mkout	NULL
 rld	redland\raptor		nmake	-	all	rld_raptor	NULL
 rld	redland\rasqal		nmake	-	all	rld_rasqal	rld_raptor NULL
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
index aa0f5ab29117..a112796e693f 100644
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
 +++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
-@@ -1,1 +1,122 @@
+@@ -1,1 +1,123 @@
 -dummy
 +#*************************************************************************
 +#
@@ -38,8 +38,10 @@
 +PRJNAME=redland
 +TARGET=raptor
 +LIBTARGET=NO
++UWINAPIDLL=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++UWINAPILIB=
 +
 +
 +# --- Settings -----------------------------------------------------
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
index adfade9670bb..f79e38f33c2d 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
 +++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
-@@ -1,1 +1,97 @@
+@@ -1,1 +1,98 @@
 -dummy
 +#*************************************************************************
 +#
@@ -38,6 +38,7 @@
 +PRJNAME=redland
 +TARGET=rasqal
 +LIBTARGET=NO
++UWINAPILIB=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 +
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
index d88f9548a341..39931b7b1b4b 100644
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
 +++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,114 @@
+@@ -1,1 +1,115 @@
 -dummy
 +#*************************************************************************
 +#
@@ -38,6 +38,7 @@
 +PRJNAME=redland
 +TARGET=librdf
 +LIBTARGET=NO
++UWINAPILIB=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 +
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 281c8e27cbf0..b41fbbb5ada9 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -365,7 +365,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal
         return REG_SET_VALUE_FAILED;
     }
 
-    rValue.flush();
+    //rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
@@ -424,7 +424,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL
         return REG_SET_VALUE_FAILED;
     }
 
-    rValue.flush();
+    //rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
@@ -492,7 +492,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu
         return REG_SET_VALUE_FAILED;
     }
 
-    rValue.flush();
+    //rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
@@ -560,7 +560,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p
         return REG_SET_VALUE_FAILED;
     }
 
-    rValue.flush();
+    //rValue.flush();
     rtl_freeMemory(pBuffer);
     return REG_NO_ERROR;
 }
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 8a4dd8b88ee9..b9edca734232 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -848,7 +848,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
     {
         return REG_DELETE_KEY_FAILED;
     }
-    sFile.flush();
+    //sFile.flush();
 
     // set flag deleted !!!
     ((ORegKey*)hOldKey)->setDeleted(sal_True);
@@ -894,7 +894,7 @@ RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey)
             {
                 return REG_DELETE_VALUE_FAILED;
             }
-        ((OStoreFile&)pKey->getStoreFile()).flush();
+        //((OStoreFile&)pKey->getStoreFile()).flush();
         }
 
         _err = rStoreDir.next(iter);
@@ -1065,7 +1065,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
     {
         return REG_VALUE_NOT_EXISTS;
     }
-    pSourceKey->getStoreFile().flush();
+    //pSourceKey->getStoreFile().flush();
 
     pBuffer = (sal_uInt8*)rtl_allocateMemory(VALUE_HEADERSIZE);
 
@@ -1137,7 +1137,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
         rtl_freeMemory(pBuffer);
         return REG_INVALID_VALUE;
     }
-    rTargetFile.flush();
+    //rTargetFile.flush();
 
     if (rwBytes != nSize)
     {
@@ -1482,6 +1482,20 @@ RegError ORegistry::dumpRegistry(RegKeyHandle hKey) const
     return REG_NO_ERROR;
 }
 
+RegError ORegistry::flush()
+{
+    REG_GUARD(m_mutex);
+
+    if (m_file.isValid())
+    {
+        m_file.flush();
+        return REG_NO_ERROR;
+    } else
+    {
+        return REG_REGISTRY_NOT_EXISTS;
+    }
+}
+
 
 //*********************************************************************
 //  dumpValue()
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index c32dcf3527df..32baf9cc6ed5 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -113,6 +113,8 @@ public:
 
     RegError    dumpRegistry(RegKeyHandle hKey) const;
 
+    RegError    flush();
+
     ~ORegistry();
 
     sal_Bool            isReadOnly() const
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index cb145b3910c2..139646f7cdc7 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -430,6 +430,8 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
     */
     _ret = pKey->closeKey(pNewKey);
 
+    if (_ret == REG_NO_ERROR )
+        _ret = pReg->flush();
     return _ret;
 }
 
diff --git a/reportbuilder/template/makefile.mk b/reportbuilder/template/makefile.mk
index a9ee2cf544d9..2db1c2b5a38f 100644
--- a/reportbuilder/template/makefile.mk
+++ b/reportbuilder/template/makefile.mk
@@ -37,7 +37,7 @@ TARGET=rpt_templates
 no_common_build_zip=true
 
 EXTENSION_VERSION_BASE=1.0.0
-.IF "$(PRODUCT)" != ""
+.IF "$(DBG_LEVEL)" == "0"
     EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
 .ELSE
     EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).$(BUILD)
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index c9cc382ca253..9b5c2795dfaf 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -34,7 +34,7 @@
 // include     -----------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START                RID_RPT_START
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 0408cb2379d7..00828f22b4d5 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -50,7 +50,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/sequence.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/svdouno.hxx>
 #include "RptModel.hxx"
 
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index af02366b3ff6..a569422bb2a6 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <memory>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index b60f66823623..7bfa73b78ecd 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -31,7 +31,7 @@
 #define RTPUI_REPORTDESIGN_HELPID_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>    // HID_RPT_DBACCESS_START
+#include <svl/solar.hrc>    // HID_RPT_DBACCESS_START
 #endif
 
 #define UID_RPT_RPT_APP_VIEW        (HID_RPT_START +  0)
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 1eae3724ce23..6255bcdf8433 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -44,8 +44,8 @@
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/unolingu.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/lingucfg.hxx>
 #include <i18npool/mslangid.hxx>
 
 // =============================================================================
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index a79dea71193c..754f97bf0b4a 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -102,7 +102,7 @@
 #include <boost/mem_fn.hpp>
 #include <boost/bind.hpp>
 #include <boost/utility.hpp>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include "RptModel.hxx"
 #include "UndoEnv.hxx"
 #include "FormattedField.hxx"
@@ -110,8 +110,8 @@
 #include "ImageControl.hxx"
 #include "Shape.hxx"
 #include "ReportHelperImpl.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <osl/thread.hxx>
 
 #include <svx/paperinf.hxx>
@@ -1509,23 +1509,6 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
     } // if ( aSaveOpt.IsSaveRelFSys() )
     const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) );
     xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName));
-    ::rtl::OUString aVersion;
-    SvtSaveOptions::ODFDefaultVersion nDefVersion = aSaveOpt.GetODFDefaultVersion();
-
-    // older versions can not have this property set, it exists only starting from ODF1.2
-    if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
-        aVersion = ODFVER_012_TEXT;
-
-    if ( aVersion.getLength() )
-    {
-        try
-        {
-            xInfoSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Version" )), uno::makeAny( aVersion ) );
-        }
-        catch( uno::Exception& )
-        {
-        }
-    }
 
 
     sal_Int32 nArgsLen = aDelegatorArguments.getLength();
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 03c5307e8f25..3c1e2540636b 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -51,7 +51,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc
index bf70cb4e8afd..ed3b25c99de0 100644
--- a/reportdesign/source/core/inc/core_resource.hrc
+++ b/reportdesign/source/core/inc/core_resource.hrc
@@ -32,7 +32,7 @@
 #define REPORTDESIGN_CORE_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index 4a2faace77a8..ddb97fad8dcd 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -42,7 +42,7 @@
 #include <rtl/uri.hxx>
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include "ModuleHelper.hxx"
 //.........................................................................
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index c1096cd47c0a..68c16dc7e804 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -37,7 +37,7 @@
 #include <rtl/uri.hxx>
 #include <tools/debug.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define EXPAND_PROTOCOL     "vnd.sun.star.expand:"
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 7da6e8697de5..aed7e9547784 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -33,7 +33,7 @@
 #include "RptPage.hxx"
 #include <dbaccess/singledoccontroller.hxx>
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "UndoActions.hxx"
 #include "UndoEnv.hxx"
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 7c2bb2bd98e5..ee98e78d69c2 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -51,7 +51,7 @@
 /** === end UNO includes === **/
 
 #include <connectivity/dbtools.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/stl_types.hxx>
 #include <vcl/svapp.hxx>
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index ee3bf30f8388..f6e4631a787b 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -50,7 +50,7 @@
 /** === end UNO includes === **/
 
 #include <connectivity/dbtools.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/stl_types.hxx>
 #include <vcl/svapp.hxx>
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 7ce45cb06f7a..c4cfbf1a9d41 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -39,7 +39,7 @@
 /** === end UNO includes === **/
 
 #include <dbaccess/singledoccontroller.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <connectivity/statementcomposer.hxx>
 #include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 4af8752d896e..0676725e3306 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -69,7 +69,7 @@
 #include <osl/file.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <com/sun/star/task/XJobExecutor.hpp>
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 73df0a049241..0ec419df836b 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -41,7 +41,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <connectivity/dbtools.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index b1341a35c365..aaefd993ef01 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -40,7 +40,7 @@
 #include "xmlControlProperty.hxx"
 #include "xmlHelper.hxx"
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <comphelper/componentcontext.hxx>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index d23f5946e85c..db7326fccd41 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -56,7 +56,7 @@
 #include <svx/tbxcolorupdate.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/imgdef.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bmpacc.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 1075e12500c4..126edd9b0f76 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -54,7 +54,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include <connectivity/dbconversion.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #ifndef RPTUI_TOOLS_HXX
 #include "UITools.hxx"
 #endif
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 7328b1c628eb..014720bd4dea 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -38,7 +38,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/charclass.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <formula/formdata.hxx>
 #include <formula/funcutl.hxx>
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 7932c5c04371..8ea1675a3dd7 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -55,7 +55,7 @@
 #include "cppuhelper/basemutex.hxx"
 #include "comphelper/SelectionMultiplex.hxx"
 #include <svtools/svtreebx.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include "ReportVisitor.hxx"
 #include "ModuleHelper.hxx"
 #include <rtl/ref.hxx>
@@ -73,7 +73,7 @@
 namespace rptui
 {
 using namespace ::com::sun::star;
-using namespace svt;
+using namespace utl;
 using namespace ::comphelper;
 
 USHORT lcl_getImageId(const uno::Reference< report::XReportComponent>& _xElement)
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index a2b87bff80b9..292d9ff3986f 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -36,7 +36,7 @@
 #ifndef _SBASLTID_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_SVXIMG_COLLAPSEDNODE                    (RID_FORMS_START + 2)
 #define RID_SVXIMG_EXPANDEDNODE                     (RID_FORMS_START + 3)
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 45ee50a1ee4f..7661413c4fab 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -38,9 +38,9 @@
 #include "dlgpage.hxx"
 #include "ModuleHelper.hxx"
 #include "RptResId.hrc"
-#include <svtools/intitem.hxx> //add CHINA001
-#include <svtools/cjkoptions.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/intitem.hxx> //add CHINA001
+#include <svl/cjkoptions.hxx>
+#include <svl/aeitem.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inc/DataProvider.hxx b/reportdesign/source/ui/inc/DataProvider.hxx
index c1a10fc86bf6..2a265b5b80bf 100644
--- a/reportdesign/source/ui/inc/DataProvider.hxx
+++ b/reportdesign/source/ui/inc/DataProvider.hxx
@@ -31,7 +31,7 @@
 #ifndef RPT_DATAPROVIDER_HXX
 #define RPT_DATAPROVIDER_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
@@ -49,7 +49,7 @@
 // #endif
 #include <cppuhelper/implbase3.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <map>
 #include <list>
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 683e4cb78a3d..1378056fe0e9 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -41,8 +41,8 @@
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <vcl/timer.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/hint.hxx>
+#include <svl/brdcst.hxx>
 #include <comphelper/stl_types.hxx>
 #include "ReportDefines.hxx"
 #include <svtools/colorcfg.hxx>
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index f685723b418c..03ccda9d2209 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -52,7 +52,7 @@
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <cppuhelper/implbase5.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/svdedtv.hxx>
 #include <svx/zoomitem.hxx>
 #include "ModuleHelper.hxx"
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 87468d61e303..2c6d0b457712 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -39,7 +39,7 @@
 #include <dllapi.h>
 #include <vector>
 
-// #include <svtools/lstner.hxx>
+// #include <svl/lstner.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/link.hxx>
 
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index d4e0a720807a..806bd857fae3 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <svx/svdedtv.hxx>
 #include <SectionView.hxx>
-
+#include <unotools/options.hxx>
 #include <list>
 #include <vector>
 #include <boost/shared_ptr.hpp>
@@ -117,7 +117,7 @@ namespace rptui
     };
 
     class OViewsWindow :    public Window
-                        ,   public SfxListener
+                        ,   public utl::ConfigurationListener
                         ,   public IMarkedSection
     {
         typedef ::std::multimap<Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess>      TRectangleMap;
@@ -161,10 +161,9 @@ namespace rptui
         // windows overload
         virtual void MouseButtonDown( const MouseEvent& rMEvt );
         virtual void MouseButtonUp( const MouseEvent& rMEvt );
-        using Window::Notify;
+
         virtual void Paint( const Rectangle& rRect );
-        // SfxListener
-        virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint);
+        virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
     public:
         OViewsWindow(
             OReportWindow* _pReportWindow);
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 7db71d29cbd3..3894e6aabff6 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -37,8 +37,8 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/inspection/XObjectInspector.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/dockwin.hxx>
 #include <svx/svdmark.hxx>
 #include "ModuleHelper.hxx"
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 3a9ebf033e03..51cf2ccd2ccd 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -35,7 +35,7 @@
 #include <comphelper/types.hxx>
 #include "uistrings.hrc"
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/inspection/PropertyLineElement.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index c2d9f067ff75..77a78965a0c0 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -42,7 +42,7 @@
 #include <unotools/configmgr.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/StringListResource.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -84,8 +84,8 @@
 #include <boost/bind.hpp>
 #include <tools/string.hxx>
 #include "metadata.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 
 #define ITEMID_COLOR_TABLE      SID_COLOR_TABLE
 #define ITEMID_DASH_LIST        SID_DASH_LIST
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index f5da42aecbab..b8e5e94b61fb 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <comphelper/types.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XSection.hpp>
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 04a9b9892bb7..c9e71383ca18 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 #include "precompiled_reportdesign.hxx"
 #include "ColorListener.hxx"
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC
 #include "uistrings.hrc"
 #endif
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 1706139d4004..b488eded2a0e 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -85,10 +85,10 @@
 #include <svx/svxdlg.hxx>
 #include <svx/unoprov.hxx>
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/namedvaluecollection.hxx>
@@ -776,7 +776,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
 
         {   // want the dialog to be destroyed before our set
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-            ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get(),RID_SVXDLG_AREA ));
+            ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() ));
             // #i74099# by default, the dialog deletes the current color table if a different one is loaded
             // (see SwDrawShell::ExecDrawDlg)
             const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index d66eca097fc1..55a1bb3776e9 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/menuoptions.hxx>
 #include <vos/mutex.hxx>
 #include <svx/svxids.hrc>
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 40264c642d52..ef1730f13843 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -33,8 +33,8 @@
 #include <tools/debug.hxx>
 #include "ReportController.hxx"
 #include <comphelper/types.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/viewoptions.hxx>
 #include "RptDef.hxx"
 #include "UITools.hxx"
 #include "RptObject.hxx"
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 1df7981e21b4..9d5c6352ef0b 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -138,12 +138,12 @@
 #include "dlgpage.hxx"
 #include "RptResId.hrc"
 
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/aeitem.hxx> //CHINA001
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/aeitem.hxx> //CHINA001
 #include <svtools/cliplistener.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/viewoptions.hxx>
 
 #include <vos/mutex.hxx>
 #include "PropertyForward.hxx"
@@ -4283,7 +4283,7 @@ void OReportController::openZoomDialog()
             aZoomItem.SetValueSet(SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_WHOLEPAGE|SVX_ZOOM_ENABLE_PAGEWIDTH);
             pDescriptor->Put(aZoomItem);
 
-            ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get(), RID_SVXDLG_ZOOM) );
+            ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) );
             pDlg->SetLimits( 20, 400 );
             bool bCancel = ( RET_CANCEL == pDlg->Execute() );
 
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 45b48f123658..fa0d5f4c4526 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -33,7 +33,7 @@
 
 #include <ReportControllerObserver.hxx>
 #include <ReportController.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/report/XFormattedField.hpp>
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index ea04c7c2d300..8cb729540990 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -67,7 +67,7 @@
 #include <vcl/lineinfo.hxx>
 #include "ColorChanger.hxx"
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/extcolorcfg.hxx>
 #include <unotools/confignode.hxx>
 #include <framework/imageproducer.hxx>
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 98dd0d2390a7..281a5650b681 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -37,8 +37,8 @@
 
 #include <tools/debug.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "RptDef.hxx"
 #include "dlgedfunc.hxx"
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 5a22e9cff5ed..3ba4f43ac905 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -41,8 +41,8 @@
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/smplhint.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/smplhint.hxx>
 
 #define CORNER_SPACE     5
 
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index aebf42bfaa00..5cc1ff689490 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -190,13 +190,13 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
     SetPaintTransparent(TRUE);
     SetUniqueId(UID_RPT_VIEWSWINDOW);
     SetMapMode( MapMode( MAP_100TH_MM ) );
-    StartListening(m_aColorConfig);
+    m_aColorConfig.AddListener(this);
     ImplInitSettings();
 }
 // -----------------------------------------------------------------------------
 OViewsWindow::~OViewsWindow()
 {
-    EndListening(m_aColorConfig);
+    m_aColorConfig.RemoveListener(this);
     m_aSections.clear();
 
     DBG_DTOR( rpt_OViewsWindow,NULL);
@@ -588,15 +588,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
 }
 */
 // -----------------------------------------------------------------------
-void OViewsWindow::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint)
+void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32)
 {
-    if (rHint.ISA(SfxSimpleHint)
-        && (static_cast< SfxSimpleHint const & >(rHint).GetId()
-            == SFX_HINT_COLORS_CHANGED))
-    {
         ImplInitSettings();
         Invalidate();
-    }
 }
 // -----------------------------------------------------------------------------
 void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index eb9f8937b939..fd8e49135eb0 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -138,28 +138,41 @@ public:
     sal_uInt32      Size(){ return( nLen ); };
     void        Put( sal_uInt64 lVal )
                 {
+                    union
+                    {
+                        sal_uInt64 lVal64;
+                        sal_uInt32 aVal32[2];
+                    };
+                    lVal64 = lVal;
                     if( bSwap )
                     {
-                        Put( *(((sal_uInt32*)&lVal)+1) );
-                        Put( *(sal_uInt32*)&lVal );
+                        Put( aVal32[1] );
+                        Put( aVal32[0] );
                     }
                     else
                     {
-                        Put( *(sal_uInt32*)&lVal );
-                        Put( *(((sal_uInt32*)&lVal)+1) );
+                        Put( aVal32[0] );
+                        Put( aVal32[1] );
                     }
                 }
     void        Put( sal_Int32 lVal )
                 {
+                    union
+                    {
+                        sal_uInt32 lVal32;
+                        sal_uInt16 aVal16[2];
+                    };
+                    lVal32 = lVal;
+
                     if( bSwap )
                     {
-                        Put( *(((sal_uInt16*)&lVal) +1) );
-                        Put( *(sal_uInt16*)&lVal );
+                        Put( aVal16[1] );
+                        Put( aVal16[0] );
                     }
                     else
                     {
-                        Put( *(sal_uInt16*)&lVal );
-                        Put( *(((sal_uInt16*)&lVal) +1) );
+                        Put( aVal16[0] );
+                        Put( aVal16[1] );
                     }
                 }
     void        Put( sal_uInt32 nValue )
@@ -171,15 +184,22 @@ public:
 
     void        PutAt( sal_uInt32 nPos, INT32 lVal )
                 {
+                    union
+                    {
+                        sal_uInt32 lVal32;
+                        sal_uInt16 aVal16[2];
+                    };
+                    lVal32 = lVal;
+
                     if( bSwap )
                     {
-                        PutAt( nPos, *(((sal_uInt16*)&lVal) +1) );
-                        PutAt( nPos + 2, *(sal_uInt16*)&lVal );
+                        PutAt( nPos, aVal16[1] );
+                        PutAt( nPos + 2, aVal16[0] );
                     }
                     else
                     {
-                        PutAt( nPos, *(sal_uInt16*)&lVal );
-                        PutAt( nPos + 2, *(((sal_uInt16*)&lVal) +1) );
+                        PutAt( nPos, aVal16[0] );
+                        PutAt( nPos + 2, aVal16[1] );
                     }
                 }
     void        PutAt( sal_uInt32 nPos, sal_uInt32 lVal )
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 8e7d76cda614..e02485cdf4ce 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -466,6 +466,7 @@ oslFileError FileHandle_Impl::readFileAt (
                 oslFileError result = syncFile();
                 if (result != osl_File_E_None)
                     return (result);
+                m_bufptr = -1, m_buflen = 0;
 
                 if (nBytesRequested >= m_bufsiz)
                 {
@@ -535,6 +536,7 @@ oslFileError FileHandle_Impl::writeFileAt (
                 oslFileError result = syncFile();
                 if (result != osl_File_E_None)
                     return (result);
+                m_bufptr = -1, m_buflen = 0;
 
                 if (nBytesToWrite >= m_bufsiz)
                 {
@@ -1009,7 +1011,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
 
     FileHandle_Impl::Guard lock (&(pImpl->m_mutex));
 
-    OSL_FILE_TRACE("osl_syncFile(%d)", pImpl->m_fd);
+    OSL_TRACE("osl_syncFile(%d)", pImpl->m_fd);
     oslFileError result = pImpl->syncFile();
     if (result != osl_File_E_None)
         return (result);
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 3f3cf02fb010..b9b2b6a23c7d 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -29,6 +29,7 @@
 
 #include "osl/diagnose.h"
 #include "osl/thread.h"
+#include <osl/signal.h>
 #include "rtl/alloc.h"
 
 #include "system.h"
@@ -48,6 +49,8 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#include <algorithm>
+
 /************************************************************************
  *   ToDo
  *
@@ -1002,7 +1005,6 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
     int SourceFileFD=0;
     int DestFileFD=0;
     int nRet=0;
-    void* pSourceFile=0;
 
     SourceFileFD=open(pszSourceFileName,O_RDONLY);
     if ( SourceFileFD < 0 )
@@ -1011,6 +1013,18 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
         return nRet;
     }
 
+    // read and lseek are used to check the possibility to access the data
+    // not a nice solution, but it allows to avoid a crash in case it is an opened samba file
+    // generally, reading of one byte should not affect the performance
+    char nCh;
+    if ( 1 != read( SourceFileFD, &nCh, 1 )
+      || -1 == lseek( SourceFileFD, 0, SEEK_SET ) )
+    {
+        nRet = errno;
+        (void) close( SourceFileFD );
+        return nRet;
+    }
+
     DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
 
     if ( DestFileFD < 0 )
@@ -1029,56 +1043,58 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
         return 0;
     }
 
-    /* FIXME doCopy: fall back code for systems not having mmap */
-    /* mmap file -- open dest file -- write once -- fsync it */
-    pSourceFile=mmap(0,nSourceSize,PROT_READ,MAP_PRIVATE,SourceFileFD,0);
+    size_t nWritten = 0;
+    size_t nRemains = nSourceSize;
 
-    if ( pSourceFile == MAP_FAILED )
+    /* mmap file -- open dest file -- write -- fsync it at the end */
+    void* pSourceFile = mmap( 0, nSourceSize, PROT_READ, MAP_SHARED, SourceFileFD, 0 );
+    if ( pSourceFile != MAP_FAILED )
     {
-        /* it's important to set nRet before the hack
-           otherwise errno may be changed by lstat */
-        nRet = errno;
-        close(SourceFileFD);
-        close(DestFileFD);
-
-        return nRet;
+        nWritten = write( DestFileFD, pSourceFile, nSourceSize );
+        nRemains -= nWritten;
+        munmap( (char*)pSourceFile, nSourceSize );
     }
 
-    nRet = write(DestFileFD,pSourceFile,nSourceSize);
-
-    /* #112584# if 'write' could not write the requested number of bytes
-             we have to fail of course; because it's not exactly specified if 'write'
-            sets errno if less than requested byte could be written we set nRet
-           explicitly to ENOSPC */
-    if ((nRet < 0) || (nRet != sal::static_int_cast< int >(nSourceSize)))
+    if ( nRemains )
     {
-        if (nRet < 0)
-            nRet = errno;
-        else
-            nRet = ENOSPC;
+        /* mmap has problems, try the direct streaming */
+        char pBuffer[32000];
+        size_t nRead = 0;
 
-        close(SourceFileFD);
-        close(DestFileFD);
-        munmap((char*)pSourceFile,nSourceSize);
-        return nRet;
+        nRemains = nSourceSize;
+
+        if ( -1 != lseek( SourceFileFD, 0, SEEK_SET )
+          && -1 != lseek( DestFileFD, 0, SEEK_SET ) )
+        {
+            do
+            {
+                nRead = 0;
+                nWritten = 0;
+
+                size_t nToRead = std::min( (size_t)32000, nRemains );
+                nRead = read( SourceFileFD, pBuffer, nToRead );
+                if ( (size_t)-1 != nRead )
+                    nWritten = write( DestFileFD, pBuffer, nRead );
+
+                if ( (size_t)-1 != nWritten )
+                    nRemains -= nWritten;
+            }
+            while( nRemains && (size_t)-1 != nRead && nRead == nWritten );
+        }
     }
 
-    nRet = munmap((char*)pSourceFile,nSourceSize);
-    if ( nRet < 0 )
+    if ( nRemains )
     {
-        nRet=errno;
-        close(SourceFileFD);
-        close(DestFileFD);
-        return nRet;
+        if ( errno )
+            nRet = errno;
+        else
+            nRet = ENOSPC;
     }
 
-    close(SourceFileFD);
+    close( SourceFileFD );
+    if ( close( DestFileFD ) == -1 && nRet == 0 )
+        nRet = errno;
 
-    // Removed call to 'fsync' again (#112584#) and instead
-    // evaluate the return value of 'close' in order to detect
-    // and report ENOSPC and other erronous conditions on close
-    if (close(DestFileFD) == -1)
-        return errno;
-    else
-        return 0;
+    return nRet;
 }
+
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 0e728c29dbcd..eac4c24cdfa9 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -55,7 +55,8 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=   $(SLO)$/conditn.obj  \
+SLOFILES= \
+            $(SLO)$/conditn.obj  \
             $(SLO)$/diagnose.obj \
             $(SLO)$/semaphor.obj \
             $(SLO)$/socket.obj   \
@@ -74,7 +75,7 @@ SLOFILES=   $(SLO)$/conditn.obj  \
             $(SLO)$/util.obj	 \
             $(SLO)$/tempfile.obj\
             $(SLO)$/file.obj     \
-            $(SLO)$/file_misc.obj \
+            $(SLO)$/file_misc.obj\
             $(SLO)$/file_url.obj\
             $(SLO)$/file_error_transl.obj\
             $(SLO)$/file_path_helper.obj\
@@ -84,6 +85,7 @@ SLOFILES=   $(SLO)$/conditn.obj  \
             $(SLO)$/process_impl.obj\
             $(SLO)$/salinit.obj
 
+
 #.IF "$(UPDATER)"=="YES"
 OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/diagnose.obj \
@@ -104,7 +106,7 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/util.obj	 \
             $(OBJ)$/tempfile.obj\
             $(OBJ)$/file.obj     \
-            $(OBJ)$/file_misc.obj \
+            $(OBJ)$/file_misc.obj\
             $(OBJ)$/file_url.obj\
             $(OBJ)$/file_error_transl.obj\
             $(OBJ)$/file_path_helper.obj\
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 11928a3b6458..ac47b1ac6050 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -255,7 +255,7 @@ void do_cleanup( void )
 
             */
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
             __try
 #endif
             {
@@ -267,7 +267,7 @@ void do_cleanup( void )
                 rtl_cache_fini();
                 rtl_arena_fini();
             }
-#ifdef PRODUCT
+#ifndef DBG_UTIL
             __except( EXCEPTION_EXECUTE_HANDLER )
             {
             }
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 34deba2293da..60c51cfb3a73 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -400,6 +400,7 @@ oslFileError FileHandle_Impl::readFileAt (
                 oslFileError result = syncFile();
                 if (result != osl_File_E_None)
                     return (result);
+                m_bufptr = -1, m_buflen = 0;
 
                 if (nBytesRequested >= m_bufsiz)
                 {
@@ -472,6 +473,7 @@ oslFileError FileHandle_Impl::writeFileAt (
                 oslFileError result = syncFile();
                 if (result != osl_File_E_None)
                     return (result);
+                m_bufptr = -1, m_buflen = 0;
 
                 if (nBytesToWrite >= m_bufsiz)
                 {
diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx
index 16283a48da92..f1105298deaf 100644
--- a/sal/qa/ByteSequence/ByteSequence.cxx
+++ b/sal/qa/ByteSequence/ByteSequence.cxx
@@ -36,7 +36,7 @@
 
 #include <rtl/byteseq.hxx>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 using namespace rtl;
 
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index a2ecbd5ccef1..0f1b88ac6e6a 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,17 +47,10 @@ CXXFLAGS+= $(LFS_CFLAGS)
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
-    $(SLO)$/ByteSequence.obj 
+    $(SLO)$/ByteSequence.obj
 
 SHL1TARGET= rtl_ByteSequence
-SHL1STDLIBS=\
-   $(SALLIB) 
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -70,9 +63,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/rtl_old_testbyteseq.obj
 SHL2TARGET= rtl_old_testbyteseq
-SHL2STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 
diff --git a/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx b/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx
index 1c49a316c537..2cea6fa3a878 100644
--- a/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx
+++ b/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx
@@ -42,7 +42,7 @@
 
 using namespace ::rtl;
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 
 namespace rtl_testbyteseq
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index be0f891cf8fc..d20c011a552e 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -56,16 +56,7 @@ SHL1OBJS= \
     $(SLO)$/rtl_String_Utils.obj
 
 SHL1TARGET= rtl_OStringBuffer
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
-
-# .IF "$(GUI)" == "WNT"
-# SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-# .ENDIF
-# .IF "$(GUI)" == "UNX"
-# SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-# .ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index df97eccf751e..2b3bbfd6caa3 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -38,7 +38,7 @@
 
 #include <rtl/strbuf.hxx>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 using namespace rtl;
 
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index fd58c9e633a3..586908e93032 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,19 +44,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Condition by codegen.pl 
+# auto generated Target:Condition by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Condition.obj
 
 SHL1TARGET= osl_Condition
-SHL1STDLIBS=\
-   $(SALLIB) 
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index c04261176ee6..608bd38e3a64 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -59,7 +59,7 @@
 #include <unistd.h>
 #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #define OSLTEST_DECLARE_USTRING( str_name, str_value ) \
     ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value )
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk
index 7c6d1232c1a0..0d83a06b7124 100644
--- a/sal/qa/osl/file/makefile.mk
+++ b/sal/qa/osl/file/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,15 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/osl_File.obj
 SHL1TARGET= osl_File
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
-# .IF "$(GUI)" == "WNT"
-# SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-# .ENDIF
-# .IF "$(GUI)" == "UNX"
-# SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-# .ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
@@ -66,13 +58,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 SHL2OBJS=$(SLO)$/test_cpy_wrt_file.obj
 SHL2TARGET=tcwf
-SHL2STDLIBS=$(SALLIB)
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL2STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL2STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 SHL2IMPLIB=i$(SHL2TARGET)
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
@@ -85,9 +71,7 @@ DEF2NAME    =$(SHL2TARGET)
 SHL3OBJS=  \
     $(SLO)$/osl_old_test_file.obj
 SHL3TARGET= osl_old_test_file
-SHL3STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL3IMPLIB= i$(SHL3TARGET)
 
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 3a44c565d162..a1cb3fa54e9e 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -44,7 +44,7 @@
 #include <osl/file.hxx>
 #include <osl_File_Const.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 // #ifdef WNT
 // #   define UNICODE
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index 18be1d38e40c..64258b8e9006 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -51,7 +51,7 @@
 #define TEST_VOLUME "c:/"
 #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace osl_test_file
 {
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 6c4986f485b3..05910ea3ddd7 100755
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
 #include <rtl/ustring.hxx>
diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk
index d3500d267020..40f597bdbbc7 100644
--- a/sal/qa/osl/module/makefile.mk
+++ b/sal/qa/osl/module/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 # --- test dll ------------------------------------------------------
 SHL1TARGET     = Module_DLL
 SHL1OBJS       = $(SLO)$/osl_Module_DLL.obj
-SHL1STDLIBS    = $(SALLIB) 
+SHL1STDLIBS    = $(SALLIB)
 SHL1IMPLIB     = i$(SHL1TARGET)
 SHL1DEF        = $(MISC)$/$(SHL1TARGET).def
 DEF1NAME       = $(SHL1TARGET)
@@ -59,21 +59,16 @@ SHL1VERSIONMAP = export_dll.map
 SHL2OBJS=  $(SLO)$/osl_Module.obj
 
 SHL2TARGET= osl_Module
-SHL2STDLIBS=   $(SALLIB) 
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL2STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib 
 SHL2STDLIBS+=i$(SHL2TARGET).lib
 .ENDIF
-.IF "$(GUI)" == "OS2"
-SHL2STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib 
-.ENDIF
 .IF "$(GUI)" == "UNX"
-SHL2STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
 APP3STDLIBS+=-l$(SHL2TARGET)
 .ENDIF
 
-SHL2DEPN= $(SHL1OBJS) 
+SHL2DEPN= $(SHL1OBJS)
 SHL2IMPLIB= i$(SHL2TARGET)
 SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
 
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index beeb4a800a11..ad954b5cb4ad 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -37,7 +37,7 @@
 #include <osl/module.hxx>
 #include <osl/file.hxx>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #if ( defined UNX ) || ( defined OS2 )  //Unix
 #   include <unistd.h>
diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx
index ed7874eb11b5..46610f35f22c 100644
--- a/sal/qa/osl/module/osl_Module_DLL.cxx
+++ b/sal/qa/osl/module/osl_Module_DLL.cxx
@@ -33,7 +33,7 @@
 
 #include <stdio.h>
 #include <sal/types.h>
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 extern "C" sal_Bool SAL_CALL firstfunc( sal_Bool bRes )
 {
diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk
index 44c5b6b46f7f..7c8cfeb39037 100755
--- a/sal/qa/osl/mutex/makefile.mk
+++ b/sal/qa/osl/mutex/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,22 +44,16 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Mutex.obj
 
 SHL1TARGET= osl_Mutex
-SHL1STDLIBS=\
-   $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 .IF "$(GUI)" == "WNT"
 SHL1STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "OS2"
-SHL1STDLIBS +=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-
 .IF "$(GUI)" == "UNX"
 SHL1STDLIBS += -ldl -lnsl
 .ENDIF
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index 789b9e91c007..a13f40ab9605 100755
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -49,7 +49,7 @@
 #endif
 #include <osl/time.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #ifdef UNX
 #include <unistd.h>
diff --git a/sal/qa/osl/pipe/makefile.mk b/sal/qa/osl/pipe/makefile.mk
index 636bdde7de82..3d0df14bbd69 100644
--- a/sal/qa/osl/pipe/makefile.mk
+++ b/sal/qa/osl/pipe/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,21 +44,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Pipe by codegen.pl 
+# auto generated Target:Pipe by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Pipe.obj
 
 SHL1TARGET= osl_Pipe
-SHL1STDLIBS=\
-   $(SALLIB) \
-    $(CPPUNITLIB)
-
-#.IF "$(GUI)" == "WNT"
-#SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-#.ENDIF
-#.IF "$(GUI)" == "UNX"
-#SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-#.ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 4f0da4ea686e..c2b2ae740527 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -35,7 +35,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index 17f6ab46bd5a..32e97f3c162d 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     CFLAGS+=/Ob1
@@ -55,17 +55,7 @@ SHL1OBJS=  \
     $(SLO)$/osl_Thread.obj
 
 SHL1TARGET= osl_Thread
-SHL1STDLIBS=\
-   $(SALLIB) 
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-# .IF "$(OS)" == "SOLARIS"
-# SHL1STDLIBS += -lrt -laio
-# .ENDIF
-.ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
@@ -82,14 +72,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 SHL2OBJS=$(SLO)$/osl_process.obj
 SHL2TARGET=osl_process
-SHL2STDLIBS=$(SALLIB) 
-
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL2STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL2STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB=i$(SHL2TARGET)
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
@@ -98,7 +81,7 @@ DEF2EXPORTFILE=export.exp
 
 # END ------------------------------------------------------------------
 
-OBJ3FILES=$(OBJ)$/osl_process_child.obj 
+OBJ3FILES=$(OBJ)$/osl_process_child.obj
 APP3TARGET=osl_process_child
 APP3OBJS=$(OBJ3FILES)
 
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 9f666acc9659..88f796b6728c 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -52,7 +52,7 @@
 #endif
 #include <osl/time.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 using namespace osl;
 using namespace rtl;
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 7fb794925ed2..a0fe5182daa1 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <osl/process.h>
 #include <osl/file.hxx>
 #include <osl/thread.h>
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk
index d685655feb86..482bc69276a2 100644
--- a/sal/qa/osl/profile/makefile.mk
+++ b/sal/qa/osl/profile/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -48,9 +48,7 @@ SHL1OBJS=  \
     $(SLO)$/osl_old_testprofile.obj
 
 SHL1TARGET= osl_old_testprofile
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -61,7 +59,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
 SLOFILES=\
-    $(SHL1OBJS) 
+    $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index d5a6b3d92468..27e4cbe6b35b 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <osl/profile.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //==================================================================================================
 // -----------------------------------------------------------------------------
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index 5896f1b6108d..6bcc6fc9f6d3 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,23 +44,15 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Security by codegen.pl 
+# auto generated Target:Security by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Security.obj
 
 SHL1TARGET= osl_Security
-SHL1STDLIBS=\
-   $(SALLIB) 
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
 SHL1STDLIBS+= $(ADVAPI32LIB)
 .ENDIF
-.IF "$(GUI)" == "OS2"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 428d6bb30fc6..ca08e3025b38 100755
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -57,7 +57,7 @@
 #include <pwd.h>
 #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 // LLA: #include <testshl2/cmdlinebits.hxx>
 
 
diff --git a/sal/qa/osl/semaphore/makefile.mk b/sal/qa/osl/semaphore/makefile.mk
index d5ad5e532626..a8918dcfb12b 100644
--- a/sal/qa/osl/semaphore/makefile.mk
+++ b/sal/qa/osl/semaphore/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,19 +44,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Semaphore by codegen.pl 
+# auto generated Target:Semaphore by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Semaphore.obj
 
 SHL1TARGET= osl_Semaphore
-SHL1STDLIBS=\
-   $(SALLIB) 
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
diff --git a/sal/qa/osl/semaphore/osl_Semaphore_Const.h b/sal/qa/osl/semaphore/osl_Semaphore_Const.h
index f1aafa3a6244..c9f1149674f4 100644
--- a/sal/qa/osl/semaphore/osl_Semaphore_Const.h
+++ b/sal/qa/osl/semaphore/osl_Semaphore_Const.h
@@ -51,7 +51,7 @@
 #endif
 #include <osl/time.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #ifdef UNX
 #include <unistd.h>
diff --git a/sal/qa/osl/socket/makefile.mk b/sal/qa/osl/socket/makefile.mk
index 5bcb252d187a..134bcadb55aa 100755
--- a/sal/qa/osl/socket/makefile.mk
+++ b/sal/qa/osl/socket/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,22 +44,18 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Socket.obj
 
 SHL1TARGET=osl_SocketOld
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-#SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
 SHL1STDLIBS+= $(WS2_32LIB)
 .ENDIF
 
 .IF "$(GUI)" == "UNX"
-#SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
 SHL1STDLIBS+= -ldl -lnsl
 .ENDIF
 
@@ -75,9 +71,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/osl_Socket_tests.obj
 SHL2TARGET= osl_Socket_tests
-SHL2STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME=    $(SHL2TARGET)
@@ -86,15 +80,13 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 # END --------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL3OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_StreamSocket.obj
 
 SHL3TARGET= osl_StreamSocket
-SHL3STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL3STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL3STDLIBS += $(WS2_32LIB)
@@ -111,15 +103,13 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL4OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_DatagramSocket.obj
 
 SHL4TARGET= osl_DatagramSocket
-SHL4STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL4STDLIBS += $(WS2_32LIB)
@@ -136,15 +126,13 @@ SHL4VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL5OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_SocketAddr.obj
 
 SHL5TARGET= osl_SocketAddr
-SHL5STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL5STDLIBS += $(WS2_32LIB)
@@ -161,15 +149,13 @@ SHL5VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL6OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_Socket2.obj
 
 SHL6TARGET= osl_Socket2
-SHL6STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL6STDLIBS += $(WS2_32LIB)
@@ -186,15 +172,13 @@ SHL6VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL7OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_ConnectorSocket.obj
 
 SHL7TARGET= osl_ConnectorSocket
-SHL7STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL7STDLIBS += $(WS2_32LIB)
@@ -211,15 +195,13 @@ SHL7VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL8OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_AcceptorSocket.obj
 
 SHL8TARGET= osl_AcceptorSocket
-SHL8STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL8STDLIBS += $(WS2_32LIB)
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index 002e27efbd0e..6325385b62ee 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index e3f4ad3e5bea..52c1b12b687e 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 4e714d0b655b..4cf27a90ad90 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 20f2a80d04da..ccc87ee23a1d 100755
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -66,7 +66,7 @@
 #include <osl_Socket_Const_orig.h>
 #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 using namespace osl;
 using namespace rtl;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 29a7924c5503..a7b0ecfa1ef7 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index e9db614bade8..63ca58f67936 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx
index 3122b27b1f1a..7f0fb5bbe87e 100644
--- a/sal/qa/osl/socket/osl_Socket_tests.cxx
+++ b/sal/qa/osl/socket/osl_Socket_tests.cxx
@@ -36,7 +36,7 @@
 //------------------------------------------------------------------------
 #include <osl_Socket_Const.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <osl/socket.hxx>
 //------------------------------------------------------------------------
 // helper functions
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 0d5a1e54739f..9769d13adb0f 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index c10ebcb2c8ca..681858f15dc1 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -32,7 +32,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 #include "sockethelper.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //------------------------------------------------------------------------
 // Ip version definition
diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index e74400ba6aff..86551fc6771b 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_thread.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/sal/qa/osl/thread/test_thread.cxx b/sal/qa/osl/thread/test_thread.cxx
index 59c857c82b2f..21fd2e297fe0 100644
--- a/sal/qa/osl/thread/test_thread.cxx
+++ b/sal/qa/osl/thread/test_thread.cxx
@@ -33,7 +33,7 @@
 
 #include "sal/config.h"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/conditn.hxx"
 #include "osl/thread.hxx"
 #include "osl/time.h"
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index 4fad638942fb..ce88442a5574 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,20 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:jobfile by codegen.pl 
+# auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_alloc.obj
 
 SHL1TARGET= rtl_Alloc
-SHL1STDLIBS=\
-   $(SALLIB) \
-    $(CPPUNITLIB)
-# .IF "$(GUI)" == "WNT"
-# SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-# .ENDIF
-# .IF "$(GUI)" == "UNX"
-# SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-# .ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 75173f3aaf86..ae9a1e9e9587 100755
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -34,7 +34,7 @@
 // autogenerated file with codegen.pl
 
 #include <rtl/alloc.h>
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace rtl_alloc
 {
diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk
index ff47fa6c78d2..a492af8dd3c5 100644
--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -55,14 +55,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_Bootstrap.obj
 
 SHL1TARGET= rtl_Bootstrap
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -72,7 +70,7 @@ DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
-OBJ2FILES=$(OBJ)$/bootstrap_process.obj 
+OBJ2FILES=$(OBJ)$/bootstrap_process.obj
 APP2TARGET=bootstrap_process
 APP2OBJS=$(OBJ2FILES)
 
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 85efcfa55b34..520c1298030f 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -39,9 +39,9 @@
 #include <stdlib.h>
 #include <algorithm> // STL
 
-#include "cppunit/stringhelper.hxx"
+#include "testshl/stringhelper.hxx"
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 //#include "stringhelper.hxx"
 //#include "valueequal.hxx"
 #include <rtl/bootstrap.hxx>
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index c8d508f8b9ef..fc7a975651f5 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_cipher.obj
 
 SHL1TARGET= rtl_cipher
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index c51344cdc83e..a55f4a20d6fe 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -32,7 +32,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/cipher.h>
 
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index aa24d698ea30..8b1ee4a6f350 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,19 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:jobfile by codegen.pl 
+# auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_crc32.obj
 
 SHL1TARGET= rtl_crc32
-SHL1STDLIBS=\
-   $(SALLIB) 
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index fa5870c9c8dd..09f492376ba2 100755
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_sal.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/crc.h>
 
 namespace rtl_CRC32
diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk
index a80835047d8b..7786522901ee 100644
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -48,12 +48,10 @@ CXXFLAGS+= $(LFS_CFLAGS)
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
-    $(SLO)$/rtl_digest.obj 
+    $(SLO)$/rtl_digest.obj
 
 SHL1TARGET= rtl_digest
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME=    $(SHL1TARGET)
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 151b01f8994c..9f8dd3f24542 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -31,7 +31,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <rtl/digest.h>
 #include <rtl/ustring.hxx>
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 7ee93688eff2..b46518fb2e68 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     CFLAGS+=/Ob1
@@ -55,9 +55,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_doublelocking.obj
 
 SHL1TARGET= rtl_doublelocking
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 2f3f004dbabc..cbcc334d3134 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -46,7 +46,7 @@
 
 #include <rtl/instance.hxx>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 // -----------------------------------------------------------------------------
 #define CONST_TEST_STRING "gregorian"
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 6ad4991bcfd9..8e4710c5ac6b 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:locale by codegen.pl 
+# auto generated Target:locale by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_locale.obj
 
 SHL1TARGET= rtl_locale
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB) 
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 91fb285db98a..c677259038f3 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_sal.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/locale.hxx>
 #include <osl/thread.h>
 
diff --git a/sal/qa/rtl/logfile/makefile.mk b/sal/qa/rtl/logfile/makefile.mk
index 23a5979237d9..da70d7533fa0 100644
--- a/sal/qa/rtl/logfile/makefile.mk
+++ b/sal/qa/rtl/logfile/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,9 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/rtl_logfile.obj
 SHL1TARGET= rtl_logfile
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 9ed83adf9c09..d589cfb2bf04 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -46,7 +46,7 @@
 #endif
 
 #include <rtl/logfile.hxx>
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 // #ifndef      _OSL_MODULE_HXX_
 // #include <osl/module.hxx>
diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk
index 14e8cec2ec9c..5db3ffdd2028 100644
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -48,17 +48,10 @@ CXXFLAGS+= $(LFS_CFLAGS)
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
-    $(SLO)$/test_rtl_math.obj 
+    $(SLO)$/test_rtl_math.obj
 
 SHL1TARGET= rtl_math
-SHL1STDLIBS=\
-   $(SALLIB) 
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -71,9 +64,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/rtl_math.obj
 SHL2TARGET= rtl_math2
-SHL2STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME=    $(SHL2TARGET)
@@ -90,14 +81,12 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 # SHL3OBJS=  \
 # 	$(SLO)$/rtl_old_testint64.obj
 # SHL3TARGET= rtl_old_testint64
-# SHL3STDLIBS=\
-# 	$(SALLIB) \
-# 	$(CPPUNITLIB)
-# 
+# SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+#
 # SHL3IMPLIB= i$(SHL3TARGET)
 # DEF3NAME=    $(SHL3TARGET)
 # SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
-# 
+#
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx
index 34d851b4f2e7..a9c16541e524 100644
--- a/sal/qa/rtl/math/rtl_math.cxx
+++ b/sal/qa/rtl/math/rtl_math.cxx
@@ -37,7 +37,7 @@
 #endif
 
 #include <math.h>
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/math.h>
 #include <rtl/string.hxx>
 
diff --git a/sal/qa/rtl/math/rtl_old_testint64.cxx b/sal/qa/rtl/math/rtl_old_testint64.cxx
index e0059b200db6..923c464186f3 100644
--- a/sal/qa/rtl/math/rtl_old_testint64.cxx
+++ b/sal/qa/rtl/math/rtl_old_testint64.cxx
@@ -49,7 +49,7 @@
 // #define TEST_ENSURE(c, m)   OSL_VERIFY(c)
 // #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 // -----------------------------------------------------------------------------
 namespace rtl_math
diff --git a/sal/qa/rtl/ostring/makefile.mk b/sal/qa/rtl/ostring/makefile.mk
index 279697313cf1..d2c6049afcbc 100644
--- a/sal/qa/rtl/ostring/makefile.mk
+++ b/sal/qa/rtl/ostring/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_OString2.obj
 
 SHL1TARGET= rtl_OString2
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -68,9 +66,7 @@ SHL2OBJS=  \
     $(SLO)$/rtl_str.obj
 
 SHL2TARGET= rtl_str
-SHL2STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
@@ -82,9 +78,7 @@ SHL3OBJS=  \
     $(SLO)$/rtl_string.obj
 
 SHL3TARGET= rtl_string
-SHL3STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL3IMPLIB= i$(SHL3TARGET)
 DEF3NAME    =$(SHL3TARGET)
diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx
index 8421346f84a7..2ff2ca6b434b 100644
--- a/sal/qa/rtl/ostring/rtl_OString2.cxx
+++ b/sal/qa/rtl/ostring/rtl_OString2.cxx
@@ -34,7 +34,7 @@
 // autogenerated file with codegen.pl
 // There exist some more test code in sal/qa/rtl_strings/rtl_OString.cxx
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include "valueequal.hxx"
 
 namespace rtl_OString
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index 5e34b034bffb..6ce43ae0bb9b 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -31,7 +31,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace rtl_str
 {
diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index 549555d0e10a..a1fc88037f51 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -31,7 +31,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace rtl_string
 {
diff --git a/sal/qa/rtl/oustring/makefile.mk b/sal/qa/rtl/oustring/makefile.mk
index dedaa650107d..40e4ba4a0b58 100644
--- a/sal/qa/rtl/oustring/makefile.mk
+++ b/sal/qa/rtl/oustring/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_OUString2.obj
 
 SHL1TARGET= rtl_OUString2
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -68,9 +66,7 @@ SHL2OBJS=  \
     $(SLO)$/rtl_ustr.obj
 
 SHL2TARGET= rtl_ustr
-SHL2STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 9606ae0859c3..8632a159ab85 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -38,7 +38,7 @@
 
 #include <algorithm> // STL
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include "stringhelper.hxx"
 #include "valueequal.hxx"
 
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index 5cc28ea1f389..43610d0461f4 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -31,7 +31,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 /** print a UNI_CODE file name.
 */
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index 9737d998a768..a910d7222773 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_OUStringBuffer2.obj
 
 SHL1TARGET= rtl_OUStringBuffer2
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
index d259e63174f8..febaa2a9d552 100644
--- a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
+++ b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
@@ -31,7 +31,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include "stringhelper.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk
index c1f5d9cad7eb..ac8d66e24b7d 100644
--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_Process.obj
 
 SHL1TARGET= rtl_Process
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -62,7 +60,7 @@ DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
-OBJ3FILES=$(OBJ)$/child_process.obj 
+OBJ3FILES=$(OBJ)$/child_process.obj
 APP3TARGET=child_process
 APP3OBJS=$(OBJ3FILES)
 
@@ -74,7 +72,7 @@ APP3OBJS=$(OBJ3FILES)
 #.ENDIF
 APP3STDLIBS=$(SALLIB)
 
-OBJ4FILES=$(OBJ)$/child_process_id.obj 
+OBJ4FILES=$(OBJ)$/child_process_id.obj
 APP4TARGET=child_process_id
 APP4OBJS=$(OBJ4FILES)
 
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 78360186fea7..e14d52905c32 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <sal/types.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
 #include <rtl/process.h>
diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk
index 61cd9b676351..0fc2e5e5a7f8 100644
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl 
+# auto generated Target:job by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_random.obj
 
 SHL1TARGET= rtl_Random
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB) 
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 7e3c56115b33..ae3845bd16b9 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -35,7 +35,7 @@
 
 #include <algorithm> // STL
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/random.h>
 
 namespace rtl_random
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index 16abc6b7e118..8b2a62b82d13 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ SHL1OBJS := \
     $(SLO)$/test_oustring_endswith.obj \
     $(SLO)$/test_oustring_noadditional.obj
 SHL1IMPLIB := i$(SHL1TARGET)
-SHL1STDLIBS := $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
 DEF1NAME := $(SHL1TARGET)
 
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index a19c3360145c..582dd6a21b7a 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/string.h"
 #include "rtl/ustring.hxx"
 
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index b579da99ee27..e1219c3024d6 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 83714ff6fe71..467878697fd2 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/string.h"
 #include "rtl/string.hxx"
diff --git a/sal/qa/rtl/strings/test_oustring_noadditional.cxx b/sal/qa/rtl/strings/test_oustring_noadditional.cxx
index 26db4917f096..dd30871b7622 100644
--- a/sal/qa/rtl/strings/test_oustring_noadditional.cxx
+++ b/sal/qa/rtl/strings/test_oustring_noadditional.cxx
@@ -31,6 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 
 NOADDITIONAL;
diff --git a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx
index ca05cbf514b7..71fb6def0b31 100644
--- a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk
index c2b9a836ab3b..31f700b7b96a 100644
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,9 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/rtl_textcvt.obj
 SHL1TARGET= rtl_textcvt
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -65,9 +63,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/rtl_tencinfo.obj
 SHL2TARGET= rtl_tencinfo
-SHL2STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index 8f5fa28defda..2bc3f930af42 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -36,7 +36,7 @@
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 // -----------------------------------------------------------------------------
 
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 0e4a1a306949..2129815a6779 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -36,7 +36,7 @@
 #include <cstddef>
 #include <cstring>
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/string.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textcvt.h"
diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk
index 95ba01debd1e..2c536da484d7 100644
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,9 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/rtl_Uri.obj
 SHL1TARGET= rtl_uri_simple
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -61,9 +59,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/rtl_testuri.obj
 SHL2TARGET= rtl_Uri
-SHL2STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 794074e18d0f..cc27f956b573 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -38,7 +38,7 @@
 #include <osl/thread.h>
 #include <osl/file.hxx>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 // -----------------------------------------------------------------------------
 
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index 956c5ccbaacb..4d1d80830dd3 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -39,7 +39,7 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 
 #include <cstddef>
 #include <stdio.h>
diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index ed780dd82ec1..554c2034d0cd 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_Uuid.obj
 
 SHL1TARGET= rtl_Uuid
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 508a1127b60e..a77c4e8d90de 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <stdio.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/uuid.h>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
diff --git a/sal/qa/rtl_strings/makefile.mk b/sal/qa/rtl_strings/makefile.mk
index 4cd99ba3aec9..166ef568debc 100644
--- a/sal/qa/rtl_strings/makefile.mk
+++ b/sal/qa/rtl_strings/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,15 +44,13 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:FileBase by codegen.pl 
+# auto generated Target:FileBase by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_String_Utils.obj \
     $(SLO)$/rtl_OString.obj
 
 SHL1TARGET= rtl_OString
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -65,15 +63,13 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:FileBase by codegen.pl 
+# auto generated Target:FileBase by codegen.pl
 SHL2OBJS=  \
     $(SLO)$/rtl_String_Utils.obj \
     $(SLO)$/rtl_OUString.obj
 
 SHL2TARGET= rtl_OUString
-SHL2STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 # SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
@@ -86,22 +82,13 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:FileBase by codegen.pl 
+# auto generated Target:FileBase by codegen.pl
 SHL3OBJS=  \
     $(SLO)$/rtl_String_Utils.obj \
     $(SLO)$/rtl_OUStringBuffer.obj
 
 SHL3TARGET= rtl_OUStringBuffer
-SHL3STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
-
-# .IF "$(GUI)" == "WNT"
-# SHL3STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-# .ENDIF
-# .IF "$(GUI)" == "UNX"
-# SHL3STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-# .ENDIF
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL3IMPLIB= i$(SHL3TARGET)
 # SHL3DEF=    $(MISC)$/$(SHL3TARGET).def
@@ -115,12 +102,10 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
 
 # BEGIN ----------------------------------------------------------------
 SHL4OBJS=  \
-    $(SLO)$/rtl_old_teststrbuf.obj 
+    $(SLO)$/rtl_old_teststrbuf.obj
 
 SHL4TARGET= rtl_old_teststrbuf
-SHL4STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL4IMPLIB= i$(SHL4TARGET)
 DEF4NAME    =$(SHL4TARGET)
@@ -130,12 +115,10 @@ SHL4VERSIONMAP = $(PRJ)$/qa$/export.map
 
 # BEGIN ----------------------------------------------------------------
 SHL5OBJS=  \
-    $(SLO)$/rtl_old_testowstring.obj 
+    $(SLO)$/rtl_old_testowstring.obj
 
 SHL5TARGET= rtl_old_testowstring
-SHL5STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL5IMPLIB= i$(SHL5TARGET)
 DEF5NAME    =$(SHL5TARGET)
@@ -145,12 +128,10 @@ SHL5VERSIONMAP = $(PRJ)$/qa$/export.map
 
 # BEGIN ----------------------------------------------------------------
 SHL6OBJS=  \
-    $(SLO)$/rtl_old_testostring.obj 
+    $(SLO)$/rtl_old_testostring.obj
 
 SHL6TARGET= rtl_old_testostring
-SHL6STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)
+SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL6IMPLIB= i$(SHL6TARGET)
 DEF6NAME    =$(SHL6TARGET)
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 6c481914127d..329eb71c7dc5 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -48,7 +48,7 @@
 #include <rtl/string.hxx>
 #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
 
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 6741deb06e84..938ec01f5fff 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -61,7 +61,7 @@
 
 #include <rtl/locale.hxx>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
 // #if OSL_DEBUG_LEVEL > 0
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index 7f6a54478697..c277517d57b2 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -53,7 +53,7 @@
 #include <rtl/ustrbuf.hxx>
 #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 using namespace rtl;
 
diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk
index ebf7aa314ab7..61f279e226eb 100644
--- a/sal/qa/sal/makefile.mk
+++ b/sal/qa/sal/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 SHL1TARGET = $(TARGET)_types
 SHL1OBJS = $(SLO)$/test_types.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx
index fff05cb08106..5d72175bb8db 100644
--- a/sal/qa/sal/test_types.cxx
+++ b/sal/qa/sal/test_types.cxx
@@ -35,7 +35,7 @@
 #include <stdio.h> // C99 snprintf not necessarily in <cstdio>
 #include <string.h> // wntmsci10 does not know <cstring> std::strcmp
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "sal/types.h"
 
 namespace {
diff --git a/sal/qa/systools/makefile.mk b/sal/qa/systools/makefile.mk
index cde5b71c215c..035bef25c34a 100644
--- a/sal/qa/systools/makefile.mk
+++ b/sal/qa/systools/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,15 +47,12 @@ CXXFLAGS+= $(LFS_CFLAGS)
 CFLAGS+=/Ob0
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl 
+# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/test_comtools.obj
 
 SHL1TARGET= test_comtools
-SHL1STDLIBS=\
-   $(SALLIB) \
-   $(CPPUNITLIB)\
-   uuid.lib
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) uuid.lib
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx
index 1957d62d54f2..c61ff435d235 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_sal.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <systools/win32/comtools.hxx>
 
 class COMObject : public IUnknown
diff --git a/sal/qa/testHelperFunctions/makefile.mk b/sal/qa/testHelperFunctions/makefile.mk
index 0064cabef952..33c43f259081 100644
--- a/sal/qa/testHelperFunctions/makefile.mk
+++ b/sal/qa/testHelperFunctions/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -49,9 +49,7 @@ SHL1OBJS=  \
     $(SLO)$/testHelperFunctions2.obj
 
 SHL1TARGET= testHelperFunctions
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
index 9272433d2e1f..9d96d91939ec 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
@@ -38,7 +38,7 @@
 
 #include "stringhelper.hxx"
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 // void isJaBloed()
 // {
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
index 9ddc1031d7fa..1adae36ade2a 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
@@ -31,7 +31,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include "stringhelper.hxx"
 
 namespace testOfHelperFunctions
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
index 9987b3a276cd..4589338a5316 100644
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/qa/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_api.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
@@ -51,4 +51,4 @@ SLOFILES = $(SHL1OBJS)
 ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN)
-    cd $(SHL1TARGETN:d) && testshl2 $(SHL1TARGETN:f)
+    cd $(SHL1TARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f)
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 9957f6a56cf1..83df7ec084c6 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -59,7 +59,7 @@ std::type_info const & getSimpleReferenceObjectTypeInfo()
 
 }
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/mutex.hxx"
 #include "salhelper/condition.hxx"
 #include "salhelper/dynload.hxx"
diff --git a/sandbox/com/sun/star/lib/sandbox/AudioProxy.java b/sandbox/com/sun/star/lib/sandbox/AudioProxy.java
deleted file mode 100644
index 154793bbe93e..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/AudioProxy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: AudioProxy.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.applet.AudioClip;
-
-import java.util.Vector;
-
-class AudioProxy implements AudioClip, Holder {
-    private static final boolean DEBUG = false;
-    private static int instances;
-
-    private AudioClip audioClip;
-    private Vector cargo = new Vector();
-
-    AudioProxy(AudioClip audioClip) {
-        this.audioClip = audioClip;
-        instances ++;
-    }
-
-    public void play() {
-        audioClip.play();
-    }
-
-    public void loop() {
-        audioClip.loop();
-    }
-
-    public void stop() {
-        audioClip.stop();
-    }
-
-    public void addCargo(Object object) {
-        cargo.addElement(object);
-    }
-
-    public void removeCargo(Object object) {
-        cargo.removeElement(object);
-    }
-
-    public void finalize() {
-        if(DEBUG) System.err.println("#### AudioProxy.finalize");
-        instances --;
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/Cachable.java b/sandbox/com/sun/star/lib/sandbox/Cachable.java
deleted file mode 100644
index 7e510ae8e4e1..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/Cachable.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Cachable.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-public interface Cachable {
-    Object getHardObject();
-    void   setWeakRef(WeakRef weakRef);
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ClassContext.java b/sandbox/com/sun/star/lib/sandbox/ClassContext.java
deleted file mode 100644
index d66ce85ae079..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ClassContext.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ClassContext.java,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.io.InputStream;
-
-import java.net.URL;
-
-public interface ClassContext  {
-    public URL getBase();
-
-    public boolean hasThreadGroup();
-
-    public ThreadGroup getThreadGroup();
-
-    public InputStream getResourceAsStream(String name);
-
-    public URL getResource(String name);
-
-    public Class findClass(String className) throws ClassNotFoundException;
-
-    public Class loadClass(String className) throws ClassNotFoundException;
-
-    public void dispose();
-
-    public ClassLoader getClassLoader();
-
-    public void addCargo( Object cargo );
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java b/sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java
deleted file mode 100644
index 0bb86a96cb69..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ClassContextImpl.java,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.awt.Toolkit;
-import java.awt.Image;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-
-import java.util.Hashtable;
-
-import java.util.zip.ZipEntry;
-
-final class ClassContextImpl extends ClassLoader implements ClassContext {
-    private static int instances;
-    private static final boolean DEBUG = false;
-
-    private URL codeBase;
-    private ProtectionDomain protectionDomain;
-    private boolean _bSecure;
-    private java.util.Vector _cargoVector = new java.util.Vector();
-
-    private java.util.Vector m_class_path_jars;
-
-    // HACKHACK!!!: java.lang.Thread fragt bei erzeugen eines Threads den
-    // HACKHACK!!!: SECURITYMANAGER nach der THREADGROUP
-    private ThreadGroup threadGroup;
-
-    public ClassContextImpl(URL codeBase, ProtectionDomain protectionDomain, ThreadGroup threadGroup, boolean bSecure) {
-        this(codeBase, protectionDomain, threadGroup);
-
-        _bSecure = bSecure;
-    }
-
-    public ClassContextImpl(URL codeBase, ProtectionDomain protectionDomain, ThreadGroup threadGroup) {
-        if(DEBUG)System.err.println("#### ClassContextImpl.<init>:" + codeBase + " " + protectionDomain + " " + threadGroup);
-
-        instances ++;
-
-        this.codeBase = codeBase;
-        this.protectionDomain = protectionDomain;
-        this.threadGroup = threadGroup;
-    }
-
-    public void finalize() {
-        instances --;
-    }
-
-    public URL getBase() {
-        return codeBase;
-    }
-
-    public void addCargo( Object cargo ) {
-        _cargoVector.addElement( cargo );
-    }
-
-    // For OS/2
-    public URL getCodeBase()
-    {
-      return getBase();
-    }
-
-    public boolean hasThreadGroup() {
-        return threadGroup != null && !threadGroup.isDestroyed();
-    }
-
-    public ThreadGroup getThreadGroup() {
-        if(threadGroup == null || threadGroup.isDestroyed()) {
-            threadGroup = new ThreadGroup(codeBase.toString());
-            threadGroup.setDaemon(true);
-        }
-
-        return threadGroup;
-    }
-
-    boolean checkSecurity() {
-        return !_bSecure;
-    }
-
-    public InputStream getResourceAsStream(String name) {
-          if(DEBUG) System.err.println("#### ClassContext.getResourceAsStream:" + name);
-
-        InputStream inputStream = getSystemResourceAsStream(name);
-        if(inputStream == null) {
-            try {
-                URL url = new URL(codeBase, name);
-                if(ResourceProxy.isResource(url)) { // VALID URL?
-                    ResourceProxy resourceProxy = ResourceProxy.load(url, protectionDomain);
-                    inputStream = resourceProxy.getInputStream();
-                }
-            }
-            catch(MalformedURLException me) {
-            }
-            catch(IOException ioe) {
-            }
-        }
-
-        return inputStream;
-    }
-
-    public URL getResource(String name) {
-          if(DEBUG) System.err.println("#### ClassContext.getResource:" + name);
-
-        URL url = getSystemResource(name);
-        if(url == null) {
-            try {
-                url = new URL(codeBase, name);
-                if(!ResourceProxy.isResource(url)) // VALID URL?
-                    url = null;
-                else
-                    url = new URL("appletresource:" + codeBase + "/+/" + name);
-            }
-            catch(MalformedURLException malformedURLException) {
-                if(DEBUG) System.err.println("#### ClassContext.getResource - exception: " + malformedURLException);
-            }
-        }
-
-        return url;
-    }
-
-    public Class findClass(String className) throws ClassNotFoundException {
-        Class xClass = findLoadedClass(className);
-
-        // It is a nasty hack to test if want to generate
-        // a proxy, but exception throw here sometimes
-        // kills the java vm (jdk1.2.2)
-        if(xClass == null && !className.startsWith("JSGen"))
-            xClass = getClass().forName(className);
-
-        // see above, throwing the exception here
-        // kills sometimes the javavm
-//          if(xClass == null) {
-//              throw new ClassNotFoundException();
-//          }
-
-        return xClass;
-    }
-
-    public Class loadClass(String className) throws ClassNotFoundException {
-          return loadClass(className, true);
-    }
-
-    synchronized protected Class loadClass(String className, boolean resolve) throws ClassNotFoundException {
-          if(DEBUG) System.err.println("#### ClassContext.loadClass:" + className + " "  + resolve);
-
-        // ???SECURITY????
-        SecurityManager security = System.getSecurityManager();
-        if(security != null) {
-            int i = className.lastIndexOf('.');
-            if(i >= 0)
-                security.checkPackageAccess(className.substring(0, i));
-        }
-
-
-        Class xClass = null;
-
-        try {
-            xClass = findClass(className);
-        }
-        catch(ClassNotFoundException e) {
-        }
-
-        if(xClass == null)
-        {
-            try
-            {
-                try
-                {
-                    ResourceProxy resourceProxy = null;
-                    resourceProxy =
-                        ResourceProxy.load(
-                            new URL( codeBase, className.replace('.', '/') + ".class" ), protectionDomain );
-                    byte bytes[] = resourceProxy.getBytes();
-                    //                      if(DEBUG) printHeader(bytes);
-
-                    xClass = defineClass(className, bytes, 0, bytes.length);
-                    //                      xClass = defineClass(className, bytes, 0, bytes.length, protectionDomain);
-                }
-                catch (IOException exc) // if not found
-                {
-                    // try further Class-Path jars
-                    if (null == m_class_path_jars)
-                    {
-                        java.util.Vector class_path_jars = new java.util.Vector();
-                        try
-                        {
-                            java.net.URL manifest_url = new java.net.URL(
-                                codeBase, "META-INF/MANIFEST.MF" );
-                            // read Class-Path from manifest file
-                            ResourceProxy resource= ResourceProxy.load( manifest_url, null );
-                            java.io.InputStream inManifest = resource.getInputStream();
-                            java.util.jar.Manifest manifest =
-                                new java.util.jar.Manifest( inManifest );
-                            java.util.jar.Attributes attributes = manifest.getMainAttributes();
-                            String class_path = attributes.getValue( "Class-Path" );
-
-                            if (class_path != null)
-                            {
-                                java.util.Enumeration tokens =
-                                    new java.util.StringTokenizer( class_path );
-                                while (tokens.hasMoreElements())
-                                {
-                                    try
-                                    {
-                                        java.net.URL url;
-                                        String str_url = (String)tokens.nextElement();
-                                        if (str_url.charAt( 0 ) != '/' &&
-                                            str_url.indexOf( ':' ) < 0)
-                                        {
-                                            // relative path
-                                            url = new java.net.URL( codeBase, str_url );
-                                        }
-                                        else
-                                        {
-                                            url = new java.net.URL( str_url );
-                                        }
-                                        ClassContext context =
-                                            ClassContextProxy.create(
-                                                url, protectionDomain, threadGroup, true );
-                                        Resource res = ResourceProxy.load(url, null);
-                                        res.loadJar(url);
-                                        context.addCargo( resource );
-                                        class_path_jars.add( context );
-                                    }
-                                    catch (MalformedURLException e) // ignoring
-                                    {
-                                    }
-                                }
-                            }
-                        }
-                        catch (IOException e2)
-                        {
-                        }
-                        m_class_path_jars = class_path_jars;
-                    }
-
-                    java.util.Enumeration enum_elements = m_class_path_jars.elements();
-                    while (enum_elements.hasMoreElements())
-                    {
-                        ClassContext context = (ClassContext)enum_elements.nextElement();
-                        try
-                        {
-                            xClass = context.loadClass( className );
-                        }
-                        catch (ClassNotFoundException e) // if not found, try next
-                        {
-                        }
-                    }
-                    if (null == xClass)
-                    {
-                        throw new ClassNotFoundException(
-                            "ClassContext.loadClass - class not found: "
-                            + className + " " + codeBase );
-                    }
-                }
-
-//                  Object objects[] = new Object[2];
-//                  objects[0] = resourceProxy.getProtectionDomain();
-//                  setSigners(xClass, objects);
-            }
-            catch(ClassFormatError classFormatError) {
-                if(DEBUG) System.err.println("#### ClassContext.loadClass - ClassFormat exception:" + classFormatError);
-                throw new ClassNotFoundException("ClassContext.loadClass - ClassFormatError:"
-                                                 + " " + classFormatError
-                                                 + " " + className
-                                                 + " " + codeBase);
-            }
-        }
-
-        if (xClass != null && resolve)
-            resolveClass(xClass);
-
-        return xClass;
-    }
-
-    static class ThreadGroupKiller implements Runnable {
-        ThreadGroup threadGroup = null;
-
-        ThreadGroupKiller(ThreadGroup threadGroup) {
-            this.threadGroup = threadGroup;
-        }
-
-        public void run() {
-            try {
-                if (DEBUG) System.err.println("#### ClassContext - killerThread start");
-                threadGroup.stop();
-                threadGroup.destroy();
-                if (DEBUG) System.err.println("#### ClassContext - killerThread succeeded");
-            }
-            catch(Exception exception) {
-                if (DEBUG) System.err.println("ClassContext.dispose:" + exception);
-            }
-        }
-    };
-
-    synchronized public void dispose() {
-        if(DEBUG)System.err.println("#### ClassContext.dispose:" + threadGroup);
-
-        if(threadGroup != null) {
-            threadGroup.list();
-
-              new Thread(new ThreadGroupKiller(threadGroup), codeBase.toString() + " killer thread").start();
-
-            threadGroup = null;
-        }
-    }
-
-    private void printHeader(byte bytes[]) {
-        System.err.print("#### ClassContext.loadClass - bytes header:");
-        for(int x =0 ; x < 4; x++) {
-            System.err.print(" " + Integer.toHexString(((int)bytes[x]) & 0xff));
-        }
-        System.err.println();
-    }
-
-    public ClassLoader getClassLoader() {
-        return this;
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java b/sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java
deleted file mode 100644
index a7d16e4cca6e..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ClassContextProxy.java,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.awt.Toolkit;
-import java.awt.Image;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-
-import java.util.Hashtable;
-import java.util.zip.ZipEntry;
-
-public final class ClassContextProxy implements ClassContext, Cachable {
-    private static int instances;
-    private static final boolean DEBUG = false;
-
-    /*
-    ** interface cachable methods
-    */
-    private ClassContext classContext;
-    private WeakRef weakRef;
-
-    public ClassContextProxy() {
-        instances ++;
-    }
-
-    public Object getHardObject() {
-        return classContext;
-    }
-
-    public void setWeakRef(WeakRef weakRef) {
-        classContext = (ClassContext)weakRef.getRef();
-        base = classContext.getBase();
-
-        this.weakRef = weakRef;
-        weakRef.incRefCnt();
-    }
-
-    public void finalize() {
-        weakRef.decRefCnt();
-
-        instances --;
-    }
-
-    /*
-    ** ClassContext methods
-    */
-    private URL base;
-
-
-    public static ClassContext create(URL base, ProtectionDomain protectionDomain, ThreadGroup threadGroup) {
-        return create(base, protectionDomain, threadGroup, false);
-    }
-
-    public static ClassContext create(URL base, ProtectionDomain protectionDomain, ThreadGroup threadGroup, boolean bSecure) {
-        Object object = WeakTable.get("ClassContxt: " + base);
-        if(DEBUG) System.err.println("#### ClassContextProxy.create:" + object);
-        ClassContextProxy classContextProxy = (ClassContextProxy)object;
-
-        if(classContextProxy == null) {
-            classContextProxy = new ClassContextProxy(base, protectionDomain, threadGroup, bSecure);
-            WeakTable.put("ClassContxt: " + base, classContextProxy);
-        }
-
-        return classContextProxy;
-    }
-
-    private ClassContextProxy(URL base, ProtectionDomain protectionDomain, ThreadGroup threadGroup, boolean bSecure) {
-        this();
-
-        this.base = base;
-
-        classContext = new ClassContextImpl(base, protectionDomain, threadGroup, bSecure);
-    }
-
-    public ClassLoader getClassLoader() {
-        return classContext.getClassLoader();
-    }
-
-    public boolean hasThreadGroup() {
-        return classContext.hasThreadGroup();
-    }
-
-    public ThreadGroup getThreadGroup() {
-        return classContext.getThreadGroup();
-    }
-
-    public URL getBase() {
-        return classContext.getBase();
-    }
-
-    public InputStream getResourceAsStream(String name) {
-        return classContext.getResourceAsStream(name);
-    }
-
-    public URL getResource(String name) {
-        return classContext.getResource(name);
-    }
-
-    public void addCargo( Object cargo ) {
-        classContext.addCargo( cargo );
-    }
-
-    public void dispose() { // HIER SOLLTE VIELLEICHT NOCH MEHR GETAN WERDEN?
-        classContext.dispose();
-    }
-
-    public synchronized Class findClass(String className) throws ClassNotFoundException {
-        return classContext.findClass(className);
-    }
-
-    public synchronized Class loadClass(String className) throws ClassNotFoundException {
-        return classContext.loadClass(className);
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ExecutionContext.java b/sandbox/com/sun/star/lib/sandbox/ExecutionContext.java
deleted file mode 100644
index 5c281db31b7d..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ExecutionContext.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ExecutionContext.java,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.awt.Image;
-import java.awt.Dimension;
-import java.awt.Container;
-import java.awt.BorderLayout;
-
-import java.applet.Applet;
-import java.applet.AppletStub;
-import java.applet.AppletContext;
-import java.applet.AudioClip;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.text.MessageFormat;
-
-import java.util.Hashtable;
-import java.util.Observable;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public abstract class ExecutionContext extends Observable {
-    private static final boolean DEBUG = false;
-
-    private static int instances;
-
-    /* message ids */
-    protected final static int CMD_LOAD    = 1;
-    protected final static int CMD_INIT    = 2;
-    protected final static int CMD_START   = 3;
-    protected final static int CMD_STOP    = 4;
-    protected final static int CMD_DESTROY = 5;
-    protected final static int CMD_DISPOSE = 6;
-
-    protected final static int LOADED    = 1;
-    protected final static int INITED    = 2;
-    protected final static int STARTED   = 3;
-    protected final static int STOPPED   = 4;
-    protected final static int DESTROYED = 5;
-    protected final static int DISPOSED  = 6;
-
-    private int status = DISPOSED;
-    private Object statusLock= new Object();
-    private boolean bDispatchException;
-
-    protected ClassContext classContext;
-
-    private Thread dispatchThread = null;
-    private SandboxThreadGroup threadGroup = null;
-
-    private String name;
-
-    protected ResourceBundle resourceBundle;
-
-    private Object synObj = new Object();
-    private Message head;
-    private Message tail;
-    private boolean loop = true;
-
-    protected ExecutionContext() {
-        instances ++;
-    }
-
-    public void finalize() {
-        instances --;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    Object getSynObject() {
-        return synObj;
-    }
-
-    class Message {
-        Message next;
-        int id;
-
-        Message(int id) {
-            this.id = id;
-        }
-    }
-
-    public void init(String name, ClassContext classContext) throws MissingResourceException {
-        this.name = name;
-
-        resourceBundle = ResourceBundle.getBundle("sun.applet.resources.MsgAppletViewer");
-
-        this.classContext = classContext;
-
-        threadGroup = new SandboxThreadGroup(classContext.getThreadGroup(), name, classContext.getClassLoader());
-        threadGroup.setDaemon(true);
-
-        dispatchThread = new Thread( threadGroup, new Runnable() {
-            public void run() {
-                while( loop ) {
-                    if( head != null) {
-                        if (DEBUG) System.err.println("#### ExecutionContext dispatchThread " + dispatchThread.toString() + " -dispatching: " + head.id);
-                        dispatch( head.id );
-                        if (DEBUG) System.err.println("#### ExecutionContext dispatchThread " + dispatchThread.toString() + " get next head - current state is " +head.id );
-                        synchronized( getSynObject() ) {
-                            head = head.next;
-                            getSynObject().notify();
-                        }
-                    }
-
-                    synchronized( getSynObject() ) {
-                        if (head == null) {
-                            try {
-                                getSynObject().wait();
-                            }
-                            catch (InterruptedException e ) {
-                                if (DEBUG) System.err.println("#### ExecutionContext - dispatchThread " + dispatchThread.toString()  + " -interrupted");
-                                  break;
-                            }
-                        }
-                    }
-                }
-                  if(DEBUG) System.err.println("#### ExecutionContext - dispatchThread  -terminating");
-            }
-        });
-
-        dispatchThread.setDaemon(true);
-        dispatchThread.start();
-    }
-    public void sendEvent(int id) {
-        sendEvent(id, 0);
-    }
-
-    public void sendEvent(int id, int timeout) {
-          synchronized( getSynObject() ) {
-            try {
-                Message message = new Message(id);
-                if(tail != null)
-                    tail.next = message;
-
-                tail = message;
-
-                if(head == null)
-                    head = tail;
-
-                getSynObject().notify();
-
-                if ( timeout != 0 )
-                    getSynObject().wait( timeout );
-            }
-            catch( InterruptedException e ) {
-            }
-          }
-    }
-
-    public void dispose() {
-          //if(DEBUG) System.err.println("#### ExecutionContext.disposing");
-        dispose(1000);
-    }
-
-    public void dispose( long timeout ) {
-        if(DEBUG) System.err.println("#### ExecutionContext "+ dispatchThread.toString() +"disposing:" + timeout);
-        try {
-            try {
-                synchronized( getSynObject() ) {
-                    while( head != null )
-                        getSynObject().wait( timeout ); // wait at most one second for each queued command
-                      loop = false;
-                       getSynObject().notifyAll();
-                 }
-              dispatchThread.join(timeout);
-            }
-            catch(InterruptedException ee) {
-                if(DEBUG) System.err.println("#### ExecutionContext " + dispatchThread.toString() + " - dispose 1:" + ee);
-            }
-
-            if(DEBUG) threadGroup.list();
-            if ( !threadGroup.isDestroyed() )
-                threadGroup.destroy();
-        }
-        catch (Exception ie) {
-            if(DEBUG) System.err.println("#### ExecutionContext "+ threadGroup.toString() + " - destroyThreadGroup:" + ie);
-            try {
-                threadGroup.stop();
-            } catch (Exception se) {
-                if(DEBUG) System.err.println("#### ExecutionContext "+ threadGroup.toString() + " - stop ThreadGroup:" + se);
-            }
-        }
-
-        classContext = null;
-
-        dispatchThread = null;
-        threadGroup.dispose();
-        threadGroup = null;
-
-        name = null;
-
-        resourceBundle = null;
-
-        synObj = null;
-        head = null;
-        tail = null;
-    }
-
-
-    protected void showStatus(String status) {
-        if (DEBUG) System.err.println("#### ExecutionContext.showStatus:" + status);
-          setChanged();
-          notifyObservers(resourceBundle.getString("appletpanel." + status));
-    }
-
-    protected void showStatus(String status, String arg1) {
-        if(DEBUG) System.err.println("#### ExecutionContext.showStatus" + status + " " + arg1);
-        try {
-            Object args[] = new Object[1];
-            args[0] = arg1;
-            setChanged();
-            try {
-                notifyObservers(MessageFormat.format(resourceBundle.getString("appletpanel." + status), args));
-            }
-            catch(MissingResourceException me) {}
-        }
-        catch(Exception ee) {
-            if(DEBUG)System.err.println("#### ExecutionContext.showStatus:" + ee);
-        }
-    }
-
-
-    public ThreadGroup getThreadGroup() {
-        return threadGroup;
-    }
-
-    /**
-     * Send an event. Queue it for execution by the handler thread.
-     */
-    public void dispatch(int id) {
-        try {
-            switch(id) {
-            case CMD_LOAD:
-                if (status == DISPOSED) {
-                    xload();
-                    setStatus(LOADED);
-                    showStatus("loaded");
-                }
-                else
-                    showStatus("notdisposed");
-                break;
-
-            case CMD_INIT:
-                if(status == LOADED || status == DESTROYED) {
-                    xinit();
-                    setStatus(INITED);
-                    showStatus("inited");
-                }
-                else
-                    showStatus("notloaded");
-                break;
-
-            case CMD_START:
-                if (status == INITED || status == STOPPED) {
-                    xstart();
-                    setStatus(STARTED);
-                    showStatus("started");
-                }
-                else
-                    showStatus("notinited");
-                break;
-
-            case CMD_STOP:
-                if (status == STARTED) {
-                    xstop();
-                    setStatus(STOPPED);
-                    showStatus("stopped");
-                }
-                else
-                    showStatus("notstarted");
-                break;
-
-            case CMD_DESTROY:
-                if(status == INITED || status == STOPPED) {
-                    xdestroy();
-                    setStatus(DESTROYED);
-                    showStatus("destroyed");
-                }
-                else
-                    showStatus("notstopped");
-                break;
-
-            case CMD_DISPOSE:
-                if (status == LOADED || status == DESTROYED) {
-                    xdispose();
-                    //  baseResourceLoader.flush();
-                    showStatus("disposed");
-                  setStatus(DISPOSED);
-                }
-                else
-                    showStatus("notdestroyed");
-                break;
-
-            default:
-                xExtended(id);
-            }
-        }
-        catch (ClassNotFoundException classNotFoundException) {
-            setDispatchException();
-            showStatus("notfound", name);
-            if(DEBUG) classNotFoundException.printStackTrace();
-        }
-        catch (InstantiationException instantiationException) {
-            setDispatchException();
-            showStatus("nocreate", name);
-            if(DEBUG) instantiationException.printStackTrace();
-        }
-        catch (IllegalAccessException illegalAccessException) {
-            setDispatchException();
-            showStatus("noconstruct", name);
-            if(DEBUG) illegalAccessException.printStackTrace();
-        }
-        catch (Exception exception) {
-            setDispatchException();
-            showStatus("exception", exception.getMessage());
-            if(DEBUG) exception.printStackTrace();
-        }
-        catch (ThreadDeath threadDeath) {
-            setDispatchException();
-            showStatus("death");
-            if(DEBUG) threadDeath.printStackTrace();
-
-            throw threadDeath;
-        }
-        catch (Error error) {
-            setDispatchException();
-            showStatus("error", error.getMessage());
-            if(DEBUG) error.printStackTrace();
-        }
-    }
-
-    protected abstract void xload() throws ClassNotFoundException, InstantiationException, IllegalAccessException;
-    protected abstract void xinit();
-    protected abstract void xstart();
-    protected abstract void xstop();
-    protected abstract void xdestroy();
-    protected abstract void xdispose();
-
-    protected void xExtended(int id) {
-    }
-
-    /*
-    **
-    */
-    public void sendLoad() {
-        sendEvent(CMD_LOAD);
-    }
-
-    public void sendInit() {
-        sendEvent(CMD_INIT);
-    }
-
-    public void sendStart() {
-          sendEvent(CMD_START);
-    }
-
-    public void sendStop() {
-        sendEvent(CMD_STOP);
-    }
-
-    public void sendDestroy() {
-        sendEvent(CMD_DESTROY);
-    }
-
-    public void sendDispose() {
-        sendEvent(CMD_DISPOSE);
-    }
-
-    public void startUp() {
-        sendLoad();
-        sendInit();
-        sendStart();
-    }
-
-    public void shutdown() {
-        sendStop();
-        sendDestroy();
-        sendDispose();
-    }
-
-    public void restart() {
-        sendStop();
-        sendDestroy();
-        sendInit();
-        sendStart();
-    }
-
-    public void reload() {
-        sendStop();
-        sendDestroy();
-        sendDispose();
-        sendLoad();
-        sendInit();
-        sendStart();
-    }
-
-    /** This function blocks until the status of ExecutionContext is DISPOSED or
-     *      an Exeption occurred during a call to the AppletExecutionContext in dispatch.
-     * @see #dispatch
-     * @see #setStatus
-     * @see #setDispatchException
-     */
-    public void waitForDispose() {
-        if (status == DISPOSED || bDispatchException)
-            return;
-        else
-        {
-            // wait until status is disposed
-            synchronized (statusLock) {
-                while (status != DISPOSED && !bDispatchException) {
-                    try {
-                        statusLock.wait();
-                    } catch (java.lang.InterruptedException e) {
-                    }
-                }
-            }
-        }
-        System.err.println("exit");
-    }
-
-    protected void  setStatus( int newStatus) {
-        synchronized (statusLock) {
-            status= newStatus;
-            statusLock.notifyAll();
-        }
-    }
-
-    protected void setDispatchException() {
-        synchronized (statusLock) {
-            bDispatchException= true;
-            statusLock.notifyAll();
-        }
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java b/sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java
deleted file mode 100644
index 8fd42f81e5ba..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ImageProducerProxy.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.awt.image.ImageConsumer;
-import java.awt.image.ImageProducer;
-
-import java.util.Vector;
-
-class ImageProducerProxy implements ImageProducer, Holder {
-    ImageProducer imageProducer;
-
-    ImageProducerProxy(ImageProducer imageProducer) {
-        this.imageProducer = imageProducer;
-    }
-
-    public void addConsumer(ImageConsumer imageConsumer) {
-        imageProducer.addConsumer(imageConsumer);
-    }
-
-    public boolean isConsumer(ImageConsumer imageConsumer) {
-        return imageProducer.isConsumer(imageConsumer);
-    }
-
-    public void removeConsumer(ImageConsumer imageConsumer) {
-        imageProducer.removeConsumer(imageConsumer);
-    }
-
-    public void startProduction(ImageConsumer imageConsumer) {
-        imageProducer.startProduction(imageConsumer);
-    }
-
-    public void requestTopDownLeftRightResend(ImageConsumer imageConsumer) {
-        imageProducer.requestTopDownLeftRightResend(imageConsumer);
-    }
-
-
-    /* Holder methods */
-    private Vector cargo = new Vector();
-
-    public void addCargo(Object object) {
-        cargo.addElement(object);
-    }
-
-    public void removeCargo(Object object) {
-        cargo.removeElement(object);
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/JarEntry.java b/sandbox/com/sun/star/lib/sandbox/JarEntry.java
deleted file mode 100644
index 67e908dc8856..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/JarEntry.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: JarEntry.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.security.Identity;
-
-import java.util.zip.ZipEntry;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
-import sun.tools.jar.JarVerifierStream;
-
-public class JarEntry {
-    private static final boolean DEBUG = false;
-
-    private ZipEntry zipEntry = null;
-    private JarVerifierStream jvs = null;
-
-    public JarEntry(ZipEntry zipEntry, JarVerifierStream jvs) {
-        this.zipEntry = zipEntry;
-        this.jvs = jvs;
-    }
-
-    public Identity[] getIdentities() {
-        Identity identities[] = null;
-
-        if(jvs != null) {
-            Class classes[] = new Class[1];
-            classes[0] = String.class;
-
-            try {
-                Method method = JarVerifierStream.class.getMethod("getIdentities", classes);
-
-                Object objects[] = new Object[1];
-                objects[0] = zipEntry.getName();
-
-                identities = (Identity[])method.invoke(jvs, objects);
-            }
-            catch(IllegalAccessException illegalAccessException) {
-                if(DEBUG)System.err.println("#### JarEntry.getIdentities:" + illegalAccessException);
-            }
-            catch(IllegalArgumentException illegalArgumentException) {
-                if(DEBUG)System.err.println("#### JarEntry.getIdentities:" + illegalArgumentException);
-            }
-            catch(InvocationTargetException invocationTargetException ) {
-                if(DEBUG)System.err.println("#### JarEntry.getIdentities:" + invocationTargetException);
-            }
-            catch(NoSuchMethodException noSuchMethodException) {
-                if(DEBUG)System.err.println("#### JarEntry.getIdentities:" + noSuchMethodException);
-            }
-            catch(SecurityException securityException) {
-                if(DEBUG)System.err.println("#### JarEntry.getIdentities:" + securityException);
-            }
-        }
-          return identities;
-    }
-
-    public String getName() {
-        return zipEntry.getName();
-    }
-
-    public long getSize() {
-        return zipEntry.getSize();
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/JarInputStream.java b/sandbox/com/sun/star/lib/sandbox/JarInputStream.java
deleted file mode 100644
index ce5ac363d855..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/JarInputStream.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: JarInputStream.java,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-import java.util.Hashtable;
-
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-
-class JarInputStream {
-//    JarVerifierStream jvs = null;
-    ZipInputStream jvs = null;
-
-    ZipEntry ent = null;
-
-    // mapping of names to objects that have been loaded from the jar
-    Hashtable nameToObject = new Hashtable();
-
-    public JarInputStream(InputStream inputStream) throws IOException {
-//      try {
-            jvs = new ZipInputStream(inputStream);
-//      jvs = new JarVerifierStream(inputStream);
-//      }
-//      catch(JarException e) {
-//          throw new IOException("JarInputStream");
-//      }
-    }
-
-
-    public int available() throws IOException {
-        return jvs.available();
-    }
-
-
-    public JarEntry getNextJarEntry() throws IOException {
-        ent = jvs.getNextEntry();
-
-//          if(ent != null && isManifest(ent.getName()))
-//              ent = jvs.getNextEntry();
-
-        return (ent != null) ? new JarEntry(ent, null/*jvs*/) : null;
-    }
-
-    public int read(byte bytes[]) throws IOException {
-        return jvs.read(bytes,0, bytes.length);
-    }
-
-    public void close() throws IOException {
-        jvs.close();
-    }
-
-
-    static boolean isManifest(String name) {
-        boolean isManifest = false;
-
-        name = name.toUpperCase();
-
-        /* ignore leading slash */
-        if (name.startsWith("/"))
-            name = name.substring(1);
-
-        /* a manifest file or signature file at all? */
-        if (name.startsWith("META-INF/")) {
-            /* the manifest? */
-            isManifest = name.equalsIgnoreCase("META-INF/MANIFEST.MF");
-            isManifest = isManifest || name.endsWith("DSA");
-            isManifest = isManifest || name.endsWith("PK7");
-            isManifest = isManifest || name.endsWith("PGP");
-            isManifest = isManifest || name.endsWith("SF");
-        }
-
-        return isManifest;
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/PermissionCollection.java b/sandbox/com/sun/star/lib/sandbox/PermissionCollection.java
deleted file mode 100644
index df84b68d9686..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/PermissionCollection.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: PermissionCollection.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.util.Vector;
-
-public final class PermissionCollection {
-    private Vector permissions = new Vector();
-
-    public PermissionCollection() {
-        SecurityManager security = System.getSecurityManager();
-        if(security != null) security.checkSecurityAccess("PermissionCollection");
-    }
-
-    public PermissionCollection(PermissionCollection permissionCollection) {
-        SecurityManager security = System.getSecurityManager();
-        if(security != null) security.checkSecurityAccess("PermissionCollection");
-
-        permissions = (Vector)permissionCollection.permissions.clone();
-    }
-
-//      public PermissionCollection(PermissionCollection p1, PermissionCollection p2) {
-//          SecurityManager security = System.getSecurityManager();
-//          if(security != null) security.checkSecurityAccess("PermissionCollection");
-
-//          if(p1 != null)
-//              this.permissions = (Vector)p1.permissions.clone();
-
-//          if(p2 != null)
-//              for(int i = 0; i < p2.permissions.size(); i ++)
-//                  this.permissions.addElement(p2.permissions.elementAt(i));
-//      }
-
-    public void reset() {
-        SecurityManager security = System.getSecurityManager();
-        if(security != null) security.checkSecurityAccess("PermissionCollection");
-
-        permissions.removeAllElements();
-    }
-
-    public void add(Permission permission) {
-        SecurityManager security = System.getSecurityManager();
-        if(security != null) security.checkSecurityAccess("PermissionCollection");
-
-        permissions.addElement(permission);
-    }
-
-    public boolean implies(Permission permission) {
-        boolean granted = false;
-
-        for(int i = 0; i < permissions.size() && !granted; i++) {
-            granted = ((Permission)permissions.elementAt(i)).implies(permission);
-        }
-
-        return granted;
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java b/sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java
deleted file mode 100644
index 55fe7cd02fe4..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ProtectionDomain.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.security.Identity;
-
-import sun.security.provider.SystemIdentity;
-import sun.security.provider.SystemSigner;
-
-public final class ProtectionDomain {
-    private PermissionCollection permissionCollection;
-    private CodeSource codeSource;
-
-    public ProtectionDomain(CodeSource codeSource, PermissionCollection permissionCollection) {
-//          this.permissionCollection = new PermissionCollection(codeSource.getPermissionCollection(), permissionCollection);
-        SecurityManager security = System.getSecurityManager();
-        if(security != null) security.checkSecurityAccess("ProtectionDomain");
-
-        this.permissionCollection = permissionCollection;
-        this.codeSource           = codeSource;
-    }
-
-    public PermissionCollection getPermissions() {
-        SecurityManager security = System.getSecurityManager();
-        if(security != null) security.checkSecurityAccess("ProtectionDomain");
-
-        return permissionCollection;
-    }
-
-    boolean isTrusted() {
-        Identity identities[] = codeSource.identities;
-
-        boolean trusted = false;
-
-        if(identities != null) {
-            for(int i = 0; i < identities.length && !trusted; i++)
-                System.out.println("XXX:" + identities[i].toString(true));
-
-            for(int i = 0; i < identities.length; i ++) {
-                if(identities[i] instanceof SystemIdentity) {
-                    SystemIdentity systemIdentity = (SystemIdentity)identities[i];
-
-                    trusted = systemIdentity.isTrusted();
-                }
-                else if(identities[i] instanceof SystemSigner) {
-                    SystemSigner systemSigner = (SystemSigner)identities[i];
-
-                    trusted = systemSigner.isTrusted();
-                }
-            }
-        }
-        return trusted;
-    }
-
-    boolean implies(Permission permission) {
-        return isTrusted() || permissionCollection.implies(permission);
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/Resource.java b/sandbox/com/sun/star/lib/sandbox/Resource.java
deleted file mode 100644
index 5c387efb5d69..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/Resource.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Resource.java,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.applet.AudioClip;
-
-import java.awt.image.ImageProducer;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-import java.net.URL;
-
-public interface Resource {
-    public ProtectionDomain getProtectionDomain();
-    public URL getURL();
-    public InputStream getInputStream() throws IOException;
-    public byte[] getBytes() throws IOException;
-    public ImageProducer getImageProducer();
-    public AudioClip getAudioClip();
-    public Object getContent() throws IOException;
-    public void loadJar(URL baseURL) throws IOException;
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ResourceImpl.java b/sandbox/com/sun/star/lib/sandbox/ResourceImpl.java
deleted file mode 100644
index 9e915b054974..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ResourceImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ResourceImpl.java,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.applet.AudioClip;
-
-import java.awt.image.ImageProducer;
-
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import sun.awt.image.ByteArrayImageSource;
-import sun.awt.image.URLImageSource;
-
-import sun.applet.AppletAudioClip;
-
-class ResourceImpl implements Resource {
-    private static int instances;
-    private static final boolean DEBUG = false;
-
-    private Object object;
-    private byte bytes[];
-    private URL url;
-    private String type;
-    private ProtectionDomain protectionDomain;
-
-    public ResourceImpl(URL url, byte bytes[], ProtectionDomain protectionDomain) {
-        if(DEBUG)System.err.println("#### ResourceImpl.<init>:" + url + " " + bytes + " " + protectionDomain);
-
-        instances ++;
-
-        this.protectionDomain = protectionDomain;
-        this.url              = url;
-        this.bytes            = bytes;
-    }
-
-    public void finalize() {
-        instances --;
-    }
-
-    public ProtectionDomain getProtectionDomain() {
-        return protectionDomain;
-    }
-
-    public URL getURL() {
-        return url;
-    }
-
-    public synchronized InputStream getInputStream() throws IOException {
-        if(DEBUG) System.err.print("#### ResourceImpl.getInputStream:" + url);
-        InputStream inputStream = null;
-
-        if(bytes == null) {
-            if(DEBUG)System.err.println(" - from url");
-              URLConnection c = url.openConnection();
-            c.setAllowUserInteraction(false);
-              inputStream = c.getInputStream();
-        }
-        else {
-            if(DEBUG)System.err.println(" - from bytes");
-            inputStream = new ByteArrayInputStream(bytes);
-        }
-
-        return inputStream;
-    }
-
-    public synchronized byte[] getBytes() throws IOException {
-        final int chunkSize = 4096;
-
-        if(bytes == null) {
-            InputStream inputStream = getInputStream();
-
-            int read = 0;
-            int total = 0;
-            Vector chunks = new Vector();
-
-            byte chunk[] = new byte[chunkSize];
-            read = inputStream.read(chunk, 0, chunkSize);
-            while(read != -1) { // until end of file
-                if(read < chunkSize) {
-                    byte tmpChunk[] = new byte[read];
-                    System.arraycopy(chunk, 0, tmpChunk, 0, tmpChunk.length);
-                    chunk = tmpChunk;
-                }
-
-                chunks.addElement(chunk);
-                chunk = new byte[chunkSize];
-                total += read;
-
-                read = inputStream.read(chunk, 0, chunkSize);
-            }
-
-            inputStream.close();
-
-            byte tmpBytes[] = new byte[total];
-            int index = 0;
-            for(int i = 0; i < chunks.size(); i++) {
-                chunk = (byte [])chunks.elementAt(i);
-
-                System.arraycopy(chunk, 0, tmpBytes, index, chunk.length);
-                index += chunk.length;
-            }
-
-            bytes = tmpBytes;
-        }
-        return bytes;
-    }
-
-    public synchronized ImageProducer getImageProducer() {
-        if(DEBUG) System.err.println("#### Resource.getImageProducer:");
-
-        ImageProducer imageProducer = null;
-
-        if(object != null)
-            imageProducer = (ImageProducer)object;
-        else {
-            // we use a PrivilegedAction here because otherwise the system classloader
-            // will call our SecurityManager's checkPackageAccess method which will
-            // refuse to access sun.* packages and hence ByteArrayInputStream and
-            // URLImageSource
-            imageProducer= (ImageProducer)
-                AccessController.doPrivileged( new PrivilegedAction() {
-                    public Object run() {
-                        if(bytes != null)
-                            return new ByteArrayImageSource(bytes, 0, bytes.length);
-                        else
-                            return new URLImageSource(url);
-                    }});
-            object = imageProducer;
-        }
-
-        return imageProducer;
-    }
-
-    public synchronized AudioClip getAudioClip() {
-        AudioClip audioClip = null;
-
-        if(object != null)
-            audioClip = (AudioClip)object;
-        else {
-            // we use a PrivilegedAction here because otherwise the system classloader
-            // will call our SecurityManager's checkPackageAccess method which will
-            // refuse to access sun.* packages and hence AppletAudioClip
-            audioClip= (AppletAudioClip)
-                AccessController.doPrivileged( new PrivilegedAction() {
-                    public Object run() {
-                        if(bytes != null)
-                            return new AppletAudioClip(bytes);
-                        else
-                            return new AppletAudioClip(url);
-                    }
-            });
-            object = audioClip;
-        }
-
-        return audioClip;
-    }
-
-    public synchronized void loadJar(URL baseURL) throws IOException {
-        if(object == null) {
-            Vector jarResourceProxys = new Vector();
-            JarInputStream jar = null;
-            byte[] rbuf = new byte[4096];
-
-            try {
-                jar = new JarInputStream(getInputStream());
-
-                JarEntry jarEntry = jar.getNextJarEntry();
-                while(jarEntry != null) {
-                    String extension = null;
-                    String fileName = jarEntry.getName();
-                    int extensionIndex = fileName.lastIndexOf('.');
-
-                    if(extensionIndex != -1) {
-                        extension = jarEntry.getName().substring(extensionIndex);
-                        fileName = fileName.substring(0, extensionIndex);
-                    }
-                    //      System.out.println("AEC entry:" + fileName + " " + extension);
-                    fileName = fileName.replace('.', '/');
-
-                    if(extension != null)
-                        fileName += extension;
-
-
-                    // Workaround: available funktioniert nicht!!!
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-                    int nread;
-                    while((nread = jar.read(rbuf)) > 0)
-                        baos.write(rbuf, 0, nread);
-
-                    byte bytes[] = baos.toByteArray(); //new byte[jar.available()];
-                    //      jar.read(bytes);
-
-                    ProtectionDomain tmpProtectionDomain = null;
-
-                    if(protectionDomain != null) {
-                        PermissionCollection permissionCollection = protectionDomain.getPermissions();
-                        CodeSource codeSource = new CodeSource(baseURL, jarEntry.getIdentities());
-                        tmpProtectionDomain = new ProtectionDomain(codeSource, permissionCollection);
-                    }
-
-                      jarResourceProxys.addElement(ResourceProxy.create(new URL(baseURL, fileName), bytes, tmpProtectionDomain));
-                      jarResourceProxys.addElement(ResourceProxy.create(new URL(baseURL + "/" +  fileName), bytes, tmpProtectionDomain));
-
-                    jarEntry = jar.getNextJarEntry();
-                }
-            }
-            finally {
-                if(jar != null)
-                    jar.close();
-            }
-
-            object = jarResourceProxys;
-        }
-    }
-
-    private void guessType() {
-        /* Parse entries which have special names, like the
-           manifest. We invent "mime types" local to this class */
-//          if (type == null) {
-//              type = guessManifestType(name);
-//          }
-
-        if (type == null) {
-            /*  REMIND Get this from MANIFEST.MF. This should
-            be changed as soon as manifest support is
-            fixed.  Because jvs must support mark, and it
-            isn't always obvious since it's a
-            FilterInputStream and whatever it used to
-            build it is what would give it mark. */
-            try {
-                InputStream tmpStream = new ByteArrayInputStream(getBytes());
-                type = URLConnection.guessContentTypeFromStream(tmpStream);
-            }
-            catch(IOException iOException) {
-                if(DEBUG) System.err.println("#### Resource.guessType - exception:" + iOException);
-            }
-        }
-
-        if (type == null) {
-            // REMIND - this canbe cleaned up if we don't mind
-            // exporting access to MANIFEST data. - epll
-            type = "input-stream/input-stream";
-        }
-
-        if(DEBUG) System.err.println("#### Resource.guessType - guessed:" + type);
-    }
-
-
-    public Object getContent() throws IOException {
-        Object content = null;
-
-        guessType();
-
-        if (type.startsWith("image")) {
-            content = getImageProducer();
-        }
-        else if (type.startsWith("audio")) {
-            content = getAudioClip();
-        }
-        else if (type.startsWith("application/java-vm") || type.startsWith("application/x-java-vm")) {
-
-        }
-        else if (type.equals("manifest/manifest") || type.equals("manifest/signature-bin")) {
-            /* We know what it is. It is handled by JarVerifierStream */
-
-        }
-        else {
-            content = getInputStream();
-        }
-
-        if(DEBUG) System.err.println("#### Resource.getContent:" + content);
-
-        return content;
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ResourceProxy.java b/sandbox/com/sun/star/lib/sandbox/ResourceProxy.java
deleted file mode 100644
index 0a2c049a90d2..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ResourceProxy.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ResourceProxy.java,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.applet.AudioClip;
-
-import java.awt.image.ImageProducer;
-
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-public class ResourceProxy implements Resource, Cachable {
-    private static final boolean DEBUG = false;
-    private static int instances;
-
-    static boolean isResource(URL url) {
-        boolean exists = false;
-
-        ResourceProxy resourceProxy = (ResourceProxy)WeakTable.get(url);
-        exists = resourceProxy != null;
-
-        if(!exists) { // not cache
-            // Check if the resource exists.
-            // It almost works to just try to do an openConnection() but
-            // HttpURLConnection will return true on HTTP_BAD_REQUEST
-            // when the requested name ends in ".html", ".htm", and ".txt"
-            // and we want to be able to handle these
-            //
-            // Also, cannot just open a connection for things like FileURLConnection,
-            // because they suceed when connecting to a non-existant file.
-            // So, in those cases we open and close an input stream.
-
-
-            try {
-                URLConnection conn = url.openConnection();
-                if (conn instanceof java.net.HttpURLConnection) {
-                    java.net.HttpURLConnection hconn = (java.net.HttpURLConnection) conn;
-                    int code = hconn.getResponseCode();
-
-                    exists = (code == java.net.HttpURLConnection.HTTP_OK) || (code < java.net.HttpURLConnection.HTTP_BAD_REQUEST);
-                }
-                else {
-                    // our best guess for the other cases
-                    InputStream is = url.openStream();
-                    is.close();
-                    exists = true;
-                }
-            }
-            catch (Exception ex) {
-            }
-        }
-
-        return exists;
-    }
-
-    static public ResourceProxy load(URL url, ProtectionDomain protectionDomain) {
-          if(DEBUG) System.err.println("#### ResourceProxy.loadResource:" + url);
-
-//          protectionDomain = (protectionDomain == null)
-//              ? new ProtectionDomain(new CodeSource(url), new PermissionCollection())
-//              : protectionDomain;
-
-        ResourceProxy resourceProxy = (ResourceProxy)WeakTable.get(url);
-
-        if(resourceProxy == null) {
-            resourceProxy = new ResourceProxy(url, null, protectionDomain);
-            WeakTable.put(url, resourceProxy);
-        }
-
-        return resourceProxy;
-    }
-
-    static public ResourceProxy create(URL url, byte bytes[], ProtectionDomain protectionDomain) {
-        ResourceProxy resourceProxy = (ResourceProxy)WeakTable.get(url);
-
-        if(resourceProxy == null) {
-            resourceProxy = new ResourceProxy(url, bytes, protectionDomain);
-            WeakTable.put(url, resourceProxy);
-        }
-        else
-            System.err.println("WARNING! ResourceProxy.create - resource already loaded:" + resourceProxy);
-
-        return resourceProxy;
-    }
-
-    /*
-    ** Members
-    */
-    private Resource resource;
-    private WeakRef weakRef;
-
-    /*
-    ** interface cachable methods
-    */
-    public ResourceProxy() {
-        instances ++;
-    }
-
-    public Object getHardObject() {
-        return resource;
-    }
-
-    public void setWeakRef(WeakRef weakRef) {
-        this.resource = (Resource)weakRef.getRef();
-        this.weakRef  = weakRef;
-
-        weakRef.incRefCnt();
-    }
-
-    public void finalize(){
-        weakRef.decRefCnt();
-        instances --;
-    }
-
-    /*
-    ** resource methods
-    */
-    private ResourceProxy(URL url, byte bytes[], ProtectionDomain protectionDomain) {
-        this();
-        resource = new ResourceImpl(url, bytes, protectionDomain);
-    }
-
-    public ProtectionDomain getProtectionDomain() {
-        return resource.getProtectionDomain();
-    }
-
-    public synchronized URL getURL() {
-        return resource.getURL();
-    }
-
-    public synchronized InputStream getInputStream() throws IOException {
-        return resource.getInputStream();
-    }
-
-    public synchronized byte[] getBytes() throws IOException {
-        return resource.getBytes();
-    }
-
-    public synchronized ImageProducer getImageProducer() {
-        ImageProducer imageProducer = resource.getImageProducer();
-
-
-        // This is due to a stupid bug in ImageConsumerQueue,
-        // which seems to be introduced in jdk1.3, which
-        // forbids me to use my own ImageProducer implementation.
-//          imageProducer = new ImageProducerProxy(imageProducer);
-
-//          Holder holder = (Holder)imageProducer;
-//          holder.addCargo(this);
-
-        return imageProducer;
-    }
-
-    public synchronized AudioClip getAudioClip() {
-        AudioClip audioClip = resource.getAudioClip();
-
-        audioClip = new AudioProxy(audioClip);
-
-        if(audioClip instanceof Holder) {
-            Holder holder = (Holder)audioClip;
-            holder.addCargo(this);
-        }
-
-        return audioClip;
-    }
-
-    public Object getContent() throws IOException {
-        Object content = resource.getContent();
-
-        if(content instanceof Holder)
-            ((Holder)content).addCargo(this);
-
-        return content;
-    }
-
-    public void loadJar(URL url) throws IOException {
-        resource.loadJar(url);
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/ResourceViewer.java b/sandbox/com/sun/star/lib/sandbox/ResourceViewer.java
deleted file mode 100644
index 6dcbf26a912a..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/ResourceViewer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ResourceViewer.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.applet.Applet;
-
-import java.awt.BorderLayout;
-import java.awt.Button;
-import java.awt.Frame;
-import java.awt.Graphics;
-import java.awt.List;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import java.util.Enumeration;
-
-import java.util.Observable;
-import java.util.Observer;
-
-public class ResourceViewer extends Frame implements Observer {
-    List list;
-    boolean refill;
-
-    public ResourceViewer() {
-        super("ResourceViewer");
-        list = new List();
-
-        setLayout(new BorderLayout());
-        add("Center", list);
-
-        Button clearCashButton = new Button("clear the cache");
-        clearCashButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent actionEvent) {
-                WeakTable.clear();
-            }
-        });
-        add("South", clearCashButton);
-
-        setSize(500, 200);
-
-        refill = true;
-
-        WeakTable.AddObserver(this);
-
-        setVisible(true);
-    }
-
-    void refresh() {
-        list.removeAll();
-
-        Enumeration elements = WeakTable.elements();
-        while(elements.hasMoreElements()) {
-            WeakRef weakRef = ((WeakEntry)elements.nextElement()).weakRef;
-            list.add(weakRef.getRefCount() + " " + weakRef.getKey().toString());
-        }
-    }
-
-    public void update(Observable observable, Object arg) {
-          refill = true;
-        repaint(500);
-    }
-
-    public void paint(Graphics g) {
-        if(refill) {
-            refill = false;
-            refresh();
-
-        }
-        super.paint(g);
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java b/sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java
deleted file mode 100644
index 43e2f0aed5bd..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: SandboxMessageHandler.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.text.MessageFormat;
-
-/**
- * An hanlder of localized messages.
- *
- * @version     1.8, 03/03/97
- * @author      Koji Uno
- */
-class SandboxMessageHandler {
-    private static ResourceBundle rb;
-    private String baseKey = null;
-
-    static {
-        try {
-            rb = ResourceBundle.getBundle("stardiv.security.resources.MsgAppletViewer");
-        } catch (MissingResourceException e)
-        {
-            System.out.println(e.getMessage());
-        }
-    };
-
-    SandboxMessageHandler(String baseKey) {
-        this.baseKey = baseKey;
-    }
-
-    String getMessage(String key) {
-        return (String)rb.getString(getQualifiedKey(key));
-    }
-
-    String getMessage(String key, Object arg){
-        String basemsgfmt = (String)rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        Object msgobj[] = new Object[1];
-    if (arg == null) {
-        arg = "null"; // mimic java.io.PrintStream.print(String)
-    }
-    msgobj[0] = arg;
-    return msgfmt.format(msgobj);
-    }
-
-    String getMessage(String key, Object arg1, Object arg2) {
-        String basemsgfmt = (String)rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        Object msgobj[] = new Object[2];
-    if (arg1 == null) {
-        arg1 = "null";
-    }
-    if (arg2 == null) {
-        arg2 = "null";
-    }
-    msgobj[0] = arg1;
-    msgobj[1] = arg2;
-    return msgfmt.format(msgobj);
-    }
-
-    String getMessage(String key, Object arg1, Object arg2, Object arg3) {
-        String basemsgfmt = (String)rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        Object msgobj[] = new Object[3];
-    if (arg1 == null) {
-        arg1 = "null";
-    }
-    if (arg2 == null) {
-        arg2 = "null";
-    }
-    if (arg3 == null) {
-        arg3 = "null";
-    }
-    msgobj[0] = arg1;
-    msgobj[1] = arg2;
-    msgobj[2] = arg3;
-    return msgfmt.format(msgobj);
-    }
-
-    String getMessage(String key, Object arg[]) {
-        String basemsgfmt = (String)rb.getString(getQualifiedKey(key));
-        MessageFormat msgfmt = new MessageFormat(basemsgfmt);
-        return msgfmt.format(arg);
-    }
-
-    String getQualifiedKey(String subKey) {
-        return baseKey + "." + subKey;
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java b/sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java
deleted file mode 100644
index 76fb3687a505..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java
+++ /dev/null
@@ -1,1160 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: SandboxSecurity.java,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.FileDescriptor;
-import java.net.URL;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.security.*;
-import sun.security.provider.*;
-
-/**
- * This class defines an applet security policy
- *
- * @version     1.68, 01/27/97
- */
-public class SandboxSecurity extends SecurityManager //implements SecurityManagerExtension
-{
-
-    private static boolean debug = false;
-
-    public final static int NETWORK_NONE = 1;
-    public final static int NETWORK_HOST = 2;
-    public final static int NETWORK_UNRESTRICTED = 3;
-
-    private final static int PRIVELEGED_PORT = 1024;
-
-    boolean bNoExit;
-    boolean initACL;
-    String  readACL[];
-    String  writeACL[];
-    int     networkMode;
-    boolean bCheckSecurity;
-    RecursionCounter InCheck = new RecursionCounter();
-    RecursionCounter InIsSecureLoader = new RecursionCounter();
-    RecursionCounter InInClassLoader = new RecursionCounter();
-    RecursionCounter InClassLoaderDepth = new RecursionCounter();
-    java.security.AllPermission allPerm = new java.security.AllPermission();
-
-    // where we look for identities
-    IdentityScope scope;
-    // local cache for network-loaded classes
-    Hashtable loadedClasses;
-
-    public int getNetworkMode(){ return networkMode; }
-
-    /**
-     * Construct and initialize.
-     */
-    public SandboxSecurity() {
-        reset();
-    }
-
-    /**
-     * Construct and initialize.
-     */
-    public SandboxSecurity( boolean bNoExit_ ) {
-        reset();
-        bNoExit = bNoExit_;
-    }
-
-    /**
-     * Reset from Properties
-     */
-    public void reset() {
-        String str = System.getProperty("appletviewer.security.mode");
-//          System.err.println("#### SandboxSecurity.reset:" + str);
-        if( str == null )
-            networkMode = NETWORK_HOST;
-        else if( str.equals("unrestricted") )
-            networkMode = NETWORK_UNRESTRICTED;
-        else if( str.equals("none") )
-            networkMode = NETWORK_NONE;
-        else
-            networkMode = NETWORK_HOST;
-
-          bCheckSecurity = !Boolean.getBoolean( "stardiv.security.disableSecurity" );
-        // see if security is disabled
-//      String prop = System.getProperty("Security", "1" );
-//      bCheckSecurity = true;
-//      if(prop.equals("0"))
-//          bCheckSecurity = false;
-
-        // see if the system scope is one we know.
-        IdentityScope scope = IdentityScope.getSystemScope();
-
-        if (scope instanceof IdentityDatabase) {
-            this.scope = (IdentityDatabase)scope;
-            debug("installing " + scope + " as the scope for signers.");
-        } else  {
-            debug("no signer scope found.");
-        }
-        loadedClasses = new Hashtable();
-    }
-
-//      /**
-//       * True if called directly from an applet.
-//       */
-//      boolean fromApplet() {
-//      return classLoaderDepth() == 1;
-//      }
-
-//      /**
-//       * This method takes a set of signers and returns true if
-//       * this set of signers implies that a class is trusted.
-//       * In this implementation, it returns true if any of the
-//       * signers is a SystemIdentity which is trusted.
-//       */
-//      protected boolean assessTrust(Object[] signers) {
-//      /* Remind: do we want to actually look into the scope here? */
-
-//      for (int i = 0; i < signers.length; i++) {
-
-//          if (signers[i] instanceof SystemIdentity) {
-//          SystemIdentity sysid = (SystemIdentity)signers[i];
-//          if (sysid.isTrusted()) {
-//              return true;
-//          }
-
-//          } else if (signers[i] instanceof SystemSigner) {
-//          SystemSigner sysid = (SystemSigner)signers[i];
-//              if (sysid.isTrusted()) {
-//                  return true;
-//              }
-//          }
-//      }
-
-//      return false;
-//      }
-
-//      /**
-//       * True if called indirectly from an <it>untrusted</it> applet.
-//       */
-    synchronized boolean inApplet() {
-        boolean ret = false;
-        try {
-            InCheck.acquire();
-            ret = inClassLoader();
-        } finally {
-            InCheck.release();
-        }
-        return ret;
-    }
-
-    /**
-     * The only variable that currently affects whether an applet can
-     * perform certain operations is the host it came from.
-     */
-    public synchronized Object getSecurityContext() {
-        Object ret = null;
-        try {
-            InCheck.acquire();
-            ClassLoader loader = currentClassLoader();
-
-            if (loader != null) {
-                if (loader instanceof ClassContextImpl) {
-                    ClassContext appletLoader = (ClassContextImpl)loader;
-                    ret = appletLoader.getBase();
-                } else {
-                    throw(new SandboxSecurityException("getsecuritycontext.unknown"));
-                }
-            }
-        }
-        finally {
-            InCheck.release();
-        }
-        return ret;
-    }
-
-    /**
-     * Applets are not allowed to create class loaders, or even execute any
-     * of ClassLoader's methods. The name of this method should be changed to
-     * checkClassLoaderOperation or somesuch.
-     */
-    public synchronized void checkCreateClassLoader() {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if (classLoaderDepth() == 2)
-                    throw(new SandboxSecurityException("checkcreateclassloader"));
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Returns true if this threadgroup is in the applet's own thread
-     * group. This will return false if there is no current class
-     * loader.
-     */
-    protected synchronized boolean inThreadGroup(ThreadGroup g) {
-        boolean ret = false;
-        try {
-            InCheck.acquire();
-            ClassLoader loader = currentClassLoader();
-
-            /* If this class wasn't loaded by an AppletClassLoader, we have
-               not eay of telling, for now. */
-
-            if (loader instanceof ClassContextImpl) {
-                ClassContext appletLoader = (ClassContextImpl)loader;
-                ThreadGroup appletGroup = appletLoader.getThreadGroup();
-                ret = appletGroup.parentOf(g);
-            }
-        } finally {
-            InCheck.release();
-        }
-        return ret;
-    }
-
-    /**
-     * Returns true of the threadgroup of thread is in the applet's
-     * own threadgroup.
-     */
-    protected synchronized boolean inThreadGroup(Thread thread) {
-        boolean ret = false;
-        try {
-            InCheck.acquire();
-            ret = inThreadGroup(thread.getThreadGroup());
-        }
-        finally {
-            InCheck.release();
-        }
-        return ret;
-    }
-
-    /**
-     * Applets are not allowed to manipulate threads outside
-     * applet thread groups.
-     */
-    public synchronized void checkAccess(Thread t) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if (classLoaderDepth()==3 && (! inThreadGroup(t))) {
-                    throw(new SandboxSecurityException("checkaccess.thread"));
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets are not allowed to manipulate thread groups outside
-     * applet thread groups.
-     */
-    public synchronized void checkAccess(ThreadGroup g) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if (classLoaderDepth() == 4 && (! inThreadGroup(g))) {
-                    throw(new SandboxSecurityException("checkaccess.threadgroup", g.toString()));
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-
-    }
-
-    /**
-     * Applets are not allowed to exit the VM.
-     */
-    public synchronized void checkExit(int status) {
-        try {
-            InCheck.acquire();
-            if( bNoExit ) {
-                throw(new SandboxSecurityException("checkexit", String.valueOf(status)));
-            }
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if( inApplet() ) {
-                    throw(new SandboxSecurityException("checkexit", String.valueOf(status)));
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets are not allowed to fork processes.
-     */
-    public synchronized void checkExec(String cmd) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader()) {
-                if (inApplet()) {
-                    throw(new SandboxSecurityException("checkexec", cmd));
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets are not allowed to link dynamic libraries.
-     */
-    public synchronized void checkLink(String lib) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                switch (classLoaderDepth()) {
-                case 2: // Runtime.load
-                case 3: // System.loadLibrary
-                    throw(new SandboxSecurityException("checklink", lib));
-                default:
-                    break;
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets are not allowed to access the entire system properties
-     * list, only properties explicitly labeled as accessible to applets.
-     */
-    public synchronized void checkPropertiesAccess() {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if (classLoaderDepth() == 2) {
-                    throw(new SandboxSecurityException("checkpropsaccess"));
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets can access the system property named by <i>key</i>
-     * only if its twin <i>key.applet</i> property is set to true.
-     * For example, the property <code>java.home</code> can be read by
-     * applets only if <code>java.home.applet</code> is <code>true</code>.
-     */
-    public synchronized void checkPropertyAccess(String key) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if (classLoaderDepth() == 2) {
-                    String prop = System.getProperty(key + ".applet");
-                    boolean allow = new Boolean(prop).booleanValue();
-                    if ( !allow ) {
-                        throw(new SandboxSecurityException("checkpropsaccess.key", prop));
-                    }
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Parse an ACL. Deals with "~" and "+"
-     */
-    void parseACL(Vector v, String path, String defaultPath) {
-        String sep = System.getProperty("path.separator");
-        StringTokenizer t = new StringTokenizer(path, sep);
-
-        while (t.hasMoreTokens()) {
-            String dir = t.nextToken();
-            if (dir.startsWith("~")) {
-            v.addElement(System.getProperty("user.home") +
-                     dir.substring(1));
-            } else if (dir.equals("+")) {
-            if (defaultPath != null) {
-                parseACL(v, defaultPath, null);
-            }
-            } else {
-            v.addElement(dir);
-            }
-        }
-    }
-
-    /**
-     * Parse an ACL.
-     */
-    String[] parseACL(String path, String defaultPath) {
-        if (path == null) {
-            return new String[0];
-        }
-        if (path.equals("*")) {
-            return null;
-        }
-        Vector v = new Vector();
-        parseACL(v, path, defaultPath);
-
-        String acl[] = new String[v.size()];
-        v.copyInto(acl);
-        return acl;
-    }
-
-    /**
-     * Initialize ACLs. Called only once.
-     */
-    void initializeACLs() {
-        readACL = parseACL(System.getProperty("acl.read"),
-                   System.getProperty("acl.read.default"));
-        writeACL = parseACL(System.getProperty("acl.write"),
-                    System.getProperty("acl.write.default"));
-        initACL = true;
-    }
-
-    /**
-     * Check if an applet can read a particular file.
-     */
-    public synchronized void checkRead(String file) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                ClassLoader loader = currentClassLoader();
-
-                /* If no class loader, it's a system class. */
-                if (loader != null)
-                {
-                    /* If not an AppletClassLoader, we don't know what to do */
-                    if (! (loader instanceof ClassContextImpl))
-                        throw(new SandboxSecurityException("checkread.unknown", file));
-                    ClassContext appletLoader = (ClassContextImpl)loader;
-                    URL base = appletLoader.getBase();
-                    checkRead(file, base);
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    public synchronized void checkRead(String file, URL base) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && (base != null) && !isSecureLoader() ) {
-                if (!initACL)
-                    initializeACLs();
-                if (readACL == null)
-                {
-                    InCheck.release();
-                    return;
-                }
-
-                String realPath = null;
-                try {
-                    realPath = (new File(file)).getCanonicalPath();
-                } catch (IOException e) {
-                    throw(new SandboxSecurityException("checkread.exception1", e.getMessage(), file));
-                }
-
-                for (int i = readACL.length ; i-- > 0 ;) {
-                    if (realPath.startsWith(readACL[i]))
-                    {
-                        InCheck.release();
-                        return;
-                    }
-                }
-
-                // if the applet is loaded from a file URL, allow reading
-                // in that directory
-                if (base.getProtocol().equals("file")) {
-                    String dir = null;
-                    try {
-                        // If the file url contains spaces (i.e. %20) then URL.getFile() still contains %20
-                        // File.getCanonicalPath does not replace %20
-                        // create a string with real spaces instead of %20
-                        StringBuffer buf= new StringBuffer(256);
-                        String sSpace= "%20";
-                        String sFile= base.getFile();
-                        int begin= 0;
-                        int end= 0;
-                        while((end= sFile.indexOf(sSpace, begin)) != -1) {
-                            buf.append( sFile.substring(begin, end));
-                            buf.append(" ");
-                            begin= end + sSpace.length();
-                        }
-                        buf.append(sFile.substring(begin));
-
-                        String sWithSpaces= buf.toString();
-                        dir = (new File(sWithSpaces).getCanonicalPath());
-                    } catch (IOException e) { // shouldn't happen
-                        throw(new SandboxSecurityException("checkread.exception2", e.toString()));
-                    }
-                    if (realPath.startsWith(dir))
-                    {
-                        InCheck.release();
-                        return;
-                    }
-                }
-                throw new SandboxSecurityException("checkread", file, realPath);
-            }
-        } finally {
-            InCheck.release();
-        }
-
-    }
-        /**
-     * Checks to see if the current context or the indicated context are
-     * both allowed to read the given file name.
-     * @param file the system dependent file name
-     * @param context the alternate execution context which must also
-     * be checked
-     * @exception  SecurityException If the file is not found.
-     */
-    public synchronized void checkRead(String file, Object context) {
-        try {
-            InCheck.acquire();
-            checkRead(file);
-            if (context != null)
-                checkRead(file, (URL) context);
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Check if an applet can write a particular file.
-     */
-    public synchronized void checkWrite(String file) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && inApplet() && !isSecureLoader() ) {
-                if (!initACL)
-                    initializeACLs();
-                if (writeACL == null)
-                {
-                    InCheck.release();
-                    return;
-                }
-
-                String realPath = null;
-                try {
-                    realPath = (new File(file)).getCanonicalPath();
-                } catch (IOException e) {
-                    throw(new SandboxSecurityException("checkwrite.exception", e.getMessage(), file));
-                }
-
-                for (int i = writeACL.length ; i-- > 0 ;) {
-                    if (realPath.startsWith(writeACL[i]))
-                    {
-                        InCheck.release();
-                        return;
-                    }
-            }
-            throw(new SandboxSecurityException("checkwrite", file, realPath));
-        }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets are not allowed to open file descriptors unless
-     * it is done through a socket, in which case other access
-     * restrictions still apply.
-     */
-    public synchronized void checkRead(FileDescriptor fd) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if( (inApplet() && !inClass("java.net.SocketInputStream") ) || (!fd.valid()) )
-                    throw(new SandboxSecurityException("checkread.fd"));
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets are not allowed to open file descriptors unless
-     * it is done through a socket, in which case other access
-     * restrictions still apply.
-     */
-    public synchronized void checkWrite(FileDescriptor fd) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if( (inApplet() && !inClass("java.net.SocketOutputStream")) || (!fd.valid()) )
-                    throw(new SandboxSecurityException("checkwrite.fd"));
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets can only listen on unpriveleged ports > 1024
-     * A port of 0 denotes an ephemeral system-assigned port
-     * Which will be outside this range.  Note that java sockets
-     * take an int and ports are really a u_short, but range
-     * checking is done in ServerSocket & DatagramSocket, so the port policy
-     * cannot be subverted by ints that wrap around to an illegal u_short.
-     */
-    public synchronized void checkListen(int port) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if (inApplet() && port > 0 && port < PRIVELEGED_PORT)
-                    throw(new SandboxSecurityException("checklisten", String.valueOf(port)));
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Applets can accept connectionions on unpriveleged ports, from
-     * any hosts they can also connect to (typically host-of-origin
-     * only, depending on the network security setting).
-     */
-    public synchronized void checkAccept(String host, int port) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if( inApplet() && port < PRIVELEGED_PORT )
-                    throw(new SandboxSecurityException("checkaccept", host, String.valueOf(port)));
-                checkConnect(host, port);
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Check if an applet can connect to the given host:port.
-     */
-    public synchronized void checkConnect(String host, int port) {
-        try {
-            InCheck.acquire();
-            if(bCheckSecurity && !isSecureLoader() ) {
-                ClassLoader loader = currentClassLoader();
-                if (loader == null)
-                {
-                    InCheck.release();
-                    return; // Not called from an applet, so it is ok
-                }
-
-                // REMIND: This is only appropriate for our protocol handlers.
-                int depth = classDepth("sun.net.www.http.HttpClient");
-                if (depth > 1)
-                {
-                    InCheck.release();
-                    return; // Called through our http protocol handler
-                }
-
-                if(getInCheck())
-                {
-                    InCheck.release();
-                    return;
-                }
-
-                if (loader instanceof ClassContextImpl) {
-                    ClassContext appletLoader = (ClassContextImpl)loader;
-                    checkConnect(appletLoader.getBase().getHost(), host);
-                } else {
-                    throw(new SandboxSecurityException("checkconnect.unknown"));
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Checks to see if the applet and the indicated execution context
-     * are both allowed to connect to the indicated host and port.
-     */
-    public synchronized void checkConnect(String host, int port, Object context) {
-        try {
-            InCheck.acquire();
-            checkConnect(host, port);
-            if (context != null)
-                checkConnect(((URL) context).getHost(), host);
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    public synchronized void checkConnect(String fromHost, String toHost, boolean trustP) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if (fromHost == null)
-                {
-                    InCheck.release();
-                    return;
-                }
-
-                switch (networkMode) {
-                case NETWORK_NONE:
-                    throw(new SandboxSecurityException("checkconnect.networknone", fromHost, toHost));
-
-                case NETWORK_HOST:
-                    /*
-                     * The policy here is as follows:
-                     *
-                     * - if the strings match, and we know the IP address for it
-                     * we allow the connection. The calling code downstream will
-                     * substitute the IP in their request to the proxy if needed.
-                     * - if the strings don't match, and we can get the IP of
-                     * both hosts then
-                     *   - if the IPs match, we allow the connection
-                     *   - if they don't we throw(an exception
-                     * - if the string match works and we don't know the IP address
-                     * then we consult the trustProxy property, and if that is true,
-                     * we allow the connection.
-                     * set inCheck so InetAddress knows it doesn't have to
-                     * check security.
-                     */
-                    try {
-                        inCheck = true;
-                        InetAddress toHostAddr, fromHostAddr;
-                        if (!fromHost.equals(toHost)) {
-                            try {
-                                // the only time we allow non-matching strings
-                                // is when IPs and the IPs match.
-                                toHostAddr = InetAddress.getByName(toHost);
-                                fromHostAddr = InetAddress.getByName(fromHost);
-
-                                if( fromHostAddr.equals(toHostAddr) )
-                                {
-                                    InCheck.release();
-                                    return;
-                                }
-                                else
-                                {
-                                    throw(new SandboxSecurityException(
-                                              "checkconnect.networkhost1", toHost, fromHost));
-                                }
-
-                            } catch (UnknownHostException e) {
-                                throw(new SecurityException("checkconnect.networkhost2" + toHost + fromHost));
-//                              throw(new SandboxSecurityException("checkconnect.networkhost2", toHost, fromHost));
-                            }
-                        } else {
-                            try {
-                                toHostAddr = InetAddress.getByName(toHost);
-                                InCheck.release();
-                                // strings match: if we have IP, we're homefree,
-                                // otherwise we check the properties.
-                                return;
-                                // getBoolean really defaults to false.
-                            } catch (UnknownHostException e) {
-                                if( trustP )
-                                {
-                                    InCheck.release();
-                                    return;
-                                }
-                                else
-                                {
-                                    throw(new SandboxSecurityException(
-                                              "checkconnect.networkhost3", toHost));
-                                }
-                            }
-                        }
-                    } finally {
-                        inCheck = false;
-                    }
-
-                case NETWORK_UNRESTRICTED:
-                    InCheck.release();
-                    return;
-                }
-                throw(new SandboxSecurityException("checkconnect", fromHost, toHost));
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-
-
-    /**
-     * check if an applet from a host can connect to another
-     * host. This usually means that you need to determine whether
-     * the hosts are inside or outside the firewall. For now applets
-     * can only access the host they came from.
-     */
-    public synchronized void checkConnect(String fromHost, String toHost) {
-        try {
-            InCheck.acquire();
-            checkConnect(fromHost, toHost, Boolean.getBoolean("trustProxy"));
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Checks to see if top-level windows can be created by the caller.
-     */
-    public synchronized boolean checkTopLevelWindow(Object window) {
-        boolean ret = true;
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && inClassLoader() && !isSecureLoader() ) {
-                /* XXX: this used to return depth > 3. However, this lets */
-                /* some applets create frames without warning strings. */
-                ret = false;
-            }
-        } finally {
-            InCheck.release();
-        }
-        return ret;
-    }
-
-    /**
-     * Check if an applet can access a package.
-     */
-    public synchronized void checkPackageAccess(String pkg) {
-        try {
-            InCheck.acquire();
-
-            if( bCheckSecurity && inClassLoader() && !isSecureLoader() ) {
-                if( pkg.equals( "stardiv.applet" )
-                    // Das AWT von StarDivision
-                    || pkg.equals( "stardiv.look" )
-                    || pkg.equals( "netscape.javascript" ) )
-                {
-                    InCheck.release();
-                    return;
-                }
-
-                final String forbidden[] = new String[]{
-                    "com.sun.star.uno",
-                    "com.sun.star.lib.uno",
-                    "com.sun.star.comp.connections",
-                    "com.sun.star.comp.loader",
-                    "com.sun.star.comp.servicemanager"
-                };
-
-
-                for(int j = 0; j < forbidden.length; ++ j) {
-                    if(pkg.startsWith(forbidden[j]))
-                        throw(new SandboxSecurityException("checkpackageaccess2", pkg));
-                }
-
-                int i = pkg.indexOf('.');
-                while (i > 0) {
-                    String subpkg = pkg.substring(0,i);
-                    if( Boolean.getBoolean("package.restrict.access." + subpkg) )
-                        throw(new SandboxSecurityException("checkpackageaccess", pkg));
-                    i = pkg.indexOf('.',i+1);
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Check if an applet can define classes in a package.
-     */
-    public synchronized void checkPackageDefinition(String pkg) {
-        try {
-            InCheck.acquire();
-        } finally {
-            InCheck.release();
-        }
-        return;
-/*
-    if (!inClassLoader())
-        return;
-        int i = pkg.indexOf('.');
-
-        while (i > 0) {
-        String subpkg = pkg.substring(0,i);
-        if (Boolean.getBoolean("package.restrict.definition." + subpkg)) {
-                throw(new SandboxSecurityException("checkpackagedefinition", pkg);
-        }
-        i = pkg.indexOf('.',i+1);
-        }
-*/
-    }
-
-
-    /**
-     * Check if an applet can set a networking-related object factory.
-     */
-    public synchronized void checkSetFactory() {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && inApplet() && !isSecureLoader() )
-                throw(new SandboxSecurityException("cannotsetfactory"));
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Check if client is allowed to reflective access to a member or
-     * a set of members for the specified class.  Once initial access
-     * is granted, the reflected members can be queried for
-     * identifying information, but can only be <strong>used</strong>
-     * (via get, set, invoke, or newInstance) with standard Java
-     * language access control.
-     *
-     * <p>The policy is to deny <em>untrusted</em> clients access to
-     * <em>declared</em> members of classes other than those loaded
-     * via the same class loader.  All other accesses are granted.
-     *
-     * XXX: Should VerifyClassAccess here?  Should Class.forName do it?
-     */
-    public synchronized void checkMemberAccess(Class clazz, int which) {
-        try {
-            InCheck.acquire();
-
-            if( bCheckSecurity && !isSecureLoader() ) {
-                if( which != java.lang.reflect.Member.PUBLIC ) {
-                    ClassLoader currentLoader = currentClassLoader();
-                    if( currentLoader != null && (classLoaderDepth() <= 3) )
-                        /* Client is an untrusted class loaded by currentLoader */
-                        if( currentLoader != clazz.getClassLoader() )
-                            throw(new SandboxSecurityException("checkmemberaccess"));
-                }
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Checks to see if an applet can initiate a print job request.
-     */
-    public synchronized void checkPrintJobAccess() {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && inApplet() && !isSecureLoader() )
-                throw(new SandboxSecurityException("checkgetprintjob"));
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Checks to see if an applet can get System Clipboard access.
-     */
-    public synchronized void checkSystemClipboardAccess() {
-        try {
-            InCheck.acquire();
-
-            if( bCheckSecurity && inApplet() && !isSecureLoader() )
-                throw(new SandboxSecurityException("checksystemclipboardaccess"));
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Checks to see if an applet can get EventQueue access.
-     */
-    public synchronized void checkAwtEventQueueAccess() {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && inClassLoader() && !isSecureLoader() ) {
-//              throw(new SandboxSecurityException("checkawteventqueueaccess"));
-            }
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Checks to see if an applet can perform a given operation.
-     */
-    public synchronized void checkSecurityAccess(String action) {
-        try {
-            InCheck.acquire();
-            if( bCheckSecurity && inApplet() && !isSecureLoader() )
-                throw(new SandboxSecurityException("checksecurityaccess", action));
-        } finally {
-            InCheck.release();
-        }
-    }
-
-    /**
-     * Returns the thread group of the applet. We consult the classloader
-     * if there is one.
-     */
-    public synchronized ThreadGroup getThreadGroup() {
-        ThreadGroup group = null;
-        try {
-            InCheck.acquire();
-            /* First we check if any classloaded thing is on the stack. */
-            ClassLoader loader = currentClassLoader();
-            if (loader != null && (loader instanceof ClassContextImpl))
-            {
-                if( inThreadGroup( Thread.currentThread() ) )
-                {
-                    group = Thread.currentThread().getThreadGroup();
-                }
-                else
-                {
-                    ClassContextImpl appletLoader = (ClassContextImpl)loader;
-                    group = appletLoader.getThreadGroup();
-                }
-            }
-            else
-            {
-                group = super.getThreadGroup();
-            }
-        } finally {
-            InCheck.release();
-        }
-        return group;
-    }
-
-    public void debug(String s) {
-        if( debug )
-            System.err.println(s);
-    }
-
-    // This method is called from within the checkXXX method which
-    //already track if this class is on the stack by using InCheck.
-    private synchronized boolean isSecureLoader() {
-        InIsSecureLoader.acquire();
-        try {
-            boolean bReturn = false;
-            ClassLoader loader = currentClassLoader();
-            if (loader != null) {
-                if (loader instanceof ClassContextImpl) {
-                    bReturn = !((ClassContextImpl) loader).checkSecurity();
-                } else {
-                    bReturn = true; // fremder ClassLoader: kann machen was er will
-                }
-            } else {
-                bReturn = true;
-            }
-            return bReturn;
-        } finally {
-            InIsSecureLoader.release();
-        }
-    }
-
-
-
-    /* In checkPermission we trap calls which are not covered by the old
-      (1.1) SecurityManager functions. This is necessary, because whenever
-      applets are used then the SecurityManager is set and Java components
-      may cause a checkPermission call. Then, if a user has not specified
-      permissions for this component, a SecurityException will be thrown
-      and the component fails to work.
-
-      Calls to java.lang.SecurityManager.inClassLoader result in
-      a call to  this function. For example, a checkPackageAccess with the
-      package java.text resulted in a call to this function with the permission
-      All_Permission. We use the member InCheck in order to determine if we
-      are in one of the check functions. If we are then checkPermissions does
-      nothing. The calling checkXXX does the required check anyway.
-
-      We cannot override
-      void checkPermission(Permission perm, Object context)
-      because we do not know if in the thread, which is represented by context,
-      one of our security functions has been called. That is, we have no
-      access to InCheck or the class loaders to dertime if we grant permission.
-
-    */
-    public synchronized void checkPermission(java.security.Permission perm)
-    {
-        //isSecureClassLoader calls SecurityManager.currentClassLoader, which then
-        //calls this function to check if we have AllPermission. If so, then currentClassLoader
-        //returns null. Therefore we must throw and exception here. This is similar with
-        //the functions inClassLoader and classLoaderDepth.
-        if (InIsSecureLoader.inRecursion()
-        || InInClassLoader.inRecursion()
-        || InClassLoaderDepth.inRecursion())
-        {
-            if (perm.implies(allPerm))
-                throw(new SandboxSecurityException("checkPermission ", perm.toString()));
-        }
-        if (InCheck.inRecursion() == false
-            && isSecureLoader() == false)
-        {
-            throw(new SandboxSecurityException("checkPermission ", perm.toString()));
-        }
-    }
-
-    protected boolean inClassLoader()
-    {
-        InInClassLoader.acquire();
-        try
-        {
-            return super.inClassLoader();
-        } finally {
-            InInClassLoader.release();
-        }
-    }
-
-    protected int classLoaderDepth()
-    {
-        InClassLoaderDepth.acquire();
-        try
-        {
-            return super.classLoaderDepth();
-        } finally {
-            InClassLoaderDepth.release();
-        }
-
-    }
-}
-
-class RecursionCounter
-{
-    void acquire()
-    {
-        int count = ((Integer)refCount.get()).intValue();
-        refCount.set(new Integer(++count));
-    }
-
-    void release()
-    {
-        int count = ((Integer)refCount.get()).intValue();
-        refCount.set(new Integer(--count));
-    }
-
-    boolean inRecursion() {
-        int count = ((Integer)refCount.get()).intValue();
-        return count > 0;
-    }
-
-    private ThreadLocal refCount = new ThreadLocal() {
-         protected synchronized Object initialValue() {
-             return new Integer(0);
-         }
-    };
-}
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java b/sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java
deleted file mode 100644
index 99e9246ff839..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: SandboxSecurityException.java,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-/**
- * An applet security exception.
- *
- * @version     1.6, 11/23/96
- * @author  Arthur van Hoff
- */
-public class SandboxSecurityException extends SecurityException {
-    private String key = null;
-    private Object msgobj[] = null;
-
-    public SandboxSecurityException(String name) {
-        super(name);
-        this.key = name;
-    }
-
-    public SandboxSecurityException(String name, String arg) {
-        this(name);
-        msgobj = new Object[1];
-        msgobj[0] = (Object)arg;
-    }
-
-    public SandboxSecurityException(String name, String arg1, String arg2) {
-        this(name);
-        msgobj = new Object[2];
-        msgobj[0] = (Object)arg1;
-        msgobj[1] = (Object)arg2;
-    }
-
-
-    //The loading of the static member  amh caused a deadlock:
-    //Thread 1 holds a monitor on SandboxSecuritymethod and tries to get hold of
-    //a lock of the class loader.
-    //Thread 2 is the finalizer which holds the class loader monitor an needs the
-    //SandboxSecurity monitor.
-    //Therefor the method getLocalizedMessage and the member amh have been removed.
-//    private static SandboxMessageHandler amh = new SandboxMessageHandler("appletsecurityexception");
-
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java b/sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java
deleted file mode 100644
index 5fb0f16f6859..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: SandboxThreadGroup.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-public class SandboxThreadGroup extends ThreadGroup {
-    private static int instances;
-    private Object context = null;
-
-    public SandboxThreadGroup(String name, Object context) {
-        this(Thread.currentThread().getThreadGroup(), name, context);
-    }
-
-    public SandboxThreadGroup(ThreadGroup parent, String name, Object context) {
-        super(parent, name);
-
-        instances ++;
-
-        setMaxPriority(Thread.NORM_PRIORITY - 1);
-
-        this.context = context;
-    }
-
-    public Object getContext() {
-        return context;
-    }
-
-    public void dispose() {
-        context = null;
-    }
-
-    public void finalize() {
-        instances --;
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/WeakRef.java b/sandbox/com/sun/star/lib/sandbox/WeakRef.java
deleted file mode 100644
index e136432827e4..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/WeakRef.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: WeakRef.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-public class WeakRef {
-    static private final boolean DEBUG = false;
-
-    private int refCnt;
-    private Object ref;
-    private Object key;
-
-    WeakRef(Object key, Object ref) {
-        this.key       = key;
-        this.ref       = ref;
-    }
-
-    public Object getRef() {
-        return ref;
-    }
-
-    public Object getKey() {
-        return key;
-    }
-
-    int getRefCount() {
-        return refCnt;
-    }
-
-    // the following two methods where synchronized, but need not to be
-    public void incRefCnt() {
-        refCnt ++;
-    }
-
-    public synchronized void decRefCnt() {
-        refCnt --;
-        if(refCnt <= 0) {
-            WeakTable.remove(key);
-
-            if(DEBUG)System.err.println("#### WeakRef - object freeed:" + key + " " + ref);
-            if(ref instanceof Disposable) {
-                ((Disposable)ref).dispose();
-            }
-
-            ref = null;
-        }
-    }
-
-    public String toString() {
-        return "WeakRef - " + key + " " + ((ref == null) ? "null" : ref.toString());
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/WeakTable.java b/sandbox/com/sun/star/lib/sandbox/WeakTable.java
deleted file mode 100644
index 56d425c03577..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/WeakTable.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: WeakTable.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.lang.reflect.Method;
-
-import java.util.Hashtable;
-import java.util.Observable;
-import java.util.Observer;
-
-public class WeakTable extends Observable {
-    private static final boolean DEBUG = false;
-
-    private static final void DEBUG(String dbg) {
-        if (DEBUG)
-            System.err.println(">>> com.sun.star.lib.sandbox.WeakTable - " + dbg);
-    }
-
-    static WeakTable weakTable = new WeakTable();
-
-    public Hashtable hash = new Hashtable();
-
-    synchronized private void pput(Object key, Cachable cachable) {
-          DEBUG("put:" + key + " " + cachable);
-
-        synchronized(hash) {
-            Object hardObject = cachable.getHardObject();
-            Class weakClass   = cachable.getClass();
-
-            WeakRef weakRef = new WeakRef(key, hardObject);
-            cachable.setWeakRef(weakRef);
-
-            hash.put(key, new WeakEntry(weakClass, weakRef));
-        }
-        setChanged();
-        notifyObservers();
-    }
-
-    synchronized private Cachable pget(Object key) {
-          DEBUG("get:" + key);
-
-        String error = null;
-
-        Cachable cachable = null;
-
-        synchronized(hash) {
-            WeakEntry weakEntry = (WeakEntry)hash.get(key);
-            if(weakEntry != null) {
-                try {
-                    //          Class sig[] = new Class[1];
-                    //          sig[0] = weakRef.getClass();
-                    //          Method method = weakClass.getMethod("<init>", sig);
-
-                    cachable = (Cachable)weakEntry.weakClass.newInstance();
-                    cachable.setWeakRef(weakEntry.weakRef);
-                }
-                catch(IllegalAccessException e) {
-                    error = "#### WeakTable.get:" + e;
-                }
-                catch(InstantiationException e) {
-                    error = "#### WeakTable.get:" + e;
-                }
-            }
-        }
-        if(error != null)
-            System.err.println(error);
-
-        return cachable;
-    }
-
-    synchronized private void premove(Object key) {
-        hash.remove(key);
-
-        setChanged();
-        notifyObservers();
-    }
-
-    synchronized private void pclear() {
-        hash.clear();
-
-        setChanged();
-        notifyObservers();
-    }
-
-    public void addObserver(Observer observer) {
-        super.addObserver(observer);
-
-        observer.update(this, null);
-    }
-
-    public static void put(Object key, Cachable cachable) {
-        weakTable.pput(key, cachable);
-    }
-
-    public static Cachable get(Object key) {
-        return weakTable.pget(key);
-    }
-
-    public static void remove(Object key) {
-        weakTable.premove(key);
-    }
-
-    public static void AddObserver(Observer observer) {
-        weakTable.addObserver(observer);
-    }
-
-    public static void DeleteObserver(Observer observer) {
-        weakTable.deleteObserver(observer);
-    }
-
-    static void clear() {
-        weakTable.pclear();
-    }
-
-    static java.util.Enumeration elements() {
-        return weakTable.hash.elements();
-    }
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/XImage.java b/sandbox/com/sun/star/lib/sandbox/XImage.java
deleted file mode 100644
index 39f4fd27e4c8..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/XImage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: XImage.java,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-
-import java.awt.image.ImageObserver;
-import java.awt.image.ImageProducer;
-
-public interface XImage {
-    public void addWatcher(ImageObserver observer);
-    public boolean isWatcher(ImageObserver observer);
-    public void removeWatcher(ImageObserver observer);
-    public void notifyWatchers(Rectangle refreshed);
-
-    public int getWidth(ImageObserver observer);
-    public int getHeight(ImageObserver observer);
-    public Object getProperty(String name, ImageObserver observer);
-    public boolean prepare(int w, int h, ImageObserver o);
-    public int check(int w, int h, ImageObserver o);
-
-    public Graphics getGraphics();
-
-    public ImageProducer getSource();
-
-    public void flush();
-
-    public boolean drawOn(int xGraphicsRef, int xDeviceRef,
-                          Color bgColor,
-                          ImageObserver observer,
-                          int dx1, int dy1, int dx2, int dy2,
-                          int sx1, int sy1, int sx2, int sy2);
-
-    public boolean drawOn(int xGraphicsRef, int xDeviceRef, int x, int y, ImageObserver observer);
-
-    public boolean drawOn(int xGraphicsRef, int xDeviceRef, int x, int y, java.awt.Color bgColor, ImageObserver observer);
-    public boolean drawOn(int xGraphicsRef, int xDeviceRef, int x, int y, int width, int height, Color bgColor, ImageObserver observer);
-    public boolean drawOn(int xGraphicsRef, int xDeviceRef, int x, int y, int width, int height, ImageObserver observer);
-}
-
diff --git a/sandbox/com/sun/star/lib/sandbox/makefile.mk b/sandbox/com/sun/star/lib/sandbox/makefile.mk
deleted file mode 100644
index 81e7fdcacefa..000000000000
--- a/sandbox/com/sun/star/lib/sandbox/makefile.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ 	= ..$/..$/..$/..$/..
-PRJNAME = sandbox
-TARGET  = lib_sandbox
-PACKAGE = com$/sun$/star$/lib$/sandbox
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.IF "$(L10N_framework)"==""
-
-.IF "$(JDK)" == "gcj"
-all:
-    @echo This dir cannot be build with gcj because of sun.applet.AppletAudioClip
-.ELSE
-
-JARFILES=
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES=						    \
-    AudioProxy.java				    \
-    Cachable.java					\
-    ClassContext.java	 			\
-    ClassContextImpl.java 			\
-    ClassContextProxy.java 		    \
-    CodeSource.java				    \
-    Disposable.java				    \
-    ExecutionContext.java			\
-    Holder.java					    \
-    ImageProducerProxy.java		    \
-    JarEntry.java					\
-    JarInputStream.java			    \
-    Permission.java				    \
-    PermissionCollection.java		\
-    ProtectionDomain.java			\
-    Resource.java					\
-    ResourceImpl.java				\
-    ResourceProxy.java				\
-    ResourceViewer.java    		    \
-    SandboxMessageHandler.java		\
-    SandboxThreadGroup.java		    \
-    SandboxSecurity.java			\
-    SandboxSecurityException.java	\
-    WeakRef.java					\
-    WeakTable.java					\
-    WeakEntry.java					\
-    XImage.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-RC_SUBDIRSDEPS=$(JAVATARGET)
-
-# --- Targets ------------------------------------------------------
-.ENDIF
-.ENDIF
-
-.INCLUDE :  target.mk
-
diff --git a/sandbox/prj/build.lst b/sandbox/prj/build.lst
deleted file mode 100644
index 65e92f594659..000000000000
--- a/sandbox/prj/build.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-ox	sandbox : soltools NULL
-ox	sandbox									usr30073	-	none	 NULL
-ox	sandbox									usr1	-	all	ox_mkout NULL
-ox	sandbox\com\sun\star\lib\sandbox		nmake	-	all	ox_sandb NULL
-ox	sandbox\util							nmake	-	all	ox_util ox_sandb NULL
diff --git a/sandbox/prj/d.lst b/sandbox/prj/d.lst
deleted file mode 100644
index 496a8625b2a2..000000000000
--- a/sandbox/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\class\sandbox.jar %_DEST%\bin%_EXT%\sandbox.jar
diff --git a/sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java b/sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java
deleted file mode 100644
index 8d512b757176..000000000000
--- a/sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ResourceTest.java,v $
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.lib.sandbox;
-
-import java.net.URL;
-import com.sun.star.lib.sandbox.ClassContextProxy;
-import com.sun.star.lib.sandbox.ClassContext;
-import com.sun.star.lib.sandbox.Resource;
-import com.sun.star.lib.sandbox.ResourceProxy;
-
-public class ResourceTest
-{
-    public static void main( String [] args ) throws java.lang.Exception
-    {
-        if( args.length != 2 )
-        {
-            System.out.println( "usage : ResourceTest file-url-to-jarfile class-name-in-jarfile" );
-            System.exit(1);
-        }
-
-        URL u2 = new URL( args[0] );
-
-        ClassContext context = ClassContextProxy.create(u2, null, null, true);
-
-        Resource resource = ResourceProxy.load(u2, null);
-        resource.loadJar(u2);
-        context.addCargo( resource );
-        resource = null;
-
-        for( int i = 0 ; i < 1000000 ; i ++ )
-        {
-            new Object();
-        }
-        System.gc();
-        System.gc();
-        System.gc();
-
-        context.loadClass( args[1] );
-        System.out.println( "Test succeeded" );
-    }
-}
diff --git a/sandbox/util/delzip b/sandbox/util/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sandbox/util/delzip
+++ /dev/null
diff --git a/sandbox/util/makefile.mk b/sandbox/util/makefile.mk
deleted file mode 100644
index ac5684ec8a87..000000000000
--- a/sandbox/util/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ 	= ..
-PRJNAME = sandbox
-TARGET  = lib_sandbox_util
-
-# --- Settings -----------------------------------------------------
-.IF "$(L10N_framework)"==""
-.INCLUDE :  settings.mk
-
-JARCLASSDIRS	= com$/sun$/star$/lib$/sandbox
-JARTARGET		= sandbox.jar
-JARCOMPRESS 	= TRUE
-
-# --- Targets ------------------------------------------------------
-.ENDIF			# L10N_framework
-
-.INCLUDE :  target.mk
-
diff --git a/sax/inc/sax/tools/converter.hxx b/sax/inc/sax/tools/converter.hxx
index 18212dfb9b8b..f8c988d2fceb 100644
--- a/sax/inc/sax/tools/converter.hxx
+++ b/sax/inc/sax/tools/converter.hxx
@@ -31,11 +31,13 @@
 #ifndef _SAX_CONVERTER_HXX
 #define _SAX_CONVERTER_HXX
 
-#include <sal/types.h>
 #include "sax/dllapi.h"
-#include <com/sun/star/util/Date.hpp>
+
+#include <sal/types.h>
+
 #include <com/sun/star/util/MeasureUnit.hpp>
 
+
 namespace rtl
 {
 class OUString;
@@ -43,8 +45,12 @@ class OUStringBuffer;
 }
 
 namespace com { namespace sun { namespace star {
-    namespace util { struct DateTime; }
-}}}
+    namespace util {
+        struct Date;
+        struct DateTime;
+        struct Duration;
+    }
+} } }
 
 namespace sax {
 
@@ -138,31 +144,43 @@ public:
     /** convert string to double number (using ::rtl::math) with unit conversion */
     static bool convertDouble(double& rValue, const ::rtl::OUString& rString, sal_Int16 nTargetUnit );
 
-    /** convert double to ISO Time String */
-    static void convertTime( ::rtl::OUStringBuffer& rBuffer,
-                                const double& fTime);
+    /** convert double to ISO "duration" string; negative durations allowed */
+    static void convertDuration(::rtl::OUStringBuffer& rBuffer,
+                                const double fTime);
 
-    /** convert util::DateTime to ISO Time String */
-    static void convertTime( ::rtl::OUStringBuffer& rBuffer,
-                                const ::com::sun::star::util::DateTime& rDateTime );
+    /** convert util::Duration to ISO "duration" string */
+    static void convertDuration(::rtl::OUStringBuffer& rBuffer,
+                        const ::com::sun::star::util::Duration& rDuration);
 
-    /** convert ISO Time String to double */
-    static bool convertTime( double& fTime,
+    /** convert ISO "duration" string to double; negative durations allowed */
+    static bool convertDuration(double & rfTime,
                                 const ::rtl::OUString& rString);
 
-    /** convert ISO Time String to util::DateTime */
-    static bool convertTime( ::com::sun::star::util::DateTime& rDateTime,
-                                 const ::rtl::OUString& rString );
+    /** convert ISO "duration" string to util::Duration */
+    static bool convertDuration(::com::sun::star::util::Duration& rDuration,
+                        const ::rtl::OUString& rString);
 
-    /** convert util::DateTime to ISO Date String */
+    /** convert util::Date to ISO "date" string */
+    static void convertDate( ::rtl::OUStringBuffer& rBuffer,
+                    const com::sun::star::util::Date& rDate );
+
+    /** convert util::DateTime to ISO "date" or "dateTime" string */
     static void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
                                 const com::sun::star::util::DateTime& rDateTime,
                                    bool bAddTimeIf0AM = false );
 
-    /** convert ISO Date String to util::DateTime */
+    /** convert ISO "date" or "dateTime" string to util::DateTime */
     static bool convertDateTime( com::sun::star::util::DateTime& rDateTime,
                                  const ::rtl::OUString& rString );
 
+    /** convert ISO "date" or "dateTime" string to util::DateTime or
+        util::Date */
+    static bool convertDateOrDateTime(
+                    com::sun::star::util::Date & rDate,
+                    com::sun::star::util::DateTime & rDateTime,
+                    bool & rbDateTime,
+                    const ::rtl::OUString & rString );
+
     /** gets the position of the first comma after npos in the string
         rStr. Commas inside '"' pairs are not matched */
     static sal_Int32 indexOfComma( const ::rtl::OUString& rStr,
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 1ec1128516fd..4eb07be50311 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.cxx
@@ -32,13 +32,6 @@
 
 #include <vector>
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
-
 #include <cppuhelper/weak.hxx>
 
 using namespace ::std;
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index e1f5161b7e3a..b1726f750127 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -46,11 +46,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 
-#ifdef SYSTEM_EXPAT
 #include <expat.h>
-#else
-#include "expat/xmlparse.h"
-#endif
 
 using namespace ::rtl;
 using namespace ::std;
diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx
index 07cb6afac77d..3e6220a0c782 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -42,11 +42,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase2.hxx>
 
-#ifdef SYSTEM_EXPAT
 #include <expat.h>
-#else
-#include "expat/xmlparse.h"
-#endif
 #include "xml2utf.hxx"
 
 #include <sax/fastattribs.hxx>
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 354ee1936094..e13df493628a 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -32,8 +32,9 @@
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/Duration.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 #include "sax/tools/converter.hxx"
@@ -683,11 +684,10 @@ bool Converter::convertDouble(double& rValue, const ::rtl::OUString& rString)
     return ( eStatus == rtl_math_ConversionStatus_Ok );
 }
 
-/** convert double to ISO Time String; negative durations allowed */
-void Converter::convertTime( ::rtl::OUStringBuffer& rBuffer,
-                            const double& fTime)
+/** convert double to ISO "duration" string; negative durations allowed */
+void Converter::convertDuration(::rtl::OUStringBuffer& rBuffer,
+                                const double fTime)
 {
-
     double fValue = fTime;
 
     // take care of negative durations as specified in:
@@ -755,9 +755,9 @@ void Converter::convertTime( ::rtl::OUStringBuffer& rBuffer,
     rBuffer.append( sal_Unicode('S'));
 }
 
-/** convert ISO Time String to double; negative durations allowed */
-bool Converter::convertTime( double& fTime,
-                            const ::rtl::OUString& rString)
+/** convert ISO "duration" string to double; negative durations allowed */
+bool Converter::convertDuration(double& rfTime,
+                                const ::rtl::OUString& rString)
 {
     rtl::OUString aTrimmed = rString.trim().toAsciiUpperCase();
     const sal_Unicode* pStr = aTrimmed.getStr();
@@ -880,64 +880,403 @@ bool Converter::convertTime( double& fTime,
             fTempTime = -fTempTime;
         }
 
-        fTime = fTempTime;
+        rfTime = fTempTime;
     }
     return bSuccess;
 }
 
-/** convert util::DateTime to ISO Time String */
-void Converter::convertTime( ::rtl::OUStringBuffer& rBuffer,
-                            const ::com::sun::star::util::DateTime& rDateTime )
+/** convert util::Duration to ISO "duration" string */
+void Converter::convertDuration(::rtl::OUStringBuffer& rBuffer,
+        const ::util::Duration& rDuration)
 {
-    double fHour = rDateTime.Hours;
-    double fMin = rDateTime.Minutes;
-    double fSec = rDateTime.Seconds;
-    double fSec100 = rDateTime.HundredthSeconds;
-    double fTempTime = fHour / 24;
-    fTempTime += fMin / (24 * 60);
-    fTempTime += fSec / (24 * 60 * 60);
-    fTempTime += fSec100 / (24 * 60 * 60 * 100);
-    convertTime( rBuffer, fTempTime );
+    if (rDuration.Negative)
+    {
+        rBuffer.append(sal_Unicode('-'));
+    }
+    rBuffer.append(sal_Unicode('P'));
+    const bool bHaveDate(static_cast<sal_Int32>(rDuration.Years)
+                        +static_cast<sal_Int32>(rDuration.Months)
+                        +static_cast<sal_Int32>(rDuration.Days));
+    if (rDuration.Years)
+    {
+        rBuffer.append(static_cast<sal_Int32>(rDuration.Years));
+        rBuffer.append(sal_Unicode('Y'));
+    }
+    if (rDuration.Months)
+    {
+        rBuffer.append(static_cast<sal_Int32>(rDuration.Months));
+        rBuffer.append(sal_Unicode('M'));
+    }
+    if (rDuration.Days)
+    {
+        rBuffer.append(static_cast<sal_Int32>(rDuration.Days));
+        rBuffer.append(sal_Unicode('D'));
+    }
+    const sal_Int32 nHSecs(static_cast<sal_Int32>(rDuration.Seconds)
+                         + static_cast<sal_Int32>(rDuration.HundredthSeconds));
+    if (static_cast<sal_Int32>(rDuration.Hours) +
+        static_cast<sal_Int32>(rDuration.Minutes) + nHSecs)
+    {
+        rBuffer.append(sal_Unicode('T')); // time separator
+        if (rDuration.Hours)
+        {
+            rBuffer.append(static_cast<sal_Int32>(rDuration.Hours));
+            rBuffer.append(sal_Unicode('H'));
+        }
+        if (rDuration.Minutes)
+        {
+            rBuffer.append(static_cast<sal_Int32>(rDuration.Minutes));
+            rBuffer.append(sal_Unicode('M'));
+        }
+        if (nHSecs)
+        {
+            // seconds must not be omitted (i.e. ".42S" is not valid)
+            rBuffer.append(static_cast<sal_Int32>(rDuration.Seconds));
+            if (rDuration.HundredthSeconds)
+            {
+                rBuffer.append(sal_Unicode('.'));
+                const sal_Int32 nHundredthSeconds(
+                        rDuration.HundredthSeconds % 100);
+                if (nHundredthSeconds < 10)
+                {
+                    rBuffer.append(sal_Unicode('0'));
+                }
+                rBuffer.append(nHundredthSeconds);
+            }
+            rBuffer.append(sal_Unicode('S'));
+        }
+    }
+    else if (!bHaveDate)
+    {
+        // zero duration: XMLSchema-2 says there must be at least one component
+        rBuffer.append(sal_Unicode('0'));
+        rBuffer.append(sal_Unicode('D'));
+    }
 }
 
-/** convert ISO Time String to util::DateTime */
-bool Converter::convertTime( ::com::sun::star::util::DateTime& rDateTime,
-                             const ::rtl::OUString& rString )
+enum Result { R_NOTHING, R_OVERFLOW, R_SUCCESS };
+
+static Result
+readUnsignedNumber(const ::rtl::OUString & rString,
+    sal_Int32 & io_rnPos, sal_Int32 & o_rNumber)
 {
-    double fCalculatedTime = 0.0;
-    if( convertTime( fCalculatedTime, rString ) )
+    bool bOverflow(false);
+    sal_Int32 nTemp(0);
+
+    for (sal_Int32 nPos = io_rnPos; (nPos < rString.getLength()); ++nPos)
     {
-        // #101357# declare as volatile to prevent optimization
-        // (gcc 3.0.1 Linux)
-        volatile double fTempTime = fCalculatedTime;
-        fTempTime *= 24;
-        double fHoursValue = ::rtl::math::approxFloor (fTempTime);
-        fTempTime -= fHoursValue;
-        fTempTime *= 60;
-        double fMinsValue = ::rtl::math::approxFloor (fTempTime);
-        fTempTime -= fMinsValue;
-        fTempTime *= 60;
-        double fSecsValue = ::rtl::math::approxFloor (fTempTime);
-        fTempTime -= fSecsValue;
-        double f100SecsValue = 0.0;
-
-        if( fTempTime > 0.00001 )
-            f100SecsValue = fTempTime;
-
-        rDateTime.Year = 0;
-        rDateTime.Month = 0;
-        rDateTime.Day = 0;
-        rDateTime.Hours = static_cast < sal_uInt16 > ( fHoursValue );
-        rDateTime.Minutes = static_cast < sal_uInt16 > ( fMinsValue );
-        rDateTime.Seconds = static_cast < sal_uInt16 > ( fSecsValue );
-        rDateTime.HundredthSeconds = static_cast < sal_uInt16 > ( f100SecsValue * 100.0 );
+        const sal_Unicode c = rString[nPos];
+        if ((sal_Unicode('0') <= c) && (c <= sal_Unicode('9')))
+        {
+            nTemp *= 10;
+            nTemp += (c - sal_Unicode('0'));
+            if (nTemp >= SAL_MAX_INT16)
+            {
+                bOverflow = true;
+            }
+        }
+        else
+        {
+            if (io_rnPos != nPos) // read something?
+            {
+                io_rnPos = nPos;
+                if (bOverflow)
+                {
+                    return R_OVERFLOW;
+                }
+                else
+                {
+                    o_rNumber = nTemp;
+                    return R_SUCCESS;
+                }
+            }
+            else break;
+        }
+    }
+
+    o_rNumber = -1;
+    return R_NOTHING;
+}
 
+static bool
+readDurationT(const ::rtl::OUString & rString, sal_Int32 & io_rnPos)
+{
+    if ((io_rnPos < rString.getLength()) &&
+        (rString[io_rnPos] == sal_Unicode('T')))
+    {
+        ++io_rnPos;
         return true;
     }
     return false;
 }
 
-/** convert util::DateTime to ISO Date String */
+static bool
+readDurationComponent(const ::rtl::OUString & rString,
+    sal_Int32 & io_rnPos, sal_Int32 & io_rnTemp, bool & io_rbTimePart,
+    sal_Int32 & o_rnTarget, const sal_Unicode c)
+{
+    if ((io_rnPos < rString.getLength()))
+    {
+        if (c == rString[io_rnPos])
+        {
+            ++io_rnPos;
+            if (-1 != io_rnTemp)
+            {
+                o_rnTarget = io_rnTemp;
+                io_rnTemp = -1;
+                if (!io_rbTimePart)
+                {
+                    io_rbTimePart = readDurationT(rString, io_rnPos);
+                }
+                return (R_OVERFLOW !=
+                        readUnsignedNumber(rString, io_rnPos, io_rnTemp));
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+/** convert ISO "duration" string to util::Duration */
+bool Converter::convertDuration(util::Duration& rDuration,
+                                const ::rtl::OUString& rString)
+{
+    const ::rtl::OUString string = rString.trim().toAsciiUpperCase();
+    sal_Int32 nPos(0);
+
+    bool bIsNegativeDuration(false);
+    if (string.getLength() && (sal_Unicode('-') == string[0]))
+    {
+        bIsNegativeDuration = true;
+        ++nPos;
+    }
+
+    if ((nPos < string.getLength())
+        && (string[nPos] != sal_Unicode('P'))) // duration must start with "P"
+    {
+        return false;
+    }
+
+    ++nPos;
+
+    /// last read number; -1 == no valid number! always reset after using!
+    sal_Int32 nTemp(-1);
+    bool bTimePart(false); // have we read 'T'?
+    bool bSuccess(false);
+    sal_Int32 nYears(0);
+    sal_Int32 nMonths(0);
+    sal_Int32 nDays(0);
+    sal_Int32 nHours(0);
+    sal_Int32 nMinutes(0);
+    sal_Int32 nSeconds(0);
+    sal_Int32 nHundredthSeconds(0);
+
+    bTimePart = readDurationT(string, nPos);
+    bSuccess = (R_SUCCESS == readUnsignedNumber(string, nPos, nTemp));
+
+    if (!bTimePart && bSuccess)
+    {
+        bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+                     nYears, sal_Unicode('Y'));
+    }
+
+    if (!bTimePart && bSuccess)
+    {
+        bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+                     nMonths, sal_Unicode('M'));
+    }
+
+    if (!bTimePart && bSuccess)
+    {
+        bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+                     nDays, sal_Unicode('D'));
+    }
+
+    if (bTimePart)
+    {
+        if (-1 == nTemp) // a 'T' must be followed by a component
+        {
+            bSuccess = false;
+        }
+
+        if (bSuccess)
+        {
+            bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+                         nHours, sal_Unicode('H'));
+        }
+
+        if (bSuccess)
+        {
+            bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
+                         nMinutes, sal_Unicode('M'));
+        }
+
+        // eeek! seconds are icky.
+        if ((nPos < string.getLength()) && bSuccess)
+        {
+            if (sal_Unicode('.') == string[nPos])
+            {
+                ++nPos;
+                if (-1 != nTemp)
+                {
+                    nSeconds = nTemp;
+                    nTemp = -1;
+                    const sal_Int32 nStart(nPos);
+                    bSuccess =
+                        (R_SUCCESS == readUnsignedNumber(string, nPos, nTemp));
+                    if ((nPos < string.getLength()) && bSuccess)
+                    {
+                        if (sal_Unicode('S') == string[nPos])
+                        {
+                            ++nPos;
+                            if (-1 != nTemp)
+                            {
+                                nTemp = -1;
+                                const sal_Int32 nDigits = nPos - nStart;
+                                OSL_ENSURE(nDigits > 0, "bad code monkey");
+                                nHundredthSeconds = 10 *
+                                    (string[nStart] - sal_Unicode('0'));
+                                if (nDigits >= 2)
+                                {
+                                    nHundredthSeconds +=
+                                        (string[nStart+1] - sal_Unicode('0'));
+                                }
+                            }
+                            else
+                            {
+                                bSuccess = false;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    bSuccess = false;
+                }
+            }
+            else if (sal_Unicode('S') == string[nPos])
+            {
+                ++nPos;
+                if (-1 != nTemp)
+                {
+                    nSeconds = nTemp;
+                    nTemp = -1;
+                }
+                else
+                {
+                    bSuccess = false;
+                }
+            }
+        }
+    }
+
+    if (nPos != string.getLength()) // string not processed completely?
+    {
+        bSuccess = false;
+    }
+
+    if (nTemp != -1) // unprocessed number?
+    {
+        bSuccess = false;
+    }
+
+    if (bSuccess)
+    {
+        rDuration.Negative  = bIsNegativeDuration;
+        rDuration.Years     = static_cast<sal_Int16>(nYears);
+        rDuration.Months    = static_cast<sal_Int16>(nMonths);
+        rDuration.Days      = static_cast<sal_Int16>(nDays);
+        rDuration.Hours     = static_cast<sal_Int16>(nHours);
+        rDuration.Minutes   = static_cast<sal_Int16>(nMinutes);
+        rDuration.Seconds   = static_cast<sal_Int16>(nSeconds);
+        rDuration.HundredthSeconds = static_cast<sal_Int16>(nHundredthSeconds);
+    }
+
+    return bSuccess;
+}
+
+#if 0
+//FIXME
+struct Test {
+    static bool eqDuration(util::Duration a, util::Duration b) {
+        return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days
+            && a.Hours == b.Hours && a.Minutes == b.Minutes
+            && a.Seconds == b.Seconds
+            && a.HundredthSeconds == b.HundredthSeconds
+            && a.Negative == b.Negative;
+    }
+    static void doTest(util::Duration const & rid, const char * pis)
+    {
+        bool bSuccess(false);
+        ::rtl::OUStringBuffer buf;
+        Converter::convertDuration(buf, rid);
+        ::rtl::OUString os(buf.makeStringAndClear());
+        OSL_TRACE(::rtl::OUStringToOString(os.getStr(), RTL_TEXTENCODING_UTF8));
+        OSL_ASSERT(os.equalsAscii(pis));
+        util::Duration od;
+        bSuccess = Converter::convertDuration(od, os);
+        OSL_TRACE("%d %dY %dM %dD %dH %dM %dS %dH",
+            od.Negative, od.Years, od.Months, od.Days,
+            od.Hours, od.Minutes, od.Seconds, od.HundredthSeconds);
+        OSL_ASSERT(bSuccess);
+        OSL_ASSERT(eqDuration(rid, od));
+    }
+    static void doTestF(const char * pis)
+    {
+        util::Duration od;
+        bool bSuccess = Converter::convertDuration(od,
+                ::rtl::OUString::createFromAscii(pis));
+        OSL_TRACE("%d %dY %dM %dD %dH %dM %dS %dH",
+            od.Negative, od.Years, od.Months, od.Days,
+            od.Hours, od.Minutes, od.Seconds, od.HundredthSeconds);
+        OSL_ASSERT(!bSuccess);
+    }
+    Test() {
+        OSL_TRACE("\nSAX CONVERTER TEST BEGIN\n");
+        doTest( util::Duration(false, 1, 0, 0, 0, 0, 0, 0), "P1Y" );
+        doTest( util::Duration(false, 0, 42, 0, 0, 0, 0, 0), "P42M" );
+        doTest( util::Duration(false, 0, 0, 111, 0, 0, 0, 0), "P111D" );
+        doTest( util::Duration(false, 0, 0, 0, 52, 0, 0, 0), "PT52H" );
+        doTest( util::Duration(false, 0, 0, 0, 0, 717, 0, 0), "PT717M" );
+        doTest( util::Duration(false, 0, 0, 0, 0, 0, 121, 0), "PT121S" );
+        doTest( util::Duration(false, 0, 0, 0, 0, 0, 0, 19), "PT0.19S" );
+        doTest( util::Duration(false, 0, 0, 0, 0, 0, 0, 9), "PT0.09S" );
+        doTest( util::Duration(true , 0, 0, 9999, 0, 0, 0, 0), "-P9999D" );
+        doTest( util::Duration(true , 7, 6, 5, 4, 3, 2, 1),
+                "-P7Y6M5DT4H3M2.01S" );
+        doTest( util::Duration(false, 0, 6, 0, 0, 3, 0, 0), "P6MT3M" );
+        doTest( util::Duration(false, 0, 0, 0, 0, 0, 0, 0), "P0D" );
+        doTestF("1Y1M");
+        doTestF("P-1Y1M");
+        doTestF("P1M1Y");
+        doTestF("PT1Y");
+        doTestF("P1Y1M1M");
+        doTestF("P1YT1MT1M");
+        doTestF("P1YT");
+        doTestF("P99999999999Y");
+        doTestF("PT.1S");
+        doTestF("PT5M.134S");
+        doTestF("PT1.S");
+        OSL_TRACE("\nSAX CONVERTER TEST END\n");
+    }
+};
+static Test test;
+#endif
+
+/** convert util::Date to ISO "date" string */
+void Converter::convertDate(
+        ::rtl::OUStringBuffer& i_rBuffer,
+        const util::Date& i_rDate)
+{
+    const util::DateTime dt(
+            0, 0, 0, 0, i_rDate.Day, i_rDate.Month, i_rDate.Year);
+    convertDateTime(i_rBuffer, dt, false);
+}
+
+/** convert util::DateTime to ISO "date" or "dateTime" string */
 void Converter::convertDateTime(
         ::rtl::OUStringBuffer& i_rBuffer,
         const com::sun::star::util::DateTime& i_rDateTime,
@@ -990,9 +1329,36 @@ void Converter::convertDateTime(
     }
 }
 
-/** convert ISO Date String to util::DateTime */
-bool Converter::convertDateTime( com::sun::star::util::DateTime& rDateTime,
-                                     const ::rtl::OUString& rString )
+/** convert ISO "date" or "dateTime" string to util::DateTime */
+bool Converter::convertDateTime( util::DateTime& rDateTime,
+                                 const ::rtl::OUString& rString )
+{
+    bool isDateTime;
+    util::Date date;
+    if (convertDateOrDateTime(date, rDateTime, isDateTime, rString))
+    {
+        if (!isDateTime)
+        {
+            rDateTime.Year = date.Year;
+            rDateTime.Month = date.Month;
+            rDateTime.Day = date.Day;
+            rDateTime.Hours = 0;
+            rDateTime.Minutes = 0;
+            rDateTime.Seconds = 0;
+            rDateTime.HundredthSeconds = 0;
+        }
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+/** convert ISO "date" or "dateTime" string to util::DateTime or util::Date */
+bool Converter::convertDateOrDateTime(
+                util::Date & rDate, util::DateTime & rDateTime,
+                bool & rbDateTime, const ::rtl::OUString & rString )
 {
     bool bSuccess = true;
 
@@ -1077,13 +1443,25 @@ bool Converter::convertDateTime( com::sun::star::util::DateTime& rDateTime,
 
     if (bSuccess)
     {
-        rDateTime.Year = (sal_uInt16)nYear;
-        rDateTime.Month = (sal_uInt16)nMonth;
-        rDateTime.Day = (sal_uInt16)nDay;
-        rDateTime.Hours = (sal_uInt16)nHour;
-        rDateTime.Minutes = (sal_uInt16)nMin;
-        rDateTime.Seconds = (sal_uInt16)nSec;
-        rDateTime.HundredthSeconds = (sal_uInt16)(sDoubleStr.toDouble() * 100);
+        if ( aTimeStr.getLength() > 0 ) // time is optional
+        {
+            rDateTime.Year = static_cast<sal_uInt16>(nYear);
+            rDateTime.Month = static_cast<sal_uInt16>(nMonth);
+            rDateTime.Day = static_cast<sal_uInt16>(nDay);
+            rDateTime.Hours = static_cast<sal_uInt16>(nHour);
+            rDateTime.Minutes = static_cast<sal_uInt16>(nMin);
+            rDateTime.Seconds = static_cast<sal_uInt16>(nSec);
+            rDateTime.HundredthSeconds =
+                static_cast<sal_uInt16>((sDoubleStr).toDouble() * 100);
+            rbDateTime = true;
+        }
+        else
+        {
+            rDate.Year = static_cast<sal_uInt16>(nYear);
+            rDate.Month = static_cast<sal_uInt16>(nMonth);
+            rDate.Day = static_cast<sal_uInt16>(nDay);
+            rbDateTime = false;
+        }
     }
     return bSuccess;
 }
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index 07491bae33ec..8fe989676993 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.cxx
@@ -31,11 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-
 #include <osl/time.h>
 #include <osl/diagnose.h>
 
@@ -245,12 +240,12 @@ Reference < XInputStream > createStreamFromSequence(
 {
     Reference < XInterface > xOutStreamService =
         xSMgr->createInstance( OUString::createFromAscii("com.sun.star.io.Pipe") );
-    assert( xOutStreamService.is() );
+    OSL_ASSERT( xOutStreamService.is() );
     Reference< XOutputStream >  rOutStream( xOutStreamService , UNO_QUERY );
-    assert( rOutStream.is() );
+    OSL_ASSERT( rOutStream.is() );
 
     Reference< XInputStream > rInStream( xOutStreamService , UNO_QUERY );
-    assert( rInStream.is() );
+    OSL_ASSERT( rInStream.is() );
 
     rOutStream->writeBytes( seqBytes );
     rOutStream->flush();
@@ -379,7 +374,7 @@ public: // ExtendedDocumentHandler
 
     virtual void SAL_CALL endElement(const OUString& aName) throw (SAXException,RuntimeException)
     {
-        assert( m_iLevel );
+        OSL_ASSERT( m_iLevel );
         m_iLevel --;
         if( m_bPrint ) {
             int i;
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index 1427d9b14a75..c9089ba48d2e 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "global.hxx"
 #include "address.hxx"
 
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index ac7d444ca561..843fa673543f 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_AFMTUNO_HXX
 #define SC_AFMTUNO_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 09a1e9ced9ba..05de5a22cc90 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_APPLUNO_HXX
 #define SC_APPLUNO_HXX
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XRecentFunctions.hpp>
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 8dd77cf68c3f..55bb707f4edb 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -31,9 +31,9 @@
 #ifndef SC_SCATTR_HXX
 #define SC_SCATTR_HXX
 
-#include <svtools/poolitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include "scdllapi.h"
 #include "global.hxx"
 #include "address.hxx"
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index f8df5e9fa236..8ec139ffa2d5 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -64,7 +64,7 @@ JP 20.07.95:
 #include <svx/udlnitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/bolnitem.hxx>
 #include "scdllapi.h"
 #include "collect.hxx"
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index 0d4b9aac9fa7..e7418c8dedfe 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -33,8 +33,8 @@
 #include "global.hxx"
 #include "address.hxx"
 #include <tools/rtti.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/hint.hxx>
+#include <svl/smplhint.hxx>
 class ScBaseCell;
 
 #define SC_HINT_DYING       SFX_HINT_DYING
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 1f2bff35ce98..9355176e3a62 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -35,14 +35,14 @@
 
 #include <set>
 #include <tools/mempool.hxx>
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include "global.hxx"
 #include "rangenam.hxx"
 #include "formula/grammar.hxx"
 #include "tokenarray.hxx"
 #include "formularesult.hxx"
 #include <rtl/ustrbuf.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include "scdllapi.h"
 
 #define USE_MEMPOOL
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 5256931aedac..7d0cc1411263 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -35,9 +35,9 @@
 #include "rangelst.hxx"         // ScRangeList
 
 #include "formula/grammar.hxx"
-#include <svtools/lstner.hxx>
-#include <svtools/listener.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/listener.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/table/XTableChartsSupplier.hpp>
 #include <com/sun/star/chart/XChartDataArray.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index dc0244dfcdb8..32dc3a777086 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -37,7 +37,7 @@
 #include "token.hxx"
 #include "chartlis.hxx"
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
@@ -59,7 +59,7 @@
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/implbase7.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <hash_set>
 #include <list>
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 490c62743fb4..0ebc84268f74 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -33,7 +33,7 @@
 
 
 #include <vcl/timer.hxx>
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include "collect.hxx"
 #include "rangelst.hxx"
 #include "token.hxx"
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 914c48393573..7c82b4874fca 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -32,7 +32,7 @@
 #define SC_CHARTUNO_HXX
 
 #include "address.hxx"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <tools/string.hxx>
 
 #include <com/sun/star/table/XTableChart.hpp>
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 6707473f5610..0018f8b2ac3c 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -39,7 +39,7 @@
 #include <tools/queue.hxx>
 #include <tools/mempool.hxx>
 #include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <unotools/options.hxx>
 #include "global.hxx"
 #include "bigrange.hxx"
 #include "collect.hxx"
@@ -994,9 +994,7 @@ DECLARE_TABLE( ScChangeActionTable, ScChangeAction* )
 // "normalen" Actions in die Quere zu kommen.
 #define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0)
 
-// SfxListener an der Applikation, um Aenderungen des Usernamens mitzubekommen
-
-class ScChangeTrack : public SfxListener
+class ScChangeTrack : public utl::ConfigurationListener
 {
     friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW );
     friend BOOL ScChangeActionDel::Reject( ScDocument* pDoc );
@@ -1059,7 +1057,6 @@ class ScChangeTrack : public SfxListener
                                     const ScBaseCell* pOldCell,
                                     const ScBaseCell* pNewCell );
 
-    virtual void                Notify( SfxBroadcaster&, const SfxHint& );
             void                Init();
             void                DtorClear();
             void                SetLoadSave( BOOL bVal ) { bLoadSave = bVal; }
@@ -1130,6 +1127,7 @@ class ScChangeTrack : public SfxListener
 #endif  // SC_CHGTRACK_CXX
 
             void                ClearMsgQueue();
+    virtual void                ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
 public:
 
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 141cb5706515..f659c52d0892 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -34,7 +34,7 @@
 #include "global.hxx"
 #include "address.hxx"
 #include "formula/grammar.hxx"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "scdllapi.h"
 
 class ScBaseCell;
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index a7327402e5e0..a82e4fad1a09 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_CONFUNO_HXX
 #define SC_CONFUNO_HXX
 
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index c3d5db0bc72b..86f395f525ca 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -34,8 +34,8 @@
 #include "global.hxx"
 #include "dpobject.hxx"
 #include "rangeutl.hxx"     // ScArea
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index a93bfc341573..6cd2d1555bdf 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -32,8 +32,8 @@
 #define SC_DATAUNO_HXX
 
 #include "global.hxx"
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/sheet/TableFilterField.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 2f33dcdb3f48..b93c386a77f0 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -31,12 +31,12 @@
 #ifndef SC_DEFLTUNO_HXX
 #define SC_DEFLTUNO_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class ScDocShell;
 
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index 06beb91790f1..b16b5a05778c 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_DETDATA_HXX
 #define SC_DETDATA_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "global.hxx"
 #include "address.hxx"
 
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index 34578c64bacf..b09a064ee797 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -34,8 +34,8 @@
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/lstner.hxx>
+#include <svl/svarray.hxx>
 #include "global.hxx"       // ScImportParam
 
 
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 325060f0c05a..f102b5ea966d 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -32,8 +32,8 @@
 #define SC_DOCOPTIO_HXX
 
 #include <unotools/configitem.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemprop.hxx>
 #include "scdllapi.h"
 #include "optutil.hxx"
 
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index c81a68afe63d..52cf1a968163 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_SCDOCPOL_HXX
 #define SC_SCDOCPOL_HXX
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include "scdllapi.h"
 
 class ScStyleSheet;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5f75108c2ebf..116d25ee901e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -155,7 +155,7 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 /*
 #ifdef _ZFORLIST_DECLARE_TABLE
 class SvNumberFormatterIndexTable;
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 5966e446d0c3..0228cddc50af 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -33,7 +33,7 @@
 
 #include "address.hxx"
 #include <sfx2/sfxbasemodel.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/fmdmod.hxx>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -61,7 +61,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include "drwlayer.hxx"
 
 class ScDocShell;
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 6dfb782b2313..b18ea8e56b76 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_DPTABRES_HXX
 #define SC_DPTABRES_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/DataResult.hpp>
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx
index 174b675ebcae..ad0ce37e35c3 100644
--- a/sc/inc/drawattr.hxx
+++ b/sc/inc/drawattr.hxx
@@ -30,7 +30,7 @@
 #ifndef _IDLITEMS_HXX
 #define _IDLITEMS_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 
 
diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx
index 7eb45d3ea355..4b0a534dc655 100644
--- a/sc/inc/drdefuno.hxx
+++ b/sc/inc/drdefuno.hxx
@@ -32,7 +32,7 @@
 #define SC_DRDEFUNO_HXX
 
 #include <svx/unopool.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class ScDocShell;
 
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 950c3533e44a..3dd928384fe8 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -33,7 +33,7 @@
 
 #include "address.hxx"
 #include <svx/unoedsrc.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <memory>
 
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index bf795f04fe1c..90adedd6d346 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -37,7 +37,7 @@
 #include "sfx2/lnkbase.hxx"
 #include "tools/time.hxx"
 #include "vcl/timer.hxx"
-#include "svtools/zforlist.hxx"
+#include "svl/zforlist.hxx"
 #include "scmatrix.hxx"
 
 #include <hash_map>
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index d4319bcba50e..6d777b38424a 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -34,8 +34,8 @@
 #include "address.hxx"
 #include "mutexhlp.hxx"
 
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 #include <svx/editdata.hxx>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 6005a849fb0f..ccd93d982bdf 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -35,7 +35,7 @@
 #include "conditio.hxx"
 #include <formula/grammar.hxx>
 #include <tools/list.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
 #include <com/sun/star/sheet/XSheetCondition.hpp>
 #include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx
index eb142b2166a1..305d818a299d 100644
--- a/sc/inc/forbiuno.hxx
+++ b/sc/inc/forbiuno.hxx
@@ -32,7 +32,7 @@
 #define SC_FORBIUNO_HXX
 
 #include <svx/UnoForbiddenCharsTable.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class ScDocShell;
 
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 2e5e167bc988..4c45cdb627bc 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/sheet/XFunctionAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class ScDocument;
 class ScDocOptions;
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 92c17caf9641..889dc302fcf6 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -33,7 +33,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 
 // ---------------------------------------------------------------------------
 
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index c45da4f35e27..1a9479dff278 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_LINKUNO_HXX
 #define SC_LINKUNO_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/sheet/XDDELink.hpp>
 #include <com/sun/star/sheet/XDDELinkResults.hpp>
 #include <com/sun/star/sheet/XDDELinks.hpp>
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 12b85d54cc49..9261a6db0395 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -34,7 +34,7 @@
 #include "address.hxx"
 #include "global.hxx"
 #include "formula/token.hxx"
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include <tools/string.hxx>
 
 #include <hash_map>
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index bac1dd9711d5..240cead3be83 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_NAMEUNO_HXX
 #define SC_NAMEUNO_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "address.hxx"
 #include "formula/grammar.hxx"
 #include <com/sun/star/sheet/XLabelRange.hpp>
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index 3907f3d20967..4cf8148eff17 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -32,7 +32,7 @@
 #define SC_NOTESUNO_HXX
 
 #include "address.hxx"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/sheet/XSheetAnnotation.hpp>
 #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 86506d7ccdb8..65d350455ddd 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -31,9 +31,9 @@
 #ifndef SC_SCPATATR_HXX
 #define SC_SCPATATR_HXX
 
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
-#include <vcl/fontcvt.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/fontcvt.hxx>
 #include <svx/svxenum.hxx>
 #include "scdllapi.h"
 
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index b905bb19db03..dbb86fdf7484 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -152,16 +152,16 @@
 #include <sot/exchange.hxx>
 #include <sot/factory.hxx>
 #include <sot/storage.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/cenumitm.hxx>
-#include <svtools/cintitem.hxx>
-#include <svtools/fltrcfg.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/listener.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/solar.hrc>
-#include <svtools/useroptions.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/cenumitm.hxx>
+#include <svl/cintitem.hxx>
+#include <unotools/fltrcfg.hxx>
+#include <svl/intitem.hxx>
+#include <svl/listener.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/solar.hrc>
+#include <unotools/useroptions.hxx>
 #include <svx/editobj.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/fmglob.hxx>
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 6c4a88d9df60..0c90ba4497fc 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_PRINTOPT_HXX
 #define SC_PRINTOPT_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
 #include "scdllapi.h"
 
@@ -96,6 +96,7 @@ public:
     void            SetOptions( const ScPrintOptions& rNew );
 
     virtual void    Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 #endif
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index ce46f044822e..bf7f8810fec3 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -34,11 +34,11 @@
 #include "scdllapi.h"
 #include "scdll.hxx"
 #include <vcl/timer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "global.hxx"       // ScInputMode
 #include "markdata.hxx"     //ScMarkData
 #include "shellids.hxx"
-
+#include <unotools/options.hxx>
 #include <tools/shl.hxx>
 
 //<!--Added by PengYunQuan for Validity Cell Range Picker
@@ -119,7 +119,7 @@ struct ScClipData
 //==================================================================
 
 
-class ScModule: public SfxModule, public SfxListener
+class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
 {
     Timer               aIdleTimer;
     Timer               aSpellTimer;
@@ -162,6 +162,7 @@ public:
 
     virtual void        FillStatusBar(StatusBar &rBar);
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void        ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
     void                DeleteCfg();
 
                         // von der Applikation verschoben:
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index d486d8b7e298..ffa54cf29d70 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/util/XReplaceDescriptor.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <cppuhelper/implbase3.hxx>
 
 
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index 1028bb5f7673..ce1d643cd27f 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_STLPOOL_HXX
 #define SC_STLPOOL_HXX
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 
 class ScStyleSheet;
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index 06786dfff69d..ddbbc41b4f80 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_STLSHEET_HXX
 #define SC_STLSHEET_HXX
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 //------------------------------------------------------------------------
 
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 5fb28db3239a..34d1b8d3302c 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_STYLEUNO_HXX
 #define SC_STYLEUNO_HXX
 
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <rsc/rscsfx.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 3dc549656fa1..db8670521c25 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_TARGUNO_HXX
 #define SC_TARGUNO_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 8ec7707874be..64eb2aaba696 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -34,8 +34,8 @@
 #include "global.hxx"           // ScRange, ScAddress
 #include "address.hxx"
 #include <svx/unotext.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/sheet/XHeaderFooterContent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index bcd3435668be..0c573c6961c1 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/sheet/XFormulaParser.hpp>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <formula/FormulaOpCodeMapperObj.hxx>
 #include "address.hxx"
 #include "compiler.hxx"
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index 42486071adef..08223d546c57 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -32,7 +32,7 @@
 #define SC_UNOREFLIST_HXX
 
 #include <list>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #include "rangelst.hxx"
 
 
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index e489cb718163..bb322424a9a6 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -32,8 +32,8 @@
 #define SC_VIEWUNO_HXX
 
 #include <sfx2/sfxbasecontroller.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/svarray.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/view/XFormLayerAccess.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/sc/prj/build.lst b/sc/prj/build.lst
index 8426ba021f60..115e92990f3c 100644..100755
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -1,4 +1,4 @@
-sc     sc      :       l10n vbahelper oovbaapi svx stoc uui BOOST:boost formula oox NULL
+sc      sc      :       filter l10n vbahelper oovbaapi svx uui stoc BOOST:boost formula oox NULL
 sc	sc							usr1	-	all	sc_mkout NULL
 sc	sc\inc							nmake	-	all	sc_inc NULL
 sc	sc\prj							get	-	all	sc_prj NULL
diff --git a/sc/qa/complex/calcPreview/makefile.mk b/sc/qa/complex/calcPreview/makefile.mk
index 76a6afb4edf0..d346f6ea9213 100755
--- a/sc/qa/complex/calcPreview/makefile.mk
+++ b/sc/qa/complex/calcPreview/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/calcPreview
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
 JAVAFILES       = ViewForwarder.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/sc/qa/complex/cellRanges/makefile.mk b/sc/qa/complex/cellRanges/makefile.mk
index 5af9bcf3b222..5ed6a3f083ff 100755
--- a/sc/qa/complex/cellRanges/makefile.mk
+++ b/sc/qa/complex/cellRanges/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/cellRanges
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = $(TARGET).java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 5d8c1de7612d..5c6f9577cb08 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -69,7 +69,7 @@ interface TableSelection
 
 
  //============================================================================
-interface TableDocument : OfficeDocument
+interface TableDocument
 [
     uuid = "BA338A42-064E-11d0-89CB-008029E4B0B1" ;
 ]
@@ -116,7 +116,7 @@ interface TableDocument : OfficeDocument
 
 
  //============================================================================
-shell ScDocShell : SfxObjectShell
+shell ScDocShell
 [
     uuid ( "3F543FA0-B6A6-101B-9961-04021C007002" )
 ]
diff --git a/sc/sdi/makefile.mk b/sc/sdi/makefile.mk
index f0f7d12885d8..0ab1b486cd43 100644
--- a/sc/sdi/makefile.mk
+++ b/sc/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,12 @@ SDI1NAME=$(TARGET)
 SDI1EXPORT=scalc
 
 SVSDI1DEPEND= \
-    scalc.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        scalc.sdi \
     app.sdi \
     auditsh.sdi \
     docsh.sdi \
@@ -66,8 +71,7 @@ SVSDI1DEPEND= \
     mediash.sdi \
     pgbrksh.sdi \
     scslots.hrc \
-    $(INC)$/sc.hrc \
-    $(SOLARINCXDIR)$/svxslots.ilb
+    $(INC)$/sc.hrc 
 .ENDIF
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 70ca39a816c6..92add2aa2fd1 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-interface TablePrintPreview : View
+interface TablePrintPreview
 {
     //  von Basic aus nicht erreichbar, darum alles mit Export = FALSE
 
@@ -166,7 +166,7 @@ interface TablePrintPreview : View
 
 
  // ===========================================================================
-shell ScPreviewShell : SfxViewShell
+shell ScPreviewShell
 {
     import TablePrintPreview;
 }
diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi
index 3f1ff119873d..e50d282ab60d 100644
--- a/sc/sdi/scslots.sdi
+++ b/sc/sdi/scslots.sdi
@@ -27,7 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-import "svxslots.ilb"
 
 module
 "ADC7D7A1-2341-101C-A55A-04021C007002"
@@ -36,7 +35,6 @@ StarCalc
 [
 HelpText( "StarDivision StarCalc" ),
 SlotIdFile( "scslots.hrc" )
-TypeLibFile( "scslots.tlb" )
 ModulePrefix( "Sc" )
 ]
 {
@@ -54,6 +52,11 @@ ModulePrefix( "Sc" )
 
     //----------------------------------------------------------
     // bei Problemen ggF. "von Hand" includen (=Copy/Paste)
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
 
     include "scalc.sdi"
     include "docsh.sdi"
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 227d91b47998..8e075ee8166c 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -130,7 +130,7 @@ interface BaseSelection
 
 }
 
-interface TableEditView : View
+interface TableEditView
 [
     uuid ( "16D7E4A0-2FB4-11CF-89CB-008029E4B0B1" )
 ]
@@ -267,7 +267,7 @@ interface DataPilotField
 }
 
  // ===========================================================================
-shell ScTabViewShell : SfxViewShell
+shell ScTabViewShell
 {
     import TableSelection "ActiveDocument.ActiveTable";
     import TableOLEObject "SelectedObject";
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 1a466d231459..590f278901d6 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -41,9 +41,9 @@
 #include <svx/bolnitem.hxx>
 #include <svx/frmdiritem.hxx>
 #include <svx/shaditem.hxx>
-#include <svtools/poolcach.hxx>
+#include <svl/poolcach.hxx>
 #include <svx/fontitem.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 
 #include "attarray.hxx"
 #include "global.hxx"
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index d3d86be58440..2d8688ce5b3b 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -34,8 +34,8 @@
 
 
 #include <sfx2/objsh.hxx>
-#include <svtools/listener.hxx>
-#include <svtools/listeneriter.hxx>
+#include <svl/listener.hxx>
+#include <svl/listeneriter.hxx>
 
 #include "document.hxx"
 #include "brdcst.hxx"
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index cfd7caafa3f3..e7c74d34a95e 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -33,7 +33,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "scitems.hxx"
 #include "attrib.hxx"
@@ -55,9 +55,9 @@
 #include "postit.hxx"
 #include "externalrefmgr.hxx"
 #include <svx/editobj.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/flditem.hxx>
-#include <svtools/broadcast.hxx>
+#include <svl/broadcast.hxx>
 
 using namespace formula;
 // More or less arbitrary, of course all recursions must fit into available
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index acac874704c6..d7d3708c3295 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -570,7 +570,7 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
                 }
                 else
                 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     String aTmp;
                     ByteString aMsg( "broken Matrix, no MatFormula at origin, Pos: " );
                     aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
@@ -600,7 +600,7 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
                 if ( !nEdges )
                     nEdges = 1;             // mittendrin
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
             {
                 String aTmp;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index afcd809eed1d..b5dc01a8b059 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -37,8 +37,8 @@
 
 #include <map>
 
-#include <svtools/poolcach.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/poolcach.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <string.h>
 
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 01c72ab4e0c4..4205c0f59dcc 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -47,9 +47,9 @@
 #include <svx/rotmodit.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/broadcast.hxx>
-#include <svtools/listeneriter.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/broadcast.hxx>
+#include <svl/listeneriter.hxx>
 #include <vcl/outdev.hxx>
 
 #include "column.hxx"
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5726862366cf..e94cfca12ab7 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -35,8 +35,8 @@
 
 
 #include <sfx2/objsh.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 
 #include "scitems.hxx"
 #include "column.hxx"
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 45ead48d0f35..857c149476b7 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -37,8 +37,8 @@
 
 #include "scitems.hxx"
 #include <sfx2/objsh.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/itemset.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <unotools/collatorwrapper.hxx>
 
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 6a849282a642..215f2d34aab1 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "dbdocutl.hxx"
 #include "document.hxx"
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index b88cd49a6a8c..4548f1f7a1b5 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -33,7 +33,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "scitems.hxx"
 #include "global.hxx"
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index fce83f25cd93..662e524b2bfc 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -36,8 +36,8 @@
 #include "scitems.hxx"
 #include <tools/shl.hxx>
 #include <vcl/outdev.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/algitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/bolnitem.hxx>
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 3404866446fe..09477e5a7eb4 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -45,11 +45,11 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <vcl/virdev.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/PasswordHelper.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/list.hxx>
 #include <rtl/crc.h>
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 17650028db70..2529d0ad7f1d 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -39,8 +39,8 @@
 #include <svx/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/PasswordHelper.hxx>
 #include <vcl/svapp.hxx>
 #include "document.hxx"
 #include "attrib.hxx"
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 7313ebbf83f5..b47f55124041 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -35,8 +35,8 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/sound.hxx>
 #include <formula/token.hxx>
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 64433a30297a..2b0b3821dcc2 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -49,16 +49,16 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include <svtools/flagitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/flagitem.hxx>
+#include <svl/intitem.hxx>
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/misccfg.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <unotools/misccfg.hxx>
 #include <sfx2/app.hxx>
 #include <unotools/transliterationwrapper.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 
 #include <vcl/virdev.hxx>
 #include <vcl/msgbox.hxx>
@@ -137,17 +137,14 @@ SfxPrinter* ScDocument::GetPrinter(BOOL bCreateIfNotExist)
                             SID_SCPRINTOPTIONS,         SID_SCPRINTOPTIONS,
                             NULL );
 
-        SfxMiscCfg* pOffCfg = SFX_APP()->GetMiscConfig();
-        if ( pOffCfg )
-        {
-            USHORT nFlags = 0;
-            if ( pOffCfg->IsPaperOrientationWarning() )
-                nFlags |= SFX_PRINTER_CHG_ORIENTATION;
-            if ( pOffCfg->IsPaperSizeWarning() )
-                nFlags |= SFX_PRINTER_CHG_SIZE;
-            pSet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) );
-            pSet->Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, pOffCfg->IsNotFoundWarning() ) );
-        }
+        ::utl::MiscCfg aMisc;
+        USHORT nFlags = 0;
+        if ( aMisc.IsPaperOrientationWarning() )
+            nFlags |= SFX_PRINTER_CHG_ORIENTATION;
+        if ( aMisc.IsPaperSizeWarning() )
+            nFlags |= SFX_PRINTER_CHG_SIZE;
+        pSet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) );
+        pSet->Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning() ) );
 
         pPrinter = new SfxPrinter( pSet );
         pPrinter->SetMapMode( MAP_100TH_MM );
@@ -189,21 +186,18 @@ void ScDocument::SetPrintOptions()
 
     if ( pPrinter )
     {
-        SfxMiscCfg* pOffCfg = SFX_APP()->GetMiscConfig();
-        if ( pOffCfg )
-        {
-            SfxItemSet aOptSet( pPrinter->GetOptions() );
-
-            USHORT nFlags = 0;
-            if ( pOffCfg->IsPaperOrientationWarning() )
-                nFlags |= SFX_PRINTER_CHG_ORIENTATION;
-            if ( pOffCfg->IsPaperSizeWarning() )
-                nFlags |= SFX_PRINTER_CHG_SIZE;
-            aOptSet.Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) );
-            aOptSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, pOffCfg->IsNotFoundWarning() ) );
-
-            pPrinter->SetOptions( aOptSet );
-        }
+        ::utl::MiscCfg aMisc;
+        SfxItemSet aOptSet( pPrinter->GetOptions() );
+
+        USHORT nFlags = 0;
+        if ( aMisc.IsPaperOrientationWarning() )
+            nFlags |= SFX_PRINTER_CHG_ORIENTATION;
+        if ( aMisc.IsPaperSizeWarning() )
+            nFlags |= SFX_PRINTER_CHG_SIZE;
+        aOptSet.Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) );
+        aOptSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning() ) );
+
+        pPrinter->SetOptions( aOptSet );
     }
 }
 
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index de27a80b17ee..772ed496d2e1 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -56,8 +56,8 @@
 #include <svx/xtable.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/saveopt.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/saveopt.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "document.hxx"
 #include "docoptio.hxx"
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 077983b4382b..4dd3f34e3f0d 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -46,9 +46,9 @@
 #include <svx/svdocapt.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/poolcach.hxx>
-#include <svtools/saveopt.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/poolcach.hxx>
+#include <unotools/saveopt.hxx>
+#include <svl/zforlist.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/tenccvt.hxx>
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 7e1bc0389eaf..49e2c5b09c94 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -38,7 +38,7 @@
 
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include <algorithm>
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index a2d21079826d..09f32b4ba1b1 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -40,7 +40,7 @@
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "dpgroup.hxx"
 #include "collect.hxx"
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 787875fcb5ff..ad9795d11c4d 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -72,7 +72,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
-#include <svtools/zforlist.hxx>     // IsNumberFormat
+#include <svl/zforlist.hxx>     // IsNumberFormat
 
 #include <vector>
 
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index cfc98af5af99..01f63f0cbaa9 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -37,7 +37,7 @@
 
 #include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
 
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 7956b68ad03f..29fe2dc7b6e5 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -36,7 +36,7 @@
 // INCLUDE --------------------------------------------------------------
 
 #include <tools/debug.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "dpshttab.hxx"
 #include "dptabres.hxx"
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 3e9a7586fd1a..e123e74a20e6 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -44,8 +44,8 @@
 
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/intitem.hxx>
 
 #include "scitems.hxx"
 #include "document.hxx"
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index a5c571026e96..cb82ede30dca 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -64,8 +64,8 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <sot/storage.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/itempool.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 88ff065572b4..d49e8e1aa139 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -47,9 +47,9 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
 #include <tools/rcid.h>
@@ -67,7 +67,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <unotools/intlwrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/transliterationwrapper.hxx>
 
 #include "global.hxx"
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 6af662119f12..e6f8523a3c42 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -38,13 +38,13 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <unotools/textsearch.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/charclass.hxx>
 #include <stdlib.h>
 #include <ctype.h>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "global.hxx"
 #include "rangeutl.hxx"
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 03ca187df4d2..a5b14a3cc8c5 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -40,7 +40,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index ee74a66bcc3b..dbc5bbf50c63 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -60,8 +60,8 @@
 #include <svx/udlnitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/wrlmitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index d85e16ad135f..2bd7cc9c1ea9 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -35,7 +35,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/editeng.hxx>
 
 #include "poolhelp.hxx"
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 7a08f352ed91..6489b4f21a6a 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -34,7 +34,7 @@
 #include "postit.hxx"
 
 #include <rtl/ustrbuf.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/outlobj.hxx>
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 260385d6feac..e47f3899bfeb 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -49,10 +49,10 @@
 #include <svx/postitem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/wghtitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/itemset.hxx>
+#include <svl/zforlist.hxx>
 #include <unotools/charclass.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 4452cd357132..277a7ce9f326 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -48,9 +48,9 @@
 #include <svx/sizeitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/smplhint.hxx>
 #include "attrib.hxx"
 
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index c8a25fbe0ec1..31f9c18e3d3a 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -36,10 +36,10 @@
 #include "scitems.hxx"
 #include <svx/boxitem.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/poolcach.hxx>
+#include <svl/poolcach.hxx>
 #include <unotools/charclass.hxx>
 #include <math.h>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/PasswordHelper.hxx>
 #include <unotools/transliterationwrapper.hxx>
 
 #include "patattr.hxx"
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 01dc74f8644e..b85b910795a5 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -33,7 +33,7 @@
 
 #include <rtl/math.hxx>
 #include <unotools/textsearch.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index fd725e96d124..b10741f46c3f 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -61,7 +61,7 @@
 #include <svx/editeng.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/escpitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/keycodes.hxx>
 #include <rtl/math.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 1620c5194e92..c19cd8cf6b21 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -35,7 +35,7 @@
 
 #include "tabprotection.hxx"
 #include "tools/debug.hxx"
-#include "svtools/PasswordHelper.hxx"
+#include "svl/PasswordHelper.hxx"
 #include "document.hxx"
 
 #define DEBUG_TAB_PROTECTION 0
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 443474060c3e..9b0970611254 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -45,7 +45,7 @@
 #include <basic/basmgr.hxx>
 
 #include <basic/sbx.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/math.hxx>
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 9d1b4e89e1c3..cc696499d025 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_ADIASYNC_HXX
 #define SC_ADIASYNC_HXX
 
-#include <svtools/broadcast.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/broadcast.hxx>
+#include <svl/svarray.hxx>
 
 #include "callform.hxx"
 
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 79335a35fa7e..a198861092d6 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -34,8 +34,8 @@
 #include <set>
 #include <hash_set>
 #include <functional>
-#include <svtools/broadcast.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/broadcast.hxx>
+#include <svl/svarray.hxx>
 
 #include "global.hxx"
 #include "brdcst.hxx"
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index d756d1a91246..19d0463e7871 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -59,7 +59,7 @@
 #include <i18npool/lang.h>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <markarr.hxx>
 #include <vcl/timer.hxx>
 #include <rangelst.hxx>
@@ -67,18 +67,18 @@
 #include <vcl/prntypes.hxx>
 #include <table.hxx>
 #include <column.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/hint.hxx>
+#include <svl/lstner.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/time.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/date.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <svx/svxids.hrc>
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
 #include <tools/resid.hxx>
 #include <tools/table.hxx>
 #include <stdarg.h>
@@ -87,7 +87,7 @@
 #include <tools/unqidx.hxx>
 #include <rsc/rscsfx.hxx>
 #include <basic/sbxdef.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <stddef.h>
 #include <collect.hxx>
 #include <scitems.hxx>
@@ -100,8 +100,8 @@
 #include <vcl/region.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/bitmap.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <sot/object.hxx>
 #include <sot/factory.hxx>
 #include <sot/sotdata.hxx>
@@ -117,12 +117,12 @@
 #include <tools/shl.hxx>
 #include <compiler.hxx>
 #include <vcl/font.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/accel.hxx>
 #include <patattr.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/pstm.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
@@ -131,7 +131,7 @@
 #include <vcl/wintypes.hxx>
 #include <vcl/event.hxx>
 #include <tools/ownlist.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <tools/datetime.hxx>
 #include <attrib.hxx>
 #include <docpool.hxx>
@@ -143,8 +143,8 @@
 #include <sc.hrc>
 #include <svx/dialogs.hrc>
 #include <math.h>
-#include <svtools/style.hxx>
-#include <svtools/style.hrc>
+#include <svl/style.hxx>
+#include <svl/style.hrc>
 #include <stdlib.h>
 #include <vcl/prntypes.hxx>
 #include <vcl/jobset.hxx>
@@ -157,11 +157,11 @@
 #include <vcl/wrkwin.hxx>
 #include <stlpool.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/inetmsg.hxx>
+#include <svl/inetmsg.hxx>
 #include <svtools/compat.hxx>
-#include <svtools/inetdef.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/inetdef.hxx>
+#include <svl/inethist.hxx>
+#include <svl/cancel.hxx>
 #include <vcl/accel.hxx>
 #include <sfx2/sfxdefs.hxx>
 #include <sfx2/module.hxx>
@@ -200,7 +200,7 @@
 #include <scresid.hxx>
 #include <vcl/print.hxx>
 #include <attarray.hxx>
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 #include <interpre.hxx>
 #include <subtotal.hxx>
 #include <rangenam.hxx>
@@ -225,7 +225,7 @@
 #include <svx/editobj.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/fhgtitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <pivot.hxx>
 #include <vcl/gdimtf.hxx>
 #include <svx/svdpage.hxx>
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index b8b44a568110..465c58afb823 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -33,7 +33,7 @@
 
 #include "address.hxx"
 #include <sfx2/lnkbase.hxx>
-#include <svtools/broadcast.hxx>
+#include <svl/broadcast.hxx>
 #include "scmatrix.hxx"
 
 class ScDocument;
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 259018e213ce..4cf317073b56 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -365,7 +365,10 @@ const sal_Unicode* ScRange::Parse_XL_Header(
         {
             p = lcl_ParseQuotedName(p, rExternDocName);
             if (!*p || *p != ']' || !rExternDocName.Len())
+            {
+                rExternDocName.Erase();
                 return start;
+            }
         }
         else
         {
@@ -418,7 +421,10 @@ const sal_Unicode* ScRange::Parse_XL_Header(
         // Excel does not allow [ and ] characters in sheet names though.
         p = lcl_ParseQuotedName(p, rExternDocName);
         if (!*p || *p != '!')
+        {
+            rExternDocName.Erase();
             return start;
+        }
         if (rExternDocName.Len())
         {
             xub_StrLen nOpen = rExternDocName.Search( '[');
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 3b8a88c47e2f..f9a9f0bd51a0 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -39,8 +39,8 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/itemset.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/itemset.hxx>
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 238d0f943367..5305db490f8d 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -33,8 +33,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <sfx2/objsh.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/zforlist.hxx>
 
 #include "cellform.hxx"
 #include "cell.hxx"
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index bd2b06001726..e4def00c10b0 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -36,8 +36,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
 #include <float.h>              // DBL_MIN
 
 #include "chartarr.hxx"
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 22d996dd701f..7dfd75206a9f 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -36,12 +36,12 @@
 #include <tools/shl.hxx>        // SHL_CALC
 #include <tools/stack.hxx>
 #include <tools/rtti.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/isethint.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/itemset.hxx>
+#include <svl/isethint.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <sfx2/sfxsids.hrc>
 
 #include "cell.hxx"
@@ -2229,7 +2229,7 @@ ScChangeTrack::ScChangeTrack( ScDocument* pDocP ) :
         pDoc( pDocP )
 {
     Init();
-    StartListening(SC_MOD()->GetUserOptions());
+    SC_MOD()->GetUserOptions().AddListener(this);
 
     ppContentSlots = new ScChangeActionContent* [ nContentSlots ];
     memset( ppContentSlots, 0, nContentSlots * sizeof( ScChangeActionContent* ) );
@@ -2240,13 +2240,14 @@ ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const ScStrCollection& aTempUse
         pDoc( pDocP )
 {
     Init();
-    StartListening(SC_MOD()->GetUserOptions());
+    SC_MOD()->GetUserOptions().AddListener(this);
     ppContentSlots = new ScChangeActionContent* [ nContentSlots ];
     memset( ppContentSlots, 0, nContentSlots * sizeof( ScChangeActionContent* ) );
 }
 
 ScChangeTrack::~ScChangeTrack()
 {
+    SC_MOD()->GetUserOptions().RemoveListener(this);
     DtorClear();
     delete [] ppContentSlots;
 }
@@ -2339,11 +2340,9 @@ void ScChangeTrack::Clear()
 }
 
 
-void __EXPORT ScChangeTrack::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    if ( !pDoc->IsInDtorClear() &&
-         rHint.ISA(SfxSimpleHint) &&
-        ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_USER_OPTIONS_CHANGED )
+    if ( !pDoc->IsInDtorClear() )
     {
         const SvtUserOptions& rUserOptions = SC_MOD()->GetUserOptions();
         USHORT nOldCount = aUserCollection.GetCount();
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index df7131397aef..4eab9aa85c9e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/objsh.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbstar.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/rcid.h>
 #include <tools/rc.hxx>
 #include <tools/solar.h>
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index cab3322401a8..446f892452fc 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -37,7 +37,7 @@
 #include <tools/list.hxx>
 #include <svx/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "ddelink.hxx"
 #include "brdcst.hxx"
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index a08b81a1917c..fed4a3b0ae40 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -61,7 +61,7 @@
 #include <svx/outliner.hxx>
 #include <svx/editobj.hxx>
 #include <svx/sxcecitm.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/writingmodeitem.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 13934914a3f3..37e6c68fbf03 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -34,7 +34,7 @@
 
 
 #include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 5519c679f84e..e4f2c07a3c57 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -49,11 +49,11 @@
 #include <svx/numitem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/inethist.hxx>
+#include <unotools/syslocale.hxx>
 #ifndef _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include "editutil.hxx"
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 904c2625730c..f92703064d3d 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -37,8 +37,8 @@
 #include <svx/langitem.hxx>
 #include <svx/algitem.hxx>
 #include <unotools/textsearch.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/charclass.hxx>
 #include <sfx2/docfile.hxx>
@@ -780,6 +780,7 @@ double ScInterpreter::Compare()
         switch ( GetRawStackType() )
         {
             case svEmptyCell:
+                Pop();
                 aComp.bEmpty[ i ] = TRUE;
                 break;
             case svMissing:
@@ -836,6 +837,7 @@ ScMatrixRef ScInterpreter::CompareMat( ScCompareOptions* pOptions )
         switch (GetRawStackType())
         {
             case svEmptyCell:
+                Pop();
                 aComp.bEmpty[ i ] = TRUE;
                 break;
             case svMissing:
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index fc0f085706c5..cb418476e9d9 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -36,8 +36,8 @@
 #include <svx/linkmgr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/stritem.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/logfile.hxx>
 
 #include "interpre.hxx"
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 11fd414c81f2..2880d7708b10 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -40,7 +40,7 @@
 #include <basic/sbmod.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/logfile.hxx>
 #include <stdlib.h>
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 7da4778bfe1a..482748cbb547 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #endif
 #include <unotools/bootstrap.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "interpre.hxx"
 #include "global.hxx"
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 3f3d2886dfa7..36fea8a5e899 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -37,7 +37,7 @@
 
 #include "optutil.hxx"
 #include "global.hxx"       // for pSysLocale
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 //------------------------------------------------------------------
 
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index dae055b5f47e..157375f32c91 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -210,4 +210,5 @@ void ScPrintCfg::SetOptions( const ScPrintOptions& rNew )
     SetModified();
 }
 
+void ScPrintCfg::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
 
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 450736997c2d..a24c33cf6255 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -40,8 +40,8 @@
 #include <sfx2/progress.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/eitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itemset.hxx>
 
 #define SC_PROGRESS_CXX
 #include "progress.hxx"
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index 499dbf0a6ba1..078f9a774c09 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -33,7 +33,7 @@
 
 
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
 
diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index d0f2b8233de0..53a87667e8c6 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -54,12 +54,17 @@ void ScRefTokenHelper::compileRangeRepresentation(
     const sal_Unicode cSep = GetScCompilerNativeSymbol(ocSep).GetChar(0);
     const sal_Unicode cQuote = '\'';
 
+    // #i107275# ignore parentheses
+    OUString aRangeStr = rRangeStr;
+    while( (aRangeStr.getLength() >= 2) && (aRangeStr[ 0 ] == '(') && (aRangeStr[ aRangeStr.getLength() - 1 ] == ')') )
+        aRangeStr = aRangeStr.copy( 1, aRangeStr.getLength() - 2 );
+
     bool bFailure = false;
     sal_Int32 nOffset = 0;
     while (nOffset >= 0 && !bFailure)
     {
         OUString aToken;
-        ScRangeStringConverter::GetTokenByOffset(aToken, rRangeStr, nOffset, cSep, cQuote);
+        ScRangeStringConverter::GetTokenByOffset(aToken, aRangeStr, nOffset, cSep, cQuote);
         if (nOffset < 0)
             break;
 
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index ad7147ccb14d..6195164e34fa 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -38,7 +38,7 @@
 #include "address.hxx"
 #include "formula/errorcodes.hxx"
 #include "interpre.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/stream.hxx>
 #include <rtl/math.hxx>
 
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 6c5c6a03b773..e4a97d96d2e4 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -394,7 +394,7 @@ ScRawToken* ScRawToken::Clone() const
 
 FormulaToken* ScRawToken::CreateToken() const
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define IF_NOT_OPCODE_ERROR(o,c) if (eOp!=o) DBG_ERROR1( #c "::ctor: OpCode %d lost, converted to " #o "; maybe inherit from FormulaToken instead!", int(eOp))
 #else
 #define IF_NOT_OPCODE_ERROR(o,c)
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index f8d2bd3f1906..62a6b48c4da0 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index cf0ccf5447a3..77803d338788 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -34,7 +34,7 @@
 //------------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include "dif.hxx"
 #include "filter.hxx"
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index c72d165c7972..998208541157 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -42,8 +42,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/ulspitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zformat.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/objsh.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 8365ef0db3f9..41529b66346f 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include "scitems.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include "filter.hxx"
 #include "document.hxx"
 #include "xistream.hxx"
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 49e5da495392..a172bd63e69b 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -36,7 +36,7 @@
 
 #include <scitems.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 
 #include <svtools/wmf.hxx>
 
@@ -56,7 +56,7 @@
 #include <svx/crsditem.hxx>
 #include <svx/flditem.hxx>
 #include <svx/xflclit.hxx>
-#include <svx/svxmsbas.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 
 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 4ee5f70dc938..ce824fa70e44 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -38,7 +38,7 @@
 #include "excrecds.hxx"
 
 #include <map>
-#include <svx/countryid.hxx>
+#include <filter/msfilter/countryid.hxx>
 
 #include "scitems.hxx"
 #include <svx/eeitem.hxx>
@@ -62,13 +62,13 @@
 #include <svx/ulspitem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/escpitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <svtools/ctrltool.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <string.h>
 
@@ -456,7 +456,7 @@ XclExpCountry::XclExpCountry( const XclExpRoot& rRoot ) :
     /*  #i31530# set document country as UI country too -
         needed for correct behaviour of number formats. */
     mnUICountry = mnDocCountry = static_cast< sal_uInt16 >(
-        ::svx::ConvertLanguageToCountry( rRoot.GetDocLanguage() ) );
+        ::msfilter::ConvertLanguageToCountry( rRoot.GetDocLanguage() ) );
 }
 
 void XclExpCountry::WriteBody( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index 677d872fe8e9..1a79aef3f0ec 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -35,11 +35,11 @@
 
 //------------------------------------------------------------------------
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 
 #include <sfx2/objsh.hxx>
 #include <sfx2/docinf.hxx>
-#include <svx/svxmsbas.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 
 #include "scerrors.hxx"
 #include "scextopt.hxx"
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 9b868f4d3268..7003cc683688 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -33,7 +33,7 @@
 
 #include "imp_op.hxx"
 
-#include <svx/countryid.hxx>
+#include <filter/msfilter/countryid.hxx>
 
 #include "scitems.hxx"
 #include <svx/eeitem.hxx>
@@ -47,7 +47,7 @@
 #include <svx/colritem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include <sfx2/objsh.hxx>
 #include "docuno.hxx"
@@ -731,12 +731,12 @@ void ImportExcel::Country( void )
     maStrm >> nUICountry >> nDocCountry;
 
     // Store system language in XclRoot
-    LanguageType eLanguage = ::svx::ConvertCountryToLanguage( static_cast< ::svx::CountryId >( nDocCountry ) );
+    LanguageType eLanguage = ::msfilter::ConvertCountryToLanguage( static_cast< ::msfilter::CountryId >( nDocCountry ) );
     if( eLanguage != LANGUAGE_DONTKNOW )
         SetDocLanguage( eLanguage );
 
     // Set Excel UI language in add-in name translator
-    eLanguage = ::svx::ConvertCountryToLanguage( static_cast< ::svx::CountryId >( nUICountry ) );
+    eLanguage = ::msfilter::ConvertCountryToLanguage( static_cast< ::msfilter::CountryId >( nUICountry ) );
     if( eLanguage != LANGUAGE_DONTKNOW )
         SetUILanguage( eLanguage );
 }
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index d1fed27bbec1..261bf8c42e30 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -58,7 +58,7 @@
 #include <com/sun/star/chart2/TickmarkStyle.hpp>
 
 #include <vcl/outdev.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 
 #include "document.hxx"
 #include "rangelst.hxx"
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 1d09082ede82..ad51304b3e3e 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/sheet/XAreaLink.hpp>
 #include <sfx2/objsh.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <formula/grammar.hxx>
 #include "scitems.hxx"
 #include <svx/eeitem.hxx>
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 45a44b2c88d1..30b30639f7c7 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/objsh.hxx>
 #include <vcl/font.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/outlobj.hxx>
@@ -49,7 +49,7 @@
 #include <svx/svxfont.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include "document.hxx"
 #include "docpool.hxx"
 #include "cell.hxx"
@@ -415,7 +415,7 @@ XclExpStringRef lclCreateFormattedString(
             nScript = nLastScript;
 
         // construct font from current text portion
-        SvxFont aFont( XclExpFontBuffer::GetFontFromItemSet( rItemSet, nScript ) );
+        SvxFont aFont( XclExpFontHelper::GetFontFromItemSet( rRoot, rItemSet, nScript ) );
 
         // Excel start position of this portion
         sal_uInt16 nXclPortionStart = xString->Len();
@@ -529,7 +529,7 @@ XclExpStringRef lclCreateFormattedString(
                 sal_Int16 nScript = xBreakIt->getScriptType( aXclPortionText, 0 );
                 if( nScript == ApiScriptType::WEAK )
                     nScript = nLastScript;
-                SvxFont aFont( XclExpFontBuffer::GetFontFromItemSet( aItemSet, nScript ) );
+                SvxFont aFont( XclExpFontHelper::GetFontFromItemSet( rRoot, aItemSet, nScript ) );
                 nLastScript = nScript;
 
                 // add escapement
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 47f101f4c351..46fcd166ecf1 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -34,7 +34,7 @@
 
 #include <algorithm>
 #include <unotools/collatorwrapper.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include "document.hxx"
 #include "cell.hxx"
 #include "scextopt.hxx"
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 36d7a9dc31b7..47414c07bec8 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -32,10 +32,10 @@
 #include "precompiled_sc.hxx"
 
 #include "xepage.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "scitems.hxx"
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/lrspitem.hxx>
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 69b323e1e718..bc694d01725e 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -42,7 +42,7 @@
 
 #include <rtl/math.hxx>
 #include <tools/date.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <sot/storage.hxx>
 #include "document.hxx"
 #include "dpobject.hxx"
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index 7c4974db3029..45f90732b070 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -32,10 +32,10 @@
 #include "precompiled_sc.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/saveopt.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <unotools/saveopt.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include "xecontent.hxx"
 #include "xltracer.hxx"
 #include "xehelper.hxx"
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 10d23eccdf27..1dd1bbc747f7 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -578,7 +578,7 @@ void XclExpBiff8Encrypter::Init( const String& aPass, const sal_uInt8 nDocId[16]
         maCodec.InitKey(mnPassw, mnDocId);
 
         // generate salt hash.
-        ::svx::MSCodec_Std97 aCodec;
+        ::msfilter::MSCodec_Std97 aCodec;
         aCodec.InitKey(mnPassw, mnDocId);
         aCodec.CreateSaltDigest(nSalt, mnSaltDigest);
 
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 2172a7678763..f70452461682 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -37,8 +37,8 @@
 #include <set>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <vcl/font.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/zformat.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/printer.hxx>
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
@@ -823,6 +823,120 @@ void XclExpPalette::WriteBody( XclExpStream& rStrm )
 
 namespace {
 
+typedef ::std::pair< USHORT, sal_Int16 > WhichAndScript;
+
+sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
+        const WhichAndScript& rWAS1, const WhichAndScript& rWAS2, const WhichAndScript& rWAS3 )
+{
+    if( ScfTools::CheckItem( rItemSet, rWAS1.first, false ) ) return rWAS1.second;
+    if( ScfTools::CheckItem( rItemSet, rWAS2.first, false ) ) return rWAS2.second;
+    if( ScfTools::CheckItem( rItemSet, rWAS3.first, false ) ) return rWAS3.second;
+    return 0;
+};
+
+} // namespace
+
+/*static*/ sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const SfxItemSet& rItemSet )
+{
+    namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
+
+    /*  #i17050# #i107170# We need to determine which font items are set in the
+        item set, and which script type we should prefer according to the
+        current language settings. */
+
+    static const WhichAndScript WAS_LATIN( ATTR_FONT, ::com::sun::star::i18n::ScriptType::LATIN );
+    static const WhichAndScript WAS_ASIAN( ATTR_CJK_FONT, ::com::sun::star::i18n::ScriptType::ASIAN );
+    static const WhichAndScript WAS_CMPLX( ATTR_CTL_FONT, ::com::sun::star::i18n::ScriptType::COMPLEX );
+
+    /*  #114008# do not let a font from a parent style override an explicit
+        cell font. */
+
+    sal_Int16 nDefScript = rRoot.GetDefApiScript();
+    sal_Int16 nScript = 0;
+    const SfxItemSet* pCurrSet = &rItemSet;
+
+    while( (nScript == 0) && pCurrSet )
+    {
+        switch( nDefScript )
+        {
+            case ApiScriptType::LATIN:
+                nScript = lclCheckFontItems( *pCurrSet, WAS_LATIN, WAS_CMPLX, WAS_ASIAN );
+            break;
+            case ApiScriptType::ASIAN:
+                nScript = lclCheckFontItems( *pCurrSet, WAS_ASIAN, WAS_CMPLX, WAS_LATIN );
+            break;
+            case ApiScriptType::COMPLEX:
+                nScript = lclCheckFontItems( *pCurrSet, WAS_CMPLX, WAS_ASIAN, WAS_LATIN );
+            break;
+            default:
+                DBG_ERRORFILE( "XclExpFontHelper::GetFirstUsedScript - unknown script type" );
+                nScript = ApiScriptType::LATIN;
+        };
+        pCurrSet = pCurrSet->GetParent();
+    }
+
+    return nScript;
+}
+
+/*static*/ Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript )
+{
+    namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
+
+    // if WEAK is passed, guess script type from existing items in the item set
+    if( nScript == ApiScriptType::WEAK )
+        nScript = GetFirstUsedScript( rRoot, rItemSet );
+
+    // convert to core script type constants
+    BYTE nScScript = SCRIPTTYPE_LATIN;
+    switch( nScript )
+    {
+        case ApiScriptType::LATIN:      nScScript = SCRIPTTYPE_LATIN;   break;
+        case ApiScriptType::ASIAN:      nScScript = SCRIPTTYPE_ASIAN;   break;
+        case ApiScriptType::COMPLEX:    nScScript = SCRIPTTYPE_COMPLEX; break;
+        default:    DBG_ERRORFILE( "XclExpFontHelper::GetFontFromItemSet - unknown script type" );
+    }
+
+    // fill the font object
+    Font aFont;
+    ScPatternAttr::GetFont( aFont, rItemSet, SC_AUTOCOL_RAW, 0, 0, 0, nScScript );
+    return aFont;
+}
+
+/*static*/ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript, bool bDeep )
+{
+    static const USHORT pnCommonIds[] = {
+        ATTR_FONT_UNDERLINE, ATTR_FONT_CROSSEDOUT, ATTR_FONT_CONTOUR,
+        ATTR_FONT_SHADOWED, ATTR_FONT_COLOR, ATTR_FONT_LANGUAGE, 0 };
+    static const USHORT pnLatinIds[] = {
+        ATTR_FONT, ATTR_FONT_HEIGHT, ATTR_FONT_WEIGHT, ATTR_FONT_POSTURE, 0 };
+    static const USHORT pnAsianIds[] = {
+        ATTR_CJK_FONT, ATTR_CJK_FONT_HEIGHT, ATTR_CJK_FONT_WEIGHT, ATTR_CJK_FONT_POSTURE, 0 };
+    static const USHORT pnComplexIds[] = {
+        ATTR_CTL_FONT, ATTR_CTL_FONT_HEIGHT, ATTR_CTL_FONT_WEIGHT, ATTR_CTL_FONT_POSTURE, 0 };
+
+    bool bUsed = ScfTools::CheckItems( rItemSet, pnCommonIds, bDeep );
+    if( !bUsed )
+    {
+        namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
+        // if WEAK is passed, guess script type from existing items in the item set
+        if( nScript == ApiScriptType::WEAK )
+            nScript = GetFirstUsedScript( rRoot, rItemSet );
+        // check the correct items
+        switch( nScript )
+        {
+            case ApiScriptType::LATIN:      bUsed = ScfTools::CheckItems( rItemSet, pnLatinIds, bDeep );    break;
+            case ApiScriptType::ASIAN:      bUsed = ScfTools::CheckItems( rItemSet, pnAsianIds, bDeep );    break;
+            case ApiScriptType::COMPLEX:    bUsed = ScfTools::CheckItems( rItemSet, pnComplexIds, bDeep );  break;
+            default:    DBG_ERRORFILE( "XclExpFontHelper::CheckItems - unknown script type" );
+        }
+    }
+    return bUsed;
+}
+
+// ----------------------------------------------------------------------------
+
+namespace {
+
 sal_uInt32 lclCalcHash( const XclFontData& rFontData )
 {
     sal_uInt32 nHash = rFontData.maName.Len();
@@ -993,7 +1107,8 @@ sal_uInt16 XclExpFontBuffer::Insert( const SfxItemSet& rItemSet,
         sal_Int16 nScript, XclExpColorType eColorType, bool bAppFont )
 {
     // #i17050# #114008# #115495# script type now provided by caller
-    return Insert( GetFontFromItemSet( rItemSet, nScript ), eColorType, bAppFont );
+    Font aFont = XclExpFontHelper::GetFontFromItemSet( GetRoot(), rItemSet, nScript );
+    return Insert( aFont, eColorType, bAppFont );
 }
 
 sal_uInt16 XclExpFontBuffer::Insert( const ScPatternAttr& rPattern,
@@ -1022,90 +1137,6 @@ void XclExpFontBuffer::SaveXml( XclExpXmlStream& rStrm )
     rStyleSheet->endElement( XML_fonts );
 }
 
-sal_Int16 XclExpFontBuffer::GetFirstUsedScript( const SfxItemSet& rItemSet )
-{
-    /*  #i17050# We need to determine if a CJK or CTL font item is set in the
-        item set. It is possible that both may be present. In this case,
-        we will choose CJK. Either option is equally correct. */
-
-    namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
-    sal_Int16 nScript = ApiScriptType::LATIN;
-
-    // #114008# do not let a font from a parent style override an explicit cell font
-    const SfxItemSet* pCurrSet = &rItemSet;
-    bool bFound = false;
-    while( !bFound && pCurrSet )
-    {
-        bFound = true;
-        if( ScfTools::CheckItem( *pCurrSet, ATTR_CJK_FONT, false ) )
-            nScript = ApiScriptType::ASIAN;
-        else if( ScfTools::CheckItem( *pCurrSet, ATTR_CTL_FONT, false ) )
-            nScript = ApiScriptType::COMPLEX;
-        else if( ScfTools::CheckItem( *pCurrSet, ATTR_FONT, false ) )
-            nScript = ApiScriptType::LATIN;
-        else
-            bFound = false;
-        pCurrSet = pCurrSet->GetParent();
-    }
-
-    return nScript;
-}
-
-Font XclExpFontBuffer::GetFontFromItemSet( const SfxItemSet& rItemSet, sal_Int16 nScript )
-{
-    namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
-
-    // if WEAK is passed, guess script type from existing items in the item set
-    if( nScript == ApiScriptType::WEAK )
-        nScript = GetFirstUsedScript( rItemSet );
-
-    // convert to core script type constants
-    BYTE nScScript = SCRIPTTYPE_LATIN;
-    switch( nScript )
-    {
-        case ApiScriptType::LATIN:      nScScript = SCRIPTTYPE_LATIN;   break;
-        case ApiScriptType::ASIAN:      nScScript = SCRIPTTYPE_ASIAN;   break;
-        case ApiScriptType::COMPLEX:    nScScript = SCRIPTTYPE_COMPLEX; break;
-        default:    DBG_ERRORFILE( "XclExpFontBuffer::GetFontFromItemSet - unknown script type" );
-    }
-
-    // fill the font object
-    Font aFont;
-    ScPatternAttr::GetFont( aFont, rItemSet, SC_AUTOCOL_RAW, 0, 0, 0, nScScript );
-    return aFont;
-}
-
-bool XclExpFontBuffer::CheckItems( const SfxItemSet& rItemSet, sal_Int16 nScript, bool bDeep )
-{
-    static const USHORT pnCommonIds[] = {
-        ATTR_FONT_UNDERLINE, ATTR_FONT_CROSSEDOUT, ATTR_FONT_CONTOUR,
-        ATTR_FONT_SHADOWED, ATTR_FONT_COLOR, ATTR_FONT_LANGUAGE, 0 };
-    static const USHORT pnLatinIds[] = {
-        ATTR_FONT, ATTR_FONT_HEIGHT, ATTR_FONT_WEIGHT, ATTR_FONT_POSTURE, 0 };
-    static const USHORT pnAsianIds[] = {
-        ATTR_CJK_FONT, ATTR_CJK_FONT_HEIGHT, ATTR_CJK_FONT_WEIGHT, ATTR_CJK_FONT_POSTURE, 0 };
-    static const USHORT pnComplexIds[] = {
-        ATTR_CTL_FONT, ATTR_CTL_FONT_HEIGHT, ATTR_CTL_FONT_WEIGHT, ATTR_CTL_FONT_POSTURE, 0 };
-
-    bool bUsed = ScfTools::CheckItems( rItemSet, pnCommonIds, bDeep );
-    if( !bUsed )
-    {
-        namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
-        // if WEAK is passed, guess script type from existing items in the item set
-        if( nScript == ApiScriptType::WEAK )
-            nScript = GetFirstUsedScript( rItemSet );
-        // check the correct items
-        switch( nScript )
-        {
-            case ApiScriptType::LATIN:      bUsed = ScfTools::CheckItems( rItemSet, pnLatinIds, bDeep );    break;
-            case ApiScriptType::ASIAN:      bUsed = ScfTools::CheckItems( rItemSet, pnAsianIds, bDeep );    break;
-            case ApiScriptType::COMPLEX:    bUsed = ScfTools::CheckItems( rItemSet, pnComplexIds, bDeep );  break;
-            default:    DBG_ERRORFILE( "XclExpFontBuffer::CheckItems - unknown script type" );
-        }
-    }
-    return bUsed;
-}
-
 // private --------------------------------------------------------------------
 
 void XclExpFontBuffer::InitDefaultFonts()
@@ -1885,7 +1916,8 @@ XclExpXF::XclExpXF( const XclExpRoot& rRoot, const SfxStyleSheetBase& rStyleShee
     mnParentXFId( XclExpXFBuffer::GetXFIdFromIndex( EXC_XF_STYLEPARENT ) )
 {
     bool bDefStyle = (rStyleSheet.GetName() == ScGlobal::GetRscString( STR_STYLENAME_STANDARD ));
-    Init( const_cast< SfxStyleSheetBase& >( rStyleSheet ).GetItemSet(), ::com::sun::star::i18n::ScriptType::WEAK,
+    sal_Int16 nScript = bDefStyle ? GetDefApiScript() : ::com::sun::star::i18n::ScriptType::WEAK;
+    Init( const_cast< SfxStyleSheetBase& >( rStyleSheet ).GetItemSet(), nScript,
         NUMBERFORMAT_ENTRY_NOT_FOUND, EXC_FONT_NOTFOUND, false, bDefStyle );
 }
 
@@ -1947,7 +1979,7 @@ void XclExpXF::Init( const SfxItemSet& rItemSet, sal_Int16 nScript,
     if( nForceXclFont == EXC_FONT_NOTFOUND )
     {
         mnXclFont = GetFontBuffer().Insert( rItemSet, nScript, EXC_COLOR_CELLTEXT, bDefStyle );
-        mbFontUsed = XclExpFontBuffer::CheckItems( rItemSet, nScript, IsStyleXF() );
+        mbFontUsed = XclExpFontHelper::CheckItems( GetRoot(), rItemSet, nScript, IsStyleXF() );
     }
     else
     {
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index ef30e9a78f6d..1583828706cc 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -35,7 +35,7 @@
 #include <map>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include "scitems.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "document.hxx"
 #include "dociter.hxx"
 #include "olinetab.hxx"
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 7b5fb222a12b..444cf4c848d1 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -37,11 +37,11 @@
 #include <svx/editeng.hxx>
 #include <svx/editobj.hxx>
 #include <svx/linkmgr.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "scitems.hxx"
 #include <svx/eeitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/flditem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/wghtitem.hxx>
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 599b33f9c8aa..419cbb3d6168 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -56,8 +56,8 @@
 
 #include <rtl/logfile.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <svtools/wmf.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/classids.hxx>
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 47b42ad51e93..99dd5632443b 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 #include "xihelper.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/editobj.hxx>
 #include <tools/urlobj.hxx>
 #include "scitems.hxx"
diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx
index 2a5252193728..4d5b5c1ce56b 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -31,11 +31,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 #include "xipage.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/graph.hxx>
 #include "scitems.hxx"
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/lrspitem.hxx>
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index acd371f43f7d..56532f1281cc 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -39,8 +39,8 @@
 #include <com/sun/star/sheet/DataPilotFieldReference.hpp>
 
 #include <tools/datetime.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/zformat.hxx>
+#include <svl/intitem.hxx>
 
 #include "document.hxx"
 #include "cell.hxx"
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index d5664c088e29..5e7f1665c0e0 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -48,14 +48,14 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 
 #include <rtl/math.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/unomid.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 
 #include "global.hxx"
 #include "xlconst.hxx"
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 0b6af9da2e63..9706279307d1 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -33,9 +33,8 @@
 #include "xlroot.hxx"
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <vcl/svapp.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
@@ -55,7 +54,7 @@
 #include "xlstyle.hxx"
 #include "xlchart.hxx"
 #include "xltracer.hxx"
-
+#include <unotools/useroptions.hxx>
 #include "root.hxx"
 
 namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
@@ -96,12 +95,10 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
     mnScTab( 0 ),
     mbExport( bExport )
 {
-    // user name
-    maUserName = SvtUserOptions().GetLastName();
+ maUserName = SvtUserOptions().GetLastName();
     if( maUserName.Len() == 0 )
         maUserName = CREATE_STRING( "Calc" );
 
-    // default script type, e.g. for empty cells
     switch( ScGlobal::GetDefaultScriptType() )
     {
         case SCRIPTTYPE_LATIN:      mnDefApiScript = ApiScriptType::LATIN;      break;
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 6398e25b9be7..4aa46c2ebed9 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -34,7 +34,7 @@
 #include <algorithm>
 #include <math.h>
 #include <sal/mathconf.h>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/editstat.hxx>
 #include "xestream.hxx"
diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx
index 48044c8401f4..fa7c0a17c5c1 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -33,7 +33,7 @@
 
 // ============================================================================
 #include "xltracer.hxx"
-#include <svx/msfiltertracer.hxx>
+#include <filter/msfilter/msfiltertracer.hxx>
 #include "address.hxx"
 
 using ::rtl::OUString;
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 31190b6407b1..299708d2e11c 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -42,8 +42,8 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/stritem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itemset.hxx>
 #include "miscuno.hxx"
 
 using ::rtl::OUString;
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 2271a8f35d4d..917cba6c34ce 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -33,9 +33,9 @@
 #include "ftools.hxx"
 #include <tools/color.hxx>
 #include <unotools/charclass.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/poolitem.hxx>
 #include <sot/storage.hxx>
 
 #include <math.h>
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index ac6a5ac5705f..8d6486fca38d 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -57,13 +57,13 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/frmhtmlw.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/stritem.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTS
 #endif
-#include <svtools/svstdarr.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/parhtml.hxx>
@@ -88,7 +88,7 @@
 
 #include <svx/flditem.hxx>
 #include <svx/borderline.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 
 // ohne sc.hrc: error C2679: binary '=' : no operator defined which takes a
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index b9705e66936d..6793cb879751 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -46,7 +46,7 @@
 #include <svtools/htmlout.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/embedtransfer.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <tools/urlobj.hxx>
 
 #include "htmlexp.hxx"
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 36bbfe1d2787..99b5150621ef 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -50,7 +50,7 @@
 #include <svx/wghtitem.hxx>
 #include <svx/boxitem.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/filter.hxx>
 #include <svtools/parhtml.hxx>
 #include <svtools/htmlkywd.hxx>
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index ce1848d25cd9..a5398fb8fa84 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -35,7 +35,7 @@
 #include <tools/gen.hxx>
 #include <vcl/graph.hxx>
 #include <tools/table.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/editdata.hxx>
 #include <address.hxx>
 
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index 79607802ccdc..b1571637828a 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -32,7 +32,7 @@
 #define SC_EXCRECDS_HXX
 
 #include <tools/solar.h>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/string.hxx>
 #include <vcl/vclenum.hxx>
 #include <tools/color.hxx>
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index b0ef236519a3..606cc2c98482 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -67,7 +67,7 @@
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/sv.h>
 #include <vcl/timer.hxx>
 #include <tools/gen.hxx>
@@ -99,8 +99,8 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Exception.hpp>
-#include <svtools/hint.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/hint.hxx>
+#include <svl/poolitem.hxx>
 #include <document.hxx>
 #include <vcl/prntypes.hxx>
 #include <table.hxx>
@@ -108,9 +108,9 @@
 #include <markarr.hxx>
 #include <root.hxx>
 #include <flttypes.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
 #include <sfx2/cntids.hrc>
 #include <tools/mempool.hxx>
 #include <compiler.hxx>
@@ -118,8 +118,8 @@
 #include <sfx2/sfx.hrc>
 #include <scitems.hxx>
 #include <svx/svxids.hrc>
-#include <svtools/itemset.hxx>
-#include <svtools/memberid.hrc>
+#include <svl/itemset.hxx>
+#include <svl/memberid.hrc>
 #include <tools/table.hxx>
 #include <flttools.hxx>
 #include <vcl/vclenum.hxx>
@@ -131,14 +131,14 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/mapunit.hxx>
 #include <vcl/region.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <patattr.hxx>
 #include <vcl/font.hxx>
-#include <svtools/cenumitm.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/cintitem.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/cenumitm.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/cintitem.hxx>
+#include <svl/brdcst.hxx>
 #include <sot/sotref.hxx>
 #include <tools/globname.hxx>
 #include <sot/factory.hxx>
@@ -170,7 +170,7 @@
 #include <uno/sequence2.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <attrib.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/fontitem.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XEventListener.hdl>
@@ -243,11 +243,11 @@
 #include <formel.hxx>
 #include <com/sun/star/container/XElementAccess.hdl>
 #include <com/sun/star/container/XElementAccess.hpp>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/eeitem.hxx>
 #include <rangenam.hxx>
 #include <vcl/syswin.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <fontbuff.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/field.hxx>
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 00281461f289..50583debc17f 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_XCL97ESC_HXX
 #define SC_XCL97ESC_HXX
 
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 #include <tools/table.hxx>
 #include <tools/stack.hxx>
 #include "xlescher.hxx"
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 857d756e2133..95d172baf9c2 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -43,7 +43,7 @@
 #include "xlstream.hxx"
 #include "xestring.hxx"
 
-#include <svx/mscodec.hxx>
+#include <filter/msfilter/mscodec.hxx>
 #include <vector>
 
 /* ============================================================================
@@ -245,7 +245,7 @@ private:
     sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ) const;
 
 private:
-    ::svx::MSCodec_Std97 maCodec;      /// Crypto algorithm implementation.
+    ::msfilter::MSCodec_Std97 maCodec;      /// Crypto algorithm implementation.
     sal_uInt16          mnPassw[16];   /// Cached password data for copy construction.
     sal_uInt8           mnDocId[16];   /// Cached document ID for copy construction.
     sal_uInt8           mnSaltDigest[16];
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index fb2ea876c279..d26739b868ae 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -34,8 +34,8 @@
 #include <map>
 #include <tools/mempool.hxx>
 #include <tools/string.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/nfkeytab.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/nfkeytab.hxx>
 #include <svx/svxfont.hxx>
 #include "xerecord.hxx"
 #include "xlstyle.hxx"
@@ -139,6 +139,36 @@ const size_t EXC_FONTLIST_NOTFOUND = static_cast< size_t >( -1 );
 
 // ----------------------------------------------------------------------------
 
+/** Static helper functions for font export. */
+class XclExpFontHelper
+{
+public:
+    /** Returns the script type of the first font item found in the item set and its parents. */
+    static sal_Int16    GetFirstUsedScript(
+                            const XclExpRoot& rRoot,
+                            const SfxItemSet& rItemSet );
+
+    /** Returns a VCL font object filled from the passed item set. */
+    static Font         GetFontFromItemSet(
+                            const XclExpRoot& rRoot,
+                            const SfxItemSet& rItemSet,
+                            sal_Int16 nScript );
+
+    /** Returns true, if at least one font related item is set in the passed item set.
+        @param bDeep  true = Searches in parent item sets too. */
+    static bool         CheckItems(
+                            const XclExpRoot& rRoot,
+                            const SfxItemSet& rItemSet,
+                            sal_Int16 nScript,
+                            bool bDeep );
+
+private:
+                            XclExpFontHelper();
+                            ~XclExpFontHelper();
+};
+
+// ----------------------------------------------------------------------------
+
 /** Stores all data of an Excel font and provides export of FONT records. */
 class XclExpFont : public XclExpRecord, protected XclExpRoot
 {
@@ -228,15 +258,6 @@ public:
     virtual void        Save( XclExpStream& rStrm );
     virtual void        SaveXml( XclExpXmlStream& rStrm );
 
-    /** Returns the script type of the first font item found in the item set and its parents. */
-    static sal_Int16    GetFirstUsedScript( const SfxItemSet& rItemSet );
-
-    /** Returns a VCL font object filled from the passed item set. */
-    static Font         GetFontFromItemSet( const SfxItemSet& rItemSet, sal_Int16 nScript );
-    /** Returns true, if at least one font related item is set in the passed item set.
-        @param bDeep  true = Searches in parent item sets too. */
-    static bool         CheckItems( const SfxItemSet& rItemSet, sal_Int16 nScript, bool bDeep );
-
 private:
     /** Initializes the default fonts for the current BIFF version. */
     void                InitDefaultFonts();
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 1798242df3c6..e09530083965 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -36,7 +36,7 @@
 #include <set>
 #include <list>
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "rangelst.hxx"
 #include "xlchart.hxx"
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index c9d2daa6bb2f..3eb5a7257630 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -33,8 +33,8 @@
 
 #include <vector>
 #include <map>
-#include <svx/msdffimp.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msdffimp.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <vcl/graph.hxx>
 #include "xlescher.hxx"
 #include "xiroot.hxx"
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index bbc1cc04fde5..8ff3c26e9abe 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -32,7 +32,7 @@
 #define SC_XISTREAM_HXX
 
 #include <comphelper/docpasswordhelper.hxx>
-#include <svx/mscodec.hxx>
+#include <filter/msfilter/mscodec.hxx>
 #include "xlstream.hxx"
 #include "xlconst.hxx"
 
@@ -121,7 +121,7 @@ private:
     virtual sal_uInt16  OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes );
 
 private:
-    ::svx::MSCodec_XorXLS95 maCodec;       /// Crypto algorithm implementation.
+    ::msfilter::MSCodec_XorXLS95 maCodec;       /// Crypto algorithm implementation.
     ::std::vector< sal_uInt8 > maPassword;
     sal_uInt16          mnKey;
     sal_uInt16          mnHash;
@@ -155,7 +155,7 @@ private:
     sal_uInt16          GetOffset( sal_Size nStrmPos ) const;
 
 private:
-    ::svx::MSCodec_Std97 maCodec;       /// Crypto algorithm implementation.
+    ::msfilter::MSCodec_Std97 maCodec;       /// Crypto algorithm implementation.
     ::std::vector< sal_uInt16 > maPassword;
     ::std::vector< sal_uInt8 > maSalt;
     ::std::vector< sal_uInt8 > maVerifier;
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index 9613abfc8725..f8cca7199f24 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -39,7 +39,7 @@
 #include <vcl/vclenum.hxx>
 #include <svx/svxenum.hxx>
 #include <svx/frmdir.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include "fapihelper.hxx"
 
 class XclRoot;
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index b413384064c4..a0c9a25d58d9 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -37,7 +37,7 @@
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/solar.h>
 
 #include "cell.hxx"
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 9c28cf49d729..c3650e882973 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -50,10 +50,10 @@
 #include <svx/htmlcfg.hxx>
 #include <sfx2/sfxhtml.hxx>
 #include <svtools/parhtml.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/charclass.hxx>
 
 #include "eeimport.hxx"
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index aee41be1a441..88611ca72283 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -43,7 +43,7 @@
 #include <svx/udlnitem.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/fhgtitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svtools/rtfout.hxx>
 #include <svtools/rtfkeywd.hxx>
 
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index e2a7d9e4d538..b54e3bb97fab 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -55,8 +55,8 @@
 #include <svx/udlnitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/wghtitem.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/PasswordHelper.hxx>
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx
index a36be98b3d11..d15cb3c5a227 100644
--- a/sc/source/filter/starcalc/scfobj.cxx
+++ b/sc/source/filter/starcalc/scfobj.cxx
@@ -41,7 +41,7 @@ using namespace com::sun::star;
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 2f546e323179..1a8480a5e758 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -34,7 +34,7 @@
 #include "XclImpChangeTrack.hxx"
 #include <tools/debug.hxx>
 #include <sot/storage.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include "chgviset.hxx"
 #include "cell.hxx"
 #include "chgtrack.hxx"
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index e618e5d91fd5..db8b085f7629 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -44,7 +44,7 @@
 #include <svx/svdoole2.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/fmglob.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <vcl/outdev.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 608b13c49ac3..45c64cca1e4f 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -37,14 +37,14 @@
 #include <svx/editobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <sot/storage.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/writingmodeitem.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/math.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include "cell.hxx"
 #include "drwlayer.hxx"
 
@@ -57,13 +57,13 @@
 
 #include "scitems.hxx"
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/frmdiritem.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/eeitem.hxx>
-#include <svx/msoleexp.hxx>
+#include <filter/msfilter/msoleexp.hxx>
 
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index ac09f19a6dbe..da3c6c29bc30 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <tools/debug.hxx>
 #include <tools/datetime.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #define SC_CHANGE_ID_PREFIX "ct"
 
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 2b16d33f1376..33a77df4f4dd 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -38,7 +38,7 @@
 #include "rangeutl.hxx"
 #include <tools/debug.hxx>
 #include <tools/datetime.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <xmloff/xmluconv.hxx>
 
 #define SC_CHANGE_ID_PREFIX "ct"
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index b9d9b4936961..6a182dcdc737 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -458,7 +458,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
 
         if (aSortFields[0].IsCaseSensitive)
             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         sal_Bool bCaseSensitive(aSortFields[0].IsCaseSensitive);
         for (i = 1; i < nSortFields; ++i)
         {
@@ -478,7 +478,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aSortFields[0].CollatorLocale.Country);
         if (aSortFields[0].CollatorAlgorithm.getLength())
             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ALGORITHM, aSortFields[0].CollatorAlgorithm);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         rtl::OUString sLanguage(aSortFields[0].CollatorLocale.Language);
         rtl::OUString sCountry(aSortFields[0].CollatorLocale.Country);
         rtl::OUString sAlgorithm(aSortFields[0].CollatorAlgorithm);
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 2d8eac1dfc76..74b0518a6c62 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -42,7 +42,7 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
 
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 6a42d505cdc8..2f3f847c6c58 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -65,12 +65,12 @@
 #include <xmloff/families.hxx>
 #include <xmloff/numehelp.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/outlobj.hxx>
 #include <svx/editobj.hxx>
 #include <svx/unoapi.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/text/XText.hpp>
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index df7e99955bfd..94613379a32d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -88,7 +88,7 @@
 
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/unoshape.hxx>
 #include <comphelper/extract.hxx>
 #include <svx/eeitem.hxx>
@@ -1139,7 +1139,7 @@ void ScXMLExport::WriteRowContent()
 {
     ScMyRowFormatRange aRange;
     sal_Int32 nIndex(-1);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Int32 nPrevCol(0);
 #endif
     sal_Int32 nCols(0);
@@ -1148,7 +1148,7 @@ void ScXMLExport::WriteRowContent()
     sal_Bool bIsFirst(sal_True);
     while (pRowFormatRanges->GetNext(aRange))
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         DBG_ASSERT(bIsFirst || (!bIsFirst && (nPrevCol + nCols == aRange.nStartColumn)), "here are some columns missing");
 #endif
         if (bIsFirst)
@@ -1158,7 +1158,7 @@ void ScXMLExport::WriteRowContent()
             bIsAutoStyle = aRange.bIsAutoStyle;
             nCols = aRange.nRepeatColumns;
             bIsFirst = sal_False;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             nPrevCol = aRange.nStartColumn;
 #endif
         }
@@ -1185,7 +1185,7 @@ void ScXMLExport::WriteRowContent()
                 bIsAutoStyle = aRange.bIsAutoStyle;
                 nCols = aRange.nRepeatColumns;
                 nPrevValidationIndex = aRange.nValidationIndex;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 nPrevCol = aRange.nStartColumn;
 #endif
             }
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 8e3f4b421a6c..5d07670f53a2 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -33,7 +33,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
@@ -51,9 +51,9 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlerror.hxx>
 
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svl/languageoptions.hxx>
 
 #include "xmlimprt.hxx"
 #include "document.hxx"
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 7bc5396fcb5b..e5a9f4b251a8 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -45,8 +45,8 @@
 #include <svx/xmlgrhlp.hxx>
 #include <svtools/sfxecode.hxx>
 #include <sfx2/frame.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/container/XChild.hpp>
@@ -71,7 +71,7 @@
 
 #include <svx/xmleohlp.hxx>
 #include <rtl/logfile.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include "document.hxx"
 #include "xmlwrap.hxx"
@@ -737,12 +737,8 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
         {
             // old stream is still in this file's storage - open read-only
 
-            SfxMedium* pSrcMed = rDoc.GetDocumentShell()->GetMedium();
-            String aSrcURL = pSrcMed->GetOrigURL();
-
-            // SfxMedium must not be read-only, or it will create a temp file in GetStorage
-            SfxMedium aTmpMedium( aSrcURL, STREAM_READWRITE, FALSE, NULL, NULL );
-            uno::Reference<embed::XStorage> xTmpStorage = aTmpMedium.GetStorage();
+            // #i106854# use the document's storage directly, without a temporary SfxMedium
+            uno::Reference<embed::XStorage> xTmpStorage = rDoc.GetDocumentShell()->GetStorage();
             uno::Reference<io::XStream> xSrcStream;
             uno::Reference<io::XInputStream> xSrcInput;
             try
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 8774ef74f86d..b611198974de 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -47,7 +47,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <comphelper/sequence.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 3ed9b4062a9d..2e6d9a256d75 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -583,7 +583,7 @@ sal_Bool ScChildrenShapes::IsSelected(sal_Int32 nIndex,
     bResult = maZOrderedShapes[nIndex]->bSelected;
     rShape = maZOrderedShapes[nIndex]->xShape;
 
-#ifndef PRODUCT // test whether it is truly selected by a slower method
+#ifdef DBG_UTIL // test whether it is truly selected by a slower method
     uno::Reference< drawing::XShape > xReturnShape;
     sal_Bool bDebugResult(sal_False);
     uno::Reference<container::XIndexAccess> xIndexAccess;
@@ -1179,7 +1179,7 @@ sal_Bool ScChildrenShapes::FindShape(const uno::Reference<drawing::XShape>& xSha
     if ((rItr != maZOrderedShapes.end()) && (*rItr != NULL) && ((*rItr)->xShape.get() == xShape.get()))
         bResult = sal_True; // if the shape is found
 
-#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted)
+#ifdef DBG_UTIL // test whether it finds truly the correct shape (perhaps it is not really sorted)
     SortedShapes::iterator aDebugItr = maZOrderedShapes.begin();
     SortedShapes::iterator aEndItr = maZOrderedShapes.end();
     sal_Bool bFound(sal_False);
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index a81f359f04c7..9801c9eeb972 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1213,7 +1213,7 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode&
 //UNUSED2008-05      if (rItr->mxShape.get() == xShape.get())
 //UNUSED2008-05          bResult = sal_True; // if the shape is found
 //UNUSED2008-05
-//UNUSED2008-05  /*#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted)
+//UNUSED2008-05  /*#ifdef DBG_UTIL // test whether it finds truly the correct shape (perhaps it is not really sorted)
 //UNUSED2008-05      ScShapeChildVec::iterator aDebugItr = std::find(rShapes.begin(), rShapes.end(), aShape);
 //UNUSED2008-05      DBG_ASSERT(rItr == aDebugItr, "wrong Shape found");
 //UNUSED2008-05  #endif*/
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index fdb7696f7f6c..960e58760512 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -52,10 +52,10 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
 #include <vcl/window.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
-#include <svtools/style.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/style.hxx>
+#include <svl/itempool.hxx>
 #include <svx/editobj.hxx>
 #include <toolkit/helper/convert.hxx>
 
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index ddb317ccc1b0..fabd1fc932cc 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -51,7 +51,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
 #include <vcl/window.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <toolkit/helper/convert.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index f4196896083b..0746495ca099 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -52,7 +52,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
 #include <vcl/window.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/sequence.hxx>
 
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 53f063db0e66..88b3d42996f6 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -60,8 +60,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdxcgv.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/itempool.hxx>
+#include <svl/urlbmk.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 46987c88636f..c6901707d2c3 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -57,7 +57,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/sound.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/help.hxx>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index fd8009051ec4..a5b481d3174a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -52,7 +52,7 @@
 #include <svx/scripttypeitem.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/help.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 #include "inputwin.hxx"
 #include "scmod.hxx"
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx
index 314f051881f1..89a51cd2b2b0 100644
--- a/sc/source/ui/app/lnktrans.cxx
+++ b/sc/source/ui/app/lnktrans.cxx
@@ -35,7 +35,7 @@
 
 
 
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 
 #include "lnktrans.hxx"
 #include "scmod.hxx"
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index fb31b5601cf8..b9d8682c412b 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -56,8 +56,8 @@
 
 #include <svtools/ehdl.hxx>
 #include <svtools/accessibilityoptions.hxx>
-#include <svtools/ctloptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/ctloptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/status.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
@@ -66,7 +66,7 @@
 #include <svx/langitem.hxx>
 #include <svtools/colorcfg.hxx>
 
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/selctrl.hxx>
 #include <svx/insctrl.hxx>
 #include <svx/zoomctrl.hxx>
@@ -74,7 +74,7 @@
 #include <svx/pszctrl.hxx>
 #include <svx/zoomsliderctrl.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/inethist.hxx>
+#include <svl/inethist.hxx>
 #include <vcl/waitobj.hxx>
 #include <svx/svxerr.hxx>
 
@@ -217,125 +217,128 @@ ScModule::~ScModule()
 }
 
 //------------------------------------------------------------------
-
-void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 )
 {
-    if ( rHint.ISA(SfxSimpleHint) )
+    if ( p == pColorConfig || p == pAccessOptions )
     {
-        ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
-        if ( nHintId == SFX_HINT_DEINITIALIZING )
-        {
-            //  ConfigItems must be removed before ConfigManager
-            DeleteCfg();
-        }
-        else if ( nHintId == SFX_HINT_COLORS_CHANGED || nHintId == SFX_HINT_ACCESSIBILITY_CHANGED )
+        //  Test if detective objects have to be updated with new colors
+        //  (if the detective colors haven't been used yet, there's nothing to update)
+        if ( ScDetectiveFunc::IsColorsInitialized() )
         {
-            //  Test if detective objects have to be updated with new colors
-            //  (if the detective colors haven't been used yet, there's nothing to update)
-            if ( ScDetectiveFunc::IsColorsInitialized() )
+            const svtools::ColorConfig& rColors = GetColorConfig();
+            BOOL bArrows =
+                ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor ||
+                  ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor );
+            BOOL bComments =
+                ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor );
+            if ( bArrows || bComments )
             {
-                const svtools::ColorConfig& rColors = GetColorConfig();
-                BOOL bArrows =
-                    ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor ||
-                      ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor );
-                BOOL bComments =
-                    ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor );
-                if ( bArrows || bComments )
-                {
-                    ScDetectiveFunc::InitializeColors();        // get the new colors
+                ScDetectiveFunc::InitializeColors();        // get the new colors
 
-                    //  update detective objects in all open documents
-                    SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
-                    while ( pObjSh )
+                //  update detective objects in all open documents
+                SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
+                while ( pObjSh )
+                {
+                    if ( pObjSh->Type() == TYPE(ScDocShell) )
                     {
-                        if ( pObjSh->Type() == TYPE(ScDocShell) )
-                        {
-                            ScDocShell* pDocSh = ((ScDocShell*)pObjSh);
-                            if ( bArrows )
-                                ScDetectiveFunc( pDocSh->GetDocument(), 0 ).UpdateAllArrowColors();
-                            if ( bComments )
-                                ScDetectiveFunc::UpdateAllComments( *pDocSh->GetDocument() );
-                        }
-                        pObjSh = SfxObjectShell::GetNext( *pObjSh );
+                        ScDocShell* pDocSh = ((ScDocShell*)pObjSh);
+                        if ( bArrows )
+                            ScDetectiveFunc( pDocSh->GetDocument(), 0 ).UpdateAllArrowColors();
+                        if ( bComments )
+                            ScDetectiveFunc::UpdateAllComments( *pDocSh->GetDocument() );
                     }
+                    pObjSh = SfxObjectShell::GetNext( *pObjSh );
                 }
             }
+        }
 
-            //  force all views to repaint, using the new options
+        //  force all views to repaint, using the new options
 
-            SfxViewShell* pViewShell = SfxViewShell::GetFirst();
-            while(pViewShell)
+        SfxViewShell* pViewShell = SfxViewShell::GetFirst();
+        while(pViewShell)
+        {
+            if ( pViewShell->ISA(ScTabViewShell) )
             {
-                if ( pViewShell->ISA(ScTabViewShell) )
-                {
-                    ScTabViewShell* pViewSh = (ScTabViewShell*)pViewShell;
-                    pViewSh->PaintGrid();
-                    pViewSh->PaintTop();
-                    pViewSh->PaintLeft();
-                    pViewSh->PaintExtras();
-
-                    ScInputHandler* pHdl = pViewSh->GetInputHandler();
-                    if ( pHdl )
-                        pHdl->ForgetLastPattern();  // EditEngine BackgroundColor may change
-                }
-                else if ( pViewShell->ISA(ScPreviewShell) )
-                {
-                    Window* pWin = pViewShell->GetWindow();
-                    if (pWin)
-                        pWin->Invalidate();
-                }
-                pViewShell = SfxViewShell::GetNext( *pViewShell );
+                ScTabViewShell* pViewSh = (ScTabViewShell*)pViewShell;
+                pViewSh->PaintGrid();
+                pViewSh->PaintTop();
+                pViewSh->PaintLeft();
+                pViewSh->PaintExtras();
+
+                ScInputHandler* pHdl = pViewSh->GetInputHandler();
+                if ( pHdl )
+                    pHdl->ForgetLastPattern();  // EditEngine BackgroundColor may change
+            }
+            else if ( pViewShell->ISA(ScPreviewShell) )
+            {
+                Window* pWin = pViewShell->GetWindow();
+                if (pWin)
+                    pWin->Invalidate();
             }
+            pViewShell = SfxViewShell::GetNext( *pViewShell );
         }
-        else if ( nHintId == SFX_HINT_CTL_SETTINGS_CHANGED )
+    }
+    else if ( p == pCTLOptions )
+    {
+        //  for all documents: set digit language for printer, recalc output factor, update row heights
+        SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
+        while ( pObjSh )
         {
-            //  for all documents: set digit language for printer, recalc output factor, update row heights
-            SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
-            while ( pObjSh )
+            if ( pObjSh->Type() == TYPE(ScDocShell) )
             {
-                if ( pObjSh->Type() == TYPE(ScDocShell) )
-                {
-                    ScDocShell* pDocSh = ((ScDocShell*)pObjSh);
-                    OutputDevice* pPrinter = pDocSh->GetPrinter();
-                    if ( pPrinter )
-                        pPrinter->SetDigitLanguage( GetOptDigitLanguage() );
+                ScDocShell* pDocSh = ((ScDocShell*)pObjSh);
+                OutputDevice* pPrinter = pDocSh->GetPrinter();
+                if ( pPrinter )
+                    pPrinter->SetDigitLanguage( GetOptDigitLanguage() );
 
-                    pDocSh->CalcOutputFactor();
+                pDocSh->CalcOutputFactor();
 
-                    SCTAB nTabCount = pDocSh->GetDocument()->GetTableCount();
-                    for (SCTAB nTab=0; nTab<nTabCount; nTab++)
-                        pDocSh->AdjustRowHeight( 0, MAXROW, nTab );
-                }
-                pObjSh = SfxObjectShell::GetNext( *pObjSh );
+                SCTAB nTabCount = pDocSh->GetDocument()->GetTableCount();
+                for (SCTAB nTab=0; nTab<nTabCount; nTab++)
+                    pDocSh->AdjustRowHeight( 0, MAXROW, nTab );
             }
+            pObjSh = SfxObjectShell::GetNext( *pObjSh );
+        }
 
-            //  for all views (table and preview): update digit language
-            SfxViewShell* pSh = SfxViewShell::GetFirst();
-            while ( pSh )
+        //  for all views (table and preview): update digit language
+        SfxViewShell* pSh = SfxViewShell::GetFirst();
+        while ( pSh )
+        {
+            if ( pSh->ISA( ScTabViewShell ) )
             {
-                if ( pSh->ISA( ScTabViewShell ) )
-                {
-                    ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
+                ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
 
-                    //  set ref-device for EditEngine (re-evaluates digit settings)
-                    ScInputHandler* pHdl = GetInputHdl(pViewSh);
-                    if (pHdl)
-                        pHdl->UpdateRefDevice();
-
-                    pViewSh->DigitLanguageChanged();
-                    pViewSh->PaintGrid();
-                }
-                else if ( pSh->ISA( ScPreviewShell ) )
-                {
-                    ScPreviewShell* pPreviewSh = (ScPreviewShell*)pSh;
-                    ScPreview* pPreview = pPreviewSh->GetPreview();
+                //  set ref-device for EditEngine (re-evaluates digit settings)
+                ScInputHandler* pHdl = GetInputHdl(pViewSh);
+                if (pHdl)
+                    pHdl->UpdateRefDevice();
 
-                    pPreview->SetDigitLanguage( GetOptDigitLanguage() );
-                    pPreview->Invalidate();
-                }
+                pViewSh->DigitLanguageChanged();
+                pViewSh->PaintGrid();
+            }
+            else if ( pSh->ISA( ScPreviewShell ) )
+            {
+                ScPreviewShell* pPreviewSh = (ScPreviewShell*)pSh;
+                ScPreview* pPreview = pPreviewSh->GetPreview();
 
-                pSh = SfxViewShell::GetNext( *pSh );
+                pPreview->SetDigitLanguage( GetOptDigitLanguage() );
+                pPreview->Invalidate();
             }
+
+            pSh = SfxViewShell::GetNext( *pSh );
+        }
+    }
+}
+
+void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
+{
+    if ( rHint.ISA(SfxSimpleHint) )
+    {
+        ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
+        if ( nHintId == SFX_HINT_DEINITIALIZING )
+        {
+            //  ConfigItems must be removed before ConfigManager
+            DeleteCfg();
         }
     }
 }
@@ -354,17 +357,17 @@ void ScModule::DeleteCfg()
 
     if ( pColorConfig )
     {
-        EndListening(*pColorConfig);
+        pColorConfig->RemoveListener(this);
         DELETEZ( pColorConfig );
     }
     if ( pAccessOptions )
     {
-        EndListening(*pAccessOptions);
+        pAccessOptions->RemoveListener(this);
         DELETEZ( pAccessOptions );
     }
     if ( pCTLOptions )
     {
-        EndListening(*pCTLOptions);
+        pCTLOptions->RemoveListener(this);
         DELETEZ( pCTLOptions );
     }
     if( pUserOptions )
@@ -967,7 +970,7 @@ svtools::ColorConfig& ScModule::GetColorConfig()
     if ( !pColorConfig )
     {
         pColorConfig = new svtools::ColorConfig;
-        StartListening(*pColorConfig);
+        pColorConfig->AddListener(this);
     }
 
     return *pColorConfig;
@@ -978,7 +981,7 @@ SvtAccessibilityOptions& ScModule::GetAccessOptions()
     if ( !pAccessOptions )
     {
         pAccessOptions = new SvtAccessibilityOptions;
-        StartListening(*pAccessOptions);
+        pAccessOptions->AddListener(this);
     }
 
     return *pAccessOptions;
@@ -989,7 +992,7 @@ SvtCTLOptions& ScModule::GetCTLOptions()
     if ( !pCTLOptions )
     {
         pCTLOptions = new SvtCTLOptions;
-        StartListening(*pCTLOptions);
+        pCTLOptions->AddListener(this);
     }
 
     return *pCTLOptions;
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index 4001ebe62036..7e0b43bdd156 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -36,7 +36,7 @@
 //------------------------------------------------------------------
 
 #include <svx/unolingu.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 94a2cdfc3324..c37fced30109 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -66,8 +66,8 @@
 #include <svx/paperinf.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/algitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
 #include "docsh.hxx"
 #include "markdata.hxx"
 #include "stlpool.hxx"
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index eedfab338844..1a36b8ca5125 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -64,8 +64,8 @@
 
 
 #include <sfx2/msg.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/objitem.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/hlnkitem.hxx>
@@ -80,7 +80,7 @@
 #include <svx/colritem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/bolnitem.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/clipfmtitem.hxx>
@@ -117,15 +117,15 @@
 #include <svx/charreliefitem.hxx>
 #include <svx/rotmodit.hxx>
 #include <svx/drawitem.hxx>
-#include <svtools/ilstitem.hxx>
-#include <svtools/globalnameitem.hxx>
+#include <svl/ilstitem.hxx>
+#include <svl/globalnameitem.hxx>
 #include <svx/chrtitem.hxx>
 #include <svx/zoomslideritem.hxx>
 
 // #i25616#
 #include <svx/sdshitm.hxx>
 
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <avmedia/mediaitem.hxx>
 #include "attrib.hxx"
 
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 9fd600409211..05bcf624a1b3 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -45,7 +45,7 @@
 //CHINA001 #include <svx/chardlg.hxx>
 //CHINA001 #include <svx/numfmt.hxx>
 //CHINA001 #include <svx/paragrph.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 #include "tabpages.hxx"
 #include "attrdlg.hxx"
diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx
index 704546d76bf6..c08f8fa2dcea 100644
--- a/sc/source/ui/attrdlg/condfrmt.cxx
+++ b/sc/source/ui/attrdlg/condfrmt.cxx
@@ -33,7 +33,7 @@
 
 
 #include <sfx2/dispatch.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 #include "tabvwsh.hxx"
 #include "reffact.hxx"
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 51641e0ce605..618c7f97a881 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -40,7 +40,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <tools/shl.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index bb0e83746050..8e1f839c39e4 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -48,7 +48,7 @@
 #ifndef _SV_GRADIENT_HXX
 #include <vcl/gradient.hxx>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/zoomslideritem.hxx>
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index ddbfb4426df8..e33ecde514a4 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -37,7 +37,7 @@
 
 #include <algorithm>
 #include <svtools/colorcfg.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/poly.hxx>
 #include "scmod.hxx"
 #include "asciiopt.hxx"
@@ -52,7 +52,7 @@
 #include <svx/colritem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/fontitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "editutil.hxx"
 // *** edit engine ***
 
@@ -96,12 +96,12 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) :
     InitColors();
     InitFonts();
     ImplClearSplits();
-    StartListening( mrColorConfig );
+    mrColorConfig.AddListener(this);
 }
 
 ScCsvGrid::~ScCsvGrid()
 {
-    EndListening( mrColorConfig );
+    mrColorConfig.RemoveListener(this);
 }
 
 
@@ -995,14 +995,10 @@ void ScCsvGrid::DataChanged( const DataChangedEvent& rDCEvt )
     ScCsvControl::DataChanged( rDCEvt );
 }
 
-void ScCsvGrid::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void ScCsvGrid::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    if( rHint.ISA( SfxSimpleHint ) &&
-        (static_cast< const SfxSimpleHint& >( rHint ).GetId() == SFX_HINT_COLORS_CHANGED) )
-    {
-        InitColors();
-        Repaint();
-    }
+    InitColors();
+    Repaint();
 }
 
 
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index d6bd29c7fddf..8a44d512cbe6 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -55,7 +55,7 @@
 #define _PFILTDLG_CXX
 #include "pfiltdlg.hxx"
 #undef _PFILTDLG_CXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 //==================================================================
 
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 60c37ee19381..0065af288783 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -39,7 +39,7 @@
 #include <svx/drawitem.hxx>
 #include <svx/xtable.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 4351d357abb9..81e8ff35195d 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -36,10 +36,10 @@
 #endif
 
 #include <vcl/svapp.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmod.hxx>
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index fa00559b4f27..fc745318b105 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -40,7 +40,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svx/linkmgr.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "arealink.hxx"
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index f9039a88f658..e292187c80c9 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -48,8 +48,8 @@
 #include <vcl/sound.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/waitobj.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/PasswordHelper.hxx>
 
 #include <list>
 
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index fd67755daf83..17cb07ca0a49 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -42,7 +42,7 @@
 
 
 #include <sot/clsids.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
@@ -51,7 +51,7 @@
 #include <vcl/waitobj.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dinfdlg.hxx>
@@ -63,10 +63,9 @@
 #include <sfx2/topfrm.hxx>
 #include <sfx2/objface.hxx>
 #include <svx/srchitem.hxx>
-#include <svx/svxmsbas.hxx>
-#include <svtools/fltrcfg.hxx>
-#include <svtools/documentlockfile.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <unotools/fltrcfg.hxx>
+#include <svl/documentlockfile.hxx>
+#include <svl/sharecontrolfile.hxx>
 #include <unotools/charclass.hxx>
 #include <vcl/virdev.hxx>
 #include "chgtrack.hxx"
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 742d66e6bcb9..386ac8528cec 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -43,7 +43,7 @@
 #include <svx/flstitem.hxx>
 #include <svx/drawitem.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 380f4635cdcf..1416c57f1165 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -44,13 +44,11 @@
 #include <svx/pageitem.hxx>
 #include <svx/paperinf.hxx>
 #include <svx/postattr.hxx>
-//#include <svx/postdlg.hxx>
 #include <svx/sizeitem.hxx>
-
+#include <unotools/misccfg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/misccfg.hxx>
 #include <sfx2/printer.hxx>
 #include <svtools/ctrltool.hxx>
 #include <vcl/virdev.hxx>
@@ -443,7 +441,7 @@ void ScDocShell::InitOptions()          // Fortsetzung von InitNew (CLOOKs)
     aDocOpt.SetAutoSpell( bAutoSpell );
 
     // zweistellige Jahreszahleneingabe aus Extras->Optionen->Allgemein->Sonstiges
-    aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( SFX_APP()->GetMiscConfig()->GetYear2000() ) );
+    aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( ::utl::MiscCfg().GetYear2000() ) );
 
     aDocument.SetDocOptions( aDocOpt );
     aDocument.SetViewOptions( aViewOpt );
@@ -968,7 +966,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                 //  -> wird weggelassen
                 //! ??? Loesch-Aktion rueckgaengig machen ???
                 //! ??? Aktion irgendwo anders speichern  ???
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 String aValue;
                 if ( eSourceType == SC_CAT_CONTENT )
                     ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue );
@@ -1126,7 +1124,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                     ScChangeAction* pAct = pThisTrack->GetLast();
                     if ( pAct && pAct->GetActionNumber() > nOldActionMax )
                         pAct->SetComment( rComment );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     else
                         DBG_ERROR( "MergeDocument: wohin mit dem Kommentar?!?" );
 #endif
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 80b0c76a64be..4827366d3924 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star;
 #include <svx/ofaitem.hxx>
 #include <sot/formats.hxx>
 #include <svtools/printdlg.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
 #include <tools/multisel.hxx>
@@ -73,9 +73,9 @@ using namespace ::com::sun::star;
 #include <sfx2/passwd.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docinsert.hxx>
-#include <svtools/PasswordHelper.hxx>
-#include <svtools/documentlockfile.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/PasswordHelper.hxx>
+#include <svl/documentlockfile.hxx>
+#include <svl/sharecontrolfile.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include "docuno.hxx"
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 5b2da76475df..b4b5f4721900 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -42,7 +42,7 @@
 #include <vcl/waitobj.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index d58777b9b5d5..174207bbf673 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -37,8 +37,8 @@
 
 #include <stdio.h>
 #include <tools/urlobj.hxx>
-#include <svtools/converter.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/converter.hxx>
+#include <svl/zforlist.hxx>
 #include <comphelper/types.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/sharedunocomponent.hxx>
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index f74e8c519fb6..e18ef20d96b9 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -55,12 +55,12 @@
 #include "sfx2/fcontnr.hxx"
 #include "sfx2/sfxsids.hrc"
 #include "sfx2/objsh.hxx"
-#include "svtools/broadcast.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/zformat.hxx"
+#include "svl/broadcast.hxx"
+#include "svl/smplhint.hxx"
+#include "svl/itemset.hxx"
+#include "svl/stritem.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/zformat.hxx"
 #include "svx/linkmgr.hxx"
 #include "tools/urlobj.hxx"
 #include "unotools/ucbhelper.hxx"
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 1561e4c6efeb..25a1c867b0e3 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -53,9 +53,9 @@ class StarBASIC;
 #include <tools/string.hxx>
 #include <rtl/math.hxx>
 #include <svtools/htmlout.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sot/formats.hxx>
 #include <sfx2/mieclip.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 570d41f7885d..c86c7591cd36 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -42,8 +42,8 @@
 
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 7bb3c92dbc9c..e4d39e21d7be 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "chartsh.hxx"
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 63f958763479..e53fea436d12 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -48,7 +48,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "drawsh.hxx"
@@ -71,7 +71,7 @@
 
 #include "userdat.hxx"
 #include <sfx2/objsh.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/viewsh.hxx>
 #include <com/sun/star/util/XModifiable.hpp>
@@ -266,7 +266,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
                                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                                 if ( pFact )
                                 {
-                                    SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView, RID_SVXDLG_CAPTION );
+                                    SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView );
 
                                     const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
                                     SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -291,7 +291,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
                                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                                 if(pFact)
                                 {
-                                    SfxAbstractTabDialog* pDlg = pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView, RID_SVXDLG_TRANSFORM );
+                                    SfxAbstractTabDialog* pDlg = pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView );
                                     DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
                                     if (pDlg->Execute() == RET_OK)
                                     {
@@ -398,7 +398,6 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
         SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
                     &aNewAttr,
                 pViewData->GetDocument()->GetDrawLayer(),
-                RID_SVXDLG_LINE,
                 pObj,
                 bHasMarked);
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
@@ -439,7 +438,6 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage )
     AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( pViewData->GetDialogParent(),
                                                                     &aNewAttr,
                                                             pViewData->GetDocument()->GetDrawLayer(),
-                                                            RID_SVXDLG_AREA,
                                                             pView);
     DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
@@ -477,7 +475,7 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ )
         pView->MergeAttrFromMarked( aNewAttr, FALSE );
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-    SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, RID_SVXDLG_TEXT, pView );
+    SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, pView );
 
     USHORT nResult = pDlg->Execute();
 
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 4507bc471ebc..ad36ad72e796 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -42,8 +42,8 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/extrusionbar.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 26e5e6cb9b2e..5d8e4cb1ca33 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -522,7 +522,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
 
                         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                         OSL_ENSURE(pFact, "Dialogdiet fail!");
-                        AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME);
+                        AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName);
                         OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                         pDlg->SetCheckNameHdl(LINK(this, ScDrawShell, NameObjectHdl));
@@ -593,7 +593,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
 
                         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                         OSL_ENSURE(pFact, "Dialogdiet fail!");
-                        AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC);
+                        AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription);
                         OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                         if(RET_OK == pDlg->Execute())
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 5e4d5640f74a..8987c9194cb2 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -45,7 +45,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "drformsh.hxx"
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index d241843f9745..908eba68cee5 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -65,8 +65,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <svtools/cliplistener.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/whiter.hxx>
+#include <svl/languageoptions.hxx>
 #include <vcl/msgbox.hxx>
 
 #include <svx/svxdlg.hxx>
@@ -799,7 +799,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
             case SID_DRAWTEXT_ATTR_DLG:
                 {
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                    SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aEditAttr, RID_SVXDLG_TEXT, pView );
+                    SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aEditAttr, pView );
 
                     bDone = ( RET_OK == pDlg->Execute() );
 
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index d05e0568c1ca..3389c362901b 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -45,7 +45,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sot/formats.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 
 #include "sc.hrc"
 #include "drtxtob.hxx"
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index fd6fc1ff3e41..0398d5a63b43 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -36,7 +36,7 @@
 #include <svx/gallery.hxx>
 #include <sfx2/request.hxx>
 #include <svx/fmmodel.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/eeitem.hxx>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 3274b6752c95..35d46f234182 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 #include <avmedia/mediawindow.hxx>
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 93abbd48c9e7..1f7534a7fcb4 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -40,16 +40,16 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sot/exchange.hxx>
-#include <svtools/globalnameitem.hxx>
+#include <svl/globalnameitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/pfiledlg.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/insdlg.hxx>
 #include <svtools/soerr.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index ebcb2ad30802..a96ce6c18980 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svx/svxids.hrc>
 #include <svx/eeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "futext.hxx"
 #include "drwlayer.hxx"
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 39b27609e3a8..34c32fb8bc08 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/grfflt.hxx>
 #include <svx/grafctrl.hxx>
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 16dcfd9f1cf7..9469cd43c96e 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
 #include <avmedia/mediaitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index a0c5bd6d818f..c9da807019c9 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -45,7 +45,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "oleobjsh.hxx"
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 8d631a9f0609..f9146b96c04c 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -39,8 +39,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/svtreebx.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/topfrm.hxx>
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx
index 8448654014c7..e89069ade49a 100644
--- a/sc/source/ui/inc/AccessibilityHints.hxx
+++ b/sc/source/ui/inc/AccessibilityHints.hxx
@@ -33,8 +33,8 @@
 
 #include "viewdata.hxx"
 #include <com/sun/star/uno/XInterface.hpp>
-#include <svtools/smplhint.hxx>
-#include <svtools/hint.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/hint.hxx>
 
 #define SC_HINT_ACC_SIMPLE_START    SFX_HINT_USER00
 #define SC_HINT_ACC_TABLECHANGED    SC_HINT_ACC_SIMPLE_START + 1
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 8d312a0d13d9..98f2afc8e88d 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -50,7 +50,7 @@
 #include <cppuhelper/interfacecontainer.h>
 
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <cppuhelper/compbase5.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx
index 7bb71854443c..fac00ea550e4 100644
--- a/sc/source/ui/inc/DrawModelBroadcaster.hxx
+++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx
@@ -32,7 +32,7 @@
 #define _SC_DRAWMODELBROADCASTER_HXX
 
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 7986935ae9c3..cdde064fc588 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -55,7 +55,7 @@
 
 #ifndef _SVARRAY_HXX
 #define _SVARRAY_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #endif
 #include "chgtrack.hxx"
 #include "chgviset.hxx"
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index c8c633060852..583c4fd2c414 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -34,10 +34,8 @@
 #define _SC_CSVGRID_HXX
 
 #include <vcl/virdev.hxx>
-#ifndef _MENU_HXX
 #include <vcl/menu.hxx>
-#endif
-#include <svtools/lstner.hxx>
+#include <unotools/options.hxx>
 
 #include <vector>
 #include <memory>
@@ -100,7 +98,7 @@ typedef ::std::vector< ScCsvColState > ScCsvColStateVec;
 
 /** A data grid control for the CSV import dialog. The design of this control
     simulates a Calc spreadsheet with row and column headers. */
-class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public SfxListener
+class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener
 {
 private:
     typedef ::std::auto_ptr< ScEditEngineDefaulter > ScEditEnginePtr;
@@ -299,8 +297,7 @@ protected:
 
     virtual void                DataChanged( const DataChangedEvent& rDCEvt );
 
-    using Control::Notify;
-    virtual void                Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void                ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     // painting ---------------------------------------------------------------
 protected:
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 068a05d57711..6a468a415b44 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -32,7 +32,7 @@
 
 #include <sfx2/childwin.hxx>
 #include <sfx2/dockwin.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/stdctrl.hxx>
 
 #ifndef _LSTBOX_HXX //autogen
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index b25811eb9220..d490e37b93ca 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -44,7 +44,7 @@
 #ifndef _SVSTDARR_STRINGS
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #endif
 #include "compiler.hxx"
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index 753000e290ab..fc8f1813be56 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -44,7 +44,7 @@
 #ifndef _SVSTDARR_STRINGS
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #endif
 #include <vcl/tabctrl.hxx>
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index bded402f5775..a5b7c4d94e5f 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -34,7 +34,7 @@
 #include <vector>
 #include <vcl/toolbox.hxx>
 #include <sfx2/childwin.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/window.hxx>
 #include <svtools/transfer.hxx>
diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx
index 954d0d7a5d47..44514766601d 100644
--- a/sc/source/ui/inc/msgpool.hxx
+++ b/sc/source/ui/inc/msgpool.hxx
@@ -35,9 +35,9 @@
 #include <svx/srchitem.hxx>
 
 
-#include <svtools/itempool.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 
 //#include <dbitems.hxx>
 #include "uiitems.hxx"
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 54434427d459..b14e668fabd0 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -36,8 +36,8 @@
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/childwin.hxx>
 #include "content.hxx"
 #include <svtools/svmedit.hxx>
diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx
index 3835f94157ca..087c8937de9d 100644
--- a/sc/source/ui/inc/parawin.hxx
+++ b/sc/source/ui/inc/parawin.hxx
@@ -44,7 +44,7 @@
 #ifndef _SVSTDARR_STRINGS
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #endif
 #include <vcl/tabctrl.hxx>
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index 0eca2cfafaf1..7cd6c04bc91e 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_SERVOBJ_HXX
 #define SC_SERVOBJ_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/listener.hxx>
+#include <svl/lstner.hxx>
+#include <svl/listener.hxx>
 #include <sfx2/linksrc.hxx>
 #include "global.hxx"
 #include "address.hxx"
diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx
index eb3b5f346ccb..1e65821915f3 100644
--- a/sc/source/ui/inc/target.hxx
+++ b/sc/source/ui/inc/target.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_TARGET_HXX
 #define SC_TARGET_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 class ScTabViewShell;
 
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 0132ec844233..ba1370b1960f 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -39,7 +39,7 @@
 #include <vcl/window.hxx>
 #endif
 #ifndef _SFXPOOLITEM_HXX   //autogen
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #endif
 #ifndef _SFXTBXCTRL_HXX    //autogen
 #include <sfx2/tbxctrl.hxx>
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 335f7e917505..d9b21fd2f0d4 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -43,7 +43,7 @@
 
 #include <tools/solar.h>
 #include <tools/string.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/rtti.hxx>
 #include <string.h>
 #include <tools/contnr.hxx>
@@ -53,9 +53,9 @@
 #include <tools/link.hxx>
 #include <i18npool/lang.h>
 #include <sfx2/sfx.hrc>
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 #include <tools/resmgr.hxx>
@@ -95,28 +95,28 @@
 #include <global.hxx>
 #include <vcl/syswin.hxx>
 #include <tools/debug.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/ctrl.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/hint.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/image.hxx>
 #include <vcl/timer.hxx>
 #include <tools/unqidx.hxx>
 #include <vcl/symbol.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <vcl/timer.hxx>
 #include <sc.hrc>
 #include <stdarg.h>
 #include <svx/dialogs.hrc>
 #include <basic/sbxdef.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/shell.hxx>
 #include <vcl/window.hxx>
 #include <vcl/group.hxx>
 #include <tools/unqid.hxx>
 #include <tools/table.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <rangelst.hxx>
@@ -127,15 +127,15 @@
 #include <vcl/spinfld.hxx>
 #include <vcl/combobox.hxx>
 #include <tools/pstm.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/tabdlg.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
 #include <shellids.hxx>
 #include <vcl/event.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/confitem.hxx>
 #include <markdata.hxx>
 #include <svx/optgrid.hxx>
@@ -150,7 +150,7 @@
 #include <column.hxx>
 #include <markarr.hxx>
 #include <vcl/mapmod.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <vcl/seleng.hxx>
 #include <rsc/rscsfx.hxx>
 #include <svx/zoomitem.hxx>
@@ -165,23 +165,23 @@
 #include <sfx2/module.hxx>
 #include <dbfunc.hxx>
 #include <vcl/accel.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <sfx2/viewfac.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/objsh.hxx>
 #include <target.hxx>
 #include <tabvwsh.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/inetdef.hxx>
+#include <svl/inethist.hxx>
+#include <svl/inetdef.hxx>
 #include <sfx2/sfxdefs.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 #include <svtools/compat.hxx>
-#include <svtools/inetmsg.hxx>
+#include <svl/inetmsg.hxx>
 #include <sfx2/app.hxx>
 #include <tools/urlobj.hxx>
 #include <scdll.hxx>
 #include <sfx2/msg.hxx>
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/frame.hxx>
@@ -207,9 +207,9 @@
 #include <svx/svdtypes.hxx>
 #include <vcl/btndlg.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/edit.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <collect.hxx>
 #include <svx/svdsob.hxx>
 #include <vcl/imagebtn.hxx>
@@ -300,7 +300,7 @@
 #include <cell.hxx>
 #include <stddef.h>
 #include <tools/mempool.hxx>
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #include <drawview.hxx>
 #include <svx/view3d.hxx>
 #include <svx/def3d.hxx>
@@ -310,7 +310,7 @@
 #include <svx/svxenum.hxx>
 #include <svx/xtextit0.hxx>
 #include <svx/svdtrans.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <reffact.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdoattr.hxx>
@@ -326,7 +326,7 @@
 #include <vcl/button.hxx>
 #include <svx/srchitem.hxx>
 #include <svx/svdorect.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <stlpool.hxx>
 #include <svx/eeitem.hxx>
 #include <inputhdl.hxx>
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 868e772a2e68..bfa1603adb80 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -35,7 +35,7 @@
 #include "conditio.hxx"
 #include "sortparam.hxx"
 #include "paramisc.hxx"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class ScEditEngineDefaulter;
 class EditTextObject;
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 2d3ee1d14dd7..8398b030ed68 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_UNDOBASE_HXX
 #define SC_UNDOBASE_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "global.hxx"
 #include "address.hxx"
 
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 7b5d59fbb620..5ded731d5105 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_UNDODRAW_HXX
 #define SC_UNDODRAW_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 class ScDocShell;
 
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index a7cf0d094d6b..40177a31e68e 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -39,14 +39,14 @@
 #ifndef _SVSTDARR_SHORTS
 
 #define _SVSTDARR_SHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #endif
 
 #ifndef _SVSTDARR_STRINGS
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #endif
 
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 066aadca817a..82ddc0bad026 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -34,14 +34,14 @@
 
 #ifndef _SVSTDARR_SHORTS
 #define _SVSTDARR_SHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #endif
 
 #ifndef _SVSTDARR_STRINGS
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #endif
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 76330036b1f5..ab2cdaba3b69 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -35,7 +35,7 @@
 
 
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <unotools/textsearch.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/collatorwrapper.hxx>
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index b4fe1f83b220..fb29b6d673ca 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -49,7 +49,7 @@
 #include <svx/wghtitem.hxx>
 #include <sfx2/topfrm.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index e6a8746a01be..f013c334bf37 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -37,7 +37,7 @@
 
 //----------------------------------------------------------------------------
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <limits.h>
 
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 97cc29ac3e54..8783df43d3df 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -37,7 +37,7 @@
 #include "scitems.hxx"
 #include <sfx2/bindings.hxx>
 #include <sfx2/imagemgr.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index af450fdcc6ab..dd1c312cd792 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -49,7 +49,7 @@ ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet,
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
-        pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, RID_SVXDLG_POSTIT, bPrevNext, TRUE );
+        pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, bPrevNext, TRUE );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
         pDocShell=pShell;
         pDlg->DontChangeAuthor();
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index e1ec71344034..32c49cf2a3ad 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -49,7 +49,7 @@
 #include <svx/shdditem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/wghtitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index ec93346e1fed..f9893f1d3faa 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -34,8 +34,8 @@
 //-----------------------------------------------------------------------------
 
 #include <osl/security.hxx>
-#include <svtools/sharecontrolfile.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/sharecontrolfile.hxx>
+#include <unotools/useroptions.hxx>
 
 #include <docsh.hxx>
 
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index b5fc7d8d322a..091329f1d03b 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -38,7 +38,7 @@
 #include "rangelst.hxx"
 #include "scitems.hxx"
 #include <sfx2/dispatch.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "uiitems.hxx"
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index c204266bbb60..a12ad4992bff 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -46,13 +46,13 @@
 //CHINA001 #include <svx/paragrph.hxx>
 //CHINA001 #include <svx/tabstpge.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 #include "textdlgs.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
 #include <svx/svxids.hrc> //add CHINA001
-#include <svtools/intitem.hxx> //add CHINA001
+#include <svl/intitem.hxx> //add CHINA001
 #include <svx/flagsdef.hxx> //CHINA001
 // -----------------------------------------------------------------------
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index af3b5f0dee5e..8198e6adb0f4 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -46,7 +46,7 @@
 #include <vcl/sound.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <stdlib.h>
 
 #include "content.hxx"
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 60f6c708e08c..c3807844270a 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -35,8 +35,8 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 
 #include "navcitem.hxx"
 #include "global.hxx"
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 6e3fbaa86cc0..0a216dac3709 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -41,8 +41,8 @@
 #include <sfx2/event.hxx>
 #include <sfx2/imgmgr.hxx>
 #include <sfx2/navigat.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/stritem.hxx>
+#include <svl/urlbmk.hxx>
 #include <vcl/sound.hxx>
 #include <unotools/charclass.hxx>
 #include <stdlib.h>
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 55f26b682034..c03e5efc82bd 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -38,8 +38,8 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include "navipi.hxx"
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index 498dbed85285..d6e8a3ae5009 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -33,7 +33,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include "tpprint.hxx"
 #include "printopt.hxx"
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 17c00948d3bd..f65105b0a687 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -37,7 +37,7 @@
 #include <rangelst.hxx>
 
 #include <sfx2/dispatch.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/charclass.hxx>
 #include <stdlib.h>
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 695ede732edd..7ab719e3e10b 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -38,7 +38,7 @@
 //------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include "hfedtdlg.hxx"
 #include "global.hxx"
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 70232e2827f1..e55c8405fc34 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -50,9 +50,9 @@
 #include <sfx2/objsh.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 //CHINA001 #include "tphfedit.hxx"
 #include "editutil.hxx"
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 5ba7a485ede8..58e5570aa01b 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -40,7 +40,7 @@
 #define _TPHF_CXX
 #include "scitems.hxx"
 #include <sfx2/basedlgs.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index fb3890616aa0..fa883f593095 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1657,7 +1657,7 @@ Resource RID_GLOBSTR
 
     String STR_UNDO_CHINESE_TRANSLATION
     {
-        Text [ en-US ] = "Chinese translation";
+        Text [ en-US ] = "Chinese conversion";
     };
 
     String STR_ERR_DATAPILOT_INPUT
diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
index 4eead4a953f2..9c367b9daf7f 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include "sc.hrc"
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #define IMPL_FAMILY(family,filter) \
     StyleFamily = family;                       \
     FilterList = { filter }
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 71066ec27ec3..ea94566b918f 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -47,8 +47,8 @@
 //CHINA001 #include <svx/page.hxx>
 //CHINA001 #include <svx/paragrph.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/style.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/style.hxx>
+#include <svl/cjkoptions.hxx>
 
 #include "styledlg.hxx"
 #include "tabpages.hxx"     // Zellvorlagen
@@ -60,9 +60,9 @@
 #include <svx/svxdlg.hxx> //CHINA001
 #include <svx/svxids.hrc> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
 #include <svx/flstitem.hxx> //CHINA001
-#include <svtools/aeitem.hxx> //CHINA001
+#include <svl/aeitem.hxx> //CHINA001
 #include <svx/flagsdef.hxx> //CHINA001
 //==================================================================
 
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index eb23516cafeb..87f83ce7a932 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -35,7 +35,7 @@
 #include <svx/eeitem.hxx>
 
 #include <svx/editobj.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <sfx2/app.hxx>
 
 #include "undocell.hxx"
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 01c561e96c83..7e7f3db1d42c 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -35,7 +35,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/virdev.hxx>
 
 #include "undostyl.hxx"
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index ce428311d3f8..0fc638b7825e 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -46,7 +46,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include "undotab.hxx"
 #include "document.hxx"
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index a3b026396942..9661335bbf35 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include "docsh.hxx"
 #include "unonames.hxx"
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index d7f1eb13c1b2..e4b9ef8a8765 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -36,7 +36,7 @@
 #include "scitems.hxx"
 #include <tools/debug.hxx>
 #include <tools/shl.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/unomid.hxx>
 #include "unowids.hxx"
 #include <rtl/uuid.h>
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index f3418a84e2ef..babccf9a7053 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -50,8 +50,8 @@
 #include <svx/unotext.hxx>
 #include <svx/svdpage.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <rtl/uuid.h>
 #include <float.h>              // DBL_MIN
 
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 3c584a94a775..d66600df4243 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -44,7 +44,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sot/clsids.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index b6dacccec334..99c907113bb8 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -34,8 +34,8 @@
 
 
 #include "scitems.hxx"
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/uuid.h>
 
 #include "cursuno.hxx"
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index c68baf36ba2b..ed40d2f5c96a 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sc.hxx"
 
 #include <algorithm>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <rtl/uuid.h>
 
 #include "dapiuno.hxx"
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 13f2c26c6e47..0dd364812d48 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -34,8 +34,8 @@
 
 
 #include <tools/debug.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/uuid.h>
 
 #include <com/sun/star/awt/XBitmap.hpp>
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index bc6f135ce174..3df667faad8c 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -33,8 +33,8 @@
 
 
 
-#include <svtools/smplhint.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/itemprop.hxx>
 #include <svx/unomid.hxx>
 #include <i18npool/mslangid.hxx>
 
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 1e2309dd2c0a..99bce5579e14 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <comphelper/uno3.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7bb4f2b45f77..5f4f1a7aa93f 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -40,9 +40,9 @@
 #include <svx/svdpage.hxx>
 #include <svx/svxids.hrc>
 
-#include <svtools/numuno.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/undoopt.hxx>
+#include <svl/numuno.hxx>
+#include <svl/smplhint.hxx>
+#include <unotools/undoopt.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 94078ff91af4..8fd4bba512eb 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 
 #include <svx/eeitem.hxx>
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index a50b4003b0ac..a60bb836b142 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -35,7 +35,7 @@
 
 #include <tools/debug.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include "funcuno.hxx"
 #include "miscuno.hxx"
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 0a07b057740b..ddb5dc3b0496 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -33,7 +33,7 @@
 
 
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/linkmgr.hxx>
 
 #include "linkuno.hxx"
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 536e1f2a1a65..ab8576949b75 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -33,7 +33,7 @@
 
 
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <com/sun/star/sheet/NamedRangeFlag.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index e44dab865d46..8477d1f17779 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 
 #include "rangelst.hxx"
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index 8c3deefba6d5..f7c8d2827f50 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -33,7 +33,7 @@
 
 
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <com/sun/star/util/Date.hpp>
 
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 6ed8181091ac..4600244cf2df 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -64,10 +64,10 @@
 #include <svtools/parhtml.hxx>
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 12cbdbdde1a1..941f586a73c9 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -45,10 +45,10 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zformat.hxx>
 #include <rtl/uuid.h>
 
 #include <com/sun/star/table/BorderLine.hpp>
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index f3fcb8c6d671..7d291235559a 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -37,8 +37,8 @@
 #include <vcl/virdev.hxx>
 //#include <toolkit/unoiface.hxx>
 #include <toolkit/unohlp.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/smplhint.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index e6e194d7eb75..9d31b15fdf47 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/sheet/AddressConvention.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include "miscuno.hxx"
 #include "convuno.hxx"
diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx
index 6b11ac7c6641..4bf4163aad3c 100644
--- a/sc/source/ui/unoobj/warnpassword.cxx
+++ b/sc/source/ui/unoobj/warnpassword.cxx
@@ -35,7 +35,7 @@
 #include "warnpassword.hxx"
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <ucbhelper/simpleinteractionrequest.hxx>
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index a72e8c4373c0..cb54532384b5 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/table/XColumnRowRange.hpp>
 #include <ooo/vba/excel/XlColorIndex.hpp>
 #include <ooo/vba/excel/XlUnderlineStyle.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "vbafont.hxx"
 #include "scitems.hxx"
 #include "cellsuno.hxx"
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index e69de29bb2d1..e010d1cf10f3 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -0,0 +1,830 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: vbahelper.cxx,v $
+ * $Revision: 1.5.32.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include <cppuhelper/bootstrap.hxx>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XIntrospection.hpp>
+
+#include <comphelper/processfactory.hxx>
+
+#include <sfx2/objsh.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/app.hxx>
+#include <svl/stritem.hxx>
+
+#include <docuno.hxx>
+
+#include <basic/sbx.hxx>
+#include <basic/sbstar.hxx>
+#include <rtl/math.hxx>
+
+#include <math.h>
+#include "vbahelper.hxx"
+#include "tabvwsh.hxx"
+#include "transobj.hxx"
+#include "scmod.hxx"
+#include "vbashape.hxx"
+#include "unonames.hxx"
+#include "cellsuno.hxx"
+using namespace ::com::sun::star;
+using namespace ::ooo::vba;
+
+#define POINTTO100THMILLIMETERFACTOR 35.27778
+void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
+
+uno::Any sbxToUnoValue( SbxVariable* pVar );
+
+
+namespace ooo
+{
+namespace vba
+{
+
+const double Millimeter::factor =  35.27778;
+
+uno::Reference< beans::XIntrospectionAccess >
+getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
+{
+    static uno::Reference< beans::XIntrospection > xIntrospection;
+    if( !xIntrospection.is() )
+    {
+        uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+        xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
+    }
+    return xIntrospection->inspect( aObject );
+}
+
+uno::Reference< script::XTypeConverter >
+getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+{
+    static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW );
+    return xTypeConv;
+}
+// helper method to determine if the view ( calc ) is in print-preview mode
+bool isInPrintPreview( SfxViewFrame* pView )
+{
+    sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
+    if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
+nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
+    {
+        SfxViewFactory &rViewFactory =
+            pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
+        if (  pView->GetCurViewId() == rViewFactory.GetOrdinal() )
+            return true;
+    }
+    return false;
+}
+const ::rtl::OUString REPLACE_CELLS_WARNING(  RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
+const uno::Any&
+aNULL()
+{
+     static  uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() );
+    return aNULLL;
+}
+
+class PasteCellsWarningReseter
+{
+private:
+    bool bInitialWarningState;
+    static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
+    {
+        static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+        static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
+        static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
+                xContext->getServiceManager(), uno::UNO_QUERY_THROW );
+        static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
+        return xProps;
+    }
+
+    bool getReplaceCellsWarning() throw ( uno::RuntimeException )
+    {
+        sal_Bool res = sal_False;
+        getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
+        return ( res == sal_True );
+    }
+
+    void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
+    {
+        getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
+    }
+public:
+    PasteCellsWarningReseter() throw ( uno::RuntimeException )
+    {
+        bInitialWarningState = getReplaceCellsWarning();
+        if ( bInitialWarningState )
+            setReplaceCellsWarning( false );
+    }
+    ~PasteCellsWarningReseter()
+    {
+        if ( bInitialWarningState )
+        {
+            // don't allow dtor to throw
+            try
+            {
+                setReplaceCellsWarning( true );
+            }
+            catch ( uno::Exception& /*e*/ ){}
+        }
+    }
+};
+
+void
+dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps )
+{
+
+    util::URL  url ;
+    url.Complete = aUrl;
+    rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ));
+    uno::Reference<frame::XController> xController = xModel->getCurrentController();
+    uno::Reference<frame::XFrame> xFrame = xController->getFrame();
+    uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW);
+    try
+    {
+        uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+        uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW  );
+        if ( !xContext.is() )
+        {
+            return ;
+        }
+
+        uno::Reference<lang::XMultiComponentFactory > xServiceManager(
+                xContext->getServiceManager() );
+        if ( !xServiceManager.is() )
+        {
+            return ;
+        }
+        uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext(     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) )
+            ,xContext), uno::UNO_QUERY_THROW );
+        if (!xParser.is())
+            return;
+        xParser->parseStrict (url);
+    }
+    catch ( uno::Exception & /*e*/ )
+    {
+        return ;
+    }
+
+    uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0);
+
+    uno::Sequence<beans::PropertyValue> dispatchProps(1);
+
+    sal_Int32 nProps = sProps.getLength();
+    beans::PropertyValue* pDest = dispatchProps.getArray();
+    if ( nProps )
+    {
+        dispatchProps.realloc( nProps + 1 );
+        // need to reaccquire pDest after realloc
+        pDest = dispatchProps.getArray();
+        beans::PropertyValue* pSrc = sProps.getArray();
+        for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
+            *pDest = *pSrc;
+    }
+
+    (*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" ));
+    (*pDest).Value <<= (sal_Bool)sal_True;
+
+    if (xDispatcher.is())
+        xDispatcher->dispatch( url, dispatchProps );
+}
+
+void
+dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl)
+{
+    uno::Sequence<beans::PropertyValue> dispatchProps;
+    dispatchRequests( xModel, aUrl, dispatchProps );
+}
+
+
+void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall)
+{
+    ScTabViewShell* pViewShell = getBestViewShell( xModel );
+    SfxViewFrame* pViewFrame = NULL;
+    if ( pViewShell )
+        pViewFrame = pViewShell->GetViewFrame();
+    if ( pViewFrame )
+    {
+        SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
+        if( pDispatcher )
+        {
+            pDispatcher->Execute( nSlot , nCall );
+        }
+    }
+}
+
+void
+implnPaste()
+{
+    PasteCellsWarningReseter resetWarningBox;
+    ScTabViewShell* pViewShell = getCurrentBestViewShell();
+    if ( pViewShell )
+    {
+        pViewShell->PasteFromSystem();
+        pViewShell->CellContentChanged();
+    }
+}
+
+
+void
+implnCopy()
+{
+    ScTabViewShell* pViewShell = getCurrentBestViewShell();
+    if ( pViewShell )
+        pViewShell->CopyToClip(NULL,false,false,true);
+}
+
+void
+implnCut()
+{
+    ScTabViewShell* pViewShell =  getCurrentBestViewShell();
+    if ( pViewShell )
+        pViewShell->CutToClip( NULL, TRUE );
+}
+
+void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
+{
+    PasteCellsWarningReseter resetWarningBox;
+    sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
+    InsCellCmd eMoveMode = INS_NONE;
+
+    ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
+    if ( !pTabViewShell )
+        // none active, try next best
+        pTabViewShell = getCurrentBestViewShell();
+    if ( pTabViewShell )
+    {
+        ScViewData* pView = pTabViewShell->GetViewData();
+        Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
+        if ( pView && pWin )
+        {
+            if ( bAsLink && bOtherDoc )
+                pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
+            else
+            {
+                ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
+                ScDocument* pDoc = NULL;
+                if ( pOwnClip )
+                    pDoc = pOwnClip->GetDocument();
+                pTabViewShell->PasteFromClip( nFlags, pDoc,
+                    nFunction, bSkipEmpty, bTranspose, bAsLink,
+                    eMoveMode, IDF_NONE, TRUE );
+                pTabViewShell->CellContentChanged();
+            }
+        }
+    }
+
+}
+
+ uno::Reference< frame::XModel >
+getCurrentDocument() throw (uno::RuntimeException)
+{
+    uno::Reference< frame::XModel > xModel;
+    SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
+    SbxObject* basicChosen =  pBasic ;
+    if ( basicChosen == NULL)
+    {
+        OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
+        return xModel;
+    }
+    SbxObject* p = pBasic;
+    SbxObject* pParent = p->GetParent();
+    SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
+
+    if( pParentParent )
+    {
+        basicChosen = pParentParent;
+    }
+    else if( pParent )
+    {
+        basicChosen = pParent;
+    }
+
+
+    uno::Any aModel;
+    SbxVariable *pCompVar = basicChosen->Find(  UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
+
+    if ( pCompVar )
+    {
+        aModel = sbxToUnoValue( pCompVar );
+        if ( sal_False == ( aModel >>= xModel ) ||
+            !xModel.is() )
+        {
+            // trying last gasp try the current component
+            uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+            // test if vba service is present
+            uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
+            uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
+            uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
+            xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
+            if ( !xModel.is() )
+            {
+                throw uno::RuntimeException(
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
+            }
+            return xModel;
+        }
+        else
+        {
+            OSL_TRACE("Have model ThisComponent points to url %s",
+            ::rtl::OUStringToOString( xModel->getURL(),
+                RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+        }
+    }
+    else
+    {
+        OSL_TRACE("Failed to get ThisComponent");
+        throw uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "Can't determine the currently selected document") ),
+            uno::Reference< uno::XInterface >() );
+    }
+    return xModel;
+}
+
+ScDocShell*
+getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
+{
+    uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
+    ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
+    ScDocShell* pDocShell = NULL;
+    if ( pModel )
+        pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
+    return pDocShell;
+
+}
+
+ScTabViewShell*
+getBestViewShell(  css::uno::Reference< css::frame::XModel>& xModel )
+{
+    ScDocShell* pDocShell = getDocShell( xModel );
+    if ( pDocShell )
+        return pDocShell->GetBestViewShell();
+    return NULL;
+}
+
+ScTabViewShell*
+getCurrentBestViewShell()
+{
+    uno::Reference< frame::XModel > xModel = getCurrentDocument();
+    return getBestViewShell( xModel );
+}
+
+SfxViewFrame*
+getCurrentViewFrame()
+{
+    ScTabViewShell* pViewShell = getCurrentBestViewShell();
+    if ( pViewShell )
+        return pViewShell->GetViewFrame();
+    return NULL;
+}
+
+sal_Int32
+OORGBToXLRGB( sal_Int32 nCol )
+{
+    sal_Int32 nRed = nCol;
+    nRed &= 0x00FF0000;
+    nRed >>= 16;
+    sal_Int32 nGreen = nCol;
+    nGreen &= 0x0000FF00;
+    nGreen >>= 8;
+    sal_Int32 nBlue = nCol;
+    nBlue &= 0x000000FF;
+    sal_Int32 nRGB =  ( (nBlue << 16) | (nGreen << 8) | nRed );
+    return nRGB;
+}
+sal_Int32
+XLRGBToOORGB( sal_Int32 nCol )
+{
+    sal_Int32 nBlue = nCol;
+    nBlue &= 0x00FF0000;
+    nBlue >>= 16;
+    sal_Int32 nGreen = nCol;
+    nGreen &= 0x0000FF00;
+    nGreen >>= 8;
+    sal_Int32 nRed = nCol;
+    nRed &= 0x000000FF;
+    sal_Int32 nRGB =  ( (nRed << 16) | (nGreen << 8) | nBlue );
+    return nRGB;
+}
+uno::Any
+OORGBToXLRGB( const uno::Any& aCol )
+{
+    sal_Int32 nCol=0;
+    aCol >>= nCol;
+    nCol = OORGBToXLRGB( nCol );
+    return uno::makeAny( nCol );
+}
+uno::Any
+XLRGBToOORGB(  const uno::Any& aCol )
+{
+    sal_Int32 nCol=0;
+    aCol >>= nCol;
+    nCol = XLRGBToOORGB( nCol );
+    return uno::makeAny( nCol );
+}
+
+void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, css::uno::Reference< frame::XModel >& xModel, sal_Bool bUseSelection  )
+{
+    sal_Int32 nTo = 0;
+    sal_Int32 nFrom = 0;
+    sal_Int16 nCopies = 1;
+    sal_Bool bPreview = sal_False;
+    sal_Bool bCollate = sal_False;
+    sal_Bool bSelection = bUseSelection;
+    From >>= nFrom;
+    To >>= nTo;
+    Copies >>= nCopies;
+    Preview >>= bPreview;
+    if ( nCopies > 1 ) // Collate only useful when more that 1 copy
+        Collate >>= bCollate;
+
+    rtl::OUString sRange(  RTL_CONSTASCII_USTRINGPARAM( "-" ) );
+    rtl::OUString sFileName;
+
+    if (( nFrom || nTo ) )
+    {
+        if ( nFrom )
+            sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
+        if ( nTo )
+            sRange += ::rtl::OUString::valueOf( nTo );
+    }
+
+    if (  PrToFileName.getValue() )
+    {
+        PrToFileName >>= sFileName;
+    }
+    ScTabViewShell* pViewShell = getBestViewShell( xModel );
+    SfxViewFrame* pViewFrame = NULL;
+    if ( pViewShell )
+        pViewFrame = pViewShell->GetViewFrame();
+    if ( pViewFrame )
+    {
+        SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+
+        SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
+        aArgs.Put( sfxCollate, sfxCollate.Which() );
+        SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
+        aArgs.Put( sfxCopies, sfxCopies.Which() );
+        if ( sFileName.getLength() )
+        {
+            SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
+            aArgs.Put( sfxFileName, sfxFileName.Which() );
+
+        }
+        if (  sRange.getLength() )
+        {
+            SfxStringItem sfxRange( SID_PRINT_PAGES, sRange );
+            aArgs.Put( sfxRange, sfxRange.Which() );
+        }
+        SfxBoolItem sfxSelection( SID_SELECTION, bSelection );
+        aArgs.Put( sfxSelection, sfxSelection.Which() );
+        SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
+        aArgs.Put( sfxAsync, sfxAsync.Which() );
+        SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
+
+        if ( pDispatcher )
+        {
+            if ( bPreview )
+            {
+                if ( !pViewFrame->GetFrame()->IsInPlace() )
+                {
+                    SC_MOD()->InputEnterHandler();
+                    pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
+                    while ( isInPrintPreview( pViewFrame ) )
+                        Application::Yield();
+                }
+            }
+            else
+                pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+        }
+
+    }
+
+    // #FIXME #TODO
+    // 1 ActivePrinter ( how/can we switch a printer via API? )
+    // 2 PrintToFile ( ms behaviour if this option is specified but no
+    //   filename supplied 'PrToFileName' then the user will be prompted )
+    // 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
+    //    values ) in oOO these options are mutually exclusive
+    // 4 There is a pop up to do with transparent objects in the print source
+    //   should be able to disable that via configuration for the duration
+    //   of this method
+}
+
+ void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, css::uno::Reference< css::frame::XModel >& xModel )
+{
+    dispatchExecute( xModel, SID_VIEWSHELL1 );
+}
+
+rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
+{
+    uno::Type aType = pvargItem.getValueType();
+    uno::TypeClass eTypeClass = aType.getTypeClass();
+    rtl::OUString sString;
+    switch ( eTypeClass )
+    {
+        case uno::TypeClass_BOOLEAN:
+        {
+            sal_Bool bBool = sal_False;
+            pvargItem >>= bBool;
+            sString = rtl::OUString::valueOf( bBool );
+            break;
+        }
+        case uno::TypeClass_STRING:
+            pvargItem >>= sString;
+            break;
+        case uno::TypeClass_FLOAT:
+            {
+                float aFloat = 0;
+                pvargItem >>= aFloat;
+                sString = rtl::OUString::valueOf( aFloat );
+                break;
+            }
+        case uno::TypeClass_DOUBLE:
+            {
+                double aDouble = 0;
+                pvargItem >>= aDouble;
+                sString = rtl::OUString::valueOf( aDouble );
+                break;
+            }
+        case uno::TypeClass_SHORT:
+        case uno::TypeClass_LONG:
+        case uno::TypeClass_BYTE:
+            {
+                sal_Int32 aNum = 0;
+                pvargItem >>= aNum;
+                sString = rtl::OUString::valueOf( aNum );
+                break;
+            }
+
+        case uno::TypeClass_HYPER:
+            {
+                sal_Int64 aHyper = 0;
+                pvargItem >>= aHyper;
+                sString = rtl::OUString::valueOf( aHyper );
+                break;
+            }
+        default:
+                   throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
+    }
+    return sString;
+}
+
+
+rtl::OUString
+ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
+{
+    return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
+}
+
+rtl::OUString
+ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
+{
+    sal_Int32 a = _nStartSuffix;
+    rtl::OUString scompname = _sElementName;
+    bool bElementexists = true;
+    sal_Int32 nLen = _slist.getLength();
+    if ( nLen == 0 )
+        return _sElementName;
+
+    while (bElementexists == true)
+    {
+        for (sal_Int32 i = 0; i < nLen; i++)
+        {
+            if (FieldInList(_slist, scompname) == -1)
+            {
+                return scompname;
+            }
+        }
+        scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
+    }
+    return rtl::OUString();
+}
+
+sal_Int32
+ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
+{
+    sal_Int32 FieldLen = SearchList.getLength();
+    sal_Int32 retvalue = -1;
+    for (sal_Int32 i = 0; i < FieldLen; i++)
+    {
+        // I wonder why comparing lexicographically is done
+        // when its a match is whats interesting?
+        //if (SearchList[i].compareTo(SearchString) == 0)
+        if ( SearchList[i].equals( SearchString ) )
+        {
+            retvalue = i;
+            break;
+        }
+    }
+    return retvalue;
+
+}
+bool NeedEsc(sal_Unicode cCode)
+{
+    String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()"));
+    return (STRING_NOTFOUND != sEsc.Search(cCode));
+}
+
+rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
+{
+    rtl::OUStringBuffer sResult;
+    const sal_Unicode *start = rIn.getStr();
+    const sal_Unicode *end = start + rIn.getLength();
+
+    int seenright = 0;
+    if ( bForLike )
+        sResult.append(static_cast<sal_Unicode>('^'));
+
+    while (start < end)
+    {
+        switch (*start)
+        {
+            case '?':
+                sResult.append(static_cast<sal_Unicode>('.'));
+                start++;
+                break;
+            case '*':
+                sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")));
+                start++;
+                break;
+            case '#':
+                sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]")));
+                start++;
+                break;
+            case '~':
+                sResult.append(static_cast<sal_Unicode>('\\'));
+                sResult.append(*(++start));
+                start++;
+                break;
+                // dump the ~ and escape the next characture
+            case ']':
+                sResult.append(static_cast<sal_Unicode>('\\'));
+                sResult.append(*start++);
+                break;
+            case '[':
+                sResult.append(*start++);
+                seenright = 0;
+                while (start < end && !seenright)
+                {
+                    switch (*start)
+                    {
+                        case '[':
+                        case '?':
+                        case '*':
+                        sResult.append(static_cast<sal_Unicode>('\\'));
+                        sResult.append(*start);
+                            break;
+                        case ']':
+                        sResult.append(*start);
+                            seenright = 1;
+                            break;
+                        case '!':
+                            sResult.append(static_cast<sal_Unicode>('^'));
+                            break;
+                        default:
+                        if (NeedEsc(*start))
+                            sResult.append(static_cast<sal_Unicode>('\\'));
+                        sResult.append(*start);
+                            break;
+                    }
+                    start++;
+                }
+                break;
+            default:
+                if (NeedEsc(*start))
+                    sResult.append(static_cast<sal_Unicode>('\\'));
+                sResult.append(*start++);
+        }
+    }
+
+    if ( bForLike )
+        sResult.append(static_cast<sal_Unicode>('$'));
+
+    return sResult.makeStringAndClear( );
+}
+
+double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical)
+{
+    double fConvertFactor = 1.0;
+    if( bVertical )
+    {
+        fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000;
+    }
+    else
+    {
+        fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;
+    }
+    return fConvertFactor;
+}
+
+double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical)
+{
+    double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
+    return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor;
+}
+double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical)
+{
+    double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
+    return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
+}
+
+ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
+{
+    m_xShape = new ScVbaShape( xContext, xShape );
+}
+
+#define VBA_LEFT "PositionX"
+#define VBA_TOP "PositionY"
+UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
+{
+    mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
+}
+    double UserFormGeometryHelper::getLeft()
+    {
+    sal_Int32 nLeft = 0;
+    mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;
+    return Millimeter::getInPoints( nLeft );
+    }
+    void UserFormGeometryHelper::setLeft( double nLeft )
+    {
+        mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
+    }
+    double UserFormGeometryHelper::getTop()
+    {
+    sal_Int32 nTop = 0;
+    mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  VBA_TOP ) ) ) >>= nTop;
+    return Millimeter::getInPoints( nTop );
+    }
+    void UserFormGeometryHelper::setTop( double nTop )
+    {
+    mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
+    }
+    double UserFormGeometryHelper::getHeight()
+    {
+    sal_Int32 nHeight = 0;
+    mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  SC_UNONAME_CELLHGT ) ) ) >>= nHeight;
+    return Millimeter::getInPoints( nHeight );
+    }
+    void UserFormGeometryHelper::setHeight( double nHeight )
+    {
+    mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
+    }
+    double UserFormGeometryHelper::getWidth()
+    {
+    sal_Int32 nWidth = 0;
+    mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  SC_UNONAME_CELLWID ) ) ) >>= nWidth;
+    return Millimeter::getInPoints( nWidth );
+    }
+    void UserFormGeometryHelper::setWidth( double nWidth)
+    {
+    mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  SC_UNONAME_CELLWID ) ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
+    }
+
+SfxItemSet*
+ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
+{
+    SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
+    return pDataSet;
+
+}
+
+} // openoffice
+} //org
+=======
+>>>>>>> other
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 4f0607e430f6..dca004a74e65 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -35,8 +35,8 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/itemwrapper.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase3.hxx>
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index c2d0f68fc6ef..e9116b19c87b 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -35,10 +35,10 @@
 
 #include "scitems.hxx"
 
-#include <svtools/slstitm.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/cliplistener.hxx>
 #include <svtools/insdlg.hxx>
 #include <sot/formats.hxx>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index f610e28b3fc5..6bdf172b9fb5 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -55,10 +55,10 @@
 #include <sfx2/viewfrm.hxx>
 
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <vcl/msgbox.hxx>
@@ -70,7 +70,7 @@
 #include <sfx2/passwd.hxx>
 #include <svx/hlnkitem.hxx>
 #include <basic/sbxcore.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/waitobj.hxx>
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 29db7f2286b3..cf64a07a2d95 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -41,14 +41,14 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <basic/sbxcore.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/whiter.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/visitem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/visitem.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index dd79bb52a112..2f96aec815fb 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -40,7 +40,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/app.hxx>
 #include "globstr.hrc"
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 36667ee43c0f..5fd4a5f470f5 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -42,7 +42,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/waitobj.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <sfx2/app.hxx>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 022eabdc11cf..b0f2197ad826 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -64,12 +64,12 @@
 #include <sfx2/viewfrm.hxx>
 #include <sot/exchange.hxx>
 #include <svtools/cliplistener.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/sound.hxx>
 #include <sot/formats.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 #define _EDITSH_CXX
 #include "editsh.hxx"
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 36f6c682832f..fb83ed5624d6 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -60,13 +60,13 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/stritem.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/zformat.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/numinf.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index de2b962f3272..aca88c554317 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -45,10 +45,10 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/svlbox.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/sound.hxx>
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 5d87806076ab..6683a75e777b 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/sizeitem.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 
 #include "tabvwsh.hxx"
 #include "gridwin.hxx"
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 2c50a8eb0a81..419124596147 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -36,8 +36,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdocapt.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/itempool.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/svapp.hxx>
 
 #include "notemark.hxx"
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index f5688171b145..700c32e4698f 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -55,7 +55,7 @@
 #include <svx/scripttypeitem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
@@ -63,7 +63,7 @@
 
 #ifndef _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include "output.hxx"
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 421e76eaa8ce..3ab72f37ac35 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 
 #include "pgbrksh.hxx"
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 273b8965451e..2039934a6e45 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "sc.hrc"
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index b94837fc1793..31121f35aa1b 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -47,7 +47,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svtools/accessibilityoptions.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <tools/multisel.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/sound.hxx>
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 360c05e2f84a..ebe58f5a0efc 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -49,8 +49,8 @@
 #include <sfx2/request.hxx>
 #include <sfx2/topfrm.hxx>
 #include <svtools/printdlg.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
@@ -705,7 +705,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
-                        AbstractSvxZoomDialog* pDlg = pFact->CreateSvxZoomDialog(NULL, aSet, RID_SVXDLG_ZOOM);
+                        AbstractSvxZoomDialog* pDlg = pFact->CreateSvxZoomDialog(NULL, aSet);
                         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
                         pDlg->SetLimits( 20, 400 );
                         pDlg->HideButton( ZOOMBTN_OPTIMAL );
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 157f4bffa4ec..58dc2d913c58 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -300,7 +300,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <svx/svdmodel.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include "prevwsh.hxx"
 #include "docsh.hxx"
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index db6ee302a792..08b7f5f4ad85 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -41,10 +41,10 @@
 
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/whiter.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/dispatch.hxx>
 
 #include "tabvwsh.hxx"
@@ -67,7 +67,7 @@
 
 // #98185# Create default drawing objects via keyboard
 #include <svx/svdpagv.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/svdpage.hxx>
 #include <fuconcustomshape.hxx>
 
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 525ea1f14578..c2812fdc4446 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -45,8 +45,8 @@
 #include <sfx2/passwd.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/topfrm.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 
 #include <vcl/msgbox.hxx>
@@ -78,9 +78,9 @@
 #include "tabprotection.hxx"
 #include "protectiondlg.hxx"
 
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <svx/zoomslideritem.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
@@ -693,7 +693,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
-                        pDlg = pFact->CreateSvxZoomDialog(GetDialogParent(), aSet, RID_SVXDLG_ZOOM);
+                        pDlg = pFact->CreateSvxZoomDialog(GetDialogParent(), aSet );
                         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
                     }
                     pDlg->SetLimits( MINZOOM, MAXZOOM );
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index e34741ba4c6b..359c34ec3685 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -51,8 +51,8 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svtools/printdlg.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/whiter.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <rtl/logfile.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 92cf03cdf5d6..a870171450ad 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -36,8 +36,8 @@
 // INCLUDE ---------------------------------------------------------------
 #define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
-#include <svtools/smplhint.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/numfmtsh.hxx>
 #include <svx/numinf.hxx>
 #include <svx/svxids.hrc>
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index 7562e7d592a0..d3020756bbb5 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <avmedia/mediaplayer.hxx>
 
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 9e844f970909..63f876cccf34 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -37,10 +37,10 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
-#include <svtools/slstitm.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/zformat.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/numinf.hxx>
 #include <svx/srchitem.hxx>
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 37dc2c11da7f..72ffe6d5ab10 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -63,9 +63,9 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svtools/soerr.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/whiter.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sot/exchange.hxx>
 
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 8eafd476d00d..9866a5aa0a0a 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -45,7 +45,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/sound.hxx>
 
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 744481c4441c..4ef21a24e1ff 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -39,9 +39,9 @@
 #include <sfx2/request.hxx>
 #include <basic/sbstar.hxx>
 #include <layout/layout.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/languageoptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index 7526a3de19bd..2d3ffc75340b 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -42,7 +42,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <basic/sbxcore.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 50ede74ab06b..4c1bcc9e35fe 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -50,9 +50,9 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/waitobj.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 3065aa2fd4e1..3327ea3fe88d 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -173,9 +173,9 @@
 #include <svx/svdetc.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/stritem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/urlbmk.hxx>
 #include <sot/clsids.hxx>
 #include <sot/formats.hxx>
 #include <vcl/graph.hxx>
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 578f6c1fe733..b57653af5f9b 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -54,9 +54,9 @@
 #include <sfx2/fcontnr.hxx>
 #include <svtools/langtab.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <vcl/msgbox.hxx>
 #include <avmedia/mediawindow.hxx>
 
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 35af3ee2a2e3..0b429a21b6d3 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -53,9 +53,9 @@
 #include <sot/clsids.hxx>
 #include <sot/formats.hxx>
 #include <sot/filelist.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/transfer.hxx>
 #include <vcl/graph.hxx>
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 79343c31f85b..a3e695e7a3f8 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -48,8 +48,8 @@
 #include <svx/langitem.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index d0a6f2acf015..cc51c48f67ed 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -43,17 +43,17 @@
 #include <svx/fontitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/scripttypeitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 2422a56b255a..11a5150d2784 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -190,7 +190,7 @@ SHL6STDLIBS= \
     $(SVTOOLLIB)	\
     $(SVLLIB)		\
     $(SVXCORELIB)		\
-    $(SVXMSFILTERLIB)		\
+    $(MSFILTERLIB)		\
     $(SVXLIB)		\
     $(BASEGFXLIB) \
     $(DRAWINGLAYERLIB) \
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index 8520fb1337fe..527ae01b5c01 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -39,7 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <tools/date.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <usr/proptypehlp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <uno/lbnames.h>
diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx
index 15b04a386399..9b901f93db22 100644
--- a/sc/workben/result.hxx
+++ b/sc/workben/result.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_RESULT_HXX
 #define SC_RESULT_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/timer.hxx>
 #include <tools/string.hxx>
 
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 342053a288cb..abf5f14740da 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index be5ca61b0563..b25f7f8b222c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1493,15 +1493,15 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
 
 STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore)
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter)
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
 STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
 
+STD_LIB_FILE_PATCH( gid_File_Lib_Msfilter, msfilter)
+
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
 STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7d1d8bb5cc40..c22fabf74d57 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -503,17 +503,6 @@ End
 #endif
 
 #ifdef SOLAR_JAVA
-#ifndef GCJ
-File gid_File_Jar_Sandbox
-    TXT_FILE_BODY;
-    Name = JARFILENAME(sandbox);
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED);
-End
-#endif
-#endif
-
-#ifdef SOLAR_JAVA
 UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
 UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
 UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
@@ -2903,6 +2892,13 @@ File gid_File_ImagesCrystal_Zip
     Styles = (PACKED);
 End
 
+File gid_File_ImagesOxygen_Zip
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Share_Config;
+    Name = "images_oxygen.zip";
+    Styles = (PACKED);
+End
+
 File gid_File_ImagesHicontrast_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 14b02d2dfa83..c0371115788f 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -106,6 +106,8 @@ STD_RES_FILE_ONLY_PATCH( gid_File_Res_Svp, svp )
 STD_RES_FILE( gid_File_Res_Svx, svx )
 STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
 
+STD_RES_FILE( gid_File_Res_Cui, cui )
+
 STD_RES_FILE( gid_File_Res_Sw, sw )
 
 STD_RES_FILE( gid_File_Res_Tk, tk )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index e20308572219..4b293e0a6126 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -867,6 +867,7 @@ Module gid_Module_Root_Files_Images
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Images_Zip,
              gid_File_ImagesCrystal_Zip,
+             gid_File_ImagesOxygen_Zip,
              gid_File_ImagesHicontrast_Zip,
              gid_File_ImagesIndustrial_Zip,
              gid_File_ImagesTango_Zip,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index d28fa5bb54dd..9f6329fabc77 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -96,6 +96,7 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Svt,
              gid_File_Res_Svp,
              gid_File_Res_Svx,
+             gid_File_Res_Cui,
              gid_File_Res_TextConversionDlgs,
              gid_File_Res_Sw,
              gid_File_Res_Tab,
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index e094027f9417..00268058745b 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define HID_SD_PRINT_OPTIONS       (HID_SD_START + 0)
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index e3329a44af7e..360f32e880bf 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -1,4 +1,5 @@
-/*************************************************************************
+/************************************************************************cherex
+
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -495,75 +496,75 @@
 #include "sot/storinfo.hxx"
 
 #include "svtools/FilterConfigItem.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/brdcst.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/brdcst.hxx"
 #include "svtools/colorcfg.hxx"
 #include "svtools/colrdlg.hxx"
 #include "svtools/controldims.hrc"
-#include "svtools/ctloptions.hxx"
+#include "svl/ctloptions.hxx"
 #include "svtools/ctrlbox.hxx"
 #include "svtools/ctrltool.hxx"
 #include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
+#include "svl/eitem.hxx"
 #include "svtools/filedlg.hxx"
 #include "svtools/filter.hxx"
-#include "svtools/flagitem.hxx"
+#include "svl/flagitem.hxx"
 #include "svtools/fltcall.hxx"
-#include "svtools/fltrcfg.hxx"
-#include "svtools/globalnameitem.hxx"
-#include "svtools/hint.hxx"
-#include "svtools/historyoptions.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "svl/globalnameitem.hxx"
+#include "svl/hint.hxx"
+#include "unotools/historyoptions.hxx"
 #include "svtools/htmlout.hxx"
 #include "svtools/imap.hxx"
 #include "svtools/imapcirc.hxx"
 #include "svtools/imapobj.hxx"
 #include "svtools/imappoly.hxx"
 #include "svtools/imaprect.hxx"
-#include "svtools/inethist.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/languageoptions.hxx"
-#include "svtools/lckbitem.hxx"
-#include "svtools/lingucfg.hxx"
-#include "svtools/linguprops.hxx"
-#include "svtools/listener.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/misccfg.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/poolitem.hxx"
+#include "svl/inethist.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/languageoptions.hxx"
+#include "svl/lckbitem.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/listener.hxx"
+#include "svl/lstner.hxx"
+#include "unotools/misccfg.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
 #include "svtools/prgsbar.hxx"
 #include "svtools/printdlg.hxx"
-#include "svtools/ptitem.hxx"
-#include "svtools/rectitem.hxx"
-#include "svtools/saveopt.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "unotools/saveopt.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 #include "svtools/sores.hxx"
 #include "svtools/stdctrl.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hrc"
-#include "svtools/style.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hrc"
+#include "svl/style.hxx"
 #include "svtools/svmedit.hxx"
-#include "svtools/svstdarr.hxx"
-#include "svtools/syslocale.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocale.hxx"
 #include "svtools/tabbar.hxx"
 #include "svtools/treelist.hxx"
-#include "svtools/undo.hxx"
+#include "svl/undo.hxx"
 #include "svtools/unoimap.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
-#include "svtools/useroptions.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
 #include "svtools/valueset.hxx"
-#include "svtools/viewoptions.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
 #include "svtools/wmf.hxx"
-#include "svtools/zforlist.hxx"
+#include "svl/zforlist.hxx"
 
 
 #include "svx/SpellDialogChildWindow.hxx"
@@ -596,7 +597,7 @@
 #include "svx/editund2.hxx"
 #include "svx/editview.hxx"
 #include "svx/eeitem.hxx"
-#include "svx/escherex.hxx"
+#include "filter/msfilter/escherex.hxx"
 #include "svx/escpitem.hxx"
 #include "svx/extrusionbar.hxx"
 #include "svx/f3dchild.hxx"
@@ -640,8 +641,8 @@
 #include "svx/lspcitem.hxx"
 #include "svx/modctrl.hxx"
 #include "svx/msdffdef.hxx"
-#include "svx/msocximex.hxx"
-#include "svx/msoleexp.hxx"
+#include "filter/msfilter/msocximex.hxx"
+#include "filter/msfilter/msoleexp.hxx"
 #include "svx/numitem.hxx"
 #include "svx/obj3d.hxx"
 #include "svx/objfac3d.hxx"
@@ -724,7 +725,7 @@
 #include "svx/svxfont.hxx"
 #include "svx/svxgrahicitem.hxx"
 #include "svx/svxids.hrc"
-#include "svx/svxmsbas.hxx"
+#include "filter/msfilter/svxmsbas.hxx"
 #include "svx/sxciaitm.hxx"
 #include "svx/sxekitm.hxx"
 #include "svx/sxelditm.hxx"
@@ -862,7 +863,7 @@
 #include "vcl/field.hxx"
 #include "vcl/fixed.hxx"
 #include "vcl/font.hxx"
-#include "vcl/fontcvt.hxx"
+#include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
 #include "vcl/gfxlink.hxx"
 #include "vcl/gradient.hxx"
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 5600302c40ff..1972ad1583d3 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -32,9 +32,9 @@
 #define _SDATTR_HXX
 
 #include <com/sun/star/presentation/FadeEffect.hpp>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/sfx.hrc>
 
 #ifndef _SDATTR_HRC
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 7481759cff4c..e4122ca0d4c3 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -42,7 +42,7 @@
 #include <sot/storage.hxx>
 #include <tools/shl.hxx>
 #include "sddllapi.h"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <sfx2/module.hxx>
 #include <vcl/vclevent.hxx>
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index d71d6371e1d1..794f23e94b8e 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -31,7 +31,7 @@
 #ifndef _SD_SDUNDO_HXX
 #define _SD_SDUNDO_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "sddllapi.h"
 
 class SdDrawDocument;
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index ccd0619a4788..a00828a2690a 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -46,7 +46,7 @@
 
 #include <cppuhelper/implbase7.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/unoipset.hxx>
 
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index f683492c2110..69ee48e58dd9 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -44,7 +44,7 @@
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/unoipset.hxx>
 
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 5ced88e66dfe..583c74b71109 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -32,7 +32,7 @@
 #define _SD_UNDOMANAGER_HXX
 
 #include "misc/scopelock.hxx"
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 namespace sd
 {
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index ace6165f64f3..bc8bf923f7e5 100644..100755
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-sd	sd	:    l10n animations svx stoc uui canvas NULL
+sd      sd      :    filter l10n animations svx stoc canvas NULL
 sd	sd										usr1	-	all	sd_mkout NULL
 sd	sd\inc									nmake		-	all	sd_inc NULL
 sd	sd\prj									get		-	all	sd_prj NULL
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 306fabf0df7d..67d9cfb1e85e 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -267,7 +267,7 @@ SfxVoidItem TaskPaneShowPanel SID_TASK_PANE (
     GroupId = GID_VIEW;
 ]
 
-interface ViewShellBaseView : View
+interface ViewShellBaseView
 {
     SID_SWITCH_SHELL
     [
@@ -380,7 +380,7 @@ interface ViewShellBaseView : View
     ]
 }
 
-shell ViewShellBase : SfxViewShell
+shell ViewShellBase
 {
     import ViewShellBaseView[Automation];
 }
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index 15b6f52ffc01..6d3267aacf81 100644
--- a/sd/sdi/_docsh.sdi
+++ b/sd/sdi/_docsh.sdi
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-interface DrawDocument : OfficeDocument
+interface DrawDocument
 {
     SID_PACKNGO // ole : ?, status : ?
     [
diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi
index 13c979071b5c..159bd05227fc 100644
--- a/sd/sdi/docshell.sdi
+++ b/sd/sdi/docshell.sdi
@@ -35,7 +35,7 @@ interface ImpressDocument : DrawDocument
 {
 }
 
-shell DrawDocShell : SfxObjectShell
+shell DrawDocShell
 {
     import ImpressDocument[Automation];
 }
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index 86cb36265704..4cd3ef0c905e 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
@@ -35,7 +35,7 @@ interface GraphicDocument : DrawDocument
 {
 }
 
-shell GraphicDocShell : SfxObjectShell
+shell GraphicDocShell
 {
     import GraphicDocument[Automation];
 }
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index 8a2c8fd971d7..7eb22a96c770 100644
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
@@ -51,6 +51,11 @@ SDI2NAME=$(TARGET2)
 SIDHRCNAME=SDSLOTS.HRC
 
 SVSDI1DEPEND= \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
     sdraw.sdi \
     app.sdi \
     _docsh.sdi \
@@ -67,11 +72,15 @@ SVSDI1DEPEND= \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
-        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 SVSDI2DEPEND= \
-    sdraw.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        sdraw.sdi \
     app.sdi \
     _docsh.sdi \
     grdocsh.sdi \
@@ -85,7 +94,6 @@ SVSDI2DEPEND= \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
-        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 # --- Targets -------------------------------------------------------
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index da196204d6ca..db62ca5cdfb3 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-import "svxslots.ilb"
-
 module
 "2DADF501-1F00-101C-A2E4-00001B4C5CE7"
 "33A1C840-1F00-101C-A2E4-00001B4C5CE7"
@@ -36,10 +34,15 @@ StarDraw
 [
 HelpText( "StarDraw Application" )
 SlotIdFile( "sdslots.hrc" )
-TypeLibFile( "sdgslots.tlb" )
 ModulePrefix( "Sd" )
 ]
 {
+        include "sfx2/sfxitems.sdi"
+        include "sfx2/sfx.sdi"
+        include "svx/svxitems.sdi"
+        include "svx/xoitems.sdi"
+        include "svx/svx.sdi"
+
         item UINT16 TbxImageItem;
 
         enum FadeEffect
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index 83060f6dd36c..208613595b65 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "2DADF501-1F00-101C-A2E4-00001B4C5CE7"
 "33A1C840-1F00-101C-A2E4-00001B4C5CE7"
@@ -37,10 +35,15 @@ StarDraw
 [
 HelpText( "StarDraw Application" )
 SlotIdFile( "sdslots.hrc" )
-TypeLibFile( "sdslots.tlb" )
 ModulePrefix( "Sd" )
 ]
 {
+        include "sfx2/sfxitems.sdi"
+        include "sfx2/sfx.sdi"
+        include "svx/svxitems.sdi"
+        include "svx/xoitems.sdi"
+        include "svx/svx.sdi"
+
         item UINT16 TbxImageItem;
 
         enum FadeEffect
diff --git a/sd/sdi/svxitems.sdi b/sd/sdi/svxitems.sdi
deleted file mode 100644
index 42d036d4e9d8..000000000000
--- a/sd/sdi/svxitems.sdi
+++ /dev/null
@@ -1,93 +0,0 @@
-enum SvxAdjust
-{
-    SVX_ADJUST_LEFT,
-    SVX_ADJUST_RIGHT,
-    SVX_ADJUST_BLOCK,
-    SVX_ADJUST_CENTER,
-    SVX_ADJUST_BLOCKLINE,
-    SVX_ADJUST_END
-}
-
-item
-{
-    INT16 Red;
-    INT16 Green;
-    INT16 Blue;
-} SvxColorItem
-
-item SvxAdjust SvxAdjustItem;
-
-item String SvxBoxInfoItem;
-
-item String SvxBoxItem;
-item String SvxBrushItem;
-item String SvxCaseMapItem;
-item String SvxCharSetColorItem;
-item String SvxColumnItem;
-item String SvxContourItem;
-item String SvxCrossedOutItem;
-item String SvxDBDescMgr;
-item String SvxDbTypeItem;
-item String SvxEscapementItem;
-item String SvxFmtBreakItem;
-item String SvxFmtSplitItem;
-item String SvxFontHeightItem;
-item String SvxFontItem;
-item String SvxFontListItem;
-item String SvxHyphenZoneItem;
-item String SvxInFrameItem;
-item String SvxKerningItem;
-item String SvxLRSpaceItem;
-item String SvxLanguageItem;
-item String SvxLineSpacingItem;
-item String SvxMacroItem;
-item String SvxNoHyphenItem;
-item String SvxNoLinebreakItem;
-item String SvxNumberInfoItem;
-item String SvxOpaqueItem;
-item String SvxOrphansItem;
-item String SvxOverlineItem;
-item String SvxPageItem;
-item String SvxPageModelItem;
-item String SvxPagePosSizeItem;
-item String SvxPaperBinItem;
-item String SvxParaDlgLimitsItem;
-item String SvxPostItAuthorItem;
-item String SvxPostItDateItem;
-item String SvxPostItTextItem;
-item String SvxPostureItem;
-item String SvxPrintItem;
-item String SvxPropSizeItem;
-item String SvxProtectItem;
-item String SvxPtrItem;
-item String SvxRulerItem;
-item String SvxSearchItem;
-item String SvxSearchControllerItem;
-item String SvxSearchItem;
-item String SvxSetItem;
-item String SvxShadowedItem;
-item String SvxShadowItem;
-item String SvxSizeItem;
-item String SvxTabStopItem;
-item String SvxULSpaceItem;
-item String SvxUnderlineItem;
-item String SvxWeightItem;
-item String SvxWidowsItem;
-item String SvxWordLineModeItem;
-item String XFillAttrSetItem;
-item String XFillBitmapItem;
-item String XFillColorItem;
-item String XFillGradientItem;
-item String XFillHatchItem;
-item String XFillStyleItem;
-item String XLineAttrSetItem;
-item String XLineColorItem;
-item String XLineDashItem;
-item String XLineEndItem;
-item String XLineEndWidthItem;
-item String XLineEndCenterItem;
-item String XLineStartItem;
-item String XLineStartWidthItem;
-item String XLineStartCenterItem;
-item String XLineStyleItem;
-item String XLineWidthItem;
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index cf5d94c420ce..6a732e58a405 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -44,7 +44,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
 
 #include <tools/debug.hxx>
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 563026fdc1ac..59251f62eb6f 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -43,7 +43,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
 
 #include <rtl/uri.hxx>
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 8d06ae3d0fcd..d5ffdd562a74 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -31,10 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 #include <tools/urlobj.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include "svx/xtable.hxx"
 #include <svx/svdopath.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/flditem.hxx>
 #include <svx/eeitem.hxx>
 
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index d5cd14a80b65..c86296a90997 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -42,11 +42,8 @@
 #include <svx/eeitem.hxx>
 #include <svx/scriptspaceitem.hxx>
 
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
-#ifndef _OFA_MISCCFG_HXX
-#include <svtools/misccfg.hxx>
-#endif
 #include <sfx2/printer.hxx>
 #include <sfx2/topfrm.hxx>
 #include <sfx2/app.hxx>
@@ -57,30 +54,30 @@
 #include <svx/eeitem.hxx>
 #include <svx/editstat.hxx>
 #include <svx/fontitem.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 #include <svx/svdoattr.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/bulitem.hxx>
 #include <svx/numitem.hxx>
 #include <svx/svditer.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <svx/xtable.hxx>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svx/outlobj.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <comphelper/extract.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/processfactory.hxx>
 #ifndef _SVTOOLS_PATHOPTIONS_HXX_
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 
 #include "eetext.hxx"
 #include "drawdoc.hxx"
@@ -262,7 +259,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
     }
 
     // DefTab und SpellOptions setzen
-    //OfaMiscCfg* pOfaMiscCfg = SFX_APP()->GetMiscConfig();
     // Jetzt am Modul (SD)
     USHORT nDefTab = pOptions->GetDefTab();
     SetDefaultTabulator( nDefTab );
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 0513e1d02083..e208399d636f 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -49,7 +49,7 @@
 #include <vcl/svapp.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/flditem.hxx>
 
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 6beaee7082eb..9c44f9edc485 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -44,13 +44,13 @@
 #include <sfx2/docfile.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svditer.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 413323d27e97..862c383f043b 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -102,7 +102,7 @@
 #include <svx/unolingu.hxx>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/outlobj.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/langitem.hxx>
@@ -119,7 +119,7 @@
 #include "shapelist.hxx"
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 14e60b3c5807..69d1d0203936 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -54,7 +54,7 @@
 #include <basic/basmgr.hxx>
 #include <svx/pbinitem.hxx>
 #include <svx/svdundo.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/editobj.hxx>
 #ifndef _SVX_SRIPTTYPEITEM_HXX
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 3f03640c27fb..047431bec461 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdotext.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/outlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/xmlcnitm.hxx>
 #include <svx/svditer.hxx>
 #include <tools/list.hxx>
@@ -60,7 +60,7 @@
 
 // #90477#
 #include <tools/tenccvt.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using namespace ::sd;
 using namespace ::com::sun::star;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 9f6bc230359b..e90b55243726 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -37,7 +37,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/unoprov.hxx>
 
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 708ed0b3c8b0..8c156af32038 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -42,14 +42,14 @@
 #include <svx/wghtitem.hxx>
 #include <svx/postitem.hxx>
 #include <svx/fontitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/numitem.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/editeng.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/langitem.hxx>
 #include <svx/charreliefitem.hxx>
 #ifndef _SVX_EMPHITEM_HXX
@@ -64,7 +64,7 @@
 #include <svx/bulitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/adjitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #define _SDR_POSITIVE
 #define _SDR_ITEMS
@@ -78,7 +78,7 @@
 #include "sdmod.hxx"
 #include "sdpage.hxx"
 #include "helpids.h"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 04a8c36263ef..d80881304b17 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -46,8 +46,8 @@
 #include <svx/fhgtitem.hxx>
 #include <svx/svdoattr.hxx>
 #include <svx/ulspitem.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/itemset.hxx>
 
 #include <svx/xflbmtit.hxx>
 #include <svx/xflbstit.hxx>
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 7223cf193cbd..c3f69a675e10 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -43,13 +43,13 @@
 #include <svx/wghtitem.hxx>
 #include <svx/postitem.hxx>
 #include <svx/fontitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/protitem.hxx>
 #include <svx/chrtitem.hxx>
 
-#include <svtools/globalnameitem.hxx>
+#include <svl/globalnameitem.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/postattr.hxx>
 #include <svx/editdata.hxx>
@@ -96,9 +96,9 @@
 #include <svx/drawitem.hxx>
 
 // #UndoRedo#
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 
-#include <svtools/lckbitem.hxx>
+#include <svl/lckbitem.hxx>
 
 
 #define CharSetItem                 SfxUInt16Item
@@ -129,8 +129,8 @@
 #define OfaStringListItem           SfxStringListItem
 #define avmedia_MediaItem           ::avmedia::MediaItem
 #include <sfx2/tplpitem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/rectitem.hxx>
 
 #include <sfx2/frame.hxx>
 
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index b843fd06009f..68719b132bb7 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -33,7 +33,7 @@
 
 #include <osl/module.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svx/xflclit.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index ef697cfa9733..cf66d81a0d6c 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -58,10 +58,11 @@
 #include <tools/zcodec.hxx>
 #include <svx/svxenum.hxx>
 #include <sot/storinfo.hxx>
-#include <svx/msoleexp.hxx>
+#include <filter/msfilter/msoleexp.hxx>
 #include <vcl/virdev.hxx>
 #include <svtools/wmf.hxx>
-#include <svx/msdffimp.hxx>
+#include <filter/msfilter/msdffimp.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <svx/flditem.hxx>
 #include <sfx2/docinf.hxx>
 
@@ -2467,3 +2468,38 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rS
     return bStatus;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
+{
+    SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
+    SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE );
+    aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+
+    SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+    if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
+    {
+        SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+        if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
+        {
+            SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) );
+            if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
+            {
+                UINT32 nLen = xTemp->GetSize();
+                if ( nLen )
+                {
+                    char* pTemp = new char[ nLen ];
+                    if ( pTemp )
+                    {
+                        xTemp->Seek( STREAM_SEEK_TO_BEGIN );
+                        xTemp->Read( pTemp, nLen );
+                        pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ );
+                        pBas->ObjectOwnsMemory( TRUE );
+                        return TRUE;
+                    }
+                }
+            }
+        }
+    }
+
+    return FALSE;
+}
+
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 2ef66bb9be75..af2c1d5ed6bf 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -38,7 +38,7 @@
 #include <sot/storage.hxx>
 #include <tools/gen.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <tools/string.hxx>
 #include "pptexanimations.hxx"
 #include <pptexsoundcollection.hxx>
@@ -85,7 +85,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/style/TabStop.hpp>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index fbb46dc20b0f..361970345430 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -46,7 +46,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/gradient.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 //#ifndef _SVX_XIT_HXX
 //#include <svx/xit.hxx>
 //#endif
diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx
index 1ebebe8a5504..577531d9f534 100644
--- a/sd/source/filter/eppt/escherex.hxx
+++ b/sd/source/filter/eppt/escherex.hxx
@@ -30,7 +30,7 @@
 
 #ifndef _PptEscherEX_HXX
 #define _PptEscherEX_HXX
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 
 // ---------------------------------------------------------------------------------------------
 // Werte fuer den ULONG im PPT_PST_TextHeaderAtom
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 78dbb731ef0b..effbe3381cea 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -38,7 +38,7 @@
 #include "../ppt/pptanimations.hxx"
 #endif
 #include <pptexsoundcollection.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 
 #ifdef DBG_ANIM_LOG
 #include <stdio.h>
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index bb3c114f603f..5ef6123fdddf 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -60,7 +60,7 @@
 
 // --
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index c2942f6b5b8f..2671452a0a3b 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -42,7 +42,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/image.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 6e2a7feb5240..e84d2b429ae3 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -40,7 +40,7 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 #include <tools/fsys.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
@@ -50,7 +50,7 @@
 #include <sfx2/progress.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svditer.hxx>
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
@@ -75,9 +75,9 @@
 #include <svx/flditem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 //#ifndef _SVDETC_HXX
 //#include <svx/svdetc.hxx>
 //#endif
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index d139940bfa97..2512c99e72d4 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <vcl/gdimtf.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "resltn.hxx"       // enum PublishingResolution
 #include <svtools/colrdlg.hxx>
 #include <svtools/ehdl.hxx>
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index aec387604488..6d9860740740 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -44,14 +44,14 @@
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/valueset.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/impgrf.hxx>
 #include <svtools/colrdlg.hxx>
 #include <svx/colritem.hxx>
@@ -60,8 +60,8 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <pres.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "sdresid.hxx"
 #include "sdattr.hxx"
diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx
index 9ccd845d14e6..14a7f81b4e98 100644
--- a/sd/source/filter/ppt/pptatom.hxx
+++ b/sd/source/filter/ppt/pptatom.hxx
@@ -32,6 +32,7 @@
 #define _PPTATOM_HXX_
 
 #include <svx/msdffdef.hxx>
+#include <filter/msfilter/msdffimp.hxx>
 
 class SvStream;
 
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index c495c69a55e8..37277a17c97b 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -35,20 +35,20 @@
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/svxids.hrc>
-#include <svx/svdfppt.hxx>
+#include <filter/msfilter/svdfppt.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdlayer.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/colritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/xbtmpit.hxx>
@@ -75,7 +75,7 @@
 #include <svx/gallery.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/numitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/svdomedia.hxx>
@@ -88,11 +88,11 @@
 #include "../../ui/inc/FrameView.hxx"
 #include "../../ui/inc/optsitem.hxx"
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <sfx2/progress.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <svx/editstat.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/docfac.hxx>
 #define MAX_USER_MOVE       2
 
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index 59d59eece151..0549f8fa85c0 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -31,11 +31,11 @@
 #ifndef _SD_PPTIN_HXX
 #define _SD_PPTIN_HXX
 
-#include <svx/svdfppt.hxx>
+#include <filter/msfilter/svdfppt.hxx>
 #include <svx/msdffdef.hxx>
 #include <diadef.h>
 #include <svx/svdtypes.hxx>
-#include <svx/msfiltertracer.hxx>
+#include <filter/msfilter/msfiltertracer.hxx>
 #include <com/sun/star/uno/Any.h>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx
index 114f471a3cef..e53a2c406f36 100644
--- a/sd/source/filter/ppt/pptinanimations.hxx
+++ b/sd/source/filter/ppt/pptinanimations.hxx
@@ -34,15 +34,13 @@
 #include <com/sun/star/animations/XTimeContainer.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 
-#ifndef _SD_PPTANIMATIONS_HXX
 #include "pptanimations.hxx"
-#endif
 #include <animations.hxx>
 
 #ifdef DBG_ANIM_LOG
 #include <stdio.h>
 #endif
-#include <svx/svdfppt.hxx>
+#include <filter/msfilter/svdfppt.hxx>
 
 #include <list>
 
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index 3507a71526cf..657d658e22d0 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/progress.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "../ui/inc/DrawDocShell.hxx"
 #include "../ui/inc/strings.hrc"
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 8c1674dbf789..8dea30f1659a 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -34,16 +34,16 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <osl/module.hxx>
-#include <svx/msoleexp.hxx>
-#include <svx/svxmsbas.hxx>
+#include <filter/msfilter/msoleexp.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <svx/svxerr.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 
 #include "sdpptwrp.hxx"
 #include "ppt/pptin.hxx"
 #include "drawdoc.hxx"
 #include <tools/urlobj.hxx>
-#include <svx/msfiltertracer.hxx>
+#include <filter/msfilter/msfiltertracer.hxx>
 
 // --------------
 // - Namespaces -
@@ -54,7 +54,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::frame;
 
-
 typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&,
                                              Reference< XModel > &,
                                              Reference< XStatusIndicator > &,
@@ -63,6 +62,8 @@ typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&,
 typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*,
                                           SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
 
+typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& );
+
 // ---------------
 // - SdPPTFilter -
 // ---------------
@@ -188,32 +189,13 @@ void SdPPTFilter::PreSaveBasic()
     SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get();
     if( pFilterOptions && pFilterOptions->IsLoadPPointBasicStorage() )
     {
-        SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
-        SvxImportMSVBasic aMSVBas( (SfxObjectShell&) mrDocShell, *xDest, FALSE, FALSE );
-        aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
-
-        SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
-        if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
+        ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() );
+        if( pLibrary )
         {
-            SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
-            if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
+            SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") ));
+            if( pSaveVBA )
             {
-                SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) );
-                if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
-                {
-                    UINT32 nLen = xTemp->GetSize();
-                    if ( nLen )
-                    {
-                        char* pTemp = new char[ nLen ];
-                        if ( pTemp )
-                        {
-                            xTemp->Seek( STREAM_SEEK_TO_BEGIN );
-                            xTemp->Read( pTemp, nLen );
-                            pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ );
-                            pBas->ObjectOwnsMemory( TRUE );
-                        }
-                    }
-                }
+                pSaveVBA( (SfxObjectShell&) mrDocShell, pBas );
             }
         }
     }
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index 16930a81b055..5fa918db31ef 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -32,10 +32,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
-#include <svtools/style.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/whiter.hxx>
 
 #include <svx/svdoutl.hxx>
 #include <svx/xmlcnitm.hxx>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 6f9e0d7b71da..6aac1c1c3967 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -67,11 +67,11 @@
 #include <com/sun/star/io/XActiveDataControl.hpp>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 // #80365# include necessary for XML progress bar at load time
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/sfxecode.hxx>
 
 #include "sderror.hxx"
diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx
index 02a230650583..51ddad2fb97d 100644
--- a/sd/source/ui/animations/AnimationSchemesPane.cxx
+++ b/sd/source/ui/animations/AnimationSchemesPane.cxx
@@ -49,7 +49,7 @@
 #include <svtools/controldims.hrc>
 #endif
 #include <svx/gallery.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index ce651b2965be..ea59e0773261 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -53,7 +53,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdstr.hrc>
 #include "sdresid.hxx"
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include "CustomAnimationCreateDialog.hxx"
 #ifndef _SD_CUSTOMANIMATIONCREATEDIALOG_HRC
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index dc7a27ab5c53..9a1634a7f695 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -52,7 +52,7 @@
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/menubtn.hxx>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 13400964c18b..4a235e3cd9af 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -51,7 +51,7 @@
 #include <svtools/controldims.hrc>
 #endif
 #include <svx/gallery.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index bbc9bbd539f3..9e650d0da43c 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -45,11 +45,11 @@
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <svtools/style.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/saveopt.hxx>
+#include <svl/style.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -199,7 +199,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase )
 {
     SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType());
     if( pOptions )
-        mbShowAnnotations = pOptions->IsPreviewTransitions() == sal_True;
+        mbShowAnnotations = pOptions->IsShowComments() == TRUE;
 }
 
 // --------------------------------------------------------------------
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index ae3c65a2b4d5..2a7ca2df9b0d 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -57,11 +57,11 @@
 #include <svx/crsditem.hxx>
 
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/slstitm.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
 
 #include <linguistic/lngprops.hxx>
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 673e00477d46..b62bba0435ef 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -36,7 +36,7 @@
 #ifndef _SV_SALBTYPE_HRC //autogen
 #include <vcl/salbtype.hxx>
 #endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "app.hxx"
 #include "optsitem.hxx"
@@ -74,6 +74,10 @@ void SdOptionsItem::Commit()
         mrParent.Commit( *this );
 };
 
+void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+{}
+
+
 // -----------------------------------------------------------------------------
 
 Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames )
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 4796be585d1e..77ef817e4c44 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include <sfx2/sfx.hrc>
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #include "glob.hrc"
 #include "res_bmp.hrc"
 
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index c2ab152d950b..7cdec8c9f36b 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -34,7 +34,7 @@
 
 #include <svx/editeng.hxx>
 #include <svx/svdobj.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #ifndef _FM_FMOBJFAC_HXX
 #include <svx/fmobjfac.hxx>
 #endif
diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx
index 2ef0815aed3c..6b525a0b3f90 100644
--- a/sd/source/ui/app/sddll1.cxx
+++ b/sd/source/ui/app/sddll1.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include "sddll.hxx"
 #include "diactrl.hxx"
 #include "tbx_ww.hxx"
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 957b1aa0475b..0e68a487b6e2 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -30,8 +30,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
-#include <svtools/pathoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/languageoptions.hxx>
 #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
 #endif
@@ -39,14 +39,14 @@
 #include <vcl/virdev.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/status.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/printer.hxx>
 #include <svx/pszctrl.hxx>
 #include <svx/zoomctrl.hxx>
 #include <svx/modctrl.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/ehdl.hxx>
 
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 4144b4afb774..65485d9df447 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -31,10 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
-#include <svtools/lckbitem.hxx>
+#include <svl/lckbitem.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include "framework/FrameworkHelper.hxx"
 
 #include <svx/dialogs.hrc>
@@ -49,7 +49,7 @@
 #include <sfx2/docfile.hxx>
 #include <svx/paperinf.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "app.hrc"
 #include "glob.hrc"
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index bbf80e942602..0a4eaf0bbebe 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -33,10 +33,10 @@
 #include <svx/eeitem.hxx>
 #include <svx/flditem.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/flagitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/inethist.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/flagitem.hxx>
+#include <unotools/useroptions.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -85,7 +85,7 @@
 #include "sdabstdlg.hxx"
 #include "tpoption.hrc"
 #include "prntopts.hrc"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 /** retrieves the page that is currently painted. This will only be the master page
     if the current drawn view only shows the master page*/
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 211e3a1fd02e..274a99f830e5 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -36,10 +36,10 @@
 
 #include <svx/editeng.hxx>
 #include <svx/flditem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "strings.hrc"
 #include "sdpopup.hxx"
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index f22af4ad2887..7a57c81178b6 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -49,13 +49,13 @@
 #include <svx/svdotext.hxx>
 #include <svx/outlobj.hxx>
 #include <sot/storage.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/editobj.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <tools/urlobj.hxx>
 #include <sot/formats.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/outliner.hxx>
 
 //#ifndef _SVDETC_HXX //autogen
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 4318f8f9b4ac..269486d56e92 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/bindings.hxx>
 #include <svx/svxids.hrc>
 #include <svx/grafctrl.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <sfx2/viewsh.hxx>
 #ifndef _SFX_IMAGEMGR_HXX
 #include <sfx2/imagemgr.hxx>
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index ce7f1ff28acc..86f0e4db6e10 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -37,8 +37,8 @@
 
 #include <vcl/menu.hxx>
 #include <vcl/status.hxx>
-#include <svtools/style.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/style.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 
 #include "tmplctrl.hxx"
diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx
index ac3149d4cadf..735af8c95042 100644
--- a/sd/source/ui/dlg/LayerDialogContent.cxx
+++ b/sd/source/ui/dlg/LayerDialogContent.cxx
@@ -38,7 +38,7 @@
 #include <svx/gallery.hxx>
 #include <svx/colritem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "sdattr.hxx"
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 84d030867abb..9b0e9d118927 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -39,7 +39,7 @@
 #include <svx/xoutbmp.hxx>
 
 #include <time.h>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx
index 0acea6b8d033..b0a353c42b2f 100644
--- a/sd/source/ui/dlg/celltempl.cxx
+++ b/sd/source/ui/dlg/celltempl.cxx
@@ -35,8 +35,8 @@
 #undef SD_DLLIMPLEMENTATION
 #endif
 
-#include <svtools/style.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/style.hxx>
+#include <svl/intitem.hxx>
 
 #include <svx/dialogs.hrc>
 #include <svx/drawitem.hxx>
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 13ad351c7b24..ea89fba79500 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -41,7 +41,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <sfx2/doctempl.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/objsh.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
@@ -49,7 +49,7 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <fadedef.h>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "DrawDocShell.hxx"
 #include <vcl/gdimtf.hxx>
 #include <vcl/wintypes.hxx>
@@ -66,7 +66,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 0b394d57702b..a1781ec2d9dc 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <sfx2/docfile.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "sdpage.hxx"
 #include "Outliner.hxx"
diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx
index 33b3a777b68b..d4a75fb8dd3d 100644
--- a/sd/source/ui/dlg/dlgassim.hxx
+++ b/sd/source/ui/dlg/dlgassim.hxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/dateitem.hxx>
+#include <svl/dateitem.hxx>
 #include "drawdoc.hxx"
 #include <svx/svdotext.hxx>
 #include <svtools/svtreebx.hxx>
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 6cee99175fcc..254e3f6dcfa2 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -44,7 +44,7 @@
 #include "sdresid.hxx"
 #include "dlg_char.hxx"
 #include <svx/svxids.hrc>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 /*************************************************************************
 |*
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 99fcace44186..19fb96a6e4d9 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -40,12 +40,12 @@
 #include <svx/editeng.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/flditem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "strings.hrc"
 #include "dlgfield.hrc"
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index a7988b850214..dbe0e252f7eb 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -48,11 +48,11 @@
 #include <svx/numitem.hxx>
 
 #include <svx/dialogs.hrc>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svdmark.hxx>
 #include "View.hxx"
 #include <svx/svdobj.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <drawdoc.hxx>
 
 #ifndef _SD_SDRESID_HXX
@@ -64,7 +64,7 @@
 #include "bulmaper.hxx"
 #include "DrawDocShell.hxx"
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index bf5eb5da7c39..2145e477e476 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -35,7 +35,7 @@
 #undef SD_DLLIMPLEMENTATION
 #endif
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
@@ -48,7 +48,7 @@
 #include "dlgpage.hxx"
 
 #include "DrawDocShell.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/flagsdef.hxx>
 #include <svx/svxenum.hxx>
 
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 5a232649251e..fc541e7925e8 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -38,8 +38,8 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dlgutil.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/aeitem.hxx>
 
 #include "dlgsnap.hrc"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 1fea04cf31ab..a4f4e99d2463 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -36,7 +36,7 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/svdglue.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx
index cb9ade5336f8..3414f779cad8 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -34,7 +34,7 @@
 #ifdef SD_DLLIMPLEMENTATION
 #undef SD_DLLIMPLEMENTATION
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "strings.hrc"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 6d34834ccab9..f43472d58ace 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -47,8 +47,8 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xenum.hxx>
 #include <svx/svdobj.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index f251f6964263..db2e69e6038c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -36,11 +36,11 @@
 #include <unotools/localfilehelper.hxx>
 #include <sfx2/imgmgr.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/menu.hxx>
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 2ebdf316af34..eeefcda29f3d 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -37,9 +37,9 @@
 
 #include <vcl/field.hxx>
 
-#include <svtools/cjkoptions.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <svx/editdata.hxx>
 #include <svx/dialogs.hrc>
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index d881c45070d3..e624e3b23320 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <comphelper/processfactory.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "sdattr.hxx"
 #include "present.hxx"
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 748d34a94c6c..b7a65b0d5b6e 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -41,7 +41,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/flstitem.hxx>
 #include <svx/drawitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/tabline.hxx>
 #include <svx/bulitem.hxx>
 #include <svx/eeitem.hxx>
@@ -49,7 +49,7 @@
 #include <vcl/graph.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/numitem.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 #include "DrawDocShell.hxx"
 #include "glob.hrc"
@@ -59,7 +59,7 @@
 #include "enumdlg.hrc"
 //#include "enumdlg.hxx"
 #include "bulmaper.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svxgrahicitem.hxx>
 #include <svx/flagsdef.hxx>
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 225919f32280..6a74ffaf206f 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -42,7 +42,7 @@
 #include "sdresid.hxx"
 #include "prntopts.hxx"
 #include "app.hrc"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index b57474906567..1f97ce8d4cf2 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -36,7 +36,7 @@
 #endif
 
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/new.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 9d335b859e31..bd93b07beb9a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -35,7 +35,7 @@
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 98a4959abdb8..5ce27def13a6 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -40,18 +40,18 @@
 #include <svx/svxids.hrc>
 
 #include <svx/drawitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/ofaitem.hxx>
 #include <svx/svxgrahicitem.hxx>
 #include <svx/svdmodel.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 
 #include <svx/dialogs.hrc>
 
 #include <svx/svxdlg.hxx>
 #include <svx/tabline.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/xtable.hxx>
 
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 2148b33d95d3..80ba0b78c9f9 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -54,10 +54,10 @@
 #include <vcl/waitobj.hxx>
 #include <osl/file.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svx/svdpagv.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/colritem.hxx>
 #include <svx/svdoole2.hxx>
 #include <sfx2/docfile.hxx>
@@ -68,7 +68,7 @@
 #include <svx/xtable.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svx/drawitem.hxx>
 #include "View.hxx"
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index b22ad4e32dbd..102c95a9b3e5 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -58,7 +58,7 @@
 #include "tpoption.hxx"
 #include "strings.hrc"
 #include "app.hrc"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #define DLGWIN this->GetParent()->GetParent()
 
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index dc0ea3d63827..e42012d4b75d 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -32,9 +32,9 @@
 #include "precompiled_sd.hxx"
 
 
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/svdobj.hxx>
 
 #include "unchss.hxx"
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index a62922381155..3917cc02880c 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -374,7 +374,7 @@ BOOL DrawDocShell::CheckPageName (::Window* pWin, String& rName )
     {
         String aDesc( SdResId( STR_WARN_PAGE_EXISTS ) );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc, RID_SVXDLG_NAME ) : 0;
+        AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : 0;
         if( aNameDlg )
         {
             aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE );
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index c62bc9fcc620..96461168e299 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -51,7 +51,7 @@
 #include <svx/outliner.hxx>
 #endif
 #include <sfx2/request.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/unolingu.hxx>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 4a4e62f2a106..ce2c38f20afd 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -41,8 +41,8 @@
 #endif
 #include <svx/flstitem.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/flagitem.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -50,7 +50,7 @@
 #include <sfx2/dispatch.hxx>
 #endif
 #include <svx/svdotext.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <sfx2/printer.hxx>
 #include <svtools/ctrltool.hxx>
 #ifndef _SFX_ECODE_HXX //autogen
@@ -63,11 +63,11 @@
 #include "unomodel.hxx"
 #endif
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svx/svxmsbas.hxx>
-#include <svtools/saveopt.hxx>
+//#include <svx/svxmsbas.hxx>
+#include <unotools/saveopt.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index d6cc2a000b1d..7d18f19f1993 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -44,8 +44,8 @@
 #include <sfx2/srchitem.hxx>
 #include <svx/srchdlg.hxx>
 #include <svx/flstitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/printer.hxx>
 #ifndef _SFX_DOCFILE_HXX //autogen
 #include <sfx2/docfile.hxx>
@@ -55,16 +55,16 @@
 #include <svx/drawitem.hxx>
 #include <svx/srchdlg.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/filter.hxx>
 #ifndef _SO_CLSIDS_HXX
 #include <sot/clsids.hxx>
 #endif
 #include <sfx2/topfrm.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/visitem.hxx>
 
 #include <svx/svdoutl.hxx>
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index d0d6938a2b21..4ce1bfebf6ee 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -45,7 +45,7 @@
 #include "app.hrc"
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <cppuhelper/compbase1.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <comphelper/stl_types.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 3abd76237680..95687ab8a833 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -54,8 +54,8 @@
 #include <svx/bulitem.hxx>
 #include <svx/brshitem.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <svx/numitem.hxx>
 #include <svx/eeitem.hxx>
 
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 5bb4942b8ea5..e070365eddda 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -37,8 +37,8 @@
 #include <svx/svxids.hrc>
 #include <svx/tabarea.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
@@ -85,7 +85,6 @@ void FuArea::DoExecute( SfxRequest& rReq )
         AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL,
                                                                         &aNewAttr,
                                                                         mpDoc,
-                                                                        RID_SVXDLG_AREA,
                                                                         mpView) : 0;
         if( pDlg && (pDlg->Execute() == RET_OK) )
         {
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 64fb3783d78d..fac03893a880 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/bindings.hxx>
 #endif
 #include <svx/eeitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/fontitem.hxx>
 #include "OutlineViewShell.hxx"
 #include "DrawViewShell.hxx"
@@ -49,8 +49,8 @@
 #include <svx/svdoutl.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/ctloptions.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/ctloptions.hxx>
+#include <svl/itempool.hxx>
 
 #ifdef IRIX
 #include <basic/sbx.hxx>
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index e9654a21bcee..eb738ef0d2fa 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -35,7 +35,7 @@
 #include <vcl/waitobj.hxx>
 
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 238c047ef70c..de658c401428 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -35,8 +35,8 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdocirc.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdobj.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index ff95b7b3115b..1e16ac4c332c 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -34,9 +34,9 @@
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 
 #include "fuconbez.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdopath.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdobj.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index a360effd5469..a9f1445097e4 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -40,7 +40,7 @@
 #include <svx/dialmgr.hxx>
 
 #include "app.hrc"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnedit.hxx>
@@ -53,7 +53,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdocirc.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/xtable.hxx>
@@ -73,7 +73,7 @@
 // #109583#
 #include <svx/writingmodeitem.hxx>
 #include <svx/gallery.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 #include "sdresid.hxx"
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index a36b6f508534..d9513f4b5c22 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -40,7 +40,7 @@
 #include <svx/dialmgr.hxx>
 
 #include "app.hrc"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnedit.hxx>
@@ -53,7 +53,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdocirc.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/xtable.hxx>
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 3f9d8151ef4e..28531c7bef47 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -34,7 +34,7 @@
 #include "fuconstr.hxx"
 
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index ef98942a581f..512ccdb53623 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -32,11 +32,11 @@
 #include "precompiled_sd.hxx"
 
 #include "fuconuno.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 
 #include <svx/fmglob.hxx>
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 6c6c0c3aaa81..7da8b98ea568 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -76,7 +76,7 @@
 #include "sdresid.hxx"
 #include "drawview.hxx"
 #include "fusel.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/msgbox.hxx>
 #include "slideshow.hxx"
 #include <svx/sdrhittesthelper.hxx>
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index d23493de4249..24ed231ea25b 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 #include "fuediglu.hxx"
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svdglue.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index eb4ca01ba621..98dbcba52ab2 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 
 #include <svx/globl3d.hxx>
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 0babfc9c2d38..42576f8d9d53 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/bootstrap.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/fontitem.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 12c94fbf9f8f..578830b37c25 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -44,13 +44,13 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 #include <svtools/sores.hxx>
 #include <svtools/insdlg.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/globalnameitem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/globalnameitem.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svx/pfiledlg.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/dialogs.hrc>
@@ -64,7 +64,7 @@
 #include <sot/clsids.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 0dea41e10ca9..a6dad3779ab7 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -38,7 +38,7 @@
 #ifndef _EDITENG_HXX
 #include <svx/editeng.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/msgbox.hxx>
@@ -48,7 +48,7 @@
 #include <svx/svdoutl.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sot/formats.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 8e7d6c6b5b86..08fdf2eb24b7 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -38,8 +38,8 @@
 #include <svx/tabline.hxx>
 #include <svx/xenum.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/xdef.hxx>
 #include <sfx2/bindings.hxx>
@@ -98,7 +98,7 @@ void FuLine::DoExecute( SfxRequest& rReq )
         mpView->GetAttributes( *pNewAttr );
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,RID_SVXDLG_LINE,pObj,bHasMarked) : 0;
+        SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,pObj,bHasMarked) : 0;
         if( pDlg && (pDlg->Execute() == RET_OK) )
         {
             mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 6f8373147845..1eb3300d30df 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -140,7 +140,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
         }
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc, RID_SVXDLG_NAME ) : 0;
+        AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0;
 
         if( pDlg )
         {
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 694f1ae6615a..5083023efdde 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -46,7 +46,7 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include "svx/xtable.hxx"
 
 #include "strings.hrc"
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 29bc28e91e17..a16e6dbb20dd 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -34,11 +34,11 @@
 
 #include "fuolbull.hxx"
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/outliner.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <svx/editdata.hxx>
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 10653e514697..284b4da2be66 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -40,14 +40,14 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
 #include <sfx2/request.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/prntypes.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <stlsheet.hxx>
 #ifndef _SVX_SVDORECT_HXX
 #include <svx/svdorect.hxx>
@@ -59,7 +59,7 @@
 #include <svx/frmdiritem.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xsetit.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/lrspitem.hxx>
 
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index c6b8f9feaab2..936802ff34cb 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -35,7 +35,7 @@
 #include "fupoor.hxx"
 
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 6975aa66fba9..7fd48732ccc4 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -35,8 +35,8 @@
 #include "fuprlout.hxx"
 #include <vcl/wrkwin.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/itempool.hxx>
 #include <sot/storage.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/svdundo.hxx>
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index b1d43699e27b..d4f6dc71cc88 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -36,9 +36,9 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/outliner.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 
 #include "app.hrc"
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 682dc1b4b719..b61836a74cca 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -139,7 +139,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr, RID_SVXDLG_ZOOM);
+            pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr);
         }
 
         if( pDlg )
@@ -169,12 +169,11 @@ void FuScale::DoExecute( SfxRequest& rReq )
 
             delete pDlg;
 
-    //      SvxZoomType eZT = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType ();
-            switch (((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType ())
+            switch (((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetType ())
             {
                 case SVX_ZOOM_PERCENT:
                 {
-                    nValue = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetValue ();
+                    nValue = ((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetValue ();
 
                     mpViewShell->SetZoom( nValue );
 
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 4e91ef79dc9a..fe97b7410ee7 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -40,15 +40,15 @@
 #include <svx/polysc3d.hxx>
 #include "drawview.hxx"
 #include <svtools/imapobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xfillit0.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 6b79046a9bf8..b10f539cf29e 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -33,7 +33,7 @@
 
 
 #include "fusldlg.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 28bb58538d85..9f0214668f82 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 #include "fusnapln.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/request.hxx>
 
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index d9ebadd48ac7..e53d6d9d7789 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -42,7 +42,7 @@
 #include <svx/bulitem.hxx>
 #include <svx/svxids.hrc>   // fuer SID_OBJECT_SELECT
 #include <sfx2/bindings.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/eeitem.hxx>
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 86cfb6be3a77..0f94366f1c56 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -39,14 +39,14 @@
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
 #include <svx/editstat.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svdotext.hxx>
 #ifndef _SVDOGROUP_HXX //autogen
 #include <svx/svdogrp.hxx>
 #endif
 #include <svx/flditem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index b5db742f70b4..a5782aadb4c8 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -94,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
-                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView, RID_SVXDLG_CAPTION ) );
+                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
 
                     const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
                     SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -114,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet,mpView, RID_SVXDLG_TRANSFORM) );
+                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
                     if( pDlg.get() && (pDlg->Execute() == RET_OK) )
                     {
                         rReq.Done( *( pDlg->GetOutputItemSet() ) );
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index e94638ecf225..8ab4d8d02a75 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -79,7 +79,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq )
     if( !pArgs )
     {
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, RID_SVXDLG_TEXT, mpView );
+        SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView );
 
         USHORT nResult = pDlg->Execute();
 
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index abe492991067..e408b70b755a 100644
--- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -33,8 +33,8 @@
 
 #include <memory>
 #include <vcl/svapp.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <svx/unoedsrc.hxx>
 #include <svx/editdata.hxx>
 #include <svx/unoforou.hxx>
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index 79e33452959c..5627612aec06 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -31,7 +31,7 @@
 #ifndef SD_TOOLS_EVENT_MULTIPLEXER_HXX
 #define SD_TOOLS_EVENT_MULTIPLEXER_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <set>
 #include <memory>
diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx
index c919e5f95c91..9956d8dc2af9 100644
--- a/sd/source/ui/inc/FormShellManager.hxx
+++ b/sd/source/ui/inc/FormShellManager.hxx
@@ -34,7 +34,7 @@
 #include <ViewShellManager.hxx>
 
 #include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class VclWindowEvent;
 class FmFormShell;
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index c508410045aa..7211a02da6f4 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -34,7 +34,7 @@
 #include "drawview.hxx"
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include <memory>
 
 
diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx
index 23ff29c7f8de..493d2c2e2a19 100644
--- a/sd/source/ui/inc/ViewShellHint.hxx
+++ b/sd/source/ui/inc/ViewShellHint.hxx
@@ -31,7 +31,7 @@
 #ifndef SD_VIEW_SHELL_HINT_HXX
 #define SD_VIEW_SHELL_HINT_HXX
 
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index 7b61c37adb45..a6c37a54991a 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -31,8 +31,8 @@
 #ifndef SD_OUTPUT_DEVICE_UPDATER_HXX
 #define SD_OUTPUT_DEVICE_UPDATER_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/lstner.hxx>
+#include <svl/ctloptions.hxx>
 #include "sddllapi.h"
 
 #ifndef INCLUDED_VECTOR
@@ -65,7 +65,7 @@ class ViewShell;
     this document is reformatted when the monitored option changes.</p>
 */
 class SD_DLLPUBLIC WindowUpdater
-    : public SfxListener
+    : public utl::ConfigurationListener
 {
 public:
     explicit WindowUpdater (void);
@@ -116,7 +116,7 @@ public:
     /** Callback that waits for notifications of a
         <type>SvtCTLOptions</type> object.
     */
-    virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint);
+    virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint);
 
 private:
     /// Options to monitor for changes.
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index b6e1b2dc9fbd..df235a66c71d 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -32,7 +32,7 @@
 #define _SD_DIACTRL_HXX
 
 #include "dlgctrls.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <svx/itemwin.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 746df06794ea..80f219ddfc59 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -37,7 +37,7 @@
 
 #include <rtl/ref.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/colorcfg.hxx>
 #include "fadedef.h"
 #include "sddllapi.h"
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index c5feb07dcab6..49e98cd36e73 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -31,7 +31,7 @@
 #ifndef SD_FU_CONSTRUCT_UNO_CONTROL_HXX
 #define SD_FU_CONSTRUCT_UNO_CONTROL_HXX
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "fuconstr.hxx"
 
 namespace sd {
diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx
index 7c4b9da4ea95..d14664a5b66b 100644
--- a/sd/source/ui/inc/fuformatpaintbrush.hxx
+++ b/sd/source/ui/inc/fuformatpaintbrush.hxx
@@ -34,11 +34,9 @@
 #include "futext.hxx"
 
 // header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <boost/scoped_ptr.hpp>
 
-class SfxItemSet;
-
 namespace sd {
 
 class DrawViewShell;
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index a67c91948617..a69381d784df 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -85,6 +85,7 @@ public:
     virtual ~SdOptionsItem();
 
     virtual void            Commit();
+    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties(
                                 const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames );
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 4fc2c12ad71b..182d2f68ac54 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -40,7 +40,7 @@
 #include "sddllapi.h"
 #include <tools/string.hxx>
 #include <svtools/svtreebx.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <tools/ref.hxx>
 #include "sdxfer.hxx"
 
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 6ad9be896829..59a3a192907b 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -34,7 +34,7 @@
 #include <svtools/transfer.hxx>
 #include <vcl/graph.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 // ------------------
 // - SdTransferable -
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index a29397a363af..a4dc305d6aeb 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -52,7 +52,7 @@
 
 #include <rtl/ref.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <svx/fmdmod.hxx>
 
diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx
index f86e9a358cbc..10c4b58fd999 100755
--- a/sd/source/ui/notes/EditWindow.cxx
+++ b/sd/source/ui/notes/EditWindow.cxx
@@ -41,12 +41,12 @@
 #include <vcl/scrbar.hxx>
 #include <svx/eeitem.hxx>
 #include "sdresid.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/fhgtitem.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/editstat.hxx>
 
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 0317b7530e5c..8890c608f17f 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -35,10 +35,10 @@
 
 #include <i18npool/mslangid.hxx>
 #include <cppcanvas/vclfactory.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/colritem.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editstat.hxx>
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 911d31d2518f..3fad355c915a 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -35,7 +35,7 @@
 
 #include "showwindow.hxx"
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <sfx2/viewfrm.hxx>
 
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 6d5e3e31ad80..f1cb2cf4afb9 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -44,7 +44,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <sfx2/topfrm.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index c0e550f69378..e59f45b71e12 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -46,8 +46,8 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <vos/process.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/urihelper.hxx>
 
 #include <toolkit/unohlp.hxx>
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 7240e6efa087..96b24913c45e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -62,8 +62,8 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/saveopt.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 8eebe162b942..4d2ecbdef39c 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -56,8 +56,8 @@
 #include <cppcanvas/spritecanvas.hxx>
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/saveopt.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index f91c7337713a..6ace8ebdd370 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <cppuhelper/compbase4.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <tools/link.hxx>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 4b48aa60678d..4aa35f91292f 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -88,10 +88,10 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/aeitem.hxx>
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
@@ -905,7 +905,7 @@ void SlotManager::RenameSlide (void)
             DBG_ASSERT(pFact, "Dialogdiet fail!");
             AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog(
                 mrSlideSorter.GetActiveWindow(),
-                aPageName, aDescr, RID_SVXDLG_NAME);
+                aPageName, aDescr);
             DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
             aNameDlg->SetText( aTitle );
             aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true );
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 3cd696e4bb26..e877b41d3738 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -60,7 +60,7 @@
 #include "sdresid.hxx"
 #include "glob.hrc"
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/xlndsit.hxx>
@@ -72,10 +72,10 @@
 #include <algorithm>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
 
 using namespace std;
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 098d71d1f06a..9ab5a4a175d5 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -50,7 +50,7 @@
 #include <vcl/bmpacc.hxx>
 //#include <vcl/toolbox.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index e2f923424831..1d1d38df82bf 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -57,12 +57,12 @@
 #include <svx/svxdlg.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include "framework/FrameworkHelper.hxx"
 #include "app.hrc"
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 2eaf13ea470f..abae004cb73a 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -39,8 +39,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index d2faeb06eb00..b78042e2e9ae 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -61,7 +61,7 @@
 #include <sfx2/objface.hxx>
 #include "sdresid.hxx"
 #include <vcl/image.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
 #include "taskpane/TitledControl.hxx"
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index c4dd6537c9ce..c0e605cac79e 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -47,7 +47,7 @@
 #include <vcl/bitmapex.hxx>
 #include <tools/color.hxx>
 #include <svx/xdash.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/svdobj.hxx>
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 03795e0e2d71..f78bbdfa0308 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -60,8 +60,8 @@
 #include "DrawDocShell.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include "sdresid.hxx"
 #include "tools/TimerBasedTaskExecution.hxx"
 #include "pres.hxx"
diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
index 7e0c3b2887c0..cf0992596c64 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
@@ -39,7 +39,7 @@
 #include <hash_map>
 #include <set>
 #include <vector>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 9356dac3f7f9..9b419c9924ec 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -62,12 +62,12 @@
 #include "drawview.hxx"
 #endif
 #include <vcl/image.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/mnumgr.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svxids.hrc>
@@ -76,7 +76,7 @@
 #include "stlpool.hxx"
 #include "unmovss.hxx"
 #include <sfx2/request.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 using namespace ::sd::toolpanel::controls;
 #define MasterPagesSelector
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 71000d263cd7..a59b63a3df10 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -63,10 +63,10 @@
 
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
@@ -83,7 +83,7 @@
 #include <svx/impgrf.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include <sot/storage.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <com/sun/star/util/XArchiver.hpp>
 #include <comphelper/processfactory.hxx>
 
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index a1a8a4f4dabb..5fedbcd717b3 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -40,8 +40,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/stl_types.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 15b3b2224b4b..187a62f0dcfe 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -54,7 +54,7 @@
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svdmodel.hxx>
 #include <sdresid.hxx>
 #include <glob.hrc>
@@ -68,7 +68,7 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <svx/svdorect.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index a1d9e0436e98..5d4c76bd9e82 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #ifndef _SVX_UNOPAGE_HXX
 #include <svx/unopage.hxx>
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 0808221582f1..5150afb2d10f 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <comphelper/extract.hxx>
 #include <rtl/uuid.h>
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 9e34bc4e3f39..32f5de8594ba 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -35,8 +35,8 @@
 
 #include <limits.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/shell.hxx>
 #include <svx/svxids.hrc>
@@ -44,7 +44,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/grfflt.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/grafctrl.hxx>
 
 
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index c05c55c0d6de..510d4a6fccca 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -38,8 +38,8 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index ba5836e8f1db..a672ce978233 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -56,8 +56,8 @@
 #include <svx/eeitem.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <svx/srchdlg.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/editeng.hxx>
 #include <vcl/metric.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx
index 797518473ebd..3963c4cb5273 100644
--- a/sd/source/ui/view/PrintManager.cxx
+++ b/sd/source/ui/view/PrintManager.cxx
@@ -52,7 +52,7 @@
 #include <sfx2/progress.hxx>
 #include <svtools/printdlg.hxx>
 #include <tools/multisel.hxx>
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <svx/prtqry.hxx>
 #include "WindowUpdater.hxx"
@@ -71,7 +71,7 @@
 #include "printdlg.hrc"
 #include "prntopts.hrc"
 #include "app.hrc"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/paperinf.hxx>
 #include <svx/xlnclit.hxx>
 #include "printdialog.hxx"
@@ -368,7 +368,7 @@ USHORT  PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p
 
         if( pPrintOpts )
         {
-            SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig();
+            ::utl::MiscCfg aMisc;
 
             if( pPrintOpts->GetOptionsPrint().IsDate() )
             {
@@ -398,9 +398,9 @@ USHORT  PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p
                 ePageKind = PK_NOTES;
             }
 
-            pPrintOpts->GetOptionsPrint().SetWarningPrinter( pMisc->IsNotFoundWarning() );
-            pPrintOpts->GetOptionsPrint().SetWarningSize( pMisc->IsPaperSizeWarning() );
-            pPrintOpts->GetOptionsPrint().SetWarningOrientation( pMisc->IsPaperOrientationWarning() );
+            pPrintOpts->GetOptionsPrint().SetWarningPrinter( aMisc.IsNotFoundWarning() );
+            pPrintOpts->GetOptionsPrint().SetWarningSize( aMisc.IsPaperSizeWarning() );
+            pPrintOpts->GetOptionsPrint().SetWarningOrientation( aMisc.IsPaperOrientationWarning() );
 
             UINT16  nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality();
             ULONG   nMode = DRAWMODE_DEFAULT;
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 286132c304c0..487794816270 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -49,7 +49,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index bbf1b69ad68a..3e0f6297f8d6 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -90,7 +90,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include "fubullet.hxx"
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 3afef14deeed..75b728c7849b 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -60,7 +60,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/imapdlg.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbstar.hxx>
diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx
index 64e93aee785e..135c6974f64e 100644
--- a/sd/source/ui/view/WindowUpdater.cxx
+++ b/sd/source/ui/view/WindowUpdater.cxx
@@ -42,7 +42,7 @@
 #endif
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <algorithm>
 
@@ -52,7 +52,7 @@ WindowUpdater::WindowUpdater (void)
     : mpViewShell (NULL),
       mpDocument (NULL)
 {
-    StartListening (maCTLOptions);
+    maCTLOptions.AddListener(this);
 }
 
 
@@ -60,7 +60,7 @@ WindowUpdater::WindowUpdater (void)
 
 WindowUpdater::~WindowUpdater (void) throw ()
 {
-    EndListening (maCTLOptions);
+    maCTLOptions.RemoveListener(this);
 }
 
 
@@ -163,33 +163,29 @@ void WindowUpdater::UpdateWindow (OutputDevice* pDevice) const
 
 
 
-void WindowUpdater::Notify (SfxBroadcaster&, const SfxHint& rHint)
+void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    const SfxSimpleHint& rSimpleHint = static_cast<const SfxSimpleHint&>(rHint);
-    if (rSimpleHint.GetId() == SFX_HINT_CTL_SETTINGS_CHANGED)
-    {
-        // #110094#-7
-        // Clear the master page cache so that master pages will be redrawn.
-        //if (mpViewShell != NULL)
-        //{
-        //    SdView* pView = mpViewShell->GetView();
-        //    if (pView != NULL)
-        //        pView->ReleaseMasterPagePaintCache ();
-        //}
-        // Set the current state at all registered output devices.
-        tWindowList::iterator aWindowIterator (maWindowList.begin());
-        while (aWindowIterator != maWindowList.end())
-            Update (*aWindowIterator++);
-
-        // Reformat the document for the modified state to take effect.
-        if (mpDocument != NULL)
-            mpDocument->ReformatAllTextObjects();
-
-        // Invalidate the windows to make the modified state visible.
-        aWindowIterator = maWindowList.begin();
-        while (aWindowIterator != maWindowList.end())
-            (*aWindowIterator++)->Invalidate();
-    }
+    // #110094#-7
+    // Clear the master page cache so that master pages will be redrawn.
+    //if (mpViewShell != NULL)
+    //{
+    //    SdView* pView = mpViewShell->GetView();
+    //    if (pView != NULL)
+    //        pView->ReleaseMasterPagePaintCache ();
+    //}
+    // Set the current state at all registered output devices.
+    tWindowList::iterator aWindowIterator (maWindowList.begin());
+    while (aWindowIterator != maWindowList.end())
+        Update (*aWindowIterator++);
+
+    // Reformat the document for the modified state to take effect.
+    if (mpDocument != NULL)
+        mpDocument->ReformatAllTextObjects();
+
+    // Invalidate the windows to make the modified state visible.
+    aWindowIterator = maWindowList.begin();
+    while (aWindowIterator != maWindowList.end())
+        (*aWindowIterator++)->Invalidate();
 }
 
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 45a22dd9f56b..dfbd76e4a3b6 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <svx/svdpagv.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/outliner.hxx>
 #ifndef _VIEW3D_HXX //autogen
 #include <svx/view3d.hxx>
@@ -48,12 +48,12 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdorect.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/bulitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/numitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index a638af2638c3..463c7415e853 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -39,10 +39,10 @@
 #include <sfx2/objface.hxx>
 
 #include <svx/svxids.hrc>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svdopath.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/dispatch.hxx>
 
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 55980ff02050..5a2b458341c9 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -39,14 +39,14 @@
 #include <svx/adjitem.hxx>
 #include <vcl/vclenum.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/style.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/style.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <svx/escpitem.hxx>
 #include <svx/svdoutl.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <svx/outlobj.hxx>
 #include <svx/writingmodeitem.hxx>
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 9c2733c933dd..2a29ecbc6d6c 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -46,9 +46,9 @@
 #endif
 #include <vcl/vclenum.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/style.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/style.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -65,14 +65,14 @@
 #include <svx/outlobj.hxx>
 #include <svx/flstitem.hxx>
 #include <svx/editeng.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SRIPTTYPEITEM_HXX //autogen
 #include <svx/scripttypeitem.hxx>
 #endif
 #include <svx/svdoutl.hxx>
 #include <svx/writingmodeitem.hxx>
 #include <svx/frmdiritem.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 
 
 #include "app.hrc"
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 27d5f6202369..12b81a01d3ba 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -52,7 +52,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/eeitem.hxx>
 #include <basic/sbstar.hxx>
 #include <svx/flditem.hxx>
@@ -467,7 +467,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 DBG_ASSERT(pFact, "Dialogdiet fail!");
-                AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr, RID_SVXDLG_NAME );
+                AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr );
                 DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
                 aNameDlg->SetText( aTitle );
                 aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true );
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 87374cce8c04..54e0f37a1b19 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -51,13 +51,13 @@
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/svdoole2.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/ptitem.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
 #include <svx/fmshell.hxx>
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 85706fb9cbb6..52a0a2e6b3cb 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -35,7 +35,7 @@
 
 #include "DrawViewShell.hxx"
 #include <vcl/msgbox.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/fmglob.hxx>
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 5eda0d648f8b..cc7fd3106fa2 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -46,11 +46,11 @@
 #include <svx/svdpagv.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <svx/fmshell.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/visitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/visitem.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/unolingu.hxx>
@@ -58,11 +58,11 @@
 #include <svx/fontworkbar.hxx>
 
 // #UndoRedo#
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/app.hxx>
 #include <svtools/insdlg.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/request.hxx>
 
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index b5644418fdf2..0e39b4a82b33 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -47,10 +47,10 @@
 #ifndef _SFX_DISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _SVXIDS_HXX
 #include <svx/svxids.hrc>
 #endif
@@ -60,7 +60,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <sot/storage.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <basic/sbstar.hxx>
 
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3c396db7207d..2eb4282bb6e5 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -42,14 +42,14 @@
 #include <svx/zoomitem.hxx>
 #endif
 #include <svx/svdpagv.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdopath.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/zoomslideritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 9a94cae21983..09e71dc547ac 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -55,7 +55,7 @@
 #include <svx/fmshell.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "app.hrc"
 #include "strings.hrc"
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index d8dbc451f0c3..e9bad2064c10 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -53,7 +53,7 @@
 #endif
 #include <sfx2/dispatch.hxx>
 #include <svx/svdoole2.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/grafctrl.hxx>
 #include "stlsheet.hxx"
@@ -127,7 +127,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
-                AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME);
+                AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                 pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
@@ -162,7 +162,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
-                AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC);
+                AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                 if(RET_OK == pDlg->Execute())
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 9838f185807f..0d90619ff76a 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -36,10 +36,10 @@
 #ifndef _SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 1ae3e4e1c40e..1dbfa7211a76 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -40,10 +40,10 @@
 
 #include "undo/undomanager.hxx"
 #include <vcl/waitobj.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/editstat.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/fmshell.hxx>
 #include <vcl/scrbar.hxx>
@@ -51,7 +51,7 @@
 #include <svx/svdundo.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdograf.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -64,11 +64,11 @@
 #include <svx/svdouno.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/ipclient.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/topfrm.hxx>
 #include <sfx2/docfile.hxx>
 
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 2b1b7518666c..3783f20a49ef 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -47,9 +47,9 @@
 #include <svx/flditem.hxx>
 #endif
 #include <sfx2/viewfrm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/tplpitem.hxx>
 #ifndef _BINDING_HXX //autogen
 #include <sfx2/bindings.hxx>
@@ -63,7 +63,7 @@
 #include <tools/urlobj.hxx>
 #include <svx/fmshell.hxx>
 #include <sfx2/topfrm.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 #ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index f4fa1d027fd9..7952106e34e0 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sd.hxx"
 
 #include "DrawViewShell.hxx"
-#include <svtools/aeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/request.hxx>
 #ifndef _SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index 703677d05415..4eb0b6671d82 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -34,7 +34,7 @@
 #include "DrawViewShell.hxx"
 #include <svx/xtable.hxx>
 #include "sdattr.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svditer.hxx>
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index cdc5fac18912..c21432b27846 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -33,7 +33,7 @@
 
 #include "DrawViewShell.hxx"
 #include <com/sun/star/embed/EmbedMisc.hpp>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #ifndef _SVXIDS_HRC //autogen
 #include <svx/svxids.hrc>
 #endif
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 99fbcb7f2eda..468ea50776f2 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -40,7 +40,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _ZOOMITEM_HXX //autogen
 #include <svx/zoomitem.hxx>
 #endif
@@ -49,7 +49,7 @@
 #include <svx/flditem.hxx>
 #include <svx/editstat.hxx>
 #include "optsitem.hxx"
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include "Outliner.hxx"
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index d14f6ed9dc34..43a8683cd039 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -55,9 +55,9 @@
 #include <svx/svdotext.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/scrbar.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/editstat.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <svx/svdorect.hxx>
 #include <sot/formats.hxx>
@@ -67,7 +67,7 @@
 #include <svx/unolingu.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svx/outlobj.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <svtools/cliplistener.hxx>
 #include <sfx2/srchitem.hxx>
 #include <svx/editobj.hxx>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 1e5564427ac8..c500a95f2811 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -46,11 +46,11 @@
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/style.hxx>
+#include <svl/itempool.hxx>
+#include <svl/style.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdundo.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/tstpitem.hxx>
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 52e098caf7f3..8fc564c358f6 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 #include "Ruler.hxx"
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <svx/ruler.hxx>
 #ifndef _SVXIDS_HXX //autogen
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 0a17724df1ed..49bbf3149c8b 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -52,8 +52,8 @@
 #include <sfx2/childwin.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdpagv.hxx>
-#include <svtools/urlbmk.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/outliner.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/dbexch.hrc>
@@ -963,7 +963,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n
                     String          aTitle( SdResId( STR_TITLE_NAMEGROUP ) );
                     String          aDesc( SdResId( STR_DESC_NAMEGROUP ) );
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                    AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc, RID_SVXDLG_NAME ) : 0;
+                    AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc ) : 0;
                     if( pDlg )
                     {
                         pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 184949f4e683..cbc8758d2b53 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -36,11 +36,11 @@
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <sot/filelist.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #ifndef _EDITDATA_HXX
 #include <svx/editdata.hxx>
 #endif
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/xexch.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
@@ -55,7 +55,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sot/clsids.hxx>
 #ifndef _FM_FMMODEL_HXX
 #include <svx/fmmodel.hxx>
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 72534b476a73..9d301368418c 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfile.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/svdundo.hxx>
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 0349388577eb..08a39c44d86a 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -59,7 +59,7 @@
 #include <svx/fmshell.hxx>
 #include <sfx2/dispatch.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 38e2b6b88001..86e441939b0e 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -59,11 +59,10 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/outliner.hxx>
-#include <svtools/misccfg.hxx>
 #include <svx/editstat.hxx>
 #include <tools/multisel.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/intitem.hxx>
+#include <svl/style.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -92,7 +91,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include <sfx2/request.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <basic/sbstar.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 208d5426c8bd..7effb79a00b1 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -48,7 +48,7 @@
 #ifndef _SCRBAR_HXX //autogen
 #include <vcl/scrbar.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/ruler.hxx>
 #ifndef _SVXIDS_HXX
 #include <svx/svxids.hrc>
@@ -90,7 +90,7 @@
 #include <svx/svdoutl.hxx>
 
 // #96090#
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/request.hxx>
 #include "SpellDialogChildWindow.hxx"
 
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index cf9a516094b7..6b1e6ebf1676 100644
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -171,6 +171,7 @@ SHL2STDLIBS= \
             $(VCLLIB) \
                         $(SOTLIB) \
             $(TOOLSLIB) \
+              $(UNOTOOLSLIB)      \
             $(UCBHELPERLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
@@ -249,7 +250,7 @@ DEF5NAME=$(SHL5TARGET)
 
 SHL5STDLIBS = $(ISDLIB) \
               $(SVXCORELIB)       \
-              $(SVXMSFILTERLIB)   \
+              $(MSFILTERLIB)   \
               $(SFX2LIB)          \
               $(SVTOOLLIB)        \
               $(SOTLIB)           \
diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map
index ac6b782f3145..62213393408d 100644
--- a/sd/util/sdfilt.map
+++ b/sd/util/sdfilt.map
@@ -2,7 +2,7 @@ PPTEXPORTER_1_0 {
         global:
                 ExportPPT;
                 ImportPPT;
-
+                SaveVBA;
         local:
                 *;
 };
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 357f908c7312..a902e2e7c486 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -33,7 +33,6 @@
 #include "precompiled_sdext.hxx"
 
 #include "configurationaccess.hxx"
-#include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index a20d6900964e..8135335a8221 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <comphelper/types.hxx>
 
 
 using namespace ::rtl;
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index 6ab275fe95f0..afcfee1e49ac 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -33,10 +33,10 @@
 #define _FILEOPEN_DIALOG_HXX_
 
 #include <vector>
-#include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 class FileOpenDialog
 {
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 5bc80399ff3d..fc0b19997eb5 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -36,6 +36,8 @@
 #include "impoptimizer.hxx"
 #include <osl/file.hxx>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index 53e2aedb3bfa..c02b5579082b 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <comphelper/property.hxx>
 
 // ----------------
 // - PPPOptimizer -
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 1545bec51f3d..eb194b36c75b 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -42,7 +42,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/compbase2.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <comphelper/anytostring.hxx>
 
 
 using namespace com::sun::star;
@@ -150,12 +149,6 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler,
     }
     catch( uno::Exception& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 
     OSL_TRACE( "request %s selected\n", pRequest->isSelected() ? "was" : "was not" );
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index 12750db201b4..283e0f9500df 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -35,7 +35,6 @@
 #include "odfemitter.hxx"
 
 #include <rtl/ustrbuf.hxx>
-#include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index fc5809c4f7d5..17ff27e8dfc5 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -37,7 +37,6 @@
 #include "saxattrlist.hxx"
 
 #include <rtl/strbuf.hxx>
-#include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
@@ -62,12 +61,6 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" );
@@ -99,12 +92,6 @@ SaxEmitter::~SaxEmitter()
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
@@ -127,12 +114,6 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties )
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
@@ -167,12 +148,6 @@ void SaxEmitter::write( const rtl::OUString& rText )
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
@@ -193,12 +168,6 @@ void SaxEmitter::endTag( const char* pTag )
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index d6d79204cef1..548961ace6f2 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -38,7 +38,6 @@
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <comphelper/servicedecl.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk
index 2fb8d3a62417..eea005178ae3 100755
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -70,6 +70,7 @@ SHL1STDLIBS=\
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
     $(CPPUNITLIB)		\
+        $(TESTSHL2LIB)           \
     $(ZLIB3RDLIB)	    \
     $(CPPULIB)			\
     $(SALLIB)
@@ -103,6 +104,7 @@ APP1STDLIBS=\
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
     $(CPPUNITLIB)		\
+        $(TESTSHL2LIB)           \
     $(ZLIB3RDLIB)	    \
     $(CPPULIB)			\
     $(SALLIB)
@@ -131,6 +133,7 @@ APP2STDLIBS=\
       $(COMPHELPERLIB)	\
       $(CPPUHELPERLIB)	\
       $(CPPUNITLIB)		\
+        $(TESTSHL2LIB)           \
       $(ZLIB3RDLIB)	    \
       $(CPPULIB)			\
       $(SALLIB)
@@ -161,5 +164,5 @@ APP2STDLIBS=\
           @echo ----------------------------------------------------------
           testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
            $(TOUCH) $@
-  
+
 #ALLTAR : $(MISC)$/pdfi_unittest_succeeded
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index b66e1812d9e0..075116e3784a 100755
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -48,7 +48,7 @@
 #include <rtl/math.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/basemutex.hxx>
diff --git a/set_soenv.in b/set_soenv.in
index 16edc29334d0..e1655da4a928 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -646,7 +646,6 @@ elsif ( $platform =~ m/cygwin/ )
       $PATH_SEPERATOR = ';';
       $outfile        = "winmingw.set"; 
       $COM            = "GCC";
-      $COMPATH        =~ s/\/bin$//i;
       $CVER           = "C341";
       $OUTPATH        = "wntgcci";
       $INPATH         = $OUTPATH.$PROEXT;
@@ -655,8 +654,6 @@ elsif ( $platform =~ m/cygwin/ )
   else # The MSVC section starts here
   {   $outfile        = "winenv.set";
       $COM            = "MSC";
-      # COMPATH for MSC is differently used
-      $COMPATH        =~ s/\/bin$//i;
       $OUTPATH        = "wntmsci@COMEX@";
       $INPATH         = $OUTPATH.$PROEXT;
       $COMEX          = '@COMEX@';
@@ -979,12 +976,10 @@ if ( $platform =~ m/darwin/ )
 $WORK_STAMP            = "@SOURCEVERSION@";
 # Location of the source.
 $SOLARSRC             = '$SRC_ROOT';
-
-# SOURCE_ROOT_DIR equals $SOLARSRC/..
-my @list1 = split( /\// , $SOLARSRC );
-pop @list1;
-$SOURCE_ROOT_DIR = join ( '/' , @list1 );
-
+# Location of the repository.
+my @splitlist = split( /\//, $SRC_ROOT );
+pop @splitlist;
+$SOURCE_ROOT_DIR      = join("/", @splitlist);
 #
 $DEVROOT              = '$SRC_ROOT';
 # Set solenv and solver to given or default values. 
@@ -1323,9 +1318,7 @@ if ($platform =~ m/solaris/)
                         $L.$LIB.
                         $L.$USR_LIB;
    if ( $CC =~ "gcc" ) {
-      my $temp = $COMPATH;
-      $temp =~ s:/bin$::;
-      $SOLARLIB      .= $L.$temp.$LIB;
+      $SOLARLIB      .= $L.$COMPATH.$LIB;
    }
    $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
                         $L.$USR_DT.$LIB.
@@ -1394,9 +1387,8 @@ $SOLARINC            .= '/SC5 ';
 }
 # Platform dependent include path at the top of this list of include paths
 if ($platform =~ m/solaris/)
-{   my $temp;
-    $temp =~ s:$COMPATH:/bin\$:;
-    $SOLARINC         .= $I.$temp.$ds."include";
+{   
+    $SOLARINC         .= $I.$COMPATH.$ds."include";
 }
 if ($platform =~ m/linux/)
 {
diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx
index ebb2890e7e49..ffa225791ead 100755
--- a/setup_native/source/win32/customactions/reg64/reg64.cxx
+++ b/setup_native/source/win32/customactions/reg64/reg64.cxx
@@ -47,11 +47,13 @@
 
 #include <malloc.h>
 //#include <string>
-//#include <map> 

+//#include <map>
 #include <strsafe.h>
 
 // 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExW if WINVER < 0x0502.
+extern "C" {
 WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY,LPCWSTR,REGSAM,DWORD);
+}
 
 // 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY
 // in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems.
@@ -227,24 +229,24 @@ bool QueryReg64Table(MSIHANDLE& rhDatabase, MSIHANDLE& rhView)
     OutputDebugStringFormat(L"QueryReg64Table - START\n" );
     int const arraysize = 400;
     wchar_t szSelect[arraysize];
-    StringCbPrintfW(szSelect, arraysize * sizeof(wchar_t), L"SELECT * FROM %s",TABLE_NAME);

-    OutputDebugStringFormat( szSelect );

-

-    UINT ret = MsiDatabaseOpenView(rhDatabase,szSelect,&rhView);

-    if (ret != ERROR_SUCCESS)

-    {

-        if ( ret == ERROR_BAD_QUERY_SYNTAX)

-            OutputDebugStringFormat(L"QueryReg64Table - MsiDatabaseOpenView - FAILED - ERROR_BAD_QUERY_SYNTAX\n" );

-        if ( ret == ERROR_INVALID_HANDLE)

-            OutputDebugStringFormat(L"QueryReg64Table - MsiDatabaseOpenView - FAILED - ERROR_INVALID_HANDLE\n" );

-        return false;

-    }

-    // execute query - not a parameter query so second parameter is NULL.

-    if (MsiViewExecute(rhView,NULL) != ERROR_SUCCESS)

-    {

-        OutputDebugStringFormat(L"QueryReg64Table - MsiViewExecute - FAILED\n" );

-        return false;

-    }

+    StringCbPrintfW(szSelect, arraysize * sizeof(wchar_t), L"SELECT * FROM %s",TABLE_NAME);
+    OutputDebugStringFormat( szSelect );
+
+    UINT ret = MsiDatabaseOpenView(rhDatabase,szSelect,&rhView);
+    if (ret != ERROR_SUCCESS)
+    {
+        if ( ret == ERROR_BAD_QUERY_SYNTAX)
+            OutputDebugStringFormat(L"QueryReg64Table - MsiDatabaseOpenView - FAILED - ERROR_BAD_QUERY_SYNTAX\n" );
+        if ( ret == ERROR_INVALID_HANDLE)
+            OutputDebugStringFormat(L"QueryReg64Table - MsiDatabaseOpenView - FAILED - ERROR_INVALID_HANDLE\n" );
+        return false;
+    }
+    // execute query - not a parameter query so second parameter is NULL.
+    if (MsiViewExecute(rhView,NULL) != ERROR_SUCCESS)
+    {
+        OutputDebugStringFormat(L"QueryReg64Table - MsiViewExecute - FAILED\n" );
+        return false;
+    }
 
     OutputDebugStringFormat(L"QueryReg64Table - ENDE\n" );
     return true;
@@ -295,136 +297,136 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
 
     MSIHANDLE hRecord;
 
-    long lRoot;

-    wchar_t  szKey[255];

-    wchar_t  szName[255];

-    wchar_t  szValue[1024];

-    wchar_t  szComponent[255];

-
-    /// read records until there are no more records

-    while (MsiViewFetch(rhView,&hRecord) == ERROR_SUCCESS)

-    {

-        DWORD    dwKey = 255;

-        DWORD    dwName = 255;

-        DWORD    dwValue = 1024;

-        DWORD    dwComponent = 255;

-        

-        szKey[0] = '\0';

-        szName[0] = '\0';

-        szValue[0] = '\0';

-        szComponent[0] = '\0';

-        

-        lRoot = MsiRecordGetInteger(hRecord,2);

-        MsiRecordGetString(hRecord,3,szKey,&dwKey);

-        

-        if (!MsiRecordIsNull(hRecord, 4)) 

-            MsiRecordGetString(hRecord,4,szName,&dwName);

-        

-        if (!MsiRecordIsNull(hRecord, 5))

-        {

-            MsiRecordGetString(hRecord,5,szValue,&dwValue);         

-                

-            

-    

-            wchar_t* nPos = wcsstr(szValue , BASISINSTALLLOCATION);

-            if ( NULL != nPos)

-            {

-

-                DWORD nPrefixSize = nPos - szValue;

-

-                DWORD nPropSize = wcslen(sBasisInstallLocation);

-                DWORD nPostfixSize = dwValue - wcslen( BASISINSTALLLOCATION );

-

+    long lRoot;
+    wchar_t  szKey[255];
+    wchar_t  szName[255];
+    wchar_t  szValue[1024];
+    wchar_t  szComponent[255];
+
+    /// read records until there are no more records
+    while (MsiViewFetch(rhView,&hRecord) == ERROR_SUCCESS)
+    {
+        DWORD    dwKey = 255;
+        DWORD    dwName = 255;
+        DWORD    dwValue = 1024;
+        DWORD    dwComponent = 255;
+
+        szKey[0] = '\0';
+        szName[0] = '\0';
+        szValue[0] = '\0';
+        szComponent[0] = '\0';
+
+        lRoot = MsiRecordGetInteger(hRecord,2);
+        MsiRecordGetString(hRecord,3,szKey,&dwKey);
+
+        if (!MsiRecordIsNull(hRecord, 4))
+            MsiRecordGetString(hRecord,4,szName,&dwName);
+
+        if (!MsiRecordIsNull(hRecord, 5))
+        {
+            MsiRecordGetString(hRecord,5,szValue,&dwValue);
+
+
+
+            wchar_t* nPos = wcsstr(szValue , BASISINSTALLLOCATION);
+            if ( NULL != nPos)
+            {
+
+                DWORD nPrefixSize = nPos - szValue;
+
+                DWORD nPropSize = wcslen(sBasisInstallLocation);
+                DWORD nPostfixSize = dwValue - wcslen( BASISINSTALLLOCATION );
+
                 DWORD nNewValueBytes = (nPropSize + nPostfixSize + 1) * sizeof( wchar_t );
                    wchar_t* newValue = reinterpret_cast<wchar_t*>( malloc( nNewValueBytes ) );
-                   ZeroMemory( newValue, nNewValueBytes );

-

-                // prefix

-                wcsncpy(newValue, szValue, nPrefixSize);

-                

-                // basis location

-                wcsncat(newValue, sBasisInstallLocation, nPropSize * sizeof( wchar_t ));

-

-                // postfix

-                wcsncat(newValue, nPos + ( wcslen( BASISINSTALLLOCATION ) ), nPropSize * sizeof( wchar_t ));

-                

-                wcsncpy(szValue, newValue, nNewValueBytes <=1024? nNewValueBytes: 1024);

-

-                free(newValue);

-            }

-            

-        }

-        

-    

-        MsiRecordGetString(hRecord,6,szComponent,&dwComponent);

-

-        OutputDebugStringFormat(L"****** DoRegEntries *******" );

-        OutputDebugStringFormat(L"Root:" );

-        HKEY key = HKEY_CURRENT_USER;

-        switch (lRoot)

-        {

-            case(-1):

-                    if (isInstall4AllUsers)

-                    {

-                        key = HKEY_CURRENT_USER;

-                        OutputDebugStringFormat(L"HKEY_CURRENT_USER" );

-                    }

-                    else

-                    {

-                        key = HKEY_LOCAL_MACHINE;

-                        OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" );

-                    }

-                break;

-            case(0):

-                    key = HKEY_CLASSES_ROOT;

-                    OutputDebugStringFormat(L"HKEY_CLASSES_ROOT" );

-                break;

-            case(1):

-                    key = HKEY_CURRENT_USER;

-                    OutputDebugStringFormat(L"HKEY_CURRENT_USER" );

-                break;

-            case(2):

-                    key = HKEY_LOCAL_MACHINE;

-                    OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" );

-                break;

-            case(3):

-                    key = HKEY_USERS;

-                    OutputDebugStringFormat(L"HKEY_USERS" );

-                break;

-

-        }

-        

-        OutputDebugStringFormat(L"Key:");

-        OutputDebugStringFormat( szKey );

-        OutputDebugStringFormat(L"Name:");

-        OutputDebugStringFormat( szName );

-        OutputDebugStringFormat(L"Value:");

-        OutputDebugStringFormat( szValue);

-        OutputDebugStringFormat(L"Component:");

-        OutputDebugStringFormat( szComponent );

-        OutputDebugStringFormat(L"*******************" );

-        switch (op)

-        {

-            case SET:

-                    

-                    if (WriteRegistry(rhMSI, SET, szComponent))

-                    {

-                        OutputDebugStringFormat(L"DoRegEntries - Write\n" );

-                        SetRegistryKey(key, szKey, szName, szValue);

-                    }

-                break;

-            case REMOVE: 

-                    OutputDebugStringFormat(L"DoRegEntries - PreRemove\n" );

-                    if (WriteRegistry(rhMSI, REMOVE, szComponent))

-                    {

-                        OutputDebugStringFormat(L"DoRegEntries - Remove\n" );

-                        DeleteRegistryKey(key, szKey);

-                    }

-                break;

-        }

-    }

-

-    MsiCloseHandle(rhView);

+                   ZeroMemory( newValue, nNewValueBytes );
+
+                // prefix
+                wcsncpy(newValue, szValue, nPrefixSize);
+
+                // basis location
+                wcsncat(newValue, sBasisInstallLocation, nPropSize * sizeof( wchar_t ));
+
+                // postfix
+                wcsncat(newValue, nPos + ( wcslen( BASISINSTALLLOCATION ) ), nPropSize * sizeof( wchar_t ));
+
+                wcsncpy(szValue, newValue, nNewValueBytes <=1024? nNewValueBytes: 1024);
+
+                free(newValue);
+            }
+
+        }
+
+
+        MsiRecordGetString(hRecord,6,szComponent,&dwComponent);
+
+        OutputDebugStringFormat(L"****** DoRegEntries *******" );
+        OutputDebugStringFormat(L"Root:" );
+        HKEY key = HKEY_CURRENT_USER;
+        switch (lRoot)
+        {
+            case(-1):
+                    if (isInstall4AllUsers)
+                    {
+                        key = HKEY_CURRENT_USER;
+                        OutputDebugStringFormat(L"HKEY_CURRENT_USER" );
+                    }
+                    else
+                    {
+                        key = HKEY_LOCAL_MACHINE;
+                        OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" );
+                    }
+                break;
+            case(0):
+                    key = HKEY_CLASSES_ROOT;
+                    OutputDebugStringFormat(L"HKEY_CLASSES_ROOT" );
+                break;
+            case(1):
+                    key = HKEY_CURRENT_USER;
+                    OutputDebugStringFormat(L"HKEY_CURRENT_USER" );
+                break;
+            case(2):
+                    key = HKEY_LOCAL_MACHINE;
+                    OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" );
+                break;
+            case(3):
+                    key = HKEY_USERS;
+                    OutputDebugStringFormat(L"HKEY_USERS" );
+                break;
+
+        }
+
+        OutputDebugStringFormat(L"Key:");
+        OutputDebugStringFormat( szKey );
+        OutputDebugStringFormat(L"Name:");
+        OutputDebugStringFormat( szName );
+        OutputDebugStringFormat(L"Value:");
+        OutputDebugStringFormat( szValue);
+        OutputDebugStringFormat(L"Component:");
+        OutputDebugStringFormat( szComponent );
+        OutputDebugStringFormat(L"*******************" );
+        switch (op)
+        {
+            case SET:
+
+                    if (WriteRegistry(rhMSI, SET, szComponent))
+                    {
+                        OutputDebugStringFormat(L"DoRegEntries - Write\n" );
+                        SetRegistryKey(key, szKey, szName, szValue);
+                    }
+                break;
+            case REMOVE:
+                    OutputDebugStringFormat(L"DoRegEntries - PreRemove\n" );
+                    if (WriteRegistry(rhMSI, REMOVE, szComponent))
+                    {
+                        OutputDebugStringFormat(L"DoRegEntries - Remove\n" );
+                        DeleteRegistryKey(key, szKey);
+                    }
+                break;
+        }
+    }
+
+    MsiCloseHandle(rhView);
 
 
     OutputDebugStringFormat(L"DoRegEntries - ENDE\n" );
@@ -436,13 +438,13 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
 bool Reg64(MSIHANDLE& rhMSI, OPERATION op)
 {
     isInstall4AllUsers = IsInstallForAllUsers(rhMSI);
-    sBasisInstallLocation = GetBasisInstallLocation(rhMSI);

-

-    if (NULL == sBasisInstallLocation)

-    {

-        OutputDebugStringFormat(L"BASISINSTALLLOCATION is NULL\n" );

-        return false;

-    }

+    sBasisInstallLocation = GetBasisInstallLocation(rhMSI);
+
+    if (NULL == sBasisInstallLocation)
+    {
+        OutputDebugStringFormat(L"BASISINSTALLLOCATION is NULL\n" );
+        return false;
+    }
 
     MSIHANDLE hView;
     MSIHANDLE hDatabase = MsiGetActiveDatabase(rhMSI);
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 177e3611d5ad..bd0a21ca0dae 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -31,7 +31,7 @@
 #define _SFX_ARRDECL_HXX
 
 #include <tools/list.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <sfx2/minarray.hxx>
 
 struct CntUpdateResult;
diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/minfitem.hxx
index 91c05547df2b..9e97bef83cb3 100644
--- a/sfx2/inc/minfitem.hxx
+++ b/sfx2/inc/minfitem.hxx
@@ -33,7 +33,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 class BasicManager;
 
 class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
index c076f48f312f..e6e1e11acffb 100644
--- a/sfx2/inc/msgnodei.hxx
+++ b/sfx2/inc/msgnodei.hxx
@@ -32,9 +32,9 @@
 #define _MSGNODEI_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/list.hxx>
 struct SfxMsgAttachFile {
     String  aFile;
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index 442afca362aa..1ced4f3b0416 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFX_ORGMGR_HXX
 #define _SFX_ORGMGR_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxDocumentTemplates;
 class SfxOrganizeListBox_Impl;
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index b1f81aa620d2..0af35427d855 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -491,105 +491,103 @@
 #include "sot/object.hxx"
 #include "sot/storinfo.hxx"
 #include "svtools/accessibilityoptions.hxx"
-#include "svtools/addxmltostorageoptions.hxx"
-#include "svtools/adrparse.hxx"
-#include "svtools/aeitem.hxx"
+#include "svl/adrparse.hxx"
+#include "svl/aeitem.hxx"
 #include "svtools/asynclink.hxx"
-#include "svtools/brdcst.hxx"
-#include "svtools/cancel.hxx"
-#include "svtools/cntwids.hrc"
+#include "svl/brdcst.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cntwids.hrc"
 #include "svtools/controldims.hrc"
-#include "svtools/cstitem.hxx"
-#include "svtools/ctypeitm.hxx"
-#include "svtools/dateitem.hxx"
-#include "svtools/dynamicmenuoptions.hxx"
+#include "svl/ctypeitm.hxx"
+#include "svl/dateitem.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
+#include "svl/eitem.hxx"
 #include "svtools/embedhlp.hxx"
 #include "svtools/embedtransfer.hxx"
-#include "svtools/eventcfg.hxx"
-#include "svtools/extendedsecurityoptions.hxx"
-#include "svtools/flagitem.hxx"
-#include "svtools/folderrestriction.hxx"
-#include "svtools/fontoptions.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/flagitem.hxx"
+#include "svl/folderrestriction.hxx"
+#include "unotools/fontoptions.hxx"
 #include "svtools/framestatuslistener.hxx"
 #include "svtools/helpopt.hxx"
-#include "svtools/hint.hxx"
-#include "svtools/historyoptions.hxx"
+#include "svl/hint.hxx"
+#include "unotools/historyoptions.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/htmltokn.h"
-#include "svtools/imageitm.hxx"
+#include "svl/imageitm.hxx"
 #include "svtools/imagemgr.hxx"
 #include "svtools/imap.hxx"
 #include "svtools/imgdef.hxx"
-#include "svtools/inetdef.hxx"
-#include "svtools/inethist.hxx"
-#include "svtools/inetmsg.hxx"
-#include "svtools/inetoptions.hxx"
-#include "svtools/inetstrm.hxx"
-#include "svtools/inettype.hxx"
-#include "svtools/internaloptions.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/isethint.hxx"
+#include "svl/inetdef.hxx"
+#include "svl/inethist.hxx"
+#include "svl/inetmsg.hxx"
+#include "unotools/inetoptions.hxx"
+#include "svl/inetstrm.hxx"
+#include "svl/inettype.hxx"
+#include "unotools/internaloptions.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
 #include "svtools/itemdel.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/itemset.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
 #include "svtools/javacontext.hxx"
-#include "svtools/lckbitem.hxx"
-#include "svtools/localisationoptions.hxx"
+#include "svl/lckbitem.hxx"
+#include "unotools/localisationoptions.hxx"
 #include "svtools/localresaccess.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/memberid.hrc"
+#include "svl/lstner.hxx"
+#include "svl/memberid.hrc"
 #include "svtools/menuoptions.hxx"
-#include "svtools/misccfg.hxx"
+#include "unotools/misccfg.hxx"
 #include "svtools/miscopt.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/ownlist.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/ownlist.hxx"
 #include "svtools/parhtml.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/pickerhelper.hxx"
-#include "svtools/poolitem.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
 #include "svtools/printoptions.hxx"
-#include "svtools/printwarningoptions.hxx"
-#include "svtools/rectitem.hxx"
-#include "svtools/regoptions.hxx"
-#include "svtools/saveopt.hxx"
-#include "svtools/searchopt.hxx"
-#include "svtools/securityoptions.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/rectitem.hxx"
+#include "unotools/regoptions.hxx"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
-#include "svtools/solar.hrc"
-#include "svtools/startoptions.hxx"
+#include "svl/solar.hrc"
+#include "unotools/startoptions.hxx"
 #include "svtools/statusbarcontroller.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hrc"
-#include "svtools/style.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svdde.hxx"
-#include "svtools/svstdarr.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hrc"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svdde.hxx"
+#include "svl/svstdarr.hxx"
 #include "svtools/svtdata.hxx"
-#include "svtools/svtools.hrc"
-#include "svtools/syslocale.hxx"
-#include "svtools/syslocaleoptions.hxx"
-#include "svtools/szitem.hxx"
+#include "svl/svtools.hrc"
+#include "unotools/syslocale.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
 #include "svtools/templatefoldercache.hxx"
 #include "svtools/toolboxcontroller.hxx"
 #include "svtools/transfer.hxx"
 #include "svtools/ttprops.hxx"
-#include "svtools/undo.hxx"
-#include "svtools/undoopt.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
-#include "svtools/useroptions.hxx"
-#include "svtools/viewoptions.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
-#include "svtools/workingsetoptions.hxx"
-#include "svtools/zforlist.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
+#include "unotools/workingsetoptions.hxx"
+#include "svl/zforlist.hxx"
 #include "toolkit/awt/vclxwindow.hxx"
 #include "toolkit/helper/convert.hxx"
 #include "tools/bigint.hxx"
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 99deee0c97a3..9f035b125a31 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -34,8 +34,8 @@
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
 #include <tools/solar.h>
-#include <svtools/smplhint.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/ref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
@@ -94,7 +94,6 @@ class SfxModule;
 class SfxModuleArr_Impl;
 class Window;
 class INetURLObject;
-class SfxMiscCfg;
 struct SfxConstant;
 struct SfxChildWinFactory;
 struct SfxMenuCtrlFactory;
@@ -229,7 +228,6 @@ public:
     USHORT                      GetFreeIndex();
     void                        ReleaseIndex(USHORT i);
     SfxEventConfiguration*      GetEventConfig() const;
-    SfxMiscCfg*                 GetMiscConfig();
 
     // Basic/Scripting
     static sal_Bool             IsXScriptURL( const String& rScriptURL );
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index e0213e8d8131..773d2fd82d6b 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
@@ -65,9 +65,9 @@
 //  something else header
 //____________________________________________________________________________________________________________________________________
 #include <tools/errcode.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sfx2/sfxuno.hxx>
 
 //____________________________________________________________________________________________________________________________________
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index a67c306e61a2..7351672f13ae 100644
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.hrc
@@ -32,11 +32,11 @@
 #define _CNTIDS_HRC
 
 #ifndef _CNTWIDS_HRC
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
 #endif
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // Slot-ID's -----------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index f5662777d7ee..51ed03c1e70d 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -33,7 +33,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SfxPoolItem;
 class SfxBindings;
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 27da2810d49e..2c8448d6bca0 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -37,16 +37,16 @@
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/svmedit.hxx>
 
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <svtools/headbar.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/zforlist.hxx>
-
+#include <unotools/syslocale.hxx>
+#include <svl/zforlist.hxx>
+#include <com/sun/star/util/Duration.hpp>
 #include "tabdlg.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -358,6 +358,55 @@ public:
     inline CustomPropertyLine*      GetLine() const { return m_pLine; }
 };
 
+class CustomPropertiesDateField : public DateField
+{
+private:
+    CustomPropertyLine*             m_pLine;
+
+public:
+    inline CustomPropertiesDateField(
+        Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
+            DateField( pParent, rResId ), m_pLine( pLine ) {}
+
+    inline CustomPropertyLine*      GetLine() const { return m_pLine; }
+};
+class CustomPropertiesTimeField : public TimeField
+{
+private:
+    CustomPropertyLine*             m_pLine;
+
+public:
+    inline CustomPropertiesTimeField(
+        Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
+            TimeField( pParent, rResId ), m_pLine( pLine ) {}
+
+    inline CustomPropertyLine*      GetLine() const { return m_pLine; }
+};
+class CustomPropertiesDurationField : public Edit
+{
+    CustomPropertyLine*             m_pLine;
+    com::sun::star::util::Duration  m_aDuration;
+protected:
+    virtual void    RequestHelp(const HelpEvent& rEvt);
+public:
+    CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine );
+    ~CustomPropertiesDurationField();
+
+    void SetDuration( const com::sun::star::util::Duration& rDuration );
+    const com::sun::star::util::Duration& GetDuration() const { return m_aDuration; }
+};
+
+class CustomPropertiesEditButton : public PushButton
+{
+    CustomPropertyLine*             m_pLine;
+
+public:
+    CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine );
+    ~CustomPropertiesEditButton();
+
+    DECL_LINK(ClickHdl, PushButton*);
+};
+
 class CustomPropertiesRemoveButton : public ImageButton
 {
 private:
@@ -394,9 +443,18 @@ struct CustomPropertyLine
     ComboBox                        m_aNameBox;
     CustomPropertiesTypeBox         m_aTypeBox;
     CustomPropertiesEdit            m_aValueEdit;
+    CustomPropertiesDateField       m_aDateField;
+    CustomPropertiesTimeField       m_aTimeField;
+    const String                    m_sDurationFormat;
+    CustomPropertiesDurationField   m_aDurationField;
+    CustomPropertiesEditButton     m_aEditButton;
     CustomPropertiesYesNoButton     m_aYesNoButton;
     CustomPropertiesRemoveButton    m_aRemoveButton;
 
+    Point                           m_aDatePos;
+    Point                           m_aTimePos;
+    Size                            m_aDateTimeSize;
+
     bool                            m_bIsRemoved;
     bool                            m_bTypeLostFocus;
 
@@ -413,6 +471,10 @@ private:
     ComboBox                            m_aNameBox;
     ListBox                             m_aTypeBox;
     Edit                                m_aValueEdit;
+    DateField                           m_aDateField;
+    TimeField                           m_aTimeField;
+    Edit                                m_aDurationField;
+    PushButton                          m_aEditButton;
     CustomPropertiesYesNoButton         m_aYesNoButton;
     ImageButton                         m_aRemoveButton;
 
@@ -430,6 +492,8 @@ private:
     DECL_LINK(  RemoveHdl, CustomPropertiesRemoveButton* );
     DECL_LINK(  EditLoseFocusHdl, CustomPropertiesEdit* );
     DECL_LINK(  BoxLoseFocusHdl, CustomPropertiesTypeBox* );
+    //add lose focus handlers of Date/TimeField?
+
     DECL_LINK(  EditTimeoutHdl, Timer* );
     DECL_LINK(  BoxTimeoutHdl, Timer* );
 
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index a96f97f20fe7..363c9280fd5a 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -37,7 +37,7 @@
 #include <stdarg.h>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index e8ae3f5d1d85..c322ee4afc0a 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -48,10 +48,10 @@
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <tools/list.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <tools/globname.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/content.hxx>
 
@@ -229,7 +229,7 @@ public:
 
     sal_Int8            ShowLockedDocumentDialog( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock );
     sal_Bool            LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI );
-    void                UnlockFile();
+    void                UnlockFile( sal_Bool bReleaseLockStream );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage( sal_Bool bCreateTempIfNo = sal_True );
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetOutputStorage();
@@ -290,6 +290,7 @@ public:
     SAL_DLLPRIVATE void Init_Impl();
     SAL_DLLPRIVATE void ForceSynchronStream_Impl( sal_Bool bSynchron );
 
+    SAL_DLLPRIVATE void GetLockingStream_Impl();
     SAL_DLLPRIVATE void GetMedium_Impl();
     SAL_DLLPRIVATE sal_Bool TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& aTargetSet );
     SAL_DLLPRIVATE void Transfer_Impl();
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 653fa2eeb7d8..10e586030f52 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -33,8 +33,8 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/eventcfg.hxx>
+#include <svl/hint.hxx>
+#include <unotools/eventcfg.hxx>
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index cfe8629cd0cf..647746abe84f 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -38,7 +38,7 @@
 #include <vcl/button.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <sfx2/event.hxx>
 
 #include <sfx2/sfxsids.hrc>
@@ -46,7 +46,7 @@
 #undef ITEMID_MACRO
 #endif
 #define ITEMID_MACRO SID_ATTR_MACROITEM
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 class SfxMacroInfo;
 class SfxMacroInfoArr_Impl;
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index 3fd8801c10a9..e48a7c000094 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/window.hxx>
 
 #include <sfx2/docfilt.hxx>
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index 2443fcb345a9..38731e032328 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -68,9 +68,9 @@ namespace com
 #include <tools/link.hxx>
 #include <tools/ref.hxx>
 #include <tools/string.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <tools/list.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvBorder;
 class SfxWorkWindow;
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index d6cd9f334f27..07098d74b658 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -34,10 +34,10 @@
 #include "sfx2/dllapi.h"
 
 #include <sfx2/sfxsids.hrc>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/gen.hxx>
 
 class SvStream;
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx
index ed863cde7fb7..b1fd8934d393 100644
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/sfx2/inc/sfx2/itemwrapper.hxx
@@ -33,10 +33,10 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 
 // ============================================================================
 
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index 86035885fc43..960faed33473 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.hxx
@@ -34,7 +34,7 @@
 #include "sfx2/dllapi.h"
 #include <sfx2/linksrc.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxObjectShell;
 
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 9540e1e396b2..d27f660bd275 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -35,7 +35,7 @@
 #include "sal/types.h"
 #include <tools/errcode.hxx>
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <sfx2/evntconf.hxx>
 
 class SfxMacroInfo;
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index d72023ea40c4..d197b6fe544d 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -35,7 +35,7 @@
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index b6ab4eb4a065..bc45f9303a96 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -36,7 +36,7 @@
 
 #include <sfx2/msg.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxInterface;
 class SfxSlot;
diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx
index ff2b913381fe..e82e92f188c1 100644
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/sfx2/inc/sfx2/objitem.hxx
@@ -32,7 +32,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 #include <sfx2/shell.hxx>
 
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index e4be280d8b72..cc525f4acd7d 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -58,7 +58,7 @@
 //#if 0 // _SOLAR__PRIVATE
 #include <vcl/timer.hxx>
 //#endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/bitmap.hxx>
 #include <sot/storage.hxx>
diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
index f4303c0e28e9..c0b015f3bc60 100644
--- a/sfx2/inc/sfx2/objuno.hxx
+++ b/sfx2/inc/sfx2/objuno.hxx
@@ -51,7 +51,7 @@
 
 #include <com/sun/star/io/IOException.hpp>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <cppuhelper/implbase10.hxx>
 
 #include "sfxuno.hxx"
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index e2e88b3df5c1..c9fef61cc318 100644
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/sfx2/inc/sfx2/querystatus.hxx
@@ -33,7 +33,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/conditn.hxx>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 6fa5001aa301..dfb25ae2a952 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -33,8 +33,8 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
-#include <svtools/itemset.hxx>
-#include <svtools/hint.hxx>
+#include <svl/itemset.hxx>
+#include <svl/hint.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 1605f689471f..9bba3997a71f 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -33,11 +33,11 @@
 // include ---------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #ifndef _MEMBERID_HRC
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #endif
 
 #define RID_GROUPS_OFFSET           32000
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 6ef67b6a009a..b7bb0fc93be1 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -103,7 +103,7 @@
 
 //  include of my own project
 //________________________________________________________________________________________________________
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 //________________________________________________________________________________________________________
 //  defines
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 899edd2cd201..270087cf24a9 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -36,7 +36,7 @@
 #include "sal/types.h"
 #include <i18npool/lang.h>
 #include <svtools/parhtml.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 
 class ImageMap;
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index c15c09a09384..32e31e782675 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define SID_SFX_START                5000
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index 5ada198c7795..735cc3c88562 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -33,7 +33,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/conditn.hxx>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 69169a6d3d10..f7fac480dccd 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <tools/debug.hxx>
 #include <tools/rtti.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 #include <tools/ownlist.hxx>
 #include <tools/unqid.hxx>
diff --git a/sfx2/inc/sfx2/srchitem.hxx b/sfx2/inc/sfx2/srchitem.hxx
index 3547fc14515c..594d12cf05b5 100644
--- a/sfx2/inc/sfx2/srchitem.hxx
+++ b/sfx2/inc/sfx2/srchitem.hxx
@@ -39,7 +39,7 @@
 #include <unotools/configitem.hxx>
 #include <rsc/rscsfx.hxx>
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/srchdefs.hxx>
 
@@ -112,6 +112,7 @@ public:
 
     // ConfigItem
     virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+    virtual void            Commit();
 
             sal_uInt16      GetCommand() const { return nCommand; }
             void            SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; }
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 3cac4227116f..d2fae3e9f534 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -37,8 +37,8 @@
 #include <vcl/button.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
 #if ENABLE_LAYOUT
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 08ea57d12e3a..0fa9b92de7fc 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -33,12 +33,12 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/frame/status/Verb.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index d0ac30a9fcd9..83ac73dbdd80 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 5281abcc7074..53953c8db3ee 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFX_SORGITM_HXX
 #define _SFX_SORGITM_HXX
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 // class SfxScriptOrganizerItem ---------------------------------------------
 
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/stbitem.hxx
index 0ec27c2ac36d..6d1b7cce6bc5 100644
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/stbitem.hxx
@@ -32,7 +32,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/statusbarcontroller.hxx>
 
 //------------------------------------------------------------------
diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx
index 25743f78ec08..d50298b59716 100644
--- a/sfx2/inc/tplpitem.hxx
+++ b/sfx2/inc/tplpitem.hxx
@@ -34,7 +34,7 @@
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
 #include <tools/rtti.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 
 class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 {
diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst
index 77acce9a7be9..fe71b1715769 100644
--- a/sfx2/prj/d.lst
+++ b/sfx2/prj/d.lst
@@ -3,8 +3,6 @@ mkdir: %COMMON_DEST%\res%_EXT%
 mkdir: %_DEST%\inc%_EXT%\sfx2
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\inc\sfxslots.ilb %_DEST%\inc%_EXT%\sfxslots.ilb
-..\%__SRC%\inc\sfxslots.ilb* %_DEST%\inc%_EXT%\sfxslots.ilb*
 ..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
@@ -26,6 +24,8 @@ mkdir: %_DEST%\inc%_EXT%\sfx2
 ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv
 ..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h
 
+..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi
+..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi
 ..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx
 ..\inc\sfx2\basedlgs.hxx %_DEST%\inc%_EXT%\sfx2\basedlgs.hxx
 ..\inc\sfx2\bindings.hxx %_DEST%\inc%_EXT%\sfx2\bindings.hxx
diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/DocumentMetaData.java
index 8ecf28f37a5f..54b0f7afd3be 100644
--- a/sfx2/qa/complex/DocumentMetaData.java
+++ b/sfx2/qa/complex/DocumentMetaData.java
@@ -41,8 +41,10 @@ import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.Locale;
 import com.sun.star.lang.EventObject;
-import com.sun.star.util.Time;
+import com.sun.star.util.Date;
 import com.sun.star.util.DateTime;
+import com.sun.star.util.Time;
+import com.sun.star.util.Duration;
 import com.sun.star.util.XModifyListener;
 import com.sun.star.util.XModifyBroadcaster;
 import com.sun.star.beans.XPropertyContainer;
@@ -351,14 +353,30 @@ public class DocumentMetaData extends ComplexTestCase
             // differently some day...
             boolean b = true;
             double d = 3.1415;
+            // note that Time is only supported for backward compatibilty!
             Time t = new Time();
             t.Hours = 1;
             t.Minutes = 16;
+            Date date = new Date();
+            date.Year = 2071;
+            date.Month = 2;
+            date.Day = 3;
             dt.Year = 2065;
+            Duration dur = new Duration();
+            dur.Negative = true;
+            dur.Years = 1001;
+            dur.Months = 999;
+            dur.Days = 888;
+            dur.Hours = 777;
+            dur.Minutes = 666;
+            dur.Seconds = 555;
+            dur.HundredthSeconds = 444;
 
             udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE,
                 new Boolean(b));
-            udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, t);
+            udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur);
+            udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t);
+            udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date);
             udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt);
             udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d));
             udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar");
@@ -383,9 +401,13 @@ public class DocumentMetaData extends ComplexTestCase
 
             assure ("UserDefined bool", new Boolean(b).equals(
                     udps.getPropertyValue("Frobnicate")));
-            assure ("UserDefined time", eqTime(t, (Time)
+            assure ("UserDefined duration", eqDuration(dur, (Duration)
                     udps.getPropertyValue("FrobDuration")));
-            assure ("UserDefined date", eqDateTime(dt, (DateTime)
+            assure ("UserDefined time", eqTime(t, (Time)
+                    udps.getPropertyValue("FrobDuration2")));
+            assure ("UserDefined date", eqDate(date, (Date)
+                    udps.getPropertyValue("FrobEndDate")));
+            assure ("UserDefined datetime", eqDateTime(dt, (DateTime)
                     udps.getPropertyValue("FrobStartTime")));
             assure ("UserDefined float", new Double(d).equals(
                     udps.getPropertyValue("Pi")));
@@ -423,9 +445,13 @@ public class DocumentMetaData extends ComplexTestCase
 
             assure ("UserDefined bool", new Boolean(b).equals(
                     udps.getPropertyValue("Frobnicate")));
-            assure ("UserDefined time", eqTime(t, (Time)
+            assure ("UserDefined duration", eqDuration(dur, (Duration)
                     udps.getPropertyValue("FrobDuration")));
-            assure ("UserDefined date", eqDateTime(dt, (DateTime)
+            assure ("UserDefined time", eqTime(t, (Time)
+                    udps.getPropertyValue("FrobDuration2")));
+            assure ("UserDefined date", eqDate(date, (Date)
+                    udps.getPropertyValue("FrobEndDate")));
+            assure ("UserDefined datetime", eqDateTime(dt, (DateTime)
                     udps.getPropertyValue("FrobStartTime")));
             assure ("UserDefined float", new Double(d).equals(
                     udps.getPropertyValue("Pi")));
@@ -474,12 +500,24 @@ public class DocumentMetaData extends ComplexTestCase
             && a.HundredthSeconds == b.HundredthSeconds;
     }
 
+    boolean eqDate(Date a, Date b) {
+        return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day;
+    }
+
     boolean eqTime(Time a, Time b) {
         return a.Hours == b.Hours && a.Minutes == b.Minutes
             && a.Seconds == b.Seconds
             && a.HundredthSeconds == b.HundredthSeconds;
     }
 
+    boolean eqDuration(Duration a, Duration b) {
+        return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days
+            && a.Hours == b.Hours && a.Minutes == b.Minutes
+            && a.Seconds == b.Seconds
+            && a.HundredthSeconds == b.HundredthSeconds
+            && a.Negative == b.Negative;
+    }
+
     java.util.Collection fromArray(Object[] os) {
         java.util.Collection ret = new java.util.HashSet();
         for (int i = 0; i < os.length; ++i) {
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
new file mode 100644
index 000000000000..30fe37ffa5f0
--- /dev/null
+++ b/sfx2/sdi/sfxitems.sdi
@@ -0,0 +1,89 @@
+    item void       SfxVoidItem;

+    item BOOL       SfxBoolItem;

+    item INT32      SfxUInt16Item;

+    item INT16      SfxInt16Item;

+    item INT32      SfxUInt32Item;

+    item INT32      SfxInt32Item;

+    item String     SfxStringItem;

+    item BYTE       SfxByteItem;

+    item INT16      SfxEnumItem;

+    item INT16      SfxAllEnumItem;

+    item INT16      TbxImageItem;

+

+    item String     SbxItem;                //! Dummy

+    item String     SfxObjectItem;          //! Dummy

+    item String     SfxTemplateItem;        //! Dummy

+    item String     SfxMacroInfoItem;       //! Dummy

+    item String     SfxImageItem;           //! Dummy

+    item String     SfxFrameItem;           //! Dummy

+    item String     SfxObjectShellItem      //! Dummy

+    item String     SfxUsrAnyItem           //! Dummy

+

+    struct Point

+    {

+        INT32   X   MID_X;

+        INT32   Y   MID_Y;

+    };

+    item Point SfxPointItem;

+

+    struct Rectangle

+    {

+        INT32   Left    MID_RECT_LEFT;

+        INT32   Top     MID_RECT_TOP;

+        INT32   Width   MID_WIDTH;

+        INT32   Height  MID_HEIGHT;

+    };

+    item Rectangle SfxRectangleItem;

+

+    struct DocInfo

+    {

+        BOOL        UseUserData        MID_DOCINFO_USEUSERDATA;

+        BOOL        DeleteUserData    MID_DOCINFO_DELETEUSERDATA;

+        String      Title              MID_DOCINFO_TITLE;

+        String      Subject            MID_DOCINFO_SUBJECT;

+        String      KeyWords           MID_DOCINFO_KEYWORDS;

+        String      Description        MID_DOCINFO_DESCRIPTION;

+        BOOL        AutoReload         MID_DOCINFO_AUTOLOADENABLED;

+        INT32       AutoReloadTime     MID_DOCINFO_AUTOLOADSECS;

+        String      AutoReloadURL      MID_DOCINFO_AUTOLOADURL;

+        String      AutoReloadFrame    MID_DOCINFO_DEFAULTTARGET;

+    };

+    item DocInfo SfxDocumentInfoItem;

+

+    struct SvxSearch

+    {

+        INT16       StyleFamily     MID_SEARCH_STYLEFAMILY;

+        UINT16      CellType        MID_SEARCH_CELLTYPE;

+        BOOL        RowDirection    MID_SEARCH_ROWDIRECTION;

+        BOOL        AllTables       MID_SEARCH_ALLTABLES;

+        BOOL        Backward        MID_SEARCH_BACKWARD;

+        BOOL        Pattern         MID_SEARCH_PATTERN;

+        BOOL        Content         MID_SEARCH_CONTENT;

+        BOOL        AsianOptions    MID_SEARCH_ASIANOPTIONS;

+        INT16       AlgorithmType   MID_SEARCH_ALGORITHMTYPE;

+        INT32       SearchFlags     MID_SEARCH_FLAGS;

+        String      SearchString    MID_SEARCH_SEARCHSTRING;

+        String      ReplaceString   MID_SEARCH_REPLACESTRING;

+        INT16       Locale          MID_SEARCH_LOCALE;

+        INT32       ChangedChars    MID_SEARCH_CHANGEDCHARS;

+        INT32       DeletedChars    MID_SEARCH_DELETEDCHARS;

+        INT32       InsertedChars   MID_SEARCH_INSERTEDCHARS;

+        INT32       TransliterateFlags MID_SEARCH_TRANSLITERATEFLAGS;

+        INT16       Command         MID_SEARCH_COMMAND;

+    };

+    item SvxSearch SvxSearchItem;

+

+    struct SvxSize

+    {

+        INT32               Width           MID_SIZE_WIDTH;

+        INT32               Height          MID_SIZE_HEIGHT;

+    };

+    item SvxSize SvxSizeItem;

+

+    struct SfxScriptOrganizer

+    {

+        String Language MID_SCRIPT_ORGANIZER_LANGUAGE;

+    };

+    item SfxScriptOrganizer SfxScriptOrganizerItem;

+    item String     SvxClipboardFmtItem;    //! Dummy

+

diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi
index e439e8c776a0..44cd45d00868 100644
--- a/sfx2/sdi/sfxslots.sdi
+++ b/sfx2/sdi/sfxslots.sdi
@@ -36,103 +36,15 @@ StarApplicationFrame
 [
 HelpText( "StarDivision Application Framework" ),
 SlotIdFile( "sfx2/sfx.hrc" )
-TypeLibFile( "sfxslots.tlb" )
 ]
 {
-    item void       SfxVoidItem;
-    item BOOL       SfxBoolItem;
-    item INT32      SfxUInt16Item;
-    item INT16      SfxInt16Item;
-    item INT32      SfxUInt32Item;
-    item INT32      SfxInt32Item;
-    item String     SfxStringItem;
-    item BYTE       SfxByteItem;
-    item INT16      SfxEnumItem;
-    item INT16      SfxAllEnumItem;
-    item INT16      TbxImageItem;
-
-    item String     SbxItem;                //! Dummy
-    item String     SfxObjectItem;          //! Dummy
-    item String     SfxTemplateItem;        //! Dummy
-    item String     SfxMacroInfoItem;       //! Dummy
-    item String     SfxImageItem;           //! Dummy
-    item String     SfxFrameItem;           //! Dummy
-    item String     SfxObjectShellItem      //! Dummy
-    item String     SfxUsrAnyItem           //! Dummy
-    item String     SvxClipboardFmtItem;    //! Dummy
-
-    struct Point
-    {
-        INT32   X   MID_X;
-        INT32   Y   MID_Y;
-    };
-    item Point SfxPointItem;
-
-    struct Rectangle
-    {
-        INT32   Left    MID_RECT_LEFT;
-        INT32   Top     MID_RECT_TOP;
-        INT32   Width   MID_WIDTH;
-        INT32   Height  MID_HEIGHT;
-    };
-    item Rectangle SfxRectangleItem;
-
-    struct DocInfo
-    {
-        BOOL        UseUserData        MID_DOCINFO_USEUSERDATA;
-        BOOL        DeleteUserData    MID_DOCINFO_DELETEUSERDATA;
-        String      Title              MID_DOCINFO_TITLE;
-        String      Subject            MID_DOCINFO_SUBJECT;
-        String      KeyWords           MID_DOCINFO_KEYWORDS;
-        String      Description        MID_DOCINFO_DESCRIPTION;
-        BOOL        AutoReload         MID_DOCINFO_AUTOLOADENABLED;
-        INT32       AutoReloadTime     MID_DOCINFO_AUTOLOADSECS;
-        String      AutoReloadURL      MID_DOCINFO_AUTOLOADURL;
-        String      AutoReloadFrame    MID_DOCINFO_DEFAULTTARGET;
-    };
-    item DocInfo SfxDocumentInfoItem;
-
-    struct SvxSearch
-    {
-        INT16       StyleFamily     MID_SEARCH_STYLEFAMILY;
-        UINT16      CellType        MID_SEARCH_CELLTYPE;
-        BOOL        RowDirection    MID_SEARCH_ROWDIRECTION;
-        BOOL        AllTables       MID_SEARCH_ALLTABLES;
-        BOOL        Backward        MID_SEARCH_BACKWARD;
-        BOOL        Pattern         MID_SEARCH_PATTERN;
-        BOOL        Content         MID_SEARCH_CONTENT;
-        BOOL        AsianOptions    MID_SEARCH_ASIANOPTIONS;
-        INT16       AlgorithmType   MID_SEARCH_ALGORITHMTYPE;
-        INT32       SearchFlags     MID_SEARCH_FLAGS;
-        String      SearchString    MID_SEARCH_SEARCHSTRING;
-        String      ReplaceString   MID_SEARCH_REPLACESTRING;
-        INT16       Locale          MID_SEARCH_LOCALE;
-        INT32       ChangedChars    MID_SEARCH_CHANGEDCHARS;
-        INT32       DeletedChars    MID_SEARCH_DELETEDCHARS;
-        INT32       InsertedChars   MID_SEARCH_INSERTEDCHARS;
-        INT32       TransliterateFlags MID_SEARCH_TRANSLITERATEFLAGS;
-        INT16       Command         MID_SEARCH_COMMAND;
-    };
-    item SvxSearch SvxSearchItem;
-
-    struct SvxSize
-    {
-        INT32               Width           MID_SIZE_WIDTH;
-        INT32               Height          MID_SIZE_HEIGHT;
-    };
-    item SvxSize SvxSizeItem;
-
-    struct SfxScriptOrganizer
-    {
-        String Language MID_SCRIPT_ORGANIZER_LANGUAGE;
-    };
-    item SfxScriptOrganizer SfxScriptOrganizerItem;
-
+    include "sfxitems.sdi"
     include "sfx.sdi"
     include "docslots.sdi"
-    include "frmslots.sdi"
     include "viwslots.sdi"
+    include "frmslots.sdi"
     include "mdislots.sdi"
     include "appslots.sdi"
+
 }
 
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 53ea87703ac6..8d13066a8340 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -45,19 +45,19 @@
 #include <tools/config.hxx>
 #include <basic/basrdll.hxx>
 #include <svtools/asynclink.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _SOUND_HXX //autogen
 #include <vcl/sound.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/eitem.hxx>
+#include <svl/urlbmk.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
@@ -65,7 +65,7 @@
 #endif
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -136,29 +136,28 @@
 #define DDE_AVAILABLE
 #endif
 
-#include <svtools/saveopt.hxx>
-#include <svtools/undoopt.hxx>
+#include <unotools/saveopt.hxx>
+#include <unotools/undoopt.hxx>
 #include <svtools/helpopt.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/viewoptions.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/historyoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/viewoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/historyoptions.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/addxmltostorageoptions.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/localisationoptions.hxx>
-#include <svtools/inetoptions.hxx>
-#include <svtools/fontoptions.hxx>
-#include <svtools/internaloptions.hxx>
-#include <svtools/workingsetoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/startoptions.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/localisationoptions.hxx>
+#include <unotools/inetoptions.hxx>
+#include <unotools/fontoptions.hxx>
+#include <unotools/internaloptions.hxx>
+#include <unotools/workingsetoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
+#include <unotools/syslocale.hxx>
 #include <framework/addonsoptions.hxx>
 #include <svtools/ttprops.hxx>
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
 
 using namespace ::com::sun::star;
 
@@ -359,7 +358,7 @@ SfxApplication::SfxApplication()
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ initialize DDE" );
 
 #ifdef DDE_AVAILABLE
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     InitializeDde();
 #else
     if( !InitializeDde() )
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 37ba123b2aca..4fe352c3c4bc 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -36,15 +36,15 @@
 #include <com/sun/star/uno/Reference.h>
 #include <basic/basrdll.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <basic/sbxfac.hxx>
 #include <basic/sbx.hxx>
 #include <vcl/gradient.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <basic/sbmod.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbstar.hxx>
 #include <vcl/wrkwin.hxx>
@@ -53,9 +53,9 @@
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
-#include <svtools/undoopt.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <unotools/bootstrap.hxx>
 
 #include <sfx2/appuno.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index af31659ec24c..5638800a9e4f 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -46,40 +46,39 @@
 #include <vcl/sound.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/string.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/szitem.hxx>
-#include <svtools/undo.hxx>
+#include <svl/itempool.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/szitem.hxx>
+#include <svl/undo.hxx>
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/ttprops.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sot/exchange.hxx>
 
 //#include <svtools/agprop.hxx>
 //#include <sj2/sjapplet.hxx>
-#include <svtools/isethint.hxx>
+#include <svl/isethint.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/wldcrd.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <svtools/helpopt.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/inetoptions.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/inetoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <vcl/toolbox.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/misccfg.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
@@ -1075,10 +1074,3 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSync
 
 IMPL_OBJHINT( SfxStringHint, String )
 
-SfxMiscCfg* SfxApplication::GetMiscConfig()
-{
-    if ( !pAppData_Impl->pMiscConfig )
-        pAppData_Impl->pMiscConfig = new SfxMiscCfg;
-
-    return pAppData_Impl->pMiscConfig;
-}
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index f9698c3b4782..5817337ae60d 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -33,8 +33,8 @@
 
 #ifndef GCC
 #endif
-#include <svtools/whiter.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/eitem.hxx>
 
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 23de7317c379..e53a4cacdb93 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -33,17 +33,17 @@
 #include <tools/cachestr.hxx>
 #include <tools/config.hxx>
 #ifndef _INETSTRM_HXX //autogen
-#include <svtools/inetstrm.hxx>
+#include <svl/inetstrm.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vos/mutex.hxx>
 
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/dateitem.hxx>
+#include <svl/dateitem.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/wrkwin.hxx>
 #include "comphelper/processfactory.hxx"
@@ -109,7 +109,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) :
         pEventConfig(0),
         pDisabledSlotList( 0 ),
         pSecureURLs(0),
-        pMiscConfig(0),
         pSaveOptions( 0 ),
         pUndoOptions( 0 ),
         pHelpOptions( 0 ),
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index ec26ead8a792..f5b3a2e6dca1 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -31,17 +31,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <vcl/wrkwin.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <basic/sbstar.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/svdde.hxx>
+#include <svl/stritem.hxx>
+#include <svl/svdde.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/linkmgr.hxx>
 
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 98439eb5a6dc..837ccc461586 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -38,17 +38,17 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <svtools/soerr.hxx>
-#include <svtools/svtools.hrc>
-#include <svtools/saveopt.hxx>
-#include <svtools/localisationoptions.hxx>
+#include <svl/svtools.hrc>
+#include <unotools/saveopt.hxx>
+#include <unotools/localisationoptions.hxx>
 #include <tools/config.hxx>
 #ifndef _SV_RESARY_HXX
 #include <tools/resary.hxx>
 #endif
 #include <tools/urlobj.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
@@ -60,9 +60,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <vos/security.hxx>
 #include <ucbhelper/configurationkeys.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/historyoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/historyoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <cppuhelper/implbase2.hxx>
 
 #include <rtl/logfile.hxx>
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index a65a16e3b518..253311c54f3d 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -37,12 +37,11 @@
 
 #include <stdio.h>
 #include <tools/urlobj.hxx>
-#include <svtools/cstitem.hxx>
 #include <tools/config.hxx>
 #include <svtools/ehdl.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/urihelper.hxx>
+#include <unotools/startoptions.hxx>
+#include <svl/itempool.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/helpopt.hxx>
 #include <vos/process.hxx>
 #include <framework/sfxhelperfunctions.hxx>
@@ -124,7 +123,7 @@ void SfxApplication::Init
 */
 {
 #ifdef DDE_AVAILABLE
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     InitializeDde();
 #else
     if( !InitializeDde() )
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 08a61b1f0ce6..1bb12990cb42 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -36,13 +36,13 @@
 #include <vos/process.hxx>
 #endif
 #include <vos/xception.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/internaloptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/internaloptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <com/sun/star/registry/InvalidRegistryException.hpp>
 #ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -64,7 +64,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/bootstrap.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <osl/file.hxx>
 
 #include "sfxresid.hxx"
@@ -189,7 +189,7 @@ void SfxApplication::InitializeDisplayName_Impl()
 
         aGuard.clear();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ::rtl::OUString aDefault;
         aTitle += DEFINE_CONST_UNICODE(" [");
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index c6cb16f8f3f6..bf3cb633cf6a 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -64,22 +64,22 @@
 #include <comphelper/sequenceasvector.hxx>
 
 #include <vcl/wrkwin.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/doctempl.hxx>
 #include <svtools/sfxecode.hxx>
 #include <framework/preventduplicateinteraction.hxx>
 #include <svtools/ehdl.hxx>
 #include <basic/sbxobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/templdlg.hxx>
 #include <osl/file.hxx>
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 #include <vcl/svapp.hxx>
 
@@ -95,7 +95,7 @@
 #include <sfx2/new.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include "objshimp.hxx"
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
@@ -112,7 +112,7 @@
 #include <sfx2/event.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 16ae1fe236a9..63d33e54997b 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -36,14 +36,14 @@
 #ifdef WIN
 #define _TL_LANG_SPECIAL
 #endif
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
-#include <svtools/saveopt.hxx>
-#include <svtools/misccfg.hxx>
+#include <unotools/saveopt.hxx>
+#include <unotools/misccfg.hxx>
 
 #ifndef GCC
 #endif
@@ -77,7 +77,7 @@
 
 using ::basic::BasicManagerRepository;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 DECLARE_LIST( SfxFrameWindowFactoryArray_Impl, SfxFrameWindowFactory* )
 SV_DECL_PTRARR(SfxInitLinkList, Link*, 2, 2)
 #endif
@@ -203,16 +203,15 @@ void SfxApplication::Deinitialize()
 
     delete pAppData_Impl->pLabelResMgr;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     DELETEX(pAppData_Impl->pSlotPool);
     DELETEX(pAppData_Impl->pEventConfig);
-    DELETEX(pAppData_Impl->pMiscConfig);
     SfxMacroConfig::Release_Impl();
     DELETEX(pAppData_Impl->pFactArr);
     DELETEX(pAppData_Impl->pInitLinkList);
 #endif
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     DELETEX(pAppData_Impl->pTbxCtrlFac);
     DELETEX(pAppData_Impl->pStbCtrlFac);
     DELETEX(pAppData_Impl->pMenuCtrlFac);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 184ecb9f1a5c..4580a11270e0 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -62,7 +62,7 @@
 #ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_
 #include <svtools/addresstemplate.hxx>
 #endif
-#include <svtools/visitem.hxx>
+#include <svl/visitem.hxx>
 #include <unotools/intlwrapper.hxx>
 
 #ifndef _UNOTOOLS_CONFIGMGR_HXX_
@@ -71,10 +71,10 @@
 #include <tools/config.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/cancel.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/cancel.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/basrdll.hxx>
@@ -84,9 +84,9 @@
 #include <vcl/stdtext.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/regoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/regoptions.hxx>
 #include <svtools/helpopt.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/shl.hxx>
@@ -1209,7 +1209,7 @@ void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
             {
                 case SID_ONLINE_REGISTRATION:
                 {
-                    ::svt::RegOptions aOptions;
+                    ::utl::RegOptions aOptions;
                     if ( !aOptions.allowMenu() )
                         rSet.DisableItem( SID_ONLINE_REGISTRATION );
                 }
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index c9814eb50e6a..7fb6ef35167f 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -43,8 +43,8 @@
 #include "sfx2/dllapi.h"
 
 #include <basic/sbx.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/rectitem.hxx>
 #include <tools/debug.hxx>
 #include <tools/wldcrd.hxx>
 
@@ -60,12 +60,12 @@
 #endif
 
 #include <basic/sbxcore.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/lckbitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 60beac537e53..23a08e71356f 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -37,7 +37,7 @@
 #ifndef _RCID_H
 #include <tools/rcid.h>
 #endif
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index e5c93b0bdbba..2bf84f87e973 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 #include <sot/formats.hxx>
 
 #define DDELINK_COLD        0
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index f06ecada0226..3533fb8a428f 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -47,7 +47,7 @@
 
 #define _SVSTDARR_STRINGSDTOR
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 
 namespace sfx2
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 8ad25458e1b2..f7ff7b161588 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -39,7 +39,7 @@
 
 #include <tools/debug.hxx>
 #include <vcl/timer.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 5f10d4062e68..8a852b44b6f7 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -50,7 +50,7 @@
 
 #include <tools/debug.hxx>
 
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index df47180c9f77..c5412f35d0f6 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -95,10 +95,10 @@
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <com/sun/star/ui/XDockingAreaAcceptor.hpp>
 #include <svtools/helpopt.hxx>
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <svtools/svtdata.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/cachestr.hxx>
@@ -2139,7 +2139,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
     if ( pEnv )
         bIsDebug = sal_True;
 
-    SvtMiscOptions().AddListener( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
+    SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
 
     if ( aOnStartupCB.GetHelpId() == 0 )
         aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX );
@@ -2152,7 +2152,7 @@ SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl()
     sfx2::RemoveFromTaskPaneList( &aToolBox );
 
     bIsInClose = sal_True;
-    SvtMiscOptions().RemoveListener( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
+    SvtMiscOptions().RemoveListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
     delete pSrchDlg;
 }
 
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 69b16058db8f..acda2cf312e7 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan
 #include <vcl/lstbox.hxx>
 #include <vcl/dialog.hxx>
 #include <svtools/svtreebx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include "srchdlg.hxx"
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 8a6622636c14..491de2138917 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -56,12 +56,12 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <svtools/helpopt.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/configmgr.hxx>
 #include <ucbhelper/content.hxx>
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/process.h>
 #include <osl/file.hxx>
@@ -74,7 +74,7 @@
 
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_ULONGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
@@ -237,6 +237,8 @@ public:
                     ~SfxHelpOptions_Impl();
 
     BOOL            HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; }
+    virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+    virtual void            Commit();
 };
 
 static Sequence< ::rtl::OUString > GetPropertyNames()
@@ -309,6 +311,15 @@ SfxHelpOptions_Impl::~SfxHelpOptions_Impl()
     delete m_pIds;
 }
 
+
+void SfxHelpOptions_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
+void SfxHelpOptions_Impl::Commit()
+{
+}
+
 // class SfxHelp_Impl ----------------------------------------------------
 
 class SfxHelp_Impl
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 91227e3e34ec..48b7ecdd1540 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -32,13 +32,13 @@
 #include "precompiled_sfx2.hxx"
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
-#include <svtools/historyoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/historyoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/urlobj.hxx>
 #include <framework/menuconfiguration.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/inethist.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <osl/file.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 995b8250e072..52805082de38 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -69,6 +69,7 @@
 #include <unistd.h>
 #include <errno.h>
 #endif
+#include <vcl/timer.hxx>
 
 #include "sfxresid.hxx"
 
@@ -186,6 +187,23 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
     return true;
 }
 
+class IdleUnloader : Timer
+{
+    ::osl::Module *m_pModule;
+public:
+    IdleUnloader (::osl::Module **pModule) :
+        m_pModule (*pModule)
+    {
+        *pModule = NULL;
+        Start();
+    }
+    virtual void Timeout()
+    {
+        delete m_pModule;
+        delete this;
+    }
+};
+
 void ShutdownIcon::initSystray()
 {
     if (m_bInitialized)
@@ -201,15 +219,15 @@ void ShutdownIcon::deInitSystray()
 {
     if (!m_bInitialized)
         return;
+
     if (m_pDeInitSystray)
         m_pDeInitSystray();
 
     m_bVeto = false;
     m_pInitSystray = 0;
     m_pDeInitSystray = 0;
-    if (m_pPlugin)
-        delete m_pPlugin;
-    m_pPlugin = 0;
+    new IdleUnloader (&m_pPlugin);
+
     delete m_pFileDlg;
     m_pFileDlg = NULL;
     m_bInitialized = false;
@@ -233,6 +251,7 @@ ShutdownIcon::ShutdownIcon( Reference< XMultiServiceFactory > aSMgr ) :
 ShutdownIcon::~ShutdownIcon()
 {
     deInitSystray();
+    new IdleUnloader (&m_pPlugin);
 }
 
 // ---------------------------------------------------------------------------
@@ -853,9 +872,11 @@ void ShutdownIcon::SetAutostart( bool bActivate )
         ::osl::File::getFileURLFromSystemPath( aShortcut, aShortcutUrl );
         ::osl::File::remove( aShortcutUrl );
 #ifdef UNX
-        ShutdownIcon *pIcon = getInstance();
-        if( pIcon )
+        if (pShutdownIcon)
+        {
+            ShutdownIcon *pIcon = getInstance();
             pIcon->deInitSystray();
+        }
 #endif
     }
 #elif defined OS2
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx
index 6b69b5d0fae8..f4108950db22 100644
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++ b/sfx2/source/appl/shutdowniconOs2.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
-#include <svtools/dynamicmenuoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
 
 #include "shutdownicon.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index e9326b4a22c2..27aa37e05c74 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -31,9 +31,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include "svtools/moduleoptions.hxx"
-#include "svtools/dynamicmenuoptions.hxx"
-#include "svtools/historyoptions.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
+#include "unotools/historyoptions.hxx"
 #include "tools/urlobj.hxx"
 #include "osl/file.h"
 #include "comphelper/sequenceashashmap.hxx"
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index f68d367df658..b9799f5818b7 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -1,9 +1,9 @@
 
 #ifdef ENABLE_QUICKSTART_APPLET
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
-#include <svtools/dynamicmenuoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
 
 #include <gtk/gtk.h>
 #include <glib.h>
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 414b400d7377..676a46ab584f 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -45,9 +45,9 @@
 //
 // the systray icon is only available on windows
 //
-#include <svtools/moduleoptions.hxx>
 
-#include <svtools/dynamicmenuoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
 
 #include "shutdownicon.hxx"
 #include "app.hrc"
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d2338a9c7226..7287023f1845 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -57,12 +57,12 @@
 #include <vcl/toolbox.hxx>
 #include <tools/rcid.h>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SFXEITEM_HXX //autogen
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 358c226d6c4a..4b4c17a2c5f2 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -60,12 +60,12 @@
 #include <rtl/ustring.hxx>
 #endif
 #include <rtl/ustrbuf.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/lckbitem.hxx>
-#include <svtools/inettype.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/inettype.hxx>
+#include <svl/rectitem.hxx>
 
 #include <sot/storage.hxx>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
@@ -97,8 +97,8 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <rtl/ustring.hxx>
 #include <vos/process.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <comphelper/mediadescriptor.hxx>
 #include <tools/urlobj.hxx>
 
@@ -109,9 +109,9 @@ using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::beans;
 using namespace ::vos;
-#include <svtools/ctypeitm.hxx>
+#include <svl/ctypeitm.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "sfxhelp.hxx"
 #include "sfxbasic.hxx"
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 4086cf2b1b96..5cb4f0200614 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -38,7 +38,7 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/sfx.hrc>
 
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 96a55c9a95f4..2d1c6db11762 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sfx2.hxx"
 
 #ifndef _INETDEF_HXX
-#include <svtools/inetdef.hxx>
+#include <svl/inetdef.hxx>
 #endif
 #include "svtools/htmlkywd.hxx"
 
@@ -40,7 +40,7 @@
 #include <rtl/tencinfo.h>
 
 #include <unotools/configmgr.hxx>
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include <tools/datetime.hxx>
 
 #include <sfx2/frmhtmlw.hxx>
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 121b8604e02d..8f143bb4baee 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -39,7 +39,7 @@
 #include <basic/sbx.hxx>
 #endif
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/time.hxx>
 
 // wg. nRescheduleLocks
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 13a75eb05693..794ee142708c 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -46,9 +46,9 @@
 #include <svtools/imaprect.hxx>
 #ifndef _SVSTDARR_ULONGS_DECL
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/tencinfo.h>
 #include <tools/tenccvt.hxx>
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index daf9174d20cb..763595913fcd 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -34,14 +34,14 @@
 #ifndef _SV_RESARY_HXX
 #include <tools/resary.hxx>
 #endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <tools/urlobj.hxx>
 #include <basic/sbx.hxx>
 
 #include <sot/storage.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 
 #ifndef _RTL_USTRING_
 #include <rtl/ustring.h>
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 0da17ba3b158..7bf2c1c6dfe7 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -32,13 +32,13 @@
 #include "precompiled_sfx2.hxx"
 
 #include <hash_map>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/visitem.hxx>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 1c2c047b228d..f39c480fbdeb 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f57ca40e8519..fa3330059859 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -33,14 +33,14 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SFXEITEM_HXX //autogen
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
@@ -50,7 +50,7 @@
 #include <stdlib.h>             // wg. bsearch
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/helpopt.hxx>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index ebc621a56bd9..d4149421f161 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -35,7 +35,7 @@
 #ifndef _SBX_HXX //autogen
 #include <basic/sbx.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
 #ifndef _BASIC_SBUNO_HXX
diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
index 481952409d6c..9d936549b5b3 100644
--- a/sfx2/source/control/makefile.mk
+++ b/sfx2/source/control/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,6 +47,10 @@ CFLAGS+=-Od
 .ENDIF
 .ENDIF
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-O0
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 SLOFILES = \
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index e65c866428e4..0b0a8d2480ed 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -30,8 +30,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/eitem.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index f5794094f15f..f57d3a3d32f2 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <sfx2/querystatus.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <svtools/itemdel.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/visitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 61747fae7d32..ef47fc088e32 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -39,10 +39,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 
 #ifndef _ARGS_HXX //autogen
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
 #include <svtools/itemdel.hxx>
 
@@ -51,7 +51,7 @@
 #ifndef GCC
 #endif
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index cba060b812f3..f7bf79f8a0f6 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <sfx2/sfxstatuslistener.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <svtools/itemdel.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/visitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index fcfd93cbc9ef..7c88c4bef24a 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -33,13 +33,13 @@
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/embed/VerbAttributes.hpp>
 #include <basic/sbstar.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/undo.hxx>
+#include <svl/itempool.hxx>
+#include <svl/undo.hxx>
 #include <svtools/itemdel.hxx>
 #include <svtools/asynclink.hxx>
 #include <basic/sbx.hxx>
 
-#include <svtools/undoopt.hxx>
+#include <unotools/undoopt.hxx>
 
 #ifndef GCC
 #endif
@@ -659,7 +659,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
 */
 
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     const SfxInterface *p_IF = GetInterface();
     if ( !p_IF )
         return;
@@ -702,7 +702,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
 */
 
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     const SfxInterface *p_IF = GetInterface();
     if ( !p_IF )
         return;
diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx
index 8f1507a45610..5702103e3398 100644
--- a/sfx2/source/control/srchitem.cxx
+++ b/sfx2/source/control/srchitem.cxx
@@ -36,7 +36,7 @@
 #ifndef __SBX_SBXVARIABLE_HXX
 #include <basic/sbxvar.hxx>
 #endif
-#include <svtools/searchopt.hxx>
+#include <unotools/searchopt.hxx>
 #include <com/sun/star/util/XReplaceable.hpp>
 #include <com/sun/star/util/XSearchable.hpp>
 #include <com/sun/star/util/XSearchDescriptor.hpp>
@@ -44,7 +44,7 @@
 #include <com/sun/star/util/XReplaceDescriptor.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <i18npool/mslangid.hxx>
 
 #ifndef GCC
@@ -359,6 +359,9 @@ void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & )
     SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() );
 }
 
+void SvxSearchItem::Commit()
+{
+}
 
 void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal )
 {
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index cb7e0f042f0d..527851e7664a 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -46,10 +46,10 @@
 #include <com/sun/star/frame/FrameAction.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/weak.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/visitem.hxx>
 #include <comphelper/processfactory.hxx>
 
 #ifndef GCC
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 190cc47dc2f6..f33f898237f9 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -32,13 +32,13 @@
 #include "precompiled_sfx2.hxx"
 
 #include <tools/debug.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/visitem.hxx>
 #include <svtools/javacontext.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XController.hpp>
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 5ed5569ea336..f7f3f7b14ec9 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -38,7 +38,7 @@
 #include "alienwarn.hrc"
 #include "dialog.hrc"
 #include <vcl/msgbox.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 // class SfxAlienWarningDialog -------------------------------------------
 
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 6b92cb0137de..89075b918b42 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -37,8 +37,8 @@
 #include <vcl/fixed.hxx>
 #include <vcl/help.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/viewoptions.hxx>
+#include <svl/eitem.hxx>
+#include <unotools/viewoptions.hxx>
 #include <svtools/fixedhyper.hxx>
 #include <svtools/controldims.hrc>
 
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 72cc8c659bc4..44d9c7e346cf 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -109,6 +109,8 @@
 #define STR_PDF_EXPORT_SEND             ( RC_DIALOG_BEGIN + 120 )
 #define STR_RECHECK_DOCUMENT            ( RC_DIALOG_BEGIN + 121 )
 #define IMG_INFO                        ( RC_DIALOG_BEGIN + 122 )
+#define RID_EDIT_DURATIONS              ( RC_DIALOG_BEGIN + 123 )
+#define SFX_PB_EDIT                     ( RC_DIALOG_BEGIN + 124 )
 
 #endif // #ifndef _SFX_DIALOG_HRC
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e0a57c2e5e9e..fe03231c6db7 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -32,13 +32,13 @@
 #include "precompiled_sfx2.hxx"
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/useroptions.hxx>
 #include <svtools/imagemgr.hxx>
 #include <tools/datetime.hxx>
 
@@ -49,12 +49,15 @@
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
+#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/Duration.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
 #include <vcl/timer.hxx>
@@ -73,6 +76,8 @@
 #include <sfx2/sfx.hrc>
 #include "dinfdlg.hrc"
 #include "sfxlocal.hrc"
+#include <dialog.hrc>
+#include <vcl/help.hxx>
 
 #include <algorithm>
 
@@ -1577,7 +1582,168 @@ CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( Window* pParent, const
     m_aYesButton.SetBackground( aWall );
     m_aNoButton.SetBackground( aWall );
 }
+class DurationDialog_Impl : public ModalDialog
+{
+    FixedLine       aDurationFL;
+
+    OKButton        aOKPB;
+    CancelButton    aCancelPB;
+    HelpButton      aHelpPB;
+
+    CheckBox        aNegativeCB;
+    FixedText       aYearFT;
+    NumericField    aYearNF;
+    FixedText       aMonthFT;
+    NumericField    aMonthNF;
+    FixedText       aDayFT;
+    NumericField    aDayNF;
+    FixedText       aHourFT;
+    NumericField    aHourNF;
+    FixedText       aMinuteFT;
+    NumericField    aMinuteNF;
+    FixedText       aSecondFT;
+    NumericField    aSecondNF;
+    FixedText       aHSecondFT;
+    NumericField    aHSecondNF;
+
+public:
+
+    DurationDialog_Impl( Window* pParent, const util::Duration& rDuration );
+    ~DurationDialog_Impl();
 
+    util::Duration  GetDuration() const;
+};
+/*-- 20.11.2009 15:40:46---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+DurationDialog_Impl::DurationDialog_Impl( Window* pParent, const util::Duration& rDuration ) :
+            ModalDialog( pParent, SfxResId( RID_EDIT_DURATIONS ) ),
+            aDurationFL(this, SfxResId( FL_DURATION       )),
+            aOKPB(      this, SfxResId( PB_OK       )),
+            aCancelPB(  this, SfxResId( PB_CANCEL   )),
+            aHelpPB(    this, SfxResId( PB_HELP     )),
+            aNegativeCB(this, SfxResId( CB_NEGATIVE     )),
+            aYearFT(    this, SfxResId( FT_YEAR         )),
+            aYearNF(    this, SfxResId( ED_YEAR         )),
+            aMonthFT(   this, SfxResId( FT_MONTH        )),
+            aMonthNF(   this, SfxResId( ED_MONTH        )),
+            aDayFT(     this, SfxResId( FT_DAY          )),
+            aDayNF(     this, SfxResId( ED_DAY          )),
+            aHourFT(    this, SfxResId( FT_HOUR         )),
+            aHourNF(    this, SfxResId( ED_HOUR         )),
+            aMinuteFT(  this, SfxResId( FT_MINUTE       )),
+            aMinuteNF(  this, SfxResId( ED_MINUTE       )),
+            aSecondFT(  this, SfxResId( FT_SECOND       )),
+            aSecondNF(  this, SfxResId( ED_SECOND       )),
+            aHSecondFT( this, SfxResId( FT_HSECOND      )),
+            aHSecondNF( this, SfxResId( ED_HSECOND      ))
+{
+    FreeResource();
+    aNegativeCB.Check(rDuration.Negative);
+    aYearNF.SetValue(rDuration.Years);
+    aMonthNF.SetValue(rDuration.Months );
+    aDayNF.SetValue(rDuration.Days   );
+    aHourNF.SetValue(rDuration.Hours  );
+    aMinuteNF.SetValue(rDuration.Minutes);
+    aSecondNF.SetValue(rDuration.Seconds);
+    aHSecondNF.SetValue(rDuration.HundredthSeconds);
+}
+/*-- 20.11.2009 16:08:55---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+DurationDialog_Impl::~DurationDialog_Impl()
+{
+}
+/*-- 20.11.2009 15:41:47---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+util::Duration  DurationDialog_Impl::GetDuration() const
+{
+    util::Duration  aRet;
+    aRet.Negative = aNegativeCB.IsChecked();
+    aRet.Years = aYearNF.GetValue();
+    aRet.Months = aMonthNF.GetValue( );
+    aRet.Days = aDayNF.GetValue(   );
+    aRet.Hours  = aHourNF.GetValue( );
+    aRet.Minutes = aMinuteNF.GetValue();
+    aRet.Seconds = aSecondNF.GetValue();
+    aRet.HundredthSeconds = aHSecondNF.GetValue();
+    return aRet;
+}
+
+/*-- 20.11.2009 15:30:58---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+CustomPropertiesDurationField::CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
+        Edit( pParent, rResId ), m_pLine( pLine )
+
+{
+    SetDuration( util::Duration(false, 0, 0, 0, 0, 0, 0, 0) );
+}
+/*-- 23.11.2009 08:46:02---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+CustomPropertiesDurationField::~CustomPropertiesDurationField()
+{
+}
+/*-- 23.11.2009 09:23:35---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt )
+{
+    if( rHEvt.GetMode() & HELPMODE_QUICK )
+    {
+        Size aSize( GetSizePixel() );
+        Rectangle aItemRect( rHEvt.GetMousePosPixel(), aSize );
+        if(Help::IsBalloonHelpEnabled())
+            Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), GetText() );
+        else
+            Help::ShowQuickHelp( this, aItemRect, GetText(),
+                QUICKHELP_LEFT|QUICKHELP_VCENTER );
+    }
+}
+/*-- 20.11.2009 15:30:58---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration )
+{
+    m_aDuration = rDuration;
+    String sText(rDuration.Negative ? '-' : '+');
+    sText += m_pLine->m_sDurationFormat;
+    sText.SearchAndReplace(String::CreateFromAscii( "%1"), String::CreateFromInt32( rDuration.Years ) );
+    sText.SearchAndReplace(String::CreateFromAscii( "%2"), String::CreateFromInt32( rDuration.Months ) );
+    sText.SearchAndReplace(String::CreateFromAscii( "%3"), String::CreateFromInt32( rDuration.Days   ) );
+    sText.SearchAndReplace(String::CreateFromAscii( "%4"), String::CreateFromInt32( rDuration.Hours  ) );
+    sText.SearchAndReplace(String::CreateFromAscii( "%5"), String::CreateFromInt32( rDuration.Minutes) );
+    sText.SearchAndReplace(String::CreateFromAscii( "%6"), String::CreateFromInt32( rDuration.Seconds) );
+    SetText( sText );
+}
+/*-- 23.11.2009 08:51:15---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+CustomPropertiesEditButton::CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
+        PushButton( pParent, rResId ), m_pLine( pLine )
+{
+    SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl ));
+}
+/*-- 23.11.2009 08:51:15---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+CustomPropertiesEditButton::~CustomPropertiesEditButton()
+{
+}
+/*-- 23.11.2009 08:47:37---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+IMPL_LINK( CustomPropertiesEditButton, ClickHdl, PushButton*, EMPTYARG )
+{
+    DurationDialog_Impl* pDurationDlg = new DurationDialog_Impl( this, m_pLine->m_aDurationField.GetDuration() );
+    if( RET_OK == pDurationDlg->Execute() )
+        m_pLine->m_aDurationField.SetDuration( pDurationDlg->GetDuration() );
+    delete pDurationDlg;
+    return 1;
+}
+//--------------------------------------------------------------------------
 void CustomPropertiesYesNoButton::Resize()
 {
     const long nWidth = GetSizePixel().Width();
@@ -1598,12 +1764,20 @@ CustomPropertyLine::CustomPropertyLine( Window* pParent ) :
     m_aNameBox      ( pParent, SfxResId( SFX_CB_PROPERTY_NAME ) ),
     m_aTypeBox      ( pParent, SfxResId( SFX_LB_PROPERTY_TYPE ), this ),
     m_aValueEdit    ( pParent, SfxResId( SFX_ED_PROPERTY_VALUE ), this ),
+    m_aDateField    ( pParent, SfxResId( SFX_FLD_DATE), this),
+    m_aTimeField    ( pParent, SfxResId( SFX_FLD_TIME), this),
+    m_sDurationFormat( SfxResId( SFX_ST_DURATION_FORMAT )),
+    m_aDurationField( pParent, SfxResId( SFX_FLD_DURATION), this),
+    m_aEditButton(    pParent, SfxResId( SFX_PB_EDIT ), this),
     m_aYesNoButton  ( pParent, SfxResId( SFX_WIN_PROPERTY_YESNO ) ),
     m_aRemoveButton ( pParent, SfxResId( SFX_PB_PROPERTY_REMOVE ), this ),
     m_bIsRemoved    ( false ),
     m_bTypeLostFocus( false )
 
 {
+    m_aTimeField.SetExtFormat( EXTTIMEF_24H_LONG );
+    m_aDateField.SetExtDateFormat( XTDATEF_SYSTEM_SHORT_YYYY );
+
     m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ), BMP_COLOR_NORMAL );
     m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE_HC ), BMP_COLOR_HIGHCONTRAST );
 }
@@ -1615,6 +1789,10 @@ void CustomPropertyLine::SetRemoved()
     m_aNameBox.Hide();
     m_aTypeBox.Hide();
     m_aValueEdit.Hide();
+    m_aDateField.Hide();
+    m_aTimeField.Hide();
+    m_aDurationField.Hide();
+    m_aEditButton.Hide();
     m_aYesNoButton.Hide();
     m_aRemoveButton.Hide();
 }
@@ -1627,6 +1805,10 @@ CustomPropertiesWindow::CustomPropertiesWindow( Window* pParent, const ResId& rR
     m_aNameBox      ( this, SfxResId( SFX_CB_PROPERTY_NAME ) ),
     m_aTypeBox      ( this, SfxResId( SFX_LB_PROPERTY_TYPE ) ),
     m_aValueEdit    ( this, SfxResId( SFX_ED_PROPERTY_VALUE ) ),
+    m_aDateField    ( this, SfxResId( SFX_FLD_DATE) ),
+    m_aTimeField    ( this, SfxResId( SFX_FLD_TIME) ),
+    m_aDurationField( this, SfxResId( SFX_FLD_DURATION) ),
+    m_aEditButton(    this, SfxResId( SFX_PB_EDIT )),
     m_aYesNoButton  ( this, SfxResId( SFX_WIN_PROPERTY_YESNO ) ),
     m_aRemoveButton ( this, SfxResId( SFX_PB_PROPERTY_REMOVE ) ),
     m_nScrollPos (0),
@@ -1651,9 +1833,23 @@ IMPL_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox*, pBox )
 {
     sal_Int64 nType = sal_Int64( (long)pBox->GetEntryData( pBox->GetSelectEntryPos() ) );
     CustomPropertyLine* pLine = pBox->GetLine();
-    BOOL bBooleanType = ( CUSTOM_TYPE_BOOLEAN == nType );
-    pLine->m_aValueEdit.Show( !bBooleanType );
-    pLine->m_aYesNoButton.Show( bBooleanType );
+    pLine->m_aValueEdit.Show( (CUSTOM_TYPE_TEXT == nType) || (CUSTOM_TYPE_NUMBER  == nType) );
+    pLine->m_aDateField.Show( (CUSTOM_TYPE_DATE == nType) || (CUSTOM_TYPE_DATETIME  == nType) );
+    pLine->m_aTimeField.Show( CUSTOM_TYPE_DATETIME  == nType );
+    pLine->m_aDurationField.Show( CUSTOM_TYPE_DURATION == nType );
+    pLine->m_aEditButton.Show( CUSTOM_TYPE_DURATION == nType );
+    pLine->m_aYesNoButton.Show( CUSTOM_TYPE_BOOLEAN == nType );
+    //adjust positions of date and time controls
+    if( nType == CUSTOM_TYPE_DATE )
+    {
+        pLine->m_aDateField.SetPosSizePixel(pLine->m_aValueEdit.GetPosPixel(), pLine->m_aValueEdit.GetSizePixel());
+    }
+    else if( nType == CUSTOM_TYPE_DATETIME)
+    {
+        pLine->m_aDateField.SetPosSizePixel( pLine->m_aDatePos, pLine->m_aDateTimeSize );
+        pLine->m_aTimeField.SetPosSizePixel(pLine->m_aTimePos, pLine->m_aDateTimeSize );
+    }
+
     return 0;
 }
 
@@ -1675,6 +1871,8 @@ IMPL_LINK( CustomPropertiesWindow, RemoveHdl, CustomPropertiesRemoveButton*, pBu
                 continue;
 
             Window* pWindows[] = {  &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit,
+                                    &pLine->m_aDateField, &pLine->m_aTimeField,
+                                    &pLine->m_aDurationField, &pLine->m_aEditButton,
                                     &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL };
             Window** pCurrent = pWindows;
             while ( *pCurrent )
@@ -1784,6 +1982,10 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa
     m_aNameBox.Hide();
     m_aTypeBox.Hide();
     m_aValueEdit.Hide();
+    m_aDateField.Hide();
+    m_aTimeField.Hide();
+    m_aDurationField.Hide();
+    m_aEditButton.Hide();
     m_aYesNoButton.Hide();
     m_aRemoveButton.Hide();
 
@@ -1815,11 +2017,23 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa
 
         if ( *pCurrent == &m_aValueEdit )
         {
+            Point aDurationPos( aPos );
+            m_aDurationField.SetPosPixel( aDurationPos );
+            Size aDurationSize(aSize);
+            aDurationSize.Width() -= (m_aEditButton.GetSizePixel().Width() + 3 );
+            m_aDurationField.SetSizePixel(aDurationSize);
+            aDurationPos.X() = aPos.X() - m_aEditButton.GetSizePixel().Width() + aSize.Width();
+            m_aEditButton.SetPosPixel(aDurationPos);
             aSize = m_aYesNoButton.GetSizePixel();
             aPos = m_aYesNoButton.GetPosPixel();
             aSize.Width() = nWidth;
             aPos.X() = aRect.getX() + ( nOffset / 2 );
             m_aYesNoButton.SetPosSizePixel( aPos, aSize );
+            aSize.Width() /= 2;
+            aSize.Width() -= 2;
+            m_aDateField.SetPosSizePixel( aPos, aSize );
+            aPos.X() += aSize.Width() + 4;
+            m_aTimeField.SetPosSizePixel( aPos, aSize );
         }
 
         pCurrent++;
@@ -1849,13 +2063,19 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
     pNewLine->m_aTypeBox.SetSelectHdl( LINK( this, CustomPropertiesWindow, TypeHdl ) );
     pNewLine->m_aRemoveButton.SetClickHdl( LINK( this, CustomPropertiesWindow, RemoveHdl ) );
     pNewLine->m_aValueEdit.SetLoseFocusHdl( LINK( this, CustomPropertiesWindow, EditLoseFocusHdl ) );
+    //add lose focus handlers of date/time fields
+
     pNewLine->m_aTypeBox.SetLoseFocusHdl( LINK( this, CustomPropertiesWindow, BoxLoseFocusHdl ) );
     long nPos = GetVisibleLineCount() * GetLineHeight();
     m_aCustomPropertiesLines.push_back( pNewLine );
     Window* pWindows[] = {  &m_aNameBox, &m_aTypeBox, &m_aValueEdit,
+                            &m_aDateField, &m_aTimeField,
+                            &m_aDurationField, &m_aEditButton,
                             &m_aYesNoButton, &m_aRemoveButton, NULL };
     Window* pNewWindows[] =
         {   &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit,
+            &pNewLine->m_aDateField, &pNewLine->m_aTimeField,
+            &pNewLine->m_aDurationField, &pNewLine->m_aEditButton,
             &pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL };
     Window** pCurrent = pWindows;
     Window** pNewCurrent = pNewWindows;
@@ -1870,11 +2090,17 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
         pCurrent++;
         pNewCurrent++;
     }
+    //
+    pNewLine->m_aDatePos = pNewLine->m_aDateField.GetPosPixel();
+    pNewLine->m_aTimePos = pNewLine->m_aTimeField.GetPosPixel();
+    pNewLine->m_aDateTimeSize = pNewLine->m_aDateField.GetSizePixel();
 
     double nTmpValue = 0;
     bool bTmpValue = false;
     ::rtl::OUString sTmpValue;
-    util::DateTime aTmpDate;
+    util::DateTime aTmpDateTime;
+    util::Date aTmpDate;
+    util::Duration aTmpDuration;
     SvtSysLocale aSysLocale;
     const LocaleDataWrapper& rLocaleWrapper = aSysLocale.GetLocaleData();
     pNewLine->m_aNameBox.SetText( sName );
@@ -1885,6 +2111,7 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
     {
         sal_uInt32 nIndex = m_aNumberFormatter.GetFormatIndex( NF_NUMBER_SYSTEM );
         m_aNumberFormatter.GetInputLineString( nTmpValue, nIndex, sValue );
+        pNewLine->m_aValueEdit.SetText( sValue );
         nType = CUSTOM_TYPE_NUMBER;
     }
     else if ( rAny >>= bTmpValue )
@@ -1894,50 +2121,26 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
     }
     else if ( rAny >>= sTmpValue )
     {
-        sValue = String( sTmpValue );
+        pNewLine->m_aValueEdit.SetText( sTmpValue );
         nType = CUSTOM_TYPE_TEXT;
     }
     else if ( rAny >>= aTmpDate )
     {
-        DateFormat eFormat = rLocaleWrapper.getDateFormat();
-        sal_Unicode cDateSep = rLocaleWrapper.getDateSep().GetChar(0);
-        switch ( eFormat )
-        {
-            case MDY :
-            {
-                sValue = String::CreateFromInt32( aTmpDate.Month );
-                sValue += cDateSep;
-                sValue += String::CreateFromInt32( aTmpDate.Day );
-                sValue += cDateSep;
-                if ( aTmpDate.Year < 10 )
-                    sValue += '0';
-                sValue += String::CreateFromInt32( aTmpDate.Year );
-                break;
-            }
-            case DMY :
-            {
-                sValue = String::CreateFromInt32( aTmpDate.Day );
-                sValue += cDateSep;
-                sValue += String::CreateFromInt32( aTmpDate.Month );
-                sValue += cDateSep;
-                if ( aTmpDate.Year < 10 )
-                    sValue += '0';
-                sValue += String::CreateFromInt32( aTmpDate.Year );
-                break;
-            }
-            case YMD :
-            {
-                if ( aTmpDate.Year < 10 )
-                    sValue += '0';
-                sValue += String::CreateFromInt32( aTmpDate.Year );
-                sValue += cDateSep;
-                sValue += String::CreateFromInt32( aTmpDate.Month );
-                sValue += cDateSep;
-                sValue += String::CreateFromInt32( aTmpDate.Day );
-                break;
-            }
-        }
         nType = CUSTOM_TYPE_DATE;
+        pNewLine->m_aDateField.SetDate( Date( aTmpDate.Day, aTmpDate.Month, aTmpDate.Year ) );
+
+    }
+    else if ( rAny >>= aTmpDuration )
+    {
+        nType = CUSTOM_TYPE_DURATION;
+        pNewLine->m_aDurationField.SetDuration( aTmpDuration );
+    }
+    else if ( rAny >>= aTmpDateTime )
+    {
+        pNewLine->m_aDateField.SetDate( Date( aTmpDateTime.Day, aTmpDateTime.Month, aTmpDateTime.Year ) );
+        pNewLine->m_aTimeField.SetTime( Time( aTmpDateTime.Hours, aTmpDateTime.Minutes, aTmpDateTime.Seconds, aTmpDateTime.HundredthSeconds ) );
+
+        nType = CUSTOM_TYPE_DATETIME;
     }
 
     if ( nType != CUSTOM_TYPE_UNKNOWN )
@@ -1949,8 +2152,6 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
             else
                 pNewLine->m_aYesNoButton.CheckNo();
         }
-        else
-            pNewLine->m_aValueEdit.SetText( sValue );
         pNewLine->m_aTypeBox.SelectEntryPos( m_aTypeBox.GetEntryPos( (void*)nType ) );
     }
 
@@ -2001,7 +2202,7 @@ void CustomPropertiesWindow::DoScroll( sal_Int32 nNewPos )
         if ( pLine->m_bIsRemoved )
             continue;
 
-        Window* pWindows[] = {  &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit,
+        Window* pWindows[] = {  &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDurationField,
                                 &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL };
         Window** pCurrent = pWindows;
         while ( *pCurrent )
@@ -2065,52 +2266,24 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
                 bool bValue = pLine->m_aYesNoButton.IsYesChecked();
                 aPropertiesSeq[i].Value <<= makeAny( bValue );
             }
+            else if ( CUSTOM_TYPE_DATETIME == nType )
+            {
+                Date aTmpDate = pLine->m_aDateField.GetDate();
+                Time aTmpTime = pLine->m_aTimeField.GetTime();
+                util::DateTime aDateTime(aTmpTime.Get100Sec(), aTmpTime.GetSec(), aTmpTime.GetMin(), aTmpTime.GetHour(),
+                        aTmpDate.GetDay(), aTmpDate.GetMonth(), aTmpDate.GetYear() );
+                aPropertiesSeq[i].Value <<= aDateTime;
+            }
+            else if ( CUSTOM_TYPE_DURATION == nType )
+            {
+                aPropertiesSeq[i].Value <<= pLine->m_aDurationField.GetDuration();
+            }
             else if ( CUSTOM_TYPE_DATE == nType )
             {
-                const LocaleDataWrapper& rLocaleWrapper = SvtSysLocale().GetLocaleData();
-                DateFormat eFormat = rLocaleWrapper.getDateFormat();
-                sal_Unicode cDateSep = rLocaleWrapper.getDateSep().GetChar(0);
-                String sValue( pLine->m_aValueEdit.GetText() );
-                if ( sValue.GetTokenCount( cDateSep ) == 3 )
-                {
-                    xub_StrLen nTokenDay = STRING_NOTFOUND;
-                    xub_StrLen nTokenMonth = STRING_NOTFOUND;
-                    xub_StrLen nTokenYear = STRING_NOTFOUND;
-
-                    switch ( eFormat )
-                    {
-                        case MDY :
-                        {
-                            nTokenDay = 1;
-                            nTokenMonth = 0;
-                            nTokenYear = 2;
-                            break;
-                        }
-                        case DMY :
-                        {
-                            nTokenDay = 0;
-                            nTokenMonth = 1;
-                            nTokenYear = 2;
-                            break;
-                        }
-                        case YMD :
-                        {
-                            nTokenDay = 2;
-                            nTokenMonth = 1;
-                            nTokenYear = 0;
-                            break;
-                        }
-                    }
-
-                    if ( nTokenDay != STRING_NOTFOUND )
-                    {
-                        util::DateTime aDateTime( 0, 0, 0, 0,
-                            sal_uInt16( sValue.GetToken( nTokenDay, cDateSep ).ToInt32() ),
-                            sal_uInt16( sValue.GetToken( nTokenMonth, cDateSep ).ToInt32() ),
-                            sal_uInt16( sValue.GetToken( nTokenYear, cDateSep ).ToInt32() ) );
-                        aPropertiesSeq[i].Value <<= makeAny( aDateTime );
-                    }
-                }
+                Date aTmpDate = pLine->m_aDateField.GetDate();
+                util::Date aDate(aTmpDate.GetDay(), aTmpDate.GetMonth(), aTmpDate.GetYear());
+                aPropertiesSeq[i].Value <<= aDate;
+
             }
             else
             {
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
index 94bfb9ba16b6..49647c40e3ee 100644
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ b/sfx2/source/dialog/dinfdlg.hrc
@@ -39,6 +39,8 @@
 #define CUSTOM_TYPE_NUMBER      2
 #define CUSTOM_TYPE_DATE        3
 #define CUSTOM_TYPE_BOOLEAN     4
+#define CUSTOM_TYPE_DURATION    5
+#define CUSTOM_TYPE_DATETIME    6
 
 // 4 TP_DOCINFORELOAD
 #define PAGE_WIDTH          260
@@ -154,5 +156,25 @@
 #define STR_HEADER_VALUE    92
 #define STR_HEADER_ACTION   93
 
+#define PB_OK                   100
+#define PB_CANCEL               101
+#define PB_HELP                 102
+#define CB_NEGATIVE             103
+#define FT_YEAR                 104
+#define ED_YEAR                 105
+#define FT_MONTH                106
+#define ED_MONTH                107
+#define FT_DAY                  108
+#define ED_DAY                  109
+#define FT_HOUR                 110
+#define ED_HOUR                 111
+#define FT_MINUTE               112
+#define ED_MINUTE               113
+#define FT_SECOND               114
+#define ED_SECOND               115
+#define FT_HSECOND              116
+#define ED_HSECOND              117
+#define FL_DURATION             118
+
 #endif
 
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index d8bf2085a5d9..3cad63ecb565 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -34,6 +34,7 @@
 #include "helpid.hrc"
 #include "sfxlocal.hrc"
 #include "dinfdlg.hrc"
+#include <dialog.hrc>
 
  // TP_DOCINFODESC --------------------------------------------------------
 String STR_SFX_NEWOFFICEDOC
@@ -579,14 +580,16 @@ ComboBox SFX_CB_PROPERTY_NAME
 ListBox SFX_LB_PROPERTY_TYPE
 {
     Pos = MAP_APPFONT ( 63 , 2 ) ;
-    Size = MAP_APPFONT ( 60 , 50 ) ;
+    Size = MAP_APPFONT ( 60 , 80 ) ;
     DropDown = TRUE;
     Border = TRUE;
     CurPos = 0;
     StringList [ en-US ] =
     {
         < "Text"        ; CUSTOM_TYPE_TEXT ; > ;
+        < "DateTime"    ; CUSTOM_TYPE_DATETIME ; > ;
         < "Date"        ; CUSTOM_TYPE_DATE ; > ;
+        < "Duration"    ; CUSTOM_TYPE_DURATION ; > ;
         < "Number"      ; CUSTOM_TYPE_NUMBER ; > ;
         < "Yes or no"   ; CUSTOM_TYPE_BOOLEAN ; > ;
     };
@@ -599,6 +602,44 @@ Edit SFX_ED_PROPERTY_VALUE
     TabStop = TRUE ;
     Left = TRUE ;
 };
+DateField SFX_FLD_DATE
+{
+    Border = TRUE ;
+    Pos = MAP_APPFONT ( 127 , 2 ) ;
+    Size = MAP_APPFONT ( 29 , RSC_CD_TEXTBOX_HEIGHT ) ;
+    TabStop = TRUE ;
+    Left = TRUE ;
+    Spin = TRUE;
+};
+TimeField SFX_FLD_TIME
+{
+    Border = TRUE ;
+    Pos = MAP_APPFONT ( 159 , 2 ) ;
+    Size = MAP_APPFONT ( 29 , RSC_CD_TEXTBOX_HEIGHT ) ;
+    TabStop = TRUE ;
+    Left = TRUE ;
+    Spin = TRUE;
+};
+
+Edit SFX_FLD_DURATION
+{
+    Readonly = TRUE;
+    Border = TRUE ;
+    Pos = MAP_APPFONT ( 159 , 2 ) ;
+    Size = MAP_APPFONT ( 61 - RSC_CD_TEXTBOX_HEIGHT - 2, RSC_CD_TEXTBOX_HEIGHT ) ;
+    TabStop = TRUE ;
+};
+PushButton SFX_PB_EDIT
+{
+    Pos = MAP_APPFONT ( 159 , 2 ) ;
+    Size = MAP_APPFONT ( RSC_CD_TEXTBOX_HEIGHT , RSC_CD_TEXTBOX_HEIGHT ) ;
+    Text = "...";
+};
+String SFX_ST_DURATION_FORMAT
+{
+    Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
+};
+
 Control SFX_WIN_PROPERTY_YESNO
 {
     HelpId = HID_CTRL_CUSTOMPROPS_YES_NO;
@@ -684,3 +725,182 @@ TabDialog SID_DOCINFO
     };
 };
 
+ModalDialog RID_EDIT_DURATIONS
+{
+    HelpId = HID_DLG_CUSTOMPROPS_DURATION;
+    OutputSize = TRUE ;
+    Size = MAP_APPFONT ( 176 , 140 ) ;
+    Text [ en-US ] = "Edit Duration" ;
+    Moveable = TRUE ;
+    OKButton PB_OK
+    {
+        Pos = MAP_APPFONT ( 120 , 7 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        DefButton = TRUE;
+    };
+    CancelButton PB_CANCEL
+    {
+        Pos = MAP_APPFONT ( 120 , 24 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+    };
+    HelpButton PB_HELP
+    {
+        Pos = MAP_APPFONT ( 120 , 48 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+    };
+    FixedLine FL_DURATION
+    {
+        Pos = MAP_APPFONT ( 6 , 8 ) ;
+        Size = MAP_APPFONT ( 108 , 8 ) ;
+        Text [ en-US ] = "Duration" ;
+    };
+    CheckBox CB_NEGATIVE
+    {
+        Pos = MAP_APPFONT ( 6 , 21 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "~Negative" ;
+    };
+    FixedText FT_YEAR
+    {
+        Pos = MAP_APPFONT ( 6 , 38 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "~Years" ;
+    };
+    NumericField ED_YEAR
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 70 , 36 ) ;
+        Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        First = 1 ;
+        Last = 100 ;
+        SpinSize = 1 ;
+        Value = 0 ;
+    };
+    FixedText FT_MONTH
+    {
+        Pos = MAP_APPFONT ( 6 , 52 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "~Months" ;
+    };
+    NumericField ED_MONTH
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 70 , 50 ) ;
+        Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        First = 1 ;
+        Last = 100 ;
+        SpinSize = 1 ;
+        Value = 0 ;
+    };
+    FixedText FT_DAY
+    {
+        Pos = MAP_APPFONT ( 6 , 66 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "~Days" ;
+    };
+    NumericField ED_DAY
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 70 , 64 ) ;
+        Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        First = 1 ;
+        Last = 100 ;
+        SpinSize = 1 ;
+        Value = 0 ;
+    };
+    FixedText FT_HOUR
+    {
+        Pos = MAP_APPFONT ( 6 , 80 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "H~ours" ;
+    };
+    NumericField ED_HOUR
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 70 , 78 ) ;
+        Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        First = 1 ;
+        Last = 100 ;
+        SpinSize = 1 ;
+        Value = 0 ;
+    };
+    FixedText FT_MINUTE
+    {
+        Pos = MAP_APPFONT ( 6 , 94 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "Min~utes" ;
+    };
+    NumericField ED_MINUTE
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 70, 92) ;
+        Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        First = 1 ;
+        Last = 100 ;
+        SpinSize = 1 ;
+        Value = 0 ;
+    };
+    FixedText FT_SECOND
+    {
+        Pos = MAP_APPFONT ( 6, 108 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "~Seconds" ;
+    };
+    NumericField ED_SECOND
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 70 , 106 ) ;
+        Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        First = 1 ;
+        Last = 100 ;
+        SpinSize = 1 ;
+        Value = 0 ;
+    };
+    FixedText FT_HSECOND
+    {
+        Pos = MAP_APPFONT ( 6 , 122 ) ;
+        Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "1/100 se~conds" ;
+    };
+    NumericField ED_HSECOND
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 70 , 120 ) ;
+        Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        First = 1 ;
+        Last = 100 ;
+        SpinSize = 1 ;
+        Value = 0 ;
+    };
+
+
+
+};
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index cf7d04ef0875..0b278a55872b 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/decoview.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 5a0d2f4a69a0..683aedcbf32f 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -71,17 +71,17 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/securityoptions.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/viewoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/viewoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/helpid.hrc>
-#include <svtools/pickerhelper.hxx>
+#include <svl/pickerhelper.hxx>
 #include <comphelper/docpasswordrequest.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 848719547ab4..2f9a7574bb2f 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -41,7 +41,7 @@
 #include <sfx2/fcontnr.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/filedlghelper.hxx>
 #include <comphelper/sequenceasvector.hxx>
diff --git a/sfx2/source/dialog/intro.cxx b/sfx2/source/dialog/intro.cxx
index aac052ff4ae2..07f20b0801b8 100644
--- a/sfx2/source/dialog/intro.cxx
+++ b/sfx2/source/dialog/intro.cxx
@@ -38,7 +38,7 @@
 
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <com/sun/star/uno/Any.h>
 
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 01ed733358d9..211afd11bc6d 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -34,7 +34,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <list>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 // ============================================================================
 
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 11d586ea2026..b36a6923184e 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -78,7 +78,7 @@
 #include <unotools/configitem.hxx>
 #include <ucbhelper/content.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index d5fececf3b38..2e87d2c4a9ba 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -73,9 +73,9 @@
 
 #include <unotools/tempfile.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <unotools/useroptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 1300f18e37ac..319c3b873b48 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -37,9 +37,9 @@
 #include <vcl/msgbox.hxx>
 #endif
 #include <vcl/field.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/style.hxx>
 #ifndef GCC
 #endif
 
@@ -57,7 +57,7 @@
 #include "mgetempl.hrc"
 
 #ifndef _SFX_STYLE_HRC
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #endif
 
 // SfxManageStyleSheetPage -----------------------------------------------
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 0e2dc5039a05..05920c07973e 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sfx2.hxx"
 
 // INCLUDE ---------------------------------------------------------------
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index c0802b573cc6..29472b65208b 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -34,9 +34,9 @@
 #ifndef GCC
 #endif
 #include <vcl/msgbox.hxx>
-#include <svtools/printwarningoptions.hxx>
+#include <unotools/printwarningoptions.hxx>
 #include <svtools/printoptions.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 
 
 #include "printopt.hrc"
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index c2b13fae76f1..7782b5178d8f 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/generictoolboxcontroller.hxx>
 #include <vcl/msgbox.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index f30fef23dbd0..750bf90d175c 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -41,7 +41,7 @@
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 0cbecdc719b0..500d530bab3f 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -38,7 +38,7 @@
 #include "srchdlg.hrc"
 #include "dialog.hrc"
 #include <tools/debug.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index f8df0ea2b082..7d4e60e117e9 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sfx2.hxx"
 
 // include ---------------------------------------------------------------
-#include <svtools/whiter.hxx>
-#include <svtools/style.hxx>
+#include <svl/whiter.hxx>
+#include <svl/style.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 80f0daba71b9..1008c76b8d9f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -34,10 +34,10 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "appdata.hxx"
 #include "sfxtypes.hxx"
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fb21ff8463a1..584dd488da56 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -34,14 +34,14 @@
 #ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
 #endif
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/style.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/style.hxx>
 #ifndef GCC
 #endif
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/intlwrapper.hxx>
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index e4475268b57d..111cab903f7e 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -33,7 +33,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <vcl/svapp.hxx>
 
 #ifndef GCC
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index accb6b5c3a37..5d2cf91b0c8f 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -34,17 +34,17 @@
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/datetime.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "versdlg.hrc"
 #include "versdlg.hxx"
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index ef36831ab681..476d6f5186a5 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -66,6 +66,7 @@
 #include "com/sun/star/xml/xpath/XXPathAPI.hpp"
 #include "com/sun/star/util/Date.hpp"
 #include "com/sun/star/util/Time.hpp"
+#include "com/sun/star/util/Duration.hpp"
 
 #include "SfxDocumentMetaData.hxx"
 #include "rtl/ustrbuf.hxx"
@@ -469,6 +470,11 @@ const char* s_nsODFMeta = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0";
 const char* s_metaXml = "meta.xml";
 
 
+bool isValidDate(const css::util::Date & i_rDate)
+{
+    return i_rDate.Month > 0;
+}
+
 bool isValidDateTime(const css::util::DateTime & i_rDateTime)
 {
     return i_rDateTime.Month > 0;
@@ -500,16 +506,25 @@ getQualifier(const char* i_name) {
     return ::rtl::OUString::createFromAscii(ns);
 }
 
+bool SAL_CALL
+textToDateOrDateTime(css::util::Date & io_rd, css::util::DateTime & io_rdt,
+        bool & o_rIsDateTime, ::rtl::OUString i_text) throw ()
+{
+    if (::sax::Converter::convertDateOrDateTime(
+                io_rd, io_rdt, o_rIsDateTime, i_text)) {
+        return true;
+    } else {
+        DBG_WARNING1("SfxDocumentMetaData: invalid date: %s",
+            OUStringToOString(i_text, RTL_TEXTENCODING_UTF8).getStr());
+        return false;
+    }
+}
+
 // convert string to date/time
 bool SAL_CALL
 textToDateTime(css::util::DateTime & io_rdt, ::rtl::OUString i_text) throw ()
 {
     if (::sax::Converter::convertDateTime(io_rdt, i_text)) {
-        // NB: there may be rounding errors; handle these here
-        if (io_rdt.HundredthSeconds > 0) {
-                io_rdt.Seconds++;
-                io_rdt.HundredthSeconds = 0;
-        }
         return true;
     } else {
         DBG_WARNING1("SfxDocumentMetaData: invalid date: %s",
@@ -528,6 +543,20 @@ textToDateTimeDefault(::rtl::OUString i_text) throw ()
     return dt;
 }
 
+// convert date to string
+::rtl::OUString SAL_CALL
+dateToText(css::util::Date const& i_rd) throw ()
+{
+    if (isValidDate(i_rd)) {
+        ::rtl::OUStringBuffer buf;
+        ::sax::Converter::convertDate(buf, i_rd);
+        return buf.makeStringAndClear();
+    } else {
+        return ::rtl::OUString();
+    }
+}
+
+
 // convert date/time to string
 ::rtl::OUString SAL_CALL
 dateTimeToText(css::util::DateTime const& i_rdt) throw ()
@@ -542,60 +571,48 @@ dateTimeToText(css::util::DateTime const& i_rdt) throw ()
 }
 
 // convert string to duration
-bool SAL_CALL
-textToDuration(css::util::Time& io_rut, ::rtl::OUString i_text) throw ()
+bool
+textToDuration(css::util::Duration& io_rDur, ::rtl::OUString const& i_rText)
+throw ()
 {
-    css::util::DateTime dt;
-    if (::sax::Converter::convertTime(dt, i_text)) {
-        // NB: there may be rounding errors; handle these here
-        if (dt.HundredthSeconds > 0) {
-                dt.Seconds++;
-                dt.HundredthSeconds = 0;
-        }
-        io_rut.Hours = dt.Hours;
-        io_rut.Minutes = dt.Minutes;
-        io_rut.Seconds = dt.Seconds;
-        io_rut.HundredthSeconds = dt.HundredthSeconds;
+    if (::sax::Converter::convertDuration(io_rDur, i_rText)) {
         return true;
     } else {
         DBG_WARNING1("SfxDocumentMetaData: invalid duration: %s",
-            OUStringToOString(i_text, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(i_rText, RTL_TEXTENCODING_UTF8).getStr());
         return false;
     }
 }
 
-sal_Int32 SAL_CALL textToDuration(::rtl::OUString i_text) throw ()
+sal_Int32 textToDuration(::rtl::OUString const& i_rText) throw ()
 {
-    css::util::Time t;
-    if (textToDuration(t, i_text)) {
-        return t.Hours * 3600 + t.Minutes * 60 + t.Seconds;
+    css::util::Duration d;
+    if (textToDuration(d, i_rText)) {
+        return (d.Days * (24*3600))
+                + (d.Hours * 3600) + (d.Minutes * 60) + d.Seconds;
     } else {
         return 0; // default
     }
 }
 
 // convert duration to string
-::rtl::OUString SAL_CALL durationToText(css::util::Time const& i_rut) throw ()
+::rtl::OUString durationToText(css::util::Duration const& i_rDur) throw ()
 {
-    css::util::DateTime dt;
-    dt.Hours   = i_rut.Hours;
-    dt.Minutes = i_rut.Minutes;
-    dt.Seconds = i_rut.Seconds;
-    dt.HundredthSeconds = i_rut.HundredthSeconds;
     ::rtl::OUStringBuffer buf;
-    ::sax::Converter::convertTime(buf, dt);
+    ::sax::Converter::convertDuration(buf, i_rDur);
     return buf.makeStringAndClear();
 }
 
 // convert duration to string
 ::rtl::OUString SAL_CALL durationToText(sal_Int32 i_value) throw ()
 {
-    css::util::Time ut;
-    ut.Hours   = static_cast<sal_Int16>(i_value / 3600);
-    ut.Minutes = static_cast<sal_Int16>((i_value % 3600) / 60);
-    ut.Seconds = static_cast<sal_Int16>(i_value % 60);
-    ut.HundredthSeconds = 0;
-    return durationToText(ut);
+    css::util::Duration ud;
+    ud.Days    = static_cast<sal_Int16>(i_value / (24 * 3600));
+    ud.Hours   = static_cast<sal_Int16>((i_value % (24 * 3600)) / 3600);
+    ud.Minutes = static_cast<sal_Int16>((i_value % 3600) / 60);
+    ud.Seconds = static_cast<sal_Int16>(i_value % 60);
+    ud.HundredthSeconds = 0;
+    return durationToText(ud);
 }
 
 // extract base URL (necessary for converting relative links)
@@ -922,17 +939,26 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
         } else if (type == ::cppu::UnoType<css::util::Date>::get()) {
             css::util::Date d;
             any >>= d;
-            css::util::DateTime dt;
-            dt.Year = d.Year;
-            dt.Month = d.Month;
-            dt.Day = d.Day;
-            values.push_back(dateTimeToText(dt));
+            values.push_back(dateToText(d));
             as.push_back(std::make_pair(vt,
                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("date"))));
         } else if (type == ::cppu::UnoType<css::util::Time>::get()) {
+            // #i97029#: replaced by Duration
+            // Time is supported for backward compatibility with OOo 3.x, x<=2
             css::util::Time ut;
             any >>= ut;
-            values.push_back(durationToText(ut));
+            css::util::Duration ud;
+            ud.Hours   = ut.Hours;
+            ud.Minutes = ut.Minutes;
+            ud.Seconds = ut.Seconds;
+            ud.HundredthSeconds = ut.HundredthSeconds;
+            values.push_back(durationToText(ud));
+            as.push_back(std::make_pair(vt,
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("time"))));
+        } else if (type == ::cppu::UnoType<css::util::Duration>::get()) {
+            css::util::Duration ud;
+            any >>= ud;
+            values.push_back(durationToText(ud));
             as.push_back(std::make_pair(vt,
                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("time"))));
         } else if (::cppu::UnoType<double>::get().isAssignableFrom(type)) {
@@ -1250,18 +1276,24 @@ void SAL_CALL SfxDocumentMetaData::init(
                 continue;
             }
         } else if (type.equalsAscii("date")) {
+            bool isDateTime;
+            css::util::Date d;
             css::util::DateTime dt;
-            if (textToDateTime(dt, text)) {
-                any <<= dt;
+            if (textToDateOrDateTime(d, dt, isDateTime, text)) {
+                if (isDateTime) {
+                    any <<= dt;
+                } else {
+                    any <<= d;
+                }
             } else {
                 DBG_WARNING1("SfxDocumentMetaData: invalid date: %s",
                     OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
                 continue;
             }
         } else if (type.equalsAscii("time")) {
-            css::util::Time ut;
-            if (textToDuration(ut, text)) {
-                any <<= ut;
+            css::util::Duration ud;
+            if (textToDuration(ud, text)) {
+                any <<= ud;
             } else {
                 DBG_WARNING1("SfxDocumentMetaData: invalid time: %s",
                     OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
@@ -2251,17 +2283,19 @@ void SfxDocumentMetaData::createUserDefined()
     // values of allowed types
     if ( !m_xUserDefined.is() )
     {
-        css::uno::Sequence<css::uno::Type> types(10);
+        css::uno::Sequence<css::uno::Type> types(11);
         types[0] = ::cppu::UnoType<bool>::get();
         types[1] = ::cppu::UnoType< ::rtl::OUString>::get();
         types[2] = ::cppu::UnoType<css::util::DateTime>::get();
         types[3] = ::cppu::UnoType<css::util::Date>::get();
-        types[4] = ::cppu::UnoType<css::util::Time>::get();
+        types[4] = ::cppu::UnoType<css::util::Duration>::get();
         types[5] = ::cppu::UnoType<float>::get();
         types[6] = ::cppu::UnoType<double>::get();
         types[7] = ::cppu::UnoType<sal_Int16>::get();
         types[8] = ::cppu::UnoType<sal_Int32>::get();
         types[9] = ::cppu::UnoType<sal_Int64>::get();
+        // Time is supported for backward compatibility with OOo 3.x, x<=2
+        types[10] = ::cppu::UnoType<css::util::Time>::get();
         css::uno::Sequence<css::uno::Any> args(2);
         args[0] <<= css::beans::NamedValue(
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowedTypes")),
diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx
index c6e5bfabbe94..8a98a1f8bd70 100644
--- a/sfx2/source/doc/applet.cxx
+++ b/sfx2/source/doc/applet.cxx
@@ -43,7 +43,7 @@
 #include <vcl/syschild.hxx>
 #include <rtl/ustring.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/javaoptions.hxx>
+#include <unotools/javaoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <comphelper/TypeGeneration.hxx>
 
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 3f8ab1ae7177..c914d9fe2927 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -30,7 +30,7 @@
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #define __RSC
-#include <svtools/inetdef.hxx>
+#include <svl/inetdef.hxx>
 //#include <so3/so2defs.hxx>
 
  // -----------------------------------------------------------------------
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 3a00bbe3097a..012109cac21a 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -35,8 +35,8 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/processfactory.hxx>
 #include <tools/config.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 302233a93ad7..108c9f27858a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -90,19 +90,19 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/lckbitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/lckbitem.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/svparser.hxx> // SvKeyValue
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <unotools/streamwrap.hxx>
 
@@ -121,9 +121,9 @@ using namespace ::com::sun::star::io;
 #include <tools/urlobj.hxx>
 #include <tools/inetmime.hxx>
 #include <unotools/ucblockbytes.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/asynclink.hxx>
-#include <svtools/inettype.hxx>
+#include <svl/inettype.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <unotools/localfilehelper.hxx>
@@ -133,8 +133,8 @@ using namespace ::com::sun::star::io;
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/interactionrequest.hxx>
 #include <sot/stg.hxx>
-#include <svtools/saveopt.hxx>
-#include <svtools/documentlockfile.hxx>
+#include <unotools/saveopt.hxx>
+#include <svl/documentlockfile.hxx>
 
 #include "opostponedtruncationstream.hxx"
 #include "helper.hxx"
@@ -383,6 +383,8 @@ public:
     Reference < XInputStream > xInputStream;
     Reference < XStream > xStream;
 
+    uno::Reference< io::XStream > m_xLockingStream;
+
     sal_uInt32                  nLastStorageError;
     ::rtl::OUString             aCharset;
 
@@ -590,11 +592,14 @@ sal_Bool SfxMedium::DocNeedsFileDateCheck()
 //------------------------------------------------------------------
 util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue )
 {
-    if ( ( bIgnoreOldValue || !pImp->m_bGotDateTime ) && GetContent().is() )
+    if ( ( bIgnoreOldValue || !pImp->m_bGotDateTime ) && aLogicName.Len() )
     {
         try
         {
-            pImp->aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= pImp->m_aDateTime;
+            uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv;
+            ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv );
+
+            aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= pImp->m_aDateTime;
             pImp->m_bGotDateTime = sal_True;
         }
         catch ( ::com::sun::star::uno::Exception& )
@@ -1111,6 +1116,13 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
     // otherwise the document should be opened readonly
     // if user cancel the loading the ERROR_ABORT is set
 
+    if ( pImp->m_bLocked && bLoading && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
+    {
+        // if the document is already locked the system locking might be temporarely off after storing
+        // check whether the system file locking should be taken again
+        GetLockingStream_Impl();
+    }
+
     sal_Bool bResult = pImp->m_bLocked;
 
     if ( !bResult )
@@ -1122,21 +1134,18 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
 
     if ( !bResult && !IsReadOnly() )
     {
-        // check whether the file is readonly in fs
-        // the check is only necessary if
-        // do it only for loading, some contents still might have problems with this property, let them not affect the saving
         sal_Bool bContentReadonly = sal_False;
-        if ( bLoading && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) )
+        if ( bLoading && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
         {
-            // let the stream be opened to check the possibility to open it for editing
-            GetMedium_Impl();
+            // let the original document be opened to check the possibility to open it for editing
+            // and to let the writable stream stay open to hold the lock on the document
+            GetLockingStream_Impl();
         }
 
         // "IsReadOnly" property does not allow to detect whether the file is readonly always
         // so we try always to open the file for editing
         // the file is readonly only in case the read-write stream can not be opened
-        SFX_ITEMSET_ARG( pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM, sal_False);
-        if ( bLoading && !pWriteStreamItem )
+        if ( bLoading && !pImp->m_xLockingStream.is() )
         {
             try
             {
@@ -2267,6 +2276,45 @@ void SfxMedium::ClearBackup_Impl()
 }
 
 //----------------------------------------------------------------
+void SfxMedium::GetLockingStream_Impl()
+{
+    if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
+      && !pImp->m_xLockingStream.is() )
+    {
+        SFX_ITEMSET_ARG( pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM, sal_False);
+        if ( pWriteStreamItem )
+            pWriteStreamItem->GetValue() >>= pImp->m_xLockingStream;
+
+        if ( !pImp->m_xLockingStream.is() )
+        {
+            // open the original document
+            uno::Sequence< beans::PropertyValue > xProps;
+            TransformItems( SID_OPENDOC, *GetItemSet(), xProps );
+            comphelper::MediaDescriptor aMedium( xProps );
+
+            aMedium.addInputStreamOwnLock();
+
+            uno::Reference< io::XInputStream > xInputStream;
+            aMedium[comphelper::MediaDescriptor::PROP_STREAM()] >>= pImp->m_xLockingStream;
+            aMedium[comphelper::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
+
+            if ( !pImp->pTempFile && !aName.Len() )
+            {
+                // the medium is still based on the original file, it makes sence to initialize the streams
+                if ( pImp->m_xLockingStream.is() )
+                    pImp->xStream = pImp->m_xLockingStream;
+
+                if ( xInputStream.is() )
+                    pImp->xInputStream = xInputStream;
+
+                if ( !pImp->xInputStream.is() && pImp->xStream.is() )
+                    pImp->xInputStream = pImp->xStream->getInputStream();
+            }
+        }
+    }
+}
+
+//----------------------------------------------------------------
 void SfxMedium::GetMedium_Impl()
 {
     if ( !pInStream )
@@ -2332,27 +2380,36 @@ void SfxMedium::GetMedium_Impl()
                 TransformItems( SID_OPENDOC, *GetItemSet(), xProps );
                 comphelper::MediaDescriptor aMedium( xProps );
 
-                if ( bFromTempFile )
+                if ( pImp->m_xLockingStream.is() && !bFromTempFile )
                 {
-                    aMedium[comphelper::MediaDescriptor::PROP_URL()] <<= ::rtl::OUString( aFileName );
-                    aMedium.erase( comphelper::MediaDescriptor::PROP_READONLY() );
-                    aMedium.addInputStream();
-                }
-                else if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
-                {
-                    // use the special locking approach only for file URLs
-                    aMedium.addInputStreamOwnLock();
+                    // the medium is not based on the temporary file, so the original stream can be used
+                    pImp->xStream = pImp->m_xLockingStream;
                 }
                 else
-                    aMedium.addInputStream();
+                {
+                    if ( bFromTempFile )
+                    {
+                        aMedium[comphelper::MediaDescriptor::PROP_URL()] <<= ::rtl::OUString( aFileName );
+                        aMedium.erase( comphelper::MediaDescriptor::PROP_READONLY() );
+                        aMedium.addInputStream();
+                    }
+                    else if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
+                    {
+                        // use the special locking approach only for file URLs
+                        aMedium.addInputStreamOwnLock();
+                    }
+                    else
+                        aMedium.addInputStream();
 
-                // the ReadOnly property set in aMedium is ignored
-                // the check is done in LockOrigFileOnDemand() for file and non-file URLs
+                    // the ReadOnly property set in aMedium is ignored
+                    // the check is done in LockOrigFileOnDemand() for file and non-file URLs
+
+                    //TODO/MBA: what happens if property is not there?!
+                    aMedium[comphelper::MediaDescriptor::PROP_STREAM()] >>= pImp->xStream;
+                    aMedium[comphelper::MediaDescriptor::PROP_INPUTSTREAM()] >>= pImp->xInputStream;
+                }
 
-                //TODO/MBA: what happens if property is not there?!
                 GetContent();
-                aMedium[comphelper::MediaDescriptor::PROP_STREAM()] >>= pImp->xStream;
-                aMedium[comphelper::MediaDescriptor::PROP_INPUTSTREAM()] >>= pImp->xInputStream;
                 if ( !pImp->xInputStream.is() && pImp->xStream.is() )
                     pImp->xInputStream = pImp->xStream->getInputStream();
             }
@@ -2661,7 +2718,7 @@ void SfxMedium::Close()
 
     CloseStreams_Impl();
 
-    UnlockFile();
+    UnlockFile( sal_False );
 }
 
 void SfxMedium::CloseAndRelease()
@@ -2694,11 +2751,31 @@ void SfxMedium::CloseAndRelease()
 
     CloseAndReleaseStreams_Impl();
 
-    UnlockFile();
+    UnlockFile( sal_True );
 }
 
-void SfxMedium::UnlockFile()
+void SfxMedium::UnlockFile( sal_Bool bReleaseLockStream )
 {
+    if ( pImp->m_xLockingStream.is() )
+    {
+        if ( bReleaseLockStream )
+        {
+            try
+            {
+                uno::Reference< io::XInputStream > xInStream = pImp->m_xLockingStream->getInputStream();
+                uno::Reference< io::XOutputStream > xOutStream = pImp->m_xLockingStream->getOutputStream();
+                if ( xInStream.is() )
+                    xInStream->closeInput();
+                if ( xOutStream.is() )
+                    xOutStream->closeOutput();
+            }
+            catch( uno::Exception& )
+            {}
+        }
+
+        pImp->m_xLockingStream = uno::Reference< io::XStream >();
+    }
+
     if ( pImp->m_bLocked )
     {
         try
@@ -2720,8 +2797,14 @@ void SfxMedium::CloseAndReleaseStreams_Impl()
     uno::Reference< io::XInputStream > xInToClose = pImp->xInputStream;
     uno::Reference< io::XOutputStream > xOutToClose;
     if ( pImp->xStream.is() )
+    {
         xOutToClose = pImp->xStream->getOutputStream();
 
+        // if the locking stream is closed here the related member should be cleaned
+        if ( pImp->xStream == pImp->m_xLockingStream )
+            pImp->m_xLockingStream = uno::Reference< io::XStream >();
+    }
+
     // The probably exsisting SvStream wrappers should be closed first
     CloseStreams_Impl();
 
@@ -3433,13 +3516,14 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
 
     if ( !( nStorOpenMode & STREAM_TRUNC ) )
     {
+        sal_Bool bTransferSuccess = sal_False;
+
         if ( GetContent().is()
           && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
           && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
         {
             // if there is already such a document, we should copy it
             // if it is a file system use OS copy process
-            sal_Bool bTransferSuccess = sal_False;
             try
             {
                 uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
@@ -3460,16 +3544,14 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
             catch( uno::Exception& )
             {}
 
-            if ( !bTransferSuccess )
+            if ( bTransferSuccess )
             {
-                SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-                return;
+                CloseOutStream();
+                CloseInStream();
             }
-
-            CloseOutStream();
-            CloseInStream();
         }
-        else if ( pInStream )
+
+        if ( !bTransferSuccess && pInStream )
         {
             // the case when there is no URL-access available or this is a remote protocoll
             // but there is an input stream
@@ -3489,13 +3571,25 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
                     pOutStream->Write( pBuf, nRead );
                 }
 
+                bTransferSuccess = sal_True;
                 delete[] pBuf;
                 CloseInStream();
             }
             CloseOutStream_Impl();
         }
         else
+        {
+            // Quite strange design, but currently it is expected that in this case no transfer happens
+            // TODO/LATER: get rid of this inconsistent part of the call design
+            bTransferSuccess = sal_True;
             CloseInStream();
+        }
+
+        if ( !bTransferSuccess )
+        {
+            SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+            return;
+        }
     }
 
     CloseStorage();
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index ecd9ae7aee42..9615cc4f51a7 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -48,13 +48,13 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index f1b889821de7..8d96c08a51d4 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -48,7 +48,7 @@
 #include <framework/interaction.hxx>
 #include <osl/file.hxx>
 #include <rtl/ref.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 3d5ba474fb3e..a00b047230d1 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -34,7 +34,7 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index f1b117f6a1c9..80492708d652 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -42,7 +42,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/ehdl.hxx>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 099e649506c0..4439dc05f9ff 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index d0c10556abd3..86a86ccb61b4 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -44,17 +44,17 @@
 #include <vcl/menubtn.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/print.hxx>
-#include <svtools/style.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/style.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/imagemgr.hxx>
 #include <vcl/waitobj.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/color.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sot/exchange.hxx>
 #include <comphelper/storagehelper.hxx>
 
@@ -81,7 +81,7 @@
 #endif
 #include <comphelper/processfactory.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 static const char cDelim = ':';
 BOOL SfxOrganizeListBox_Impl::bDropMoveOk = TRUE;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 6f333586a22e..23616edf9279 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -34,7 +34,7 @@
 #include <sot/object.hxx>
 #include <tools/stream.hxx>
 #include <vcl/splitwin.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 5916fb625787..bceca0db94ca 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -62,12 +62,11 @@
 
 #include "guisaveas.hxx"
 
-#include <svtools/pathoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/adrparse.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/saveopt.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index cffa86c0540d..0fe45c49db95 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -37,8 +37,8 @@
 #ifndef _SVMEDIT_HXX
 #include <svtools/svmedit.hxx>
 #endif
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 9c14ed84cc7e..6883f0976566 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -41,25 +41,25 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <tools/cachestr.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/ctloptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <tools/datetime.hxx>
 #include <math.h>
 
-#include <svtools/saveopt.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/saveopt.hxx>
+#include <unotools/useroptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index efd3f04444ba..3c78bad9220e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -32,12 +32,12 @@
 #include "precompiled_sfx2.hxx"
 
 #ifndef _INETMSG_HXX //autogen
-#include <svtools/inetmsg.hxx>
+#include <svl/inetmsg.hxx>
 #endif
 #include <tools/diagnose_ex.h>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/svparser.hxx> // SvKeyValue
 #include <vos/mutex.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -80,7 +80,7 @@
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/task/ErrorCodeRequest.hpp>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
@@ -111,12 +111,12 @@ using namespace ::com::sun::star::container;
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <tools/inetmime.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/inettype.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/inettype.hxx>
+#include <svl/sharecontrolfile.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <vcl/svapp.hxx>
@@ -2538,12 +2538,20 @@ void SfxObjectShell::StoreLog()
 
     if ( pImp->m_xLogRing.is() )
     {
-        ::rtl::OUString aFileURL =
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ) );
+#ifdef WNT
+        ::rtl::OUString aFileURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ) );
+#else
+        ::rtl::OUString aFileURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}" ) );
+#endif
+
         ::rtl::Bootstrap::expandMacros( aFileURL );
 
-        ::rtl::OUString aBuildID =
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ) );
+#ifdef WNT
+        ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ) );
+#else
+        ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/setuprc:buildid}" ) );
+#endif
+
         ::rtl::Bootstrap::expandMacros( aBuildID );
 
         if ( aFileURL.getLength() )
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 206350fd03d6..fb555c5edeec 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -54,20 +54,20 @@
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <tools/urlobj.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
 #include <comphelper/string.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <svtools/asynclink.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <comphelper/documentconstants.hxx>
 
 #include <sfx2/app.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 21515b2c6f3d..ead9a7c9fd9a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -34,9 +34,9 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <tools/zcodec.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XModel.hpp>
@@ -80,16 +80,15 @@
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/interaction.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/cachestr.hxx>
-#include <svtools/addxmltostorageoptions.hxx>
 #include <unotools/streamwrap.hxx>
 
-#include <svtools/saveopt.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/saveopt.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/localfilehelper.hxx>
@@ -1872,7 +1871,19 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMediu
         {
             uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW );
             ::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl();
-            if ( aBackupURL.getLength() )
+            if ( !aBackupURL.getLength() )
+            {
+                // the backup could not be created, try to disconnect the storage and close the source SfxMedium
+                // in this case the optimization is not possible, connect storage to a temporary file
+                rTargetMedium.ResetError();
+                xOptStorage->writeAndAttachToStream( uno::Reference< io::XStream >() );
+                rSrcMedium.CanDisposeStorage_Impl( sal_False );
+                rSrcMedium.Close();
+
+                // now try to create the backup
+                rTargetMedium.GetBackup_Impl();
+            }
+            else
             {
                 // the following call will only compare stream sizes
                 // TODO/LATER: this is a very risky part, since if the URL contents are different from the storage
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 1f1cbba7d7e0..eb022afc60df 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -59,7 +59,7 @@
 #include <vos/mutex.hxx>
 
 #include <tools/errcode.hxx>
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
 #include <comphelper/string.hxx>
 #include <comphelper/sequenceasvector.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 950ecf9ea239..91c0f605e453 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -54,14 +54,14 @@
 #include <vcl/wrkwin.hxx>
 #endif
 #include <vcl/svapp.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/rtti.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfxhelp.hxx>
 #include <basic/sbstar.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/eventcfg.hxx>
+#include <unotools/eventcfg.hxx>
 
 #include <sfx2/objsh.hxx>
 #include <sfx2/signaturestate.hxx>
@@ -71,7 +71,7 @@
 #endif
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
-#include <svtools/printwarningoptions.hxx>
+#include <unotools/printwarningoptions.hxx>
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
 #endif
@@ -82,9 +82,9 @@
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 
-#include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/sharecontrolfile.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <svtools/asynclink.hxx>
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index cd8e28ee771c..d61bd4701e1b 100755
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -43,10 +43,10 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 
-#include <svtools/lstner.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/lstner.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <osl/file.hxx>
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index 94370e9a1c52..b156d409c9be 100755
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -1,108 +1,108 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: shutdowniconw32.cxx,v $

- * $Revision: 1.48 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-

-#ifdef WNT

-

-// necessary to include system headers without warnings

-#ifdef _MSC_VER

-#pragma warning(disable:4668 4917) 

-#endif

-

-#include <windows.h>

-#include <lmaccess.h>

-#include <sal/types.h>

-

-sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath )

-{

-    sal_Bool bResult = sal_False;

-

-    sal_uInt32 nFDSize = 0;

-    GetFileSecurityW( pFilePath, DACL_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|OWNER_SECURITY_INFORMATION, NULL, 0, &nFDSize );

-    if ( nFDSize )

-    {

-        PSECURITY_DESCRIPTOR pFileDescr = reinterpret_cast< PSECURITY_DESCRIPTOR >( malloc( nFDSize ) );

-        if ( GetFileSecurityW( pFilePath, DACL_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|OWNER_SECURITY_INFORMATION, pFileDescr, nFDSize, &nFDSize ) )

-        {

-            HANDLE hToken = NULL;

-            if ( OpenThreadToken( GetCurrentThread(), TOKEN_DUPLICATE|TOKEN_QUERY, TRUE, &hToken )

-              || OpenProcessToken( GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &hToken) )

-            {

-                HANDLE hImpersonationToken = NULL;

-                if ( DuplicateToken( hToken, SecurityImpersonation, &hImpersonationToken) )

-                {

-                    sal_uInt32 nDesiredAccess = ACCESS_WRITE;

-                    GENERIC_MAPPING aGenericMapping = { ACCESS_READ, ACCESS_WRITE, 0, ACCESS_READ | ACCESS_WRITE };

-                    MapGenericMask( &nDesiredAccess, &aGenericMapping );

-

-                    PRIVILEGE_SET aPrivilegeSet;

-                    sal_uInt32 nPrivilegeSetSize = sizeof( PRIVILEGE_SET );

-

-                    sal_uInt32 nGrantedAccess;

-                    BOOL bAccessible = TRUE;

-                    if ( AccessCheck( pFileDescr,

-                                      hImpersonationToken,

-                                      nDesiredAccess,

-                                      &aGenericMapping,

-                                      &aPrivilegeSet,

-                                      &nPrivilegeSetSize,

-                                      &nGrantedAccess, 

-                                      &bAccessible ) )

-                    {

-                        bResult = !bAccessible;

-                    }

-

-                    CloseHandle( hImpersonationToken );

-                }

-

-                CloseHandle( hToken );

-            }

-        }

-

-        free( pFileDescr );

-    }

-

-    return bResult;

-}

-

-#else // this is UNX

-// MARKER(update_precomp.py): autogen include statement, do not remove

-#include "precompiled_sfx2.hxx"

-

-

-#include <sal/types.h>

-

-sal_Bool IsReadonlyAccordingACL( const sal_Unicode* )

-{

-    // to be implemented

-    return sal_False;

-}

-

-#endif

-

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: shutdowniconw32.cxx,v $
+ * $Revision: 1.48 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifdef WNT
+
+// necessary to include system headers without warnings
+#ifdef _MSC_VER
+#pragma warning(disable:4668 4917)
+#endif
+
+#include <windows.h>
+#include <lmaccess.h>
+#include <sal/types.h>
+
+sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath )
+{
+    sal_Bool bResult = sal_False;
+
+    sal_uInt32 nFDSize = 0;
+    GetFileSecurityW( reinterpret_cast< LPCWSTR >(pFilePath), DACL_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|OWNER_SECURITY_INFORMATION, NULL, 0, &nFDSize );
+    if ( nFDSize )
+    {
+        PSECURITY_DESCRIPTOR pFileDescr = reinterpret_cast< PSECURITY_DESCRIPTOR >( malloc( nFDSize ) );
+        if ( GetFileSecurityW( reinterpret_cast< LPCWSTR >(pFilePath), DACL_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|OWNER_SECURITY_INFORMATION, pFileDescr, nFDSize, &nFDSize ) )
+        {
+            HANDLE hToken = NULL;
+            if ( OpenThreadToken( GetCurrentThread(), TOKEN_DUPLICATE|TOKEN_QUERY, TRUE, &hToken )
+              || OpenProcessToken( GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &hToken) )
+            {
+                HANDLE hImpersonationToken = NULL;
+                if ( DuplicateToken( hToken, SecurityImpersonation, &hImpersonationToken) )
+                {
+                    sal_uInt32 nDesiredAccess = ACCESS_WRITE;
+                    GENERIC_MAPPING aGenericMapping = { ACCESS_READ, ACCESS_WRITE, 0, ACCESS_READ | ACCESS_WRITE };
+                    MapGenericMask( &nDesiredAccess, &aGenericMapping );
+
+                    PRIVILEGE_SET aPrivilegeSet;
+                    sal_uInt32 nPrivilegeSetSize = sizeof( PRIVILEGE_SET );
+
+                    sal_uInt32 nGrantedAccess;
+                    BOOL bAccessible = TRUE;
+                    if ( AccessCheck( pFileDescr,
+                                      hImpersonationToken,
+                                      nDesiredAccess,
+                                      &aGenericMapping,
+                                      &aPrivilegeSet,
+                                      &nPrivilegeSetSize,
+                                      &nGrantedAccess,
+                                      &bAccessible ) )
+                    {
+                        bResult = !bAccessible;
+                    }
+
+                    CloseHandle( hImpersonationToken );
+                }
+
+                CloseHandle( hToken );
+            }
+        }
+
+        free( pFileDescr );
+    }
+
+    return bResult;
+}
+
+#else // this is UNX
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+
+#include <sal/types.h>
+
+sal_Bool IsReadonlyAccordingACL( const sal_Unicode* )
+{
+    // to be implemented
+    return sal_False;
+}
+
+#endif
+
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 03e6e9170153..158dbdb9e13e 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -73,9 +73,9 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>  // can be removed when this is a "real" service
 #include <comphelper/componentcontext.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbuno.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index 223f0b767845..4c7a1fcbe102 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -31,9 +31,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include <svtools/itempool.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/stritem.hxx>
 #include <nochaos.hxx>
 #include <sfx2/sfxuno.hxx>
 
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index bd782b76a5ae..8b0420ef1e97 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -32,7 +32,7 @@
 
 #include <tools/link.hxx>
 #include <tools/list.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/timer.hxx>
 #include <tools/string.hxx>
 #include "rtl/ref.hxx"
@@ -58,7 +58,6 @@ class SfxFilterMatcher;
 class SfxCancelManager;
 class SfxStatusDispatcher;
 class SfxDdeTriggerTopic_Impl;
-class SfxMiscCfg;
 class SfxDocumentTemplates;
 class SfxFrameArr_Impl;
 class SvtSaveOptions;
@@ -122,7 +121,6 @@ public:
     SfxEventConfiguration*              pEventConfig;
     SvUShorts*                          pDisabledSlotList;
     SvStrings*                          pSecureURLs;
-    SfxMiscCfg*                         pMiscConfig;
     SvtSaveOptions*                     pSaveOptions;
     SvtUndoOptions*                     pUndoOptions;
     SvtHelpOptions*                     pHelpOptions;
diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx
index 53b97b2656ff..f8906a7670dd 100644
--- a/sfx2/source/inc/applet.hxx
+++ b/sfx2/source/inc/applet.hxx
@@ -43,8 +43,8 @@
 #include <cppuhelper/implbase6.hxx>
 
 #include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 0940d4bb66e3..a720c2369cf5 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -57,8 +57,8 @@
 
 #include <vos/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/eventcfg.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/eventcfg.hxx>
 
 //--------------------------------------------------------------------------------------------------------
 
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 1b2cc2220a28..b8beacafee3a 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -32,7 +32,7 @@
 
 // include ------------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids -----------------------------------------------------------------
 
@@ -346,8 +346,9 @@
 #define HID_TP_CUSTOMPROPERTIES                     (HID_SFX_START + 324)
 #define HID_CTRL_CUSTOMPROPERTIES                   (HID_SFX_START + 325)
 #define HID_CTRL_CUSTOMPROPS_YES_NO                 (HID_SFX_START + 326)
+#define HID_DLG_CUSTOMPROPS_DURATION                (HID_SFX_START + 327)
 
-#define ACT_SFX_HID_END HID_CTRL_CUSTOMPROPS_YES_NO
+#define ACT_SFX_HID_END HID_DLG_CUSTOMPROPS_DURATION
 
 // "Uberlaufpr"ufung --------------------------------------------------------
 
diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx
index bec875659e28..9abfd70ab663 100644
--- a/sfx2/source/inc/iframe.hxx
+++ b/sfx2/source/inc/iframe.hxx
@@ -45,8 +45,8 @@
 #include <cppuhelper/implbase6.hxx>
 
 #include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
 
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/frmdescr.hxx>
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 77162423cabe..fed465c69986 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/logging/XSimpleLogRing.hpp>
 #include <tools/datetime.hxx>
 
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <sfx2/objsh.hxx>
 #include "sfx2/docmacromode.hxx"
 #include "bitset.hxx"
diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx
index bba36717a946..f258ca720b15 100644
--- a/sfx2/source/inc/plugin.hxx
+++ b/sfx2/source/inc/plugin.hxx
@@ -45,8 +45,8 @@
 #include <cppuhelper/implbase5.hxx>
 
 #include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
 
 #include <sfx2/sfxuno.hxx>
 
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 2ad3670ab014..bc7d267d75d8 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -60,6 +60,11 @@
 #define SFX_QB_WRONG_TYPE                   (RID_SFX_SFXLOCAL_START +  7)
 #define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  8)
 #define SFX_IMG_PROPERTY_REMOVE_HC          (RID_SFX_SFXLOCAL_START +  9)
+#define SFX_FLD_DATE                        (RID_SFX_SFXLOCAL_START +  10)
+#define SFX_FLD_TIME                        (RID_SFX_SFXLOCAL_START +  11)
+#define SFX_FLD_DURATION                    (RID_SFX_SFXLOCAL_START +  12)
+#define SFX_ST_DURATION_FORMAT              (RID_SFX_SFXLOCAL_START +  13)
+
 
 #endif
 
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 541fad8c3c2e..6e502bd9d7ad 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -34,7 +34,7 @@
 #include <osl/mutex.hxx>
 #include <tools/string.hxx>
 #include <vcl/menu.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/util/XStringWidth.hpp>
 
 #include <vector>
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index c1ffb7a79a0a..b4ea96c1ed4e 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -41,12 +41,12 @@ class SfxTemplateControllerItem;
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/svtreebx.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 
 #include <rsc/rscsfx.hxx>
 #include <tools/rtti.hxx>
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index f3c466343205..aecb2c0cf4cb 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -32,7 +32,7 @@
 #define _SFXVIRTMENU_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <sfx2/mnuitem.hxx>
 #include "mnucfga.hxx"
 
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index a8d84187691e..59b9d29c479d 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -42,7 +42,7 @@
 #include <cppuhelper/propshlp.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <rtl/ustring.hxx>
 #include <vos/mutex.hxx>
 
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index d6ce65c96b6d..de399eaaa956 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -40,11 +40,11 @@
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #endif
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/cancel.hxx>
-#include <svtools/historyoptions.hxx>
-#include <svtools/folderrestriction.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/cancel.hxx>
+#include <unotools/historyoptions.hxx>
+#include <svl/folderrestriction.hxx>
 #include <vcl/toolbox.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
@@ -57,9 +57,9 @@
 #endif
 #include <rtl/ustring.hxx>
 
-#include <svtools/itemset.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/itemset.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/asynclink.hxx>
 #include <svtools/inettbc.hxx>
 
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
index a6d592bf48d5..92454ae62f36 100644
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ b/sfx2/source/layout/sfxtabdialog.cxx
@@ -34,10 +34,10 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "appdata.hxx"
 #include "sfxtypes.hxx"
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 88247a0966e7..0e80cc207ce0 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -51,8 +51,8 @@
 #include <comphelper/processfactory.hxx>
 #endif
 #include <tools/urlobj.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/menuoptions.hxx>
 #include <framework/menuconfiguration.hxx>
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index f0bb48b54261..076932ba9dea 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -54,13 +54,13 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <sfx2/mnumgr.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/menuoptions.hxx>
 
 #include "virtmenu.hxx"
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index ba27fdcd797d..3d88009e7c0e 100644
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -38,7 +38,7 @@
 #include <vcl/menu.hxx>
 #endif
 #ifndef _SXSTRITEM_HXX //autogen
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef GCC
 #endif
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 326431c3ffbd..87f35805d1e7 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -34,7 +34,7 @@
 #include <sot/factory.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/imageitm.hxx>
+#include <svl/imageitm.hxx>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
@@ -284,7 +284,7 @@ SfxVirtualMenu::~SfxVirtualMenu()
     DBG_DTOR(SfxVirtualMenu, 0);
 
     DELETEZ( pImageControl );
-    SvtMenuOptions().RemoveListener( LINK( this, SfxVirtualMenu, SettingsChanged ) );
+    SvtMenuOptions().RemoveListenerLink( LINK( this, SfxVirtualMenu, SettingsChanged ) );
 
     if ( bIsActive )
     {
@@ -396,7 +396,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
     const int bOleServer = FALSE;
     const int bMac = FALSE;
     SvtMenuOptions aOptions;
-    aOptions.AddListener( LINK( this, SfxVirtualMenu, SettingsChanged ) );
+    aOptions.AddListenerLink( LINK( this, SfxVirtualMenu, SettingsChanged ) );
 
     // iterate through the items
     pBindings->ENTERREGISTRATIONS(); ++nLocks;
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index a01b1df73c82..ec542c4af595 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -42,14 +42,14 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #endif
 #include <tools/urlobj.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <sfx2/appuno.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <sfx2/evntconf.hxx>
-#include <svtools/eventcfg.hxx>
+#include <unotools/eventcfg.hxx>
 
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include "eventsupplier.hxx"
 
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 503995d97b30..df463ac92396 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef GCC
 #endif
 #include <com/sun/star/util/URL.hpp>
@@ -57,9 +57,9 @@
 #include <sfx2/sfx.hrc>
 
 #include <comphelper/processfactory.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
 #endif
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 0d659826d453..eb9305fc0e49 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -171,7 +171,7 @@ SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) :
     for ( sal_uInt32 i = 0; i < IMAGELIST_COUNT; i++ )
         m_pImageList[i] = 0;
 
-    m_aOpt.AddListener( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
+    m_aOpt.AddListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
     Application::AddEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) );
 }
 
@@ -179,7 +179,7 @@ SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) :
 
 SfxImageManager_Impl::~SfxImageManager_Impl()
 {
-    m_aOpt.RemoveListener( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
+    m_aOpt.RemoveListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
     Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) );
 
     for ( sal_uInt32 i = 0; i < m_aToolBoxes.size(); i++ )
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index b6e69156214d..29e6b85d67d2 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -58,14 +58,14 @@
 #include <com/sun/star/ui/XUIFunctionListener.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/imageitm.hxx>
-#include <svtools/visitem.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/imageitm.hxx>
+#include <svl/visitem.hxx>
+#include <svl/urlbmk.hxx>
 #include <vcl/toolbox.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <svtools/imagemgr.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 42e9a1d04cb6..c88297e477f7 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -43,12 +43,12 @@
 #ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SPLITWIN_HXX //autogen
 #include <vcl/splitwin.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index b91e1e6b4998..b439dca4ffed 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -62,10 +62,10 @@
 
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
@@ -73,7 +73,7 @@
 #include <sot/storinfo.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/mediadescriptor.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #ifndef css
 namespace css = ::com::sun::star;
diff --git a/sfx2/source/view/impframe.cxx b/sfx2/source/view/impframe.cxx
index d13beadee9f0..c81b48b20aa2 100644
--- a/sfx2/source/view/impframe.cxx
+++ b/sfx2/source/view/impframe.cxx
@@ -36,7 +36,7 @@
 
 #include "impframe.hxx"
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <sfx2/frame.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 21215fa6e730..d0b83ad619af 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -31,7 +31,7 @@
 #ifndef _SFX_IMPFRAME_HXX
 #define _SFX_IMPFRAME_HXX
 
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>                  // SvBorder
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index a8b57be6714b..3e9989760b11 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -72,7 +72,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/rectitem.hxx>
 #include <svtools/soerr.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index c99d45db6397..1ea49ecd879b 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -34,7 +34,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/printdlg.hxx>
-#include <svtools/printwarningoptions.hxx>
+#include <unotools/printwarningoptions.hxx>
 #include <svtools/printoptions.hxx>
 #include <vector>
 
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index 21d484e550ab..f875143bfab0 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -39,8 +39,8 @@
 #include <vcl/msgbox.hxx>
 #include <svtools/asynclink.hxx>
 
-#include <svtools/printwarningoptions.hxx>
-#include <svtools/eitem.hxx>
+#include <unotools/printwarningoptions.hxx>
+#include <svl/eitem.hxx>
 
 #ifndef GCC
 #endif
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index 01c48f8f2be0..f3596de6b1c2 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -60,15 +60,15 @@
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <vcl/menu.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/asynclink.hxx>
 #include <svtools/sfxecode.hxx>
 #include <vcl/dialog.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/bootstrap.hxx>
 
@@ -535,7 +535,7 @@ SfxTopFrame* SfxTopFrame::Create( SfxObjectShell* pDoc, USHORT nViewId, BOOL bHi
         aTitle += String(aProductName);
         aTitle += ' ';
         aTitle += String( GetModuleName_Impl( aDocServiceName ) );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ::rtl::OUString aDefault;
         aTitle += DEFINE_CONST_UNICODE(" [");
         String aVerId( utl::Bootstrap::getBuildIdData( aDefault ));
@@ -1098,7 +1098,7 @@ String SfxTopViewFrame::UpdateTitle()
     aTitle += ' ';
     ::rtl::OUString aDocServiceName( GetObjectShell()->GetFactory().GetDocumentServiceName() );
     aTitle += String( GetModuleName_Impl( aDocServiceName ) );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ::rtl::OUString aDefault;
     aTitle += DEFINE_CONST_UNICODE(" [");
     String aVerId( utl::Bootstrap::getBuildIdData( aDefault ));
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 592926bca1ce..945419189b78 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -44,13 +44,13 @@
 #ifndef _SPLITWIN_HXX //autogen
 #include <vcl/splitwin.hxx>
 #endif
-#include <svtools/moduleoptions.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/undo.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/whiter.hxx>
+#include <svl/undo.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
@@ -90,7 +90,7 @@
 #include <basic/sbx.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <svtools/asynclink.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/sharecontrolfile.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index c944264dd20c..e4a53a8a6e7a 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -33,7 +33,7 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/view/PrintableState.hpp>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
@@ -43,13 +43,13 @@
 #ifndef _SV_PRNSETUP_HXX //autogen
 #include <svtools/prnsetup.hxx>
 #endif
-#include <svtools/flagitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/flagitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/printwarningoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/printwarningoptions.hxx>
 #include <tools/datetime.hxx>
 
 #include <sfx2/viewsh.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f6053a467ed4..86c9ba0bb70e 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -30,12 +30,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/toolbox.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <com/sun/star/frame/XLayoutManager.hpp>
@@ -55,12 +55,12 @@
 #include <vos/mutex.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/soerr.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/internaloptions.hxx>
 
-#include <svtools/javaoptions.hxx>
+#include <unotools/javaoptions.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbuno.hxx>
 #include <framework/actiontriggerhelper.hxx>
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index f0f7022dc02c..4da6d6ce1eca 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -47,6 +47,7 @@
 #include "internal/types.hxx"
 
 #include <string>
+#define STRSAFE_NO_DEPRECATE
 #include <strsafe.h>
 
 //---------------------------------
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 5c52fcb7cd13..ff9842c18208 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -31,11 +31,7 @@
 #ifndef _XML_PARSER_HXX_
 #define _XML_PARSER_HXX_
 
-#ifdef SYSTEM_EXPAT
 #include <expat.h>
-#else
-#include <external/expat/xmlparse.h>
-#endif
 #include <stdexcept>
 
 //-----------------------------------------------------
@@ -76,9 +72,6 @@ public:
     xml_parser(const XML_Char* EncodingName = 0);
 
     //########################################################
-    xml_parser(const XML_Char* EncodingName, XML_Char NamespaceSeparator);
-
-    //########################################################
     ~xml_parser();
 
     //########################################################
@@ -126,10 +119,6 @@ public:
     /** Returns the currently used document handler or null if
         no document handler was set before. */
     i_xml_parser_event_handler* get_document_handler() const;
-
-    //############################################
-    void set_encoding(const XML_Char* Encoding);
-
 private:
 
     void init();
diff --git a/vcl/unx/inc/kde_headers.h b/shell/inc/kde_headers.h
index ccbffc99cb99..ccbffc99cb99 100644
--- a/vcl/unx/inc/kde_headers.h
+++ b/shell/inc/kde_headers.h
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index ed4fbca7e3f5..0fdf02409682 100644
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -1,4 +1,4 @@
-sl    shell	:    l10n offuh rdbmaker tools sal vcl EXPAT:expat NULL
+sl    shell	:    l10n offuh rdbmaker tools sal EXPAT:expat NULL
 sl    shell\inc			                           nmake   -   all sl_inc NULL
 sl    shell\source\win32                           nmake   -   w   sl_win32 sl_inc NULL
 sl    shell\source\win32\simplemail                nmake   -   w   sl_win32_simplemail sl_inc NULL
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index d623a55c2d6c..eee13ef34fe9 100644..100755
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -21,3 +21,4 @@
 ..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml
 
 ..\%__SRC%\misc\*-ucd.txt  %_DEST%\bin%_EXT%\*-ucd.txt
+..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index 70c42e646391..e935abd1c0d6 100755
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,17 +42,13 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
-SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj 
+SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj
 SHL1TARGET=recent_docs
-SHL1STDLIBS=$(SALLIB) 
+SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \
 ..$/unxsols4.pro$/slb$/libsysshell.a \
 $(EXPATASCII3RDLIB)
 .ENDIF
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index df0266d24156..5936c8c033b1 100755
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "systemshell.hxx"
 #include "osl/file.hxx"
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 1c898afde0a2..046397f64b8b 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -90,14 +90,6 @@ xml_parser::xml_parser(const XML_Char* EncodingName) :
 }
 
 //###################################################
-xml_parser::xml_parser(const XML_Char* EncodingName, XML_Char /*NamespaceSeparator*/) :
-    document_handler_(0),
-    xml_parser_(XML_ParserCreate(EncodingName))
-{
-    init();
-}
-
-//###################################################
 xml_parser::~xml_parser()
 {
     XML_ParserFree(xml_parser_);
@@ -224,9 +216,3 @@ i_xml_parser_event_handler* xml_parser::get_document_handler() const
 {
     return document_handler_;
 }
-
-//###################################################
-void xml_parser::set_encoding(const XML_Char* Encoding)
-{
-    XML_SetEncoding(xml_parser_, Encoding);
-}
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index 504c3bba9232..3c5b5eb86ad6 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -763,7 +763,6 @@ keyChangedCallback(GConfClient* aClient,
     aGconfBe->notifyListeners(aGconfKey);
 
 }
-#endif
 
 //------------------------------------------------------------------------------
 
@@ -827,7 +826,7 @@ void GconfBackend::notifyListeners(const rtl::OUString& /*aGconfKey*/)
     }
 */
 }
-
+#endif
 
 //------------------------------------------------------------------------------
 void SAL_CALL GconfBackend::addChangesListener(
diff --git a/shell/source/backends/gconfbe/gconfbackend.hxx b/shell/source/backends/gconfbe/gconfbackend.hxx
index 721586a80186..185577ec0265 100644
--- a/shell/source/backends/gconfbe/gconfbackend.hxx
+++ b/shell/source/backends/gconfbe/gconfbackend.hxx
@@ -174,10 +174,11 @@ class GconfBackend : public BackendBase {
             const uno::Reference<backend::XBackendChangesListener>& xListener,
             const rtl::OUString& aComponent)
                 throw (::com::sun::star::uno::RuntimeException);
-
+// currently not used
+#if 0
         //Notify all listener of component change
         void notifyListeners(const rtl::OUString& aGconfKey);
-
+#endif
     protected:
         /**
           Service constructor from a service factory.
diff --git a/shell/source/backends/kdebe/kdebecdef.cxx b/shell/source/backends/kdebe/kdebecdef.cxx
index 4ef90e992b03..c4995e6e81c1 100644
--- a/shell/source/backends/kdebe/kdebecdef.cxx
+++ b/shell/source/backends/kdebe/kdebecdef.cxx
@@ -37,7 +37,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #endif
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
 
 #include "uno/current_context.hxx"
 
diff --git a/shell/source/backends/kdebe/kdecommonlayer.cxx b/shell/source/backends/kdebe/kdecommonlayer.cxx
index d2347f7becdb..44592e893342 100644
--- a/shell/source/backends/kdebe/kdecommonlayer.cxx
+++ b/shell/source/backends/kdebe/kdecommonlayer.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 #include "kdecommonlayer.hxx"
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
 #include <com/sun/star/configuration/backend/PropertyInfo.hpp>
 #ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
 #include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
diff --git a/shell/source/backends/kdebe/kdeinetlayer.hxx b/shell/source/backends/kdebe/kdeinetlayer.hxx
index 7e8053a67b7b..1a7427b1cb2c 100644..100755
--- a/shell/source/backends/kdebe/kdeinetlayer.hxx
+++ b/shell/source/backends/kdebe/kdeinetlayer.hxx
@@ -10,7 +10,7 @@
 #endif
 #include <com/sun/star/util/XTimeStamped.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <vcl/kde_headers.h>
+#include <kde_headers.h>
 
 namespace css = com::sun::star ;
 namespace uno = css::uno ;
diff --git a/shell/source/backends/kdebe/kdepathslayer.cxx b/shell/source/backends/kdebe/kdepathslayer.cxx
index 34d85ee93d6d..c60a7fff040a 100644
--- a/shell/source/backends/kdebe/kdepathslayer.cxx
+++ b/shell/source/backends/kdebe/kdepathslayer.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 #include "kdepathslayer.hxx"
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
 #include <com/sun/star/configuration/backend/PropertyInfo.hpp>
 #ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
 #include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
diff --git a/shell/source/backends/kdebe/kdevcllayer.cxx b/shell/source/backends/kdebe/kdevcllayer.cxx
index d657ea5054a6..f6c5368acfec 100644
--- a/shell/source/backends/kdebe/kdevcllayer.cxx
+++ b/shell/source/backends/kdebe/kdevcllayer.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
 #endif
 #include <com/sun/star/uno/Sequence.hxx>
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
 
 //==============================================================================
 
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 43fbd410dbe3..f605d6f340d9 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -31,12 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 
-#if OSL_DEBUG_LEVEL == 0
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-#endif
-
 #include <tools/presys.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
@@ -60,7 +54,6 @@
 
 #include <iostream>
 #include <fstream>
-#include <assert.h>
 #include <map>
 #include <sstream>
 #include <iterator>
@@ -283,7 +276,7 @@ public:
     void substitute(std::string& Text)
     {
         replacement_table_t* prt = get_replacement_table(active_iso_lang_.make_std_string());
-        assert(prt);
+        OSL_ASSERT(prt);
         replacement_table_t::iterator iter = prt->find(Text);
         if (iter != prt->end())
             Text = iter->second;
@@ -293,7 +286,7 @@ public:
         const std::string& Placeholder, const std::string& Substitute)
     {
         replacement_table_t* prt = get_replacement_table(active_iso_lang_.make_std_string());
-        assert(prt);
+        OSL_ASSERT(prt);
         prt->insert(std::make_pair(Placeholder, Substitute));
     }
 
@@ -333,7 +326,7 @@ void add_group_entries(
     const ByteString& GroupName,
     Substitutor& Substitutor)
 {
-    assert(aConfig.HasGroup(GroupName));
+    OSL_ASSERT(aConfig.HasGroup(GroupName));
 
     aConfig.SetGroup(GroupName);
     size_t key_count = aConfig.GetKeyCount();
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 9126f1829ed7..6de067a62936 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -115,12 +115,6 @@ void recently_used_file::reset() const
 }
 
 //------------------------------------------------
-void recently_used_file::flush()
-{
-    fflush(file_);
-}
-
-//------------------------------------------------
 void recently_used_file::truncate(off_t length)
 {
     ftruncate(fileno(file_), length);
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index 93d0027a0d3e..ec27e5458cf0 100644
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -54,9 +54,6 @@ public:
     void truncate(off_t length = 0);
 
     //----------------------------
-    void flush();
-
-    //----------------------------
     size_t read(
         char* buffer,
         size_t size) const;
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index faf8118d7f8d..80d22501ed46 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -49,18 +49,6 @@
 #include <string.h>
 
 namespace /* private */ {
-
-    const rtl::OUString ENVV_UPDATE_RECENTLY_USED =
-        rtl::OUString::createFromAscii("ENABLE_UPDATE_RECENTLY_USED");
-
-    //########################################
-    inline rtl::OString get_file_extension(const rtl::OString& file_url)
-    {
-        sal_Int32 index = file_url.lastIndexOf('.');
-        OSL_ENSURE((index != -1) && ((index + 1) < file_url.getLength()), "Invalid file url");
-        return file_url.copy(index + 1);
-    }
-
     //########################################
     typedef std::vector<string_t> string_container_t;
 
@@ -475,14 +463,6 @@ namespace /* private */ {
             greater_recently_used_item());
     }
 
-    //##############################
-    bool update_recently_used_enabled()
-    {
-        rtl::OUString tmp;
-        osl_getEnvironment(ENVV_UPDATE_RECENTLY_USED.pData, &tmp.pData);
-        return (tmp.getLength() > 0);
-    }
-
     //------------------------------------------------
     struct cleanup_guard
     {
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
index cde95f49163a..b6bd1cc2889c 100644
--- a/slideshow/test/makefile.mk
+++ b/slideshow/test/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 PRJ=..
 
 PRJNAME=slideshow
-PRJINC=$(PRJ)$/source 
+PRJINC=$(PRJ)$/source
 TARGET=tests
 TARGETTYPE=GUI
 
@@ -50,13 +50,14 @@ SHL1OBJS=  \
     $(SLO)$/views.obj	  \
     $(SLO)$/slidetest.obj \
     $(SLO)$/testshape.obj \
-    $(SLO)$/testview.obj	
+    $(SLO)$/testview.obj
 
 SHL1TARGET= tests
 SHL1STDLIBS= 	$(SALLIB)		 \
                 $(BASEGFXLIB)	 \
                 $(CPPUHELPERLIB) \
                 $(CPPULIB)		 \
+                                $(TESTSHL2LIB)    \
                 $(CPPUNITLIB)	 \
                 $(UNOTOOLSLIB)	 \
                 $(VCLLIB)
@@ -70,7 +71,7 @@ SHL1STDLIBS= 	$(SALLIB)		 \
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map 
+SHL1VERSIONMAP = export.map
 # END target1 ----------------------------------------------------------
 
 # BEGIN target2 --------------------------------------------------------
@@ -96,9 +97,9 @@ APP2DEF=	$(MISC)$/$(TARGET).def
 #------------------------------- All object files ----------------------------
 
 # do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS) 
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk 
+.INCLUDE : _cppunit.mk
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index 96ed6f07fb90..633ee324359e 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index 00f9868bcae4..9482b9d31500 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index 57024438ef43..5f4c44f2a50d 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx
index 20a6a06a976a..e53a14e1fa33 100644
--- a/slideshow/test/views.cxx
+++ b/slideshow/test/views.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
diff --git a/soldep/bootstrp/XMLBuildListParser.pm b/soldep/bootstrp/XMLBuildListParser.pm
deleted file mode 100644
index 857723657568..000000000000
--- a/soldep/bootstrp/XMLBuildListParser.pm
+++ /dev/null
@@ -1,1966 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: XMLBuildListParser.pm,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#************************************************************
-# Data structure and XML parser/creator for the changeover  *
-# of the current build.lst to build.xlist files             *
-# programmer: Pascal Junck, Sun Microsystems GmbH           *
-#************************************************************
-
-# The current XMLBuildListParser is the second step for the changeover to XML.
-# It was written to create a complex structure with more possibilities to store informations
-# of the 'build.lst' files in the new XML files. The important informations were parsed by the
-# 'buildlst_parser.pl' from the old files and then are (temporary) stored by the set and add
-# methods in the module 'XMLBuildListParser' and 'XML::Parser'. By the API of this module it's
-# possible to create the new XML 'build.xlist' files.
-
-# If the '$Product' or the '$JobPlatform' (as also '$BuildReqPlatform') have no value,
-# their value are automatically 'all'.
-# It doesn't matter whether it's the set/add or the get method, that receives or sends
-# these optional parameters.
-# In the created XML file the default values aren't set, because of the constraints of the
-# 'Document Type Definition'(DTD).
-# If there is no product/platform attribute in the 'build.xlist' it means a default of 'all'!
-
-# The important parameters are:
-
-#     $ModuleName      =  it's the name of the current module
-
-#     $DependencyType  =  here are the three possible scalar dependency values
-#                         for all other depending modules(of the current module):
-#                         'md-simple', 'md-always' and 'md-force'
-
-#     $Products        =  which products can be used for the module dependencies
-#                         and might have more different whitespace separated values
-#                         e.g.'so oo' (scalar type)
-
-#     $Dir             =  it means a string(scalar) with the current working directory,
-#                         with a '/'(current directory) at the beginning of the string
-
-#     $JobType         =  it means a job e.g. 'make'
-
-#     $Platforms       =  in this scalar parameter might be more than one different value,
-#                         like: 'wnt unx mac' and 'all'('all' includes the three values)
-#                         it must be whitespace separated
-
-#     @DependingDirs   =  a list(array) of all inner depending directories
-#                         of the current working directory
-
-#     %BuildReq        =  means a hash with build requirement pairs:
-#                         'BuildReqName'(key) => 'BuildReqPlatform'(value)
-
-
-
-##############################  begin of main   ########################################
-
-use strict;
-
-use XML::Parser;
-
-package XMLBuildListParser;
-
-# global variable for printing out all results at parsing
-# if the debug variable is set to '1' it prints the results to STDOUT
-my $Debug = 0;
-
-
-#############################  begin of subroutines  ###################################
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-
-    my $self = {};
-
-    # no real instance data yet, might change if package is extended
-    bless($self, $class);
-    $$self{'error_string'} = '';
-    $self->beginXMLStructure();
-
-    return $self;
-}
-
-# VG: procedure for a better error handling
-sub getError
-{
-   my $self = shift;
-   return $$self{'error_string'};
-};
-
-########################################################################################
-#         sub: loadXMLFile
-#        gets: $File
-#    optional: -
-#     returns: -
-# description: get the 'path' of the 'build.xlist'(s), load it in the 'xml parser tree'
-#              and fill it in the own data_structure to make it available for the API
-########################################################################################
-sub loadXMLFile
-{
-   my $self = shift;
-   my $File = shift;
-
-   if (-f $File)
-   {
-      my $TreeParse = new XML::Parser(Style => 'Tree');
-
-      my $File_ref;
-
-      eval
-      {
-         $File_ref = $TreeParse->parsefile($File);
-      };
-
-      if ($@)
-      {
-         $@ =~ s/[\r\n]//g;
-         print"ERROR: $@" if ($Debug);
-         $$self{'error_string'} = 'ERROR: ' . $@ . ". Error occured while trying to parse $File";
-
-         return 0;
-      }
-      else
-      {
-         filterXMLFile($File_ref);
-
-         $$self{"ModuleData"} = $File_ref;
-
-         return 1;
-      }
-   }
-   else
-   {
-      $$self{'error_string'} = "ERROR: cannot find file $File";
-      return 0;
-   }
-}
-
-########################################################################################
-#         sub: filterXMLFile
-#        gets: $ArrayContent_ref
-#    optional: -
-#     returns: -
-# description: filters all '0' and whitespace based pairs of the XML file
-#              -> all spaces, tabs and new lines
-########################################################################################
-sub filterXMLFile
-{
-   my $ArrayContent_ref = shift;
-
-   # get the number of elements of the array_ref
-   my $Count = getContentCount($ArrayContent_ref);
-
-   for (my $i = 0; $i < $Count;)
-   {
-      # get each content pair
-      my $Content_ref = getContent($ArrayContent_ref, $i);
-
-      # in each content pair the first element is either
-      # a tag name or the value '0'
-      my $FirstContent = getTagName($Content_ref);
-
-      # we need the second part of the content pair to check
-      # which value is inside
-      my $SecondContent = getSecondContent($Content_ref);
-
-      my $tempArray_ref = "";
-      if (($FirstContent eq "task") or ($FirstContent eq "depend"))
-      {
-        my $dir = $Content_ref->[1]->[0]->{dir};
-        $dir =~ s/\/$//;
-        $Content_ref->[1]->[0]->{dir} = $dir;
-        $i++;
-        filterXMLFile($Content_ref);
-      }
-      elsif ($FirstContent eq "0")
-      {
-         # only if there is in the first part a '0' and in the
-         # second part are whitespaces...
-         if ($SecondContent =~ /\s+/)
-         {
-            # ...make a ref at this position
-            $tempArray_ref = @$ArrayContent_ref[1];
-
-            # and delete this element pair
-            removeContent($tempArray_ref, $i);
-
-            # now we have one element pair fewer
-            $Count--;
-         }
-         else
-         {
-            # is there a '0' but in the second part not a whitespace,
-            # increase 'i' by 1
-            $i++;
-         }
-      }
-      else
-      {
-         # if it's a tag name, increase 'i' by one and call recursive
-         # the 'filterXMLFile' with the 'content ref'
-         $i++;
-
-         # look further after the '0' and whitespace content
-         filterXMLFile($Content_ref);
-      }
-   }
-}
-
-########################################################################################
-#         sub: removeContent
-#        gets: $File_ref, $Count
-#    optional: -
-#     returns: -
-# description: removes the '0' and the whitespace based pairs of the XML structure
-#              whitespace could be: tabs, new lines and whitespace itself
-########################################################################################
-sub removeContent
-{
-   my $tempArray_ref = shift;
-   my $i = shift;
-
-   my $Start = (2*$i) + 1;
-
-   splice(@$tempArray_ref, $Start, 2);
-}
-
-########################################################################################
-#         sub: beginXMLStructure
-#        gets: $ModuleData_ref
-#    optional: -
-#     returns: -
-# description: create a new beginning of the XML file structure
-########################################################################################
-sub beginXMLStructure
-{
-   my $self = shift;
-
-   # global variable for the complete filled data structure
-   my $ModuleData_ref = createTag("build-list", {});
-
-   $$self{"ModuleData"} = $ModuleData_ref;
-}
-
-########################################################################################
-#         sub: insertContent
-#        gets: $HigherLevelTag_ref, $currentTag_ref, $Pos
-#    optional: -
-#     returns: -
-# description: insert a content at the right (alphabetical sorted) position
-########################################################################################
-sub insertContent
-{
-   my $HigherLevelTag_ref = shift;
-   my $currentTag_ref = shift;
-   my $Pos = shift;
-
-   my $Array_ref = $HigherLevelTag_ref->[1];
-
-   $Pos = ($Pos*2)+1;
-
-   splice(@$Array_ref, $Pos, 0, @$currentTag_ref);
-}
-
-########################################################################################
-#         sub: saveXMLFile
-#        gets: $Path
-#    optional: -
-#     returns: -
-# description: creates a XML file of the whole data structure
-########################################################################################
-sub saveXMLFile
-{
-   my $self = shift;
-   my $Path = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # open the filehandle 'CREATE_XML' for creating the XML files
-   open (SAVE_XML, ">".$Path)
-   or die "Error. Open the file <build.xlist> wasn't successful!\n\n";
-
-   select SAVE_XML;
-
-   print"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-   print"<!DOCTYPE build-list SYSTEM \"build_xlist.dtd\">\n";
-   print"<!--\n"
-       ."***************************************************************************\n"
-       ."*                                                                          \n"
-       ."* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.            \n"
-       ."*                                                                          \n"
-       ."* Copyright 2008 by Sun Microsystems, Inc.                                 \n"
-       ."*                                                                          \n"
-       ."* OpenOffice.org - a multi-platform office productivity suite              \n"
-       ."*                                                                          \n"
-       ."* \$RCSfile: XMLBuildListParser.pm,v $                                     \n"
-       ."*                                                                          \n"
-       ."* \$Revision: 1.3 $                                                        \n"
-       ."*                                                                          \n"
-       ."* This file is part of OpenOffice.org.                                     \n"
-       ."*                                                                          \n"
-       ."* OpenOffice.org is free software: you can redistribute it and/or modify   \n"
-       ."* it under the terms of the GNU Lesser General Public License version 3    \n"
-       ."* only, as published by the Free Software Foundation.                      \n"
-       ."*                                                                          \n"
-       ."* OpenOffice.org is distributed in the hope that it will be useful,        \n"
-       ."* but WITHOUT ANY WARRANTY; without even the implied warranty of           \n"
-       ."* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            \n"
-       ."* GNU Lesser General Public License version 3 for more details             \n"
-       ."* (a copy is included in the LICENSE file that accompanied this code).     \n"
-       ."*                                                                          \n"
-       ."* You should have received a copy of the GNU Lesser General Public License \n"
-       ."* version 3 along with OpenOffice.org.  If not, see                        \n"
-       ."* <http://www.openoffice.org/license.html>                                 \n"
-       ."* for a copy of the LGPLv3 License.                                        \n"
-       ."*                                                                          \n"
-       ."***************************************************************************\n"
-       ."-->\n";
-
-   printTag($ModuleData_ref);
-
-   # flush the buffer
-   # it's the same like the both lines below here, but we make it manually without module 'IO'
-   # use IO::Handle;
-   # SAVE_XML -> autoflush(1);
-   $| = 1;
-
-   select STDOUT;
-
-   close (SAVE_XML);
-
-}
-
-########################################################################################
-#         sub: printTag
-#        gets: $Tag_ref
-#    optional: -
-#     returns: -
-# description: prints out each tag of the existing data structure (XML tree)
-########################################################################################
-sub printTag
-{
-   my $Tag_ref = shift;
-
-   # the first time we call this function the 'pos counter' has the default value of '0',
-   # because it is for the begin tag -> it shouldn't have a distance to the left side
-   my $PosCounter = shift || 0;
-
-   # makes it possible that each tag has a specified distance from the left sided margin
-   my $Distance = " " x $PosCounter;
-
-   # it's possible that the content is a text(case 1) between a begin and end tag
-   # or a tag name(case 2)
-   # case 1: (    0      , "Text between the begin and end tag" )
-   my $TagName = getTagName($Tag_ref);
-
-   if ($TagName eq "0")
-   {
-        print"$Tag_ref->[1]";
-   }
-   # case 2: ( "TagName" , (...) )
-   else
-   {
-      # open the tag
-      # only a new line if it is not the first tag
-      print"\n" if ($PosCounter != 0);
-      print $Distance."<".$TagName;
-
-      my $Attributes_ref  = getAttributesRef($Tag_ref);
-
-      # print all sorted attributes of this tag
-      foreach my $Attribute (sort keys %$Attributes_ref)
-      {
-         my $value = $$Attributes_ref{$Attribute};
-         print" $Attribute=\"$value\"";
-      }
-
-      # get the number of elements of the array
-      my $ContentCount = getContentCount($Tag_ref);
-
-      # close the tag
-      # if it is an empty tag create a '/' before we close it with '>'
-      print"/" if ($ContentCount == 0);
-      print">";
-
-      # get and print all tags recursive
-      for (my $i = 0; $i < $ContentCount; $i++)
-      {
-         # here we get the content of the current tag,
-         # we rise the 'pos counter' that each level of tags
-         # has a specified distance from the left side
-         printTag(getContent($Tag_ref, $i), $PosCounter + 2);
-      }
-
-      # check that the tag has a text between the begin and end tag
-      # first: had the tag further inner tags?
-      if ($ContentCount > 0)
-      {
-         my $Content_ref = getContent($Tag_ref, 0);
-         my $TagName = getTagName($Tag_ref);
-         my $TagContent = getTagName($Content_ref);
-
-         # if a tag has a begin tag and a following text, create the end tag behind the text
-         print"</$TagName>" if ($TagContent eq "0");
-
-         print"\n".$Distance."</$TagName>" if ($TagContent ne "0");
-      }
-   }
-}
-
-########################################################################################
-#         sub: getTagName
-#        gets: $Content_ref
-#    optional: -
-#     returns: $TagName
-# description: gets a reference of an array and returns the tag name at position '0'
-########################################################################################
-sub getTagName
-{
-   my $Content_ref = shift;
-
-   my $TagName = $$Content_ref[0];
-
-   return $TagName;
-}
-
-########################################################################################
-#         sub: getSecondContent
-#        gets: $Content_ref
-#    optional: -
-#     returns: $SecondContent
-# description: gets a reference of an array and returns the second value(index '1')
-########################################################################################
-sub getSecondContent
-{
-   my $Content_ref = shift;
-
-   my $SecondContent = $$Content_ref[1];
-
-   return $SecondContent;
-}
-
-########################################################################################
-#         sub: createSortKey
-#        gets: $DependencyType, $DepModuleName
-#    optional: -
-#     returns: $SortKey
-# description: creates a key with a number(depending of the dependency type)
-#              and a string and returns it
-########################################################################################
-sub createSortKey
-{
-   my $DependencyType = shift;
-   my $DepModuleName = shift;
-
-   my $DepTypeAsValue = 0;
-
-   if ($DependencyType eq "md-simple")
-   {
-      $DepTypeAsValue = 1;
-   }
-   elsif ($DependencyType eq "md-always")
-   {
-      $DepTypeAsValue = 2;
-   }
-   elsif ($DependencyType eq "md-force")
-   {
-      $DepTypeAsValue = 3;
-   }
-
-   my $SortKey = $DepTypeAsValue.$DepModuleName;
-
-   return $SortKey;
-}
-
-########################################################################################
-#         sub: searchTag
-#        gets: $TagName, $Tag_ref
-#    optional: -
-#     returns: $TagValues_ref
-# description: gets a reference and goes in the lower level tag,
-#              looks after the specified tag name and returns the reference
-#              of itself and the neighbour element
-########################################################################################
-sub searchTag
-{
-   my $TagName = shift;
-   my $Tag_ref = shift;
-
-   my $TagSerie_ref = $Tag_ref->[1];
-
-   # (all elements of the array) - 1 => highest index of the array
-   my $IndexEnd = scalar(@$TagSerie_ref)-1;
-
-   my $TagValues_ref = undef;
-
-   for (my $i = 1; $i <= $IndexEnd; $i += 2)
-   {
-      if ($TagSerie_ref->[$i] eq $TagName)
-      {
-         @$TagValues_ref = @$TagSerie_ref[$i..$i+1];
-
-         last;
-      }
-   }
-
-   return $TagValues_ref;
-}
-
-########################################################################################
-#         sub: createTag
-#        gets: $TagName, $Attribute_ref
-#    optional: -
-#     returns: $Tag_ref
-# description: creates an anonymous array with a tag name and the reference of its
-#              attributes; then returns the reference of this array
-########################################################################################
-sub createTag
-{
-   my $TagName = shift;
-   my $Attribute_ref = shift;
-
-   my $Tag_ref = [$TagName, [$Attribute_ref]];
-
-   return $Tag_ref;
-}
-
-########################################################################################
-#         sub: createText
-#        gets: $Text
-#    optional: -
-#     returns: $TagText_ref
-# description: creates an anonymous array(which contains a '0' and a string)
-#              for the data structure and returns a reference of it
-########################################################################################
-sub createText
-{
-   my $Text = shift;
-
-   my $TagText_ref = [0, $Text];
-
-   return $TagText_ref;
-}
-
-########################################################################################
-#         sub: addContent
-#        gets: $Tag_ref, $NextInfos_ref
-#    optional: -
-#     returns: -
-# description: creates and adds a tag with its following content
-########################################################################################
-sub addContent
-{
-   # '$NextInfos_ref' has two infos:
-   # either:  '0' and a string                          -> [Tag, [{}, 0     ,  string ]]
-   #     or:  'tag' and a ref of a anonymous array      -> [Tag, [{}, newTag, [.....] ]]
-   my $Tag_ref = shift;
-   my $NextInfos_ref = shift;
-
-   my $SecondPart_ref = $Tag_ref->[1];
-
-   # '$Tag_ref' gets now the right structure:
-   # e.g.  ['tag1', [{}, 0, "text of tag1" ...]...]
-   # or    ['tag1', [{}, 'tag2', [...]     ...]...]
-   push(@$SecondPart_ref, @$NextInfos_ref);
-}
-
-########################################################################################
-#         sub: getContent
-#        gets: $Tag_ref, $i
-#    optional: -
-#     returns: \@Content (ref of array 'content')
-# description: creates and returns a reference of an array with two elements,
-#              which are a part of the array of the current tag
-########################################################################################
-sub getContent
-{
-   my $Tag_ref = shift;
-   my $i = shift;
-
-   # e.g.
-   #          [ "tag 1",  [  {} ,  0 , "string", "tag 2", [{}..], "tag 3", [{}..], ..] ..]
-   # $Tag_ref [  [0]     [1]                                                           ..]
-   # $Content_ref         [ [0]   [1]    [2]       [3]    [4]      [5]     [6]     ..]
-
-   my $Content_ref = $$Tag_ref[1];
-
-   # '$start' contains: elements with the index 1, 3, 5 ...(and so on)
-   #  '$end'  contains: elements with the index 2, 4, 6 ...(and so on)
-   my $start = (2 * $i) + 1;
-   my $end = $start + 1;
-
-   my @Content = @$Content_ref[$start..$end];
-
-   return \@Content;
-}
-
-########################################################################################
-#         sub: getAttribute
-#        gets: $Tag_ref, $AttributeName
-#    optional: -
-#     returns: $Attribute
-# description: finds and returns an attribute as a string
-########################################################################################
-sub getAttribute
-{
-   my $Tag_ref = shift;
-   my $AttributeName = shift;
-
-   #          [ "tag1",  [   { attribute1 = "..",    attribute2 = ".." } , "tag2"...  ]  ]
-   # Tag_ref  [  [0]    [1]                                                           ]  ]
-   #                    [  [0]->'attribute1'    , [0]->'attribute2'      ,   [1] ...  ]  ]
-
-   # get the scalar of the value of the 'AttributeName' in the anonymous hash
-   my $Attribute = $Tag_ref->[1]->[0]->{$AttributeName};
-
-   return $Attribute;
-}
-
-########################################################################################
-#         sub: getAttributeRef
-#        gets: $Tag_ref
-#    optional: -
-#     returns: $Attribute_ref
-# description: finds and returns the reference of the hash which contains the attributes
-########################################################################################
-sub getAttributesRef
-{
-   my $Tag_ref = shift;
-
-   #         [ "tag1",  [   {  attribute1 = "..",    attribute2 = ".." } , "tag2"... ]  ]
-   # Tag_ref [  [0]   [1]                                                            ]  ]
-   #                   [   [0]                                           ,  [1]      ]  ]
-
-   # get the reference of the anonymous hash
-   my $Attribute_ref = $Tag_ref->[1]->[0];
-
-   return $Attribute_ref;
-}
-
-########################################################################################
-#         sub: getContentCount
-#        gets: $Tag_ref
-#    optional: -
-#     returns: $IndexValue
-# description: returns the sum of elements pairs of the array (less the anonymous hash)
-########################################################################################
-sub getContentCount
-{
-   my $Tag_ref = shift;
-
-   # get the content array (address of the inner array)
-   my $Content_ref = $$Tag_ref[1];
-
-   # get the number of the element pairs of the array (without the anonymous hash)
-   my $IndexValue = scalar(@$Content_ref);
-   $IndexValue = ($IndexValue-1)/2;
-
-   return $IndexValue;
-}
-
-########################################################################################
-#         sub: getIterationData
-#        gets: $TagName
-#    optional: -
-#     returns: $IndexValue, $TagDepend_ref
-# description: gets a tag name and returns the sum of elements pairs of the array
-#             (less the anonymous hash) and the reference of the anonymous array
-########################################################################################
-sub getIterationData
-{
-   my $self = shift;
-   my $TagName = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my $TagDepend_ref = searchTag($TagName, $ModuleData_ref);
-   my $IndexValue = getContentCount($TagDepend_ref);
-
-   return ($IndexValue, $TagDepend_ref);
-}
-
-########################################################################################
-#         sub: printErrorMessage
-#        gets: $BuildReqPlatforms or $Platforms or $Products
-#    optional: -
-#     returns: -
-# description: it's an error, if a platform or a product content (e.g.'so oo')
-#              has at least one valid value and also the value 'all',
-#              because 'all' includes all other possible values
-########################################################################################
-sub printErrorMessage
-{
-   my $self = shift;
-   my $Content = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my $Module_ref = searchTag("module-name", $ModuleData_ref);
-   my $ModuleContent_ref = getContent($Module_ref, 0);
-   my $Module = @$ModuleContent_ref[1];
-
-   print"Error in module <$Module> in Content <$Content>!\n";
-   print"The value 'all' includes all currently existing valid values.\n\n";
-}
-
-########################################################################################
-#         sub: adjustRedundancy
-#        gets: $Task_ref, $JobPlatform, $BuildReq_ref
-#    optional: -
-#     returns: -
-# description: the tag <task> (it means 'job') should be created with no redundant infos,
-#              like: <task dir="/uno" platform="unx"> ...
-#                    <task dir="/uno" platform="wnt"> ...
-#                       <build-requirement name="test10" platform="wnt">
-#
-#              it should be: <task dir="/uno" platform="unx wnt">
-#                               <build-requirement name="test10" platform="wnt">
-########################################################################################
-sub adjustRedundancy
-{
-   my $Task_ref = shift;
-   my $JobPlatform = shift;
-   my $BuildReq_ref = shift;
-
-   my %sortedJobPlatforms = ();
-   my @JobPlatforms = ();
-   my $PlatformContent = "";
-
-   # get the 'task platforms' in one content
-   my $Attributes_ref = getAttributesRef($Task_ref);
-
-   # get the existing 'task platform'
-   my $existingPlatform = getAttribute($Task_ref, "platform");
-   $existingPlatform = "all" if (!($existingPlatform));
-
-   if ( ($existingPlatform ne "all") && ($JobPlatform ne "all") )
-   {
-      # get the sorted platform content
-      $sortedJobPlatforms{$JobPlatform} = "";
-      $sortedJobPlatforms{$existingPlatform} = "";
-
-      @JobPlatforms = sort keys %sortedJobPlatforms;
-
-      $PlatformContent = join " ", @JobPlatforms;
-
-      $$Attributes_ref{"platform"} = $PlatformContent;
-   }
-   elsif ( ($existingPlatform ne "all") && ($JobPlatform eq "all") )
-   {
-      delete $$Attributes_ref{"platform"};
-   }
-
-   if ($BuildReq_ref)
-   {
-      my $JobType_ref = getContent($Task_ref, 0);
-
-      # if it exists add the 'build requirements' at the
-      # previous(with the same directory as the current) <task> tag
-      addBuildReq($JobType_ref, $BuildReq_ref);
-   }
-}
-
-########################################################################################
-#         sub: addBuildReq
-#        gets: $JobTypeInfos_ref, $BuildReq_ref
-#    optional: -
-#     returns: -
-# description: add the 'build requirements' to the existing data structure
-#              case 1: if the 'job directory' is not redundant
-#              case 2: if it is redundant create it to the first existing 'job'
-########################################################################################
-sub addBuildReq
-{
-   my $JobTypeInfos_ref = shift;
-   my $BuildReq_ref = shift;
-
-   my @sortedBuildReqPlatforms = ();
-
-   foreach my $BuildReqName (sort keys %$BuildReq_ref)
-   {
-      my $BuildReqPlatforms = $$BuildReq_ref{$BuildReqName};
-
-      $BuildReqPlatforms = "all" if (!($BuildReqPlatforms));
-
-      my $Attributes_ref = {"name" => "$BuildReqName"};
-
-      # it's wrong, if in a platform content(e.g. "unx wnt") are at least
-      # one or more platform(s) and within a 'all' term,
-      # because 'all' is default and means it includes all other possible values!
-      if ( ($BuildReqPlatforms ne "all") && ($BuildReqPlatforms =~ /\ball\b/) )
-      {
-         printErrorMessage($BuildReqPlatforms);
-      }
-      elsif (!($BuildReqPlatforms =~ /\ball\b/))
-      {
-         @sortedBuildReqPlatforms = sort(split(/\s+/, $BuildReqPlatforms));
-         $BuildReqPlatforms = join " ", @sortedBuildReqPlatforms;
-
-         $$Attributes_ref{"platform"} = "$BuildReqPlatforms";
-      }
-
-      # create the tag <build-requirement>
-      my $BuildReqInfos_ref = createTag("build-requirement", $Attributes_ref);
-
-      # append the <build-requirement> tag to the <'$JobType'> tag
-      addContent($JobTypeInfos_ref, $BuildReqInfos_ref);
-   }
-}
-
-########################################################################################
-#         sub: checkJobRedundancy
-#        gets: $Task_ref, $JobType, $DependingDirs_ref, $JobPlatform, $BuildReq_ref
-#    optional: -
-#     returns: $LineIsRedundant
-# description: checks whether the values of the 'job' line are redundant, like:
-#              'job dir', 'job'(e.g.: make) and 'depending dirs'
-########################################################################################
-sub checkJobRedundancy
-{
-   my $Task_ref = shift;
-   my $JobType = shift;
-   my $DependingDirs_ref = shift;
-   my $JobPlatform = shift;
-   my $BuildReq_ref = shift;
-
-   my $LineIsRedundant = 0;
-
-
-   # get the ref of the existing 'depending directories'
-   # if they also equal with the current 'depending directories',
-   # make one tag instead of two, which differences only in the platform
-   # (and the 'build requirement', if it exists)
-   my $JobType_ref = getContent($Task_ref, 0);
-   my $JobName = getTagName($JobType_ref);
-
-   # get the existing 'task platform'
-   my $existingPlatform = getAttribute($Task_ref, "platform");
-
-   # are the jobs equal?
-   if ($JobType eq $JobName)
-   {
-      my @existingDepDirs = ();
-
-      my $IndexEnd = getContentCount($JobType_ref);
-
-      # get all existing 'depending dirs' of this redundant 'job'
-      for (my $j = 0; $j < $IndexEnd; $j++)
-      {
-         my $Content_ref = getContent($JobType_ref, $j);
-
-         my $TagName = getTagName($Content_ref);
-
-         # create an array of the 'depending directories'
-         if ($TagName eq "depend")
-         {
-            my $DepDir = getAttribute($Content_ref, "depend");
-
-            push(@existingDepDirs, $DepDir);
-         }
-      }
-
-      # if now the current 'depending dirs' equal with the existing,
-      # we know that is redundant and have to create only one instead
-      # of two tags, e.g.
-      #            before: <task dir="/uno" platform="unx">...
-      #                    <task dir="/uno" platform="wnt"> ...
-      #                       <build-requirement name="test10" platform="wnt">
-      #
-      #      it should be: <task dir="/uno" platform="unx wnt">
-      #                       <build-requirement name="test10" platform="wnt">
-      if (@$DependingDirs_ref eq @existingDepDirs)
-      {
-         $LineIsRedundant = 1;
-
-         # check redundant directories and create no redundant 'task dirs'
-         adjustRedundancy($Task_ref, $JobPlatform, $BuildReq_ref);
-      }
-   }
-
-   return $LineIsRedundant;
-}
-
-########################################################################################
-#         sub: existsTag
-#        gets: $TagName
-#    optional: -
-#     returns: $TagExists_ref
-# description: checks whether that a tag exists and returns the ref of the content
-########################################################################################
-sub existsTag
-{
-   my $self = shift;
-   my $TagName = shift;
-
-   my $TagExists_ref = undef;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   $TagExists_ref = searchTag($TagName, $ModuleData_ref);
-
-   return $TagExists_ref;
-}
-
-########################################################################################
-#                           API - (internal) 'set/add' methods                         #
-########################################################################################
-
-########################################################################################
-#         sub: setModuleName
-#        gets: $ModuleName
-#    optional: -
-#     returns: -
-# description: gets the name of the current module and set it at the right position
-#              in the data structure
-########################################################################################
-sub setModuleName
-{
-   my $self = shift;
-   my $ModuleName = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my $Tag_ref = createTag("module-name", {});
-   my $TagText_ref = createText($ModuleName);
-
-   addContent($Tag_ref, $TagText_ref);
-
-   addContent($ModuleData_ref, $Tag_ref);
-}
-
-########################################################################################
-#         sub: addModuleDependencies
-#        gets: $ModuleName, $DependencyType, $Products
-#    optional: $Products(default: 'all' -> includes currently 'so' and 'oo')
-#              but the default should not set in the data structure,
-#              it's only a 'Document Type Definition' based term
-#     returns: -
-# description: add the module dependencies and their attributes into the data structure
-########################################################################################
-sub addModuleDependencies
-{
-   my $self = shift;
-   my $ModuleName = shift;
-   my $DependencyType = shift;
-   my $Products = shift || "all";
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my @sortedProducts = ();
-
-   # change all possible upper cases to lower cases
-   $Products =~ s/($Products)/\L$Products/;
-
-   # before we add the module dependencies, we have to prove that the <module-depend> tag was set
-   # because this tag must be set once before the module dependency tags begin
-   my $ModuleDepend_ref = searchTag("module-depend", $ModuleData_ref);
-
-   # if it doesn't exist, create this tag '<module-depend>'
-   if (!($ModuleDepend_ref))
-   {
-      $ModuleDepend_ref = createTag("module-depend", {});
-
-      # add it to the global data structure
-      addContent($ModuleData_ref, $ModuleDepend_ref);
-   }
-
-   my $Attributes_ref = {"module" => "$ModuleName"};
-
-   # it's wrong, if in a product content(e.g. "so") are at least
-   # one or more product(s) and within a 'all' term,
-   # because 'all' is default and means it includes all other possible values!
-   if ( ($Products ne "all") && ($Products =~ /\ball\b/) )
-   {
-      printErrorMessage($Products);
-   }
-   elsif (!($Products =~ /\ball\b/))
-   {
-      @sortedProducts = sort(split(/\s+/ ,$Products));
-      $Products = join " ", @sortedProducts;
-
-      $$Attributes_ref{"product"} = "$Products";
-   }
-
-   my $ModuleDependenciesInfos_ref = createTag("$DependencyType", $Attributes_ref);
-
-   my $currentKey = createSortKey($DependencyType, $ModuleName);
-
-   # search and get the position in which we have to insert the current 'module depend name'
-   # at first get the current 'module depend name'
-   my $currentName = getAttribute($ModuleDependenciesInfos_ref, "module");
-
-   # get the information about the number of 'Contents'(= elements) of the array
-   my $ContentCount = getContentCount($ModuleDepend_ref);
-
-   # we have to sort the serie of the 'name' contents,
-   # therefore we need a 'Pos'(position) of the array in which we want to sort in the 'name' content
-   my $Pos = 0;
-
-   # and we need a control variable 'isInsert'
-   # that we won't add the 'name' and the content more than one time
-   my $isInsert = 0;
-
-   for (my $i = 0; $i < $ContentCount; $i++)
-   {
-      # get each 'Content' of the array = ('task', ARRAY(...))
-      my $Content_ref = getContent($ModuleDepend_ref, $i);
-      my $TagName = getTagName($Content_ref);
-
-      # get the existing 'task dir' to compare it with the current 'task dir'
-      my $existingName = getAttribute($Content_ref, "module");
-
-      my $existingKey = createSortKey(getTagName($Content_ref), $existingName);
-
-      # compare both dirs...
-      # only if the 'current dir' is lower than a 'existing dir'
-      # insert it in the data structure
-      if ($currentKey lt $existingKey)
-      {
-         $Pos = $i;
-
-         insertContent($ModuleDepend_ref, $ModuleDependenciesInfos_ref, $Pos);
-
-         $isInsert = 1;
-
-         last;
-      }
-   }
-   # only if the 'current name' is greater (or equal) than the other 'existing names'
-   # insert it at the end of the data structure
-   addContent($ModuleDepend_ref, $ModuleDependenciesInfos_ref) if ($isInsert == 0);
-}
-
-########################################################################################
-#         sub: addJob
-#        gets: $Dir, $JobType, $JobPlatform, $DependingDirs_ref, $BuildReq_ref,
-#              $JobPlatform, $DependingDirs_ref, $BuildReq_ref
-#    optional: $JobPlatform(default: 'all' -> includes all other possible values),
-#              $DependingDirs_ref, $BuildReq_ref
-#     returns: -
-# description: add the infos about a job from the old build lists(by ascii parser) and
-#              sort it in the data structure
-########################################################################################
-sub addJob
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $JobType = shift;
-   my $JobPlatform = shift || "all";
-   my $DependingDirs_ref = shift;
-   my $BuildReq_ref = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # before we add the "build" tag, we have to prove that the <build> tag was set
-   # because this tag must be set once before the job tag(s) follows
-   my $buildTag_ref = searchTag("build", $ModuleData_ref);
-
-   # if it doesn't exist, create the tag '<build>'
-   if (!($buildTag_ref))
-   {
-      # If the tag wasn't found, create it
-      $buildTag_ref = createTag("build", {});
-
-      # add it to the global data structure
-      addContent($ModuleData_ref, $buildTag_ref);
-   }
-
-   my $Attributes_ref = {"dir" => "$Dir"};
-
-   # it's wrong, if a 'job platform' content(e.g. "unx wnt") has at least
-   # one or more 'job platform(s)' and an 'all' term,
-   # because 'all' is default and means it includes all other possible values
-   if ( ($JobPlatform ne "all") && ($JobPlatform =~ /\ball\b/) )
-   {
-      printErrorMessage($JobPlatform);
-   }
-   elsif (!($JobPlatform =~ /\ball\b/))
-   {
-      my @sortedPlatforms = sort(split /\s+/, $JobPlatform);
-      $JobPlatform = join " ", @sortedPlatforms;
-
-      $$Attributes_ref{"platform"} = "$JobPlatform";
-   }
-
-   # create the tags: <task>, <make> and (if it exists)...
-   #                  <depend> and/or <build-requirement>
-   my $taskInfos_ref = createTag("task", $Attributes_ref);
-
-   # search and get the position in which we have to insert the current task
-   # at first get the current 'task directory'
-   my $currentDir = getAttribute($taskInfos_ref, "dir");
-
-   # get the information about the number of 'Contents'(= elements) of the array
-   my $IndexValue = getContentCount($buildTag_ref);
-
-   # we have to sort the serie of the 'task contents',
-   # therefore we need a '$pos'(position) of the array in which we want to sort in the 'task content'
-   my $Pos = 0;
-
-   # and we need a control variable 'isInsert'
-   # that we won't add the 'task content' more than one time
-   my $isInsert = 0;
-
-   # control variable for the redundancy check
-   my $LineIsRedundant = 0;
-
-   # go in the array of the corresponding <build> tag element
-   for (my $i = 0; $i < $IndexValue; $i++)
-   {
-      # get each content of the <build> tag => ('task1', ARRAY1(...), task2...)
-      my $Task_ref = getContent($buildTag_ref, $i);
-
-      # get the existing 'task dir' to compare it with the current 'task dir'
-      my $existingDir = getAttribute($Task_ref, "dir");
-
-      # is the 'job dir' redundant?
-      if ($currentDir eq $existingDir)
-      {
-         $LineIsRedundant = checkJobRedundancy($Task_ref, $JobType, $DependingDirs_ref, $JobPlatform, $BuildReq_ref);
-      }
-
-      # if it's not a redundant line, compare both dirs:
-      # only if the 'current dir' is lower than an 'existing dir'
-      # insert it in the data structure
-      if ( ($LineIsRedundant == 0) && ($currentDir lt $existingDir) )
-      {
-         $Pos = $i;
-
-         insertContent($buildTag_ref, $taskInfos_ref, $Pos);
-
-         $isInsert = 1;
-
-         last;
-      }
-   }
-
-   # only if the 'current dir' is greater (or equal) than the other 'existing dirs'
-   # and it is not redundant insert it at the end of the data structure
-   if ( ($isInsert == 0) && ($LineIsRedundant == 0) )
-   {
-      addContent($buildTag_ref, $taskInfos_ref);
-   }
-
-   if ($LineIsRedundant == 0)
-   {
-      # create the <'$JobType'> tag
-      my $JobTypeInfos_ref = createTag($JobType, {});
-
-      # append the <'$JobType'> tag to the <task> tag
-      addContent($taskInfos_ref, $JobTypeInfos_ref);
-
-      # before we add the "depend" infos
-      # we have to get the alphabetical sorted 'Depending Directories'
-      @$DependingDirs_ref = sort(@$DependingDirs_ref) if ($DependingDirs_ref);
-
-      foreach my $DependDir (@$DependingDirs_ref)
-      {
-         my $DependInfos_ref = createTag("depend", {"dir" => "$DependDir"});
-
-         # append the <depend> tag to the <'$JobType'> tag
-         addContent($JobTypeInfos_ref, $DependInfos_ref);
-      }
-
-      # if a 'build requirement' exists, create the tag <build-requirement>
-      if ($BuildReq_ref)
-      {
-         addBuildReq($JobTypeInfos_ref, $BuildReq_ref);
-      }
-   }
-}
-
-########################################################################################
-#                           end of (internal) 'set/add' methods                        #
-########################################################################################
-
-
-########################################################################################
-#                             API - (external) 'get' methods                           #
-########################################################################################
-
-########################################################################################
-#         sub: getModuleDependencies
-#        gets: $Product, $DependencyType
-#    optional: $Product(default: 'all', means all currently used valid values),
-#              $DependencyType(default: 'md-simple', 'md-always' and 'md-force')
-#     returns: @ModuleDependencies
-# description: gets a ref of an array (with the products) and creates and
-#              returns an array with the sorted depending modules
-########################################################################################
-sub getModuleName {
-   my $self = shift;
-   if ($self->existsTag("module-name")) {
-       my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-name");
-       return $$ModuleDepend_ref[1][2];
-   };
-   return "";
-
-};
-sub getModuleDependencies
-{
-   my $self = shift;
-   my $Products_ref = shift;
-   my $DependencyType = shift || "all";
-
-   push(@$Products_ref, "all") if (!scalar @$Products_ref);
-
-   my $Product = "";
-   my %tempModuleDeps = ();
-   my @ModuleDependencies = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      # change all possible upper cases to lower cases
-      $DependencyType =~ s/($DependencyType)/\L$DependencyType/ if ($DependencyType ne "all");
-
-      foreach $Product (@$Products_ref)
-      {
-         # change all possible upper cases to lower cases
-         $Product =~ s/($Product)/\L$Product/;
-
-         my $ProductContent = undef;
-         my $ModuleDependencyName = "";
-
-         # get the number of elements and the ref of the <module-depend> tag
-         my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-         for (my $i = 0; $i < $IndexValue; $i++)
-         {
-            my $Content_ref = getContent($ModuleDepend_ref, $i);
-
-            my $ModuleDependencyName = getAttribute($Content_ref, "module");
-
-            # get the name of each existing tag
-            my $TagName = getTagName($Content_ref);
-
-            $ProductContent = getAttribute($Content_ref, "product");
-
-            # if the attribute 'product' wasn't set in the internal data structure,
-            # it means the default of 'all' is valid and includes all other possible values
-            $ProductContent = "all" if (!($ProductContent));
-
-            if ($Product ne "all")
-            {
-               if ($DependencyType ne "all")
-               {
-                  # if the caller wants all (e.g.)'so' product based dependency types,
-                  # we must get the 'so' and the 'all' matching products
-                  # because 'all' matches also the product 'so'
-                  if ( ($DependencyType eq $TagName) &&
-                       ((($ProductContent eq "all") || $ProductContent =~ /\b($Product)\b/)) )
-                  {
-                     $tempModuleDeps{$ModuleDependencyName} = "";
-
-                     print"ModuleDeps (Product != 'all' && DepType != 'all') = <$ModuleDependencyName>\n" if ($Debug);
-                  }
-               }
-               # we get from the caller only the 'product' parameter,
-               # 'dependency type' is now 'all'(default) and includes all possible values
-               elsif ( ($ProductContent =~ /\b($Product)\b/) || ($ProductContent eq "all") )
-               {
-                  $tempModuleDeps{$ModuleDependencyName} = "";
-
-                  print"ModuleDeps (Product != 'all' && DepType = 'all') = <$ModuleDependencyName>\n" if ($Debug);
-               }
-            }
-            # now the product is 'all' and we only need to check the 'dependency type'
-            elsif ($DependencyType ne "all")
-            {
-               if ($DependencyType eq $TagName)
-               {
-                  $tempModuleDeps{$ModuleDependencyName} = "";
-
-                  print"ModuleDeps (Product = 'all' && DepType != 'all') = <$ModuleDependencyName>\n" if ($Debug);
-               }
-            }
-            else
-            {
-               $tempModuleDeps{$ModuleDependencyName} = "";
-
-               print"ModuleDeps (Product = 'all' && DepType = 'all') = <$ModuleDependencyName>\n" if ($Debug);
-            }
-         }
-      }
-
-      @ModuleDependencies = sort keys %tempModuleDeps;
-   }
-
-   print"ModuleDependencies            =  <@ModuleDependencies>\n" if ($Debug);
-
-   return @ModuleDependencies;
-}
-
-########################################################################################
-#         sub: getModuleDepType
-#        gets: $DepModuleName
-#    optional: -
-#     returns: $DependencyType
-# description: gets a module name and returns the dependency type of it
-########################################################################################
-sub getModuleDepType
-{
-   my $self = shift;
-   my $DepModuleName = shift;
-
-   my $DependencyType = "";
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      # change all possible upper cases to lower cases
-      $DepModuleName =~ s/($DepModuleName)/\L$DepModuleName/;
-
-      my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($ModuleDepend_ref, $i);
-         my $existingModuleName = getAttribute($Content_ref, "module");
-
-         if ($DepModuleName eq $existingModuleName)
-         {
-            $DependencyType = getTagName($Content_ref);
-            last;
-         }
-      }
-   }
-
-   print"DependencyType                =  <$DependencyType>\n" if ($Debug);
-
-   return $DependencyType;
-}
-
-########################################################################################
-#         sub: getModuleProducts
-#        gets: $DepModuleName
-#    optional: -
-#     returns: @ModuleProducts
-# description: gets a module name and returns the associated products
-########################################################################################
-sub getModuleProducts
-{
-   my $self = shift;
-   my $DepModuleName = shift;
-
-   my @ModuleProducts = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      # change all possible upper cases to lower cases
-      $DepModuleName =~ s/($DepModuleName)/\L$DepModuleName/;
-
-      my $ProductContent = undef;
-
-      my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($ModuleDepend_ref, $i);
-
-         my $existingModuleName = getAttribute($Content_ref, "module");
-
-         # if the attribute 'product' wasn't set in the internal data structure,
-         # it means the default of 'all' is valid and includes all other possible values
-         $ProductContent = getAttribute($Content_ref, "product");
-
-         if ($DepModuleName eq $existingModuleName)
-         {
-            $ProductContent = "all" if (!($ProductContent));
-
-            @ModuleProducts = split /\s+/, $ProductContent;
-
-            last;
-         }
-      }
-   }
-
-   print"Products                      =  <@ModuleProducts>\n" if ($Debug);
-
-   return @ModuleProducts;
-}
-
-########################################################################################
-#         sub: getProducts
-#        gets: -
-#    optional: -
-#     returns: @ModuleProducts
-# description: returns the products of the whole depending modules
-#              each found product name may occurs only once in the module products array
-########################################################################################
-sub getProducts
-{
-   my $self = shift;
-   my $ProductContent = undef;
-   my @tempProducts = ();
-   my @ModuleProducts = ();
-   my %Products = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($ModuleDepend_ref, $i);
-
-         $ProductContent = getAttribute($Content_ref, "product");
-
-         # if the attribute 'product' wasn't set in the internal data structure,
-         # it means the default of 'all' is valid and includes all other possible values
-         # but here we need only all 'not-all' values!
-         if (!($ProductContent))
-         {
-            $ProductContent="";
-         }
-         else
-         {
-            # here are the products of the current depending module
-            @tempProducts = split /\s+/, $ProductContent;
-
-            foreach my $Product (@tempProducts)
-            {
-               $Products{$Product} = "";
-            }
-         }
-      }
-
-      # fill the sorted 'module products' in the array
-      @ModuleProducts = sort keys %Products;
-   }
-
-   print"All ModuleProducts            =  <@ModuleProducts>\n" if ($Debug);
-
-   return @ModuleProducts;
-}
-
-########################################################################################
-#         sub: getJobDirectories
-#        gets: $JobType, $JobPlatform
-#    optional: $JobType, $JobPlatform(default: 'all' -> includes all possible values)
-#     returns: @JobDirectories
-# description: creates and returns an array with the sorted directories, which
-#              fulfil the expected values of the job type and the job platform
-########################################################################################
-sub getJobDirectories
-{
-   my $self = shift;
-   my $JobType = shift;
-   my $JobPlatform = shift || "all";
-
-   my @JobDirectories = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $JobType =~ s/($JobType)/\L$JobType/ if ($JobType);
-      $JobPlatform =~ s/($JobPlatform)/\L$JobPlatform/ if ($JobPlatform ne "all");
-
-      my $PlatformContent = undef;
-      my %tempJobDirectories = ();
-
-      # get the ref of the <build> tag
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($Build_ref, $i);
-
-         my $PlatformContent = getAttribute($Content_ref, "platform");
-         my $existingDir = getAttribute($Content_ref, "dir");
-
-         # three cases are possible...
-         if ($JobType)
-         {
-            my $JobType_ref = getContent($Content_ref, 0);
-            my $existingJobType = getTagName($JobType_ref);
-
-            # if the attribute 'job platform' wasn't set in the internal data structure,
-            # it means the default of 'all' is valid and includes all other possible values
-            $PlatformContent = "all" if (!($PlatformContent));
-
-            # first case: we get from the caller the parameters 'job type' and 'job platform'
-            if ($JobPlatform ne "all")
-            {
-               # if the caller wants all e.g.'wnt' job platform based directories,
-               # we have to get the 'wnt' or the 'all' matching platform
-               # because 'all' includes also 'wnt'
-               if ( ($JobType eq $existingJobType) &&
-                    (($PlatformContent =~ /\b($JobPlatform)\b/) || ($PlatformContent eq "all")) )
-               {
-                  $tempJobDirectories{$existingDir} = "";
-               }
-            }
-            # second case: we get from the caller only the 'job type' parameter
-            #              'job platform' is now 'all'(default) and includes all possible values
-            elsif ($JobType eq $existingJobType)
-            {
-               $tempJobDirectories{$existingDir} = "";
-            }
-         }
-         # third case: we get from the caller no parameter; now we take each existing 'job directory',
-         #             no matter which 'job type' and 'job platform' it has
-         else
-         {
-            $tempJobDirectories{$existingDir} = "";
-         }
-      }
-
-      # sort each unique 'job directory' alphabetical
-      @JobDirectories = sort keys %tempJobDirectories;
-   }
-   print"JobDirectories                =  <@JobDirectories>\n" if ($Debug);
-
-   return @JobDirectories;
-}
-
-########################################################################################
-#         sub: getDirDependencies
-#        gets: $Dir, $JobType, $JobPlatform
-#    optional: $JobPlatform(default: 'all' -> includes all possible values)
-#     returns: @JobDependencies
-# description: creates and returns an array with the sorted depending directories
-########################################################################################
-sub getDirDependencies
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $JobType = shift;
-   my $JobPlatform = shift || "all";
-
-   my @JobDependencies = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $JobType =~ s/($JobType)/\L$JobType/;
-      $JobPlatform =~ s/($JobPlatform)/\L$JobPlatform/ if ($JobPlatform ne "all");
-
-      my $PlatformContent = undef;
-      my %tempJobDependencies = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref) = $self->getIterationData("build");
-
-      # get all 'job directories' with the matching values of the 'job type' and the 'job platform'
-      my @tempDepDirs = ();
-      @tempDepDirs = $self->getJobDirectories($JobType, $JobPlatform);
-
-      # get each content of the <build> tag
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref of the content of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get both attributes: 'job dir' and 'job platform'
-         my $existingDir = getAttribute($Task_ref, "dir");
-         my $PlatformContent = getAttribute($Task_ref, "platform");
-
-         # if the attribute 'job platform' wasn't set in the internal data structure,
-         # it means the default of 'all' is valid and includes all other possible values
-         $PlatformContent = "all" if (!($PlatformContent));
-
-         # get the 'job type' ref which is inside the <task> tag on position '0'
-         my $JobType_ref = getContent($Task_ref, 0);
-
-         my $existingJobType = getTagName($JobType_ref);
-
-         if ( ($Dir eq $existingDir) && ($JobType eq $existingJobType) )
-         {
-            # each 'job type' can have several 'depends' and 'build requirements'
-            # here we get the number of the including elements
-            my $IndexEnd = getContentCount($JobType_ref);
-
-            for (my $j = 0; $j < $IndexEnd; $j++)
-            {
-               # create a ref of the existing content
-               my $Content_ref = getContent($JobType_ref, $j);
-
-               # the content_ref can be 'depend' or 'build requirement'
-               # but we only need the 'depend' informations
-               next if (getTagName($Content_ref) ne "depend");
-
-               # get the 'depend dir'
-               my $DependDir = getAttribute($Content_ref, "dir");
-
-               # look in the list of all existing 'job directories'
-               foreach my $DepDir (@tempDepDirs)
-               {
-                  # get it, if one of these 'job dirs' is equal with one of the 'depending dirs'
-                  if ($DepDir eq $DependDir)
-                  {
-                     # get all unique values only once
-                     $tempJobDependencies{$DepDir} = "";
-                  }
-               }
-            }
-         }
-      }
-
-      # get the unique sorted values in the array
-      @JobDependencies = sort keys %tempJobDependencies;
-   }
-
-   print"Depending Dirs                =  <@JobDependencies>\n" if ($Debug);
-
-   return @JobDependencies;
-}
-
-########################################################################################
-#         sub: getJobTypes
-#        gets: $Dir
-#    optional: -
-#     returns: @JobTypes
-# description: creates and returns an array with the sorted 'job types'
-########################################################################################
-sub getJobTypes
-{
-   my $self = shift;
-   my $Dir = shift;
-
-   my @JobTypes = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # it's for creating unique 'job types' which exists only once in the (later) array
-      my %tempJobTypes = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-         my $existingDir = getAttribute($Task_ref, "dir");
-
-         # we only need the 'task(s)' with the matching dir
-         next if ($Dir ne $existingDir);
-
-         # get the ref of the <task> tag at the position '0'
-         my $JobType_ref = getContent($Task_ref, 0);
-         my $JobType = getTagName($JobType_ref);
-
-         # get the 'job type' as a key in the hash
-         # so we can guarantee that each 'job type' stays unique!
-         $tempJobTypes{$JobType} = "";
-      }
-
-      # fill the unique sorted 'job types' in the array
-      @JobTypes = sort keys %tempJobTypes;
-   }
-
-   print"JobTypes                      =  <@JobTypes>\n" if ($Debug);
-
-   return @JobTypes;
-}
-
-########################################################################################
-#         sub: getJobBuildReqs
-#        gets: $Dir, $BuildReqPlatform
-#    optional: $BuildReqPlatform(default: 'all' -> includes all possible values)
-#     returns: @JobBuildRequirements
-# description: creates and returns an array with the sorted 'job build requirements'
-########################################################################################
-sub getJobBuildReqs
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $BuildReqPlatform = shift || "all";
-
-   my @JobBuildRequirements = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $BuildReqPlatform =~ s/($BuildReqPlatform)/\L$BuildReqPlatform/ if ($BuildReqPlatform ne "all");
-
-      my $BuildReqPlatformContent = undef;
-      my %tempJobBuildRequirements = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref to the content of the array of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get the attribute 'task dir'
-         my $existingDir = getAttribute($Task_ref, "dir");
-
-         # get the 'job type' ref which is inside the <task> tag
-         my $JobType_ref = getContent($Task_ref, 0);
-
-         # each 'job type' can have several 'depends' and 'build requirements'
-         # here we get the number of the included elements
-         my $IndexEnd = getContentCount($JobType_ref);
-
-         for (my $j = 0; $j < $IndexEnd; $j++)
-         {
-            # create a ref of the existing content
-            my $Content_ref = getContent($JobType_ref, $j);
-
-            # the content_ref can be 'build requirement' or 'depend'
-            # but we need only the 'build requirement' informations
-            next if (getTagName($Content_ref) ne "build-requirement");
-
-            my $BuildReqName = getAttribute($Content_ref, "name");
-            $BuildReqPlatformContent = getAttribute($Content_ref, "platform");
-
-            $BuildReqPlatformContent = "all" if (!($BuildReqPlatformContent));
-
-            if ($BuildReqPlatform ne "all")
-            {
-               # compare the parameters: 'dir' and 'platform'
-               # other values('wnt', 'unx' and 'mac') for 'platform'
-               # including the value 'all' in the existing 'platform' list
-               # get each 'build requirement name' only once (unique)
-               if ( ($Dir eq $existingDir) &&
-                    (($BuildReqPlatformContent =~ /\b($BuildReqPlatform)\b/) || ($BuildReqPlatformContent =~ /\ball\b/)) )
-               {
-                  $tempJobBuildRequirements{$BuildReqName} = "";
-
-                  print"JobBuildRequirements   (if)   =  <$BuildReqName>\n" if ($Debug);
-               }
-            }
-            # if the 'build requirement platform' was not allocated, it is "all" (default)
-            # now we only need to compare the directories
-            elsif ($Dir eq $existingDir)
-            {
-               $tempJobBuildRequirements{$BuildReqName} = "";
-
-               print"JobBuildRequirements (elsif)  =  <$BuildReqName>\n" if ($Debug);
-            }
-         }
-      }
-
-      # fill the unique sorted 'build requirement names' in the array
-      @JobBuildRequirements = sort keys %tempJobBuildRequirements;
-   }
-
-   print"JobBuildRequirements          =  <@JobBuildRequirements>\n" if ($Debug);
-
-   return @JobBuildRequirements;
-}
-
-########################################################################################
-#         sub: getJobBuildReqPlatforms
-#        gets: $Dir, $BuildReqName
-#    optional: -
-#     returns: @JobBuildReqPlatforms
-# description: creates and returns an array with
-#              the sorted 'job build requirement platforms'
-########################################################################################
-sub getJobBuildReqPlatforms
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $JobBuildReqName = shift;
-
-   my @JobBuildReqPlatforms = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $JobBuildReqName =~ s/($JobBuildReqName)/\L$JobBuildReqName/;
-
-      my $BuildReqPlatformContent = undef;
-      my @tempPlatforms = ();
-      my %tempJobBuildReqPlatforms = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref to the content of the array of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get the attribute 'task dir'
-         my $existingDir = getAttribute($Task_ref, "dir");
-
-         # get the 'job type' ref which is inside the <task> tag
-         my $JobType_ref = getContent($Task_ref, 0);
-
-         # each 'job type' can have several 'depends' and 'build requirements'
-         # here we get the number of the included elements
-         my $IndexEnd = getContentCount($JobType_ref);
-
-         for (my $j = 0; $j < $IndexEnd; $j++)
-         {
-            # create a ref of the existing content
-            my $Content_ref = getContent($JobType_ref, $j);
-
-            # the content_ref can be 'build requirement' or 'depend'
-            # but we need only the 'build requirement' informations
-            next if (getTagName($Content_ref) ne "build-requirement");
-
-            my $existingJobBuildReqName = getAttribute($Content_ref, "name");
-            $BuildReqPlatformContent = getAttribute($Content_ref, "platform");
-
-            $BuildReqPlatformContent = "all" if (!($BuildReqPlatformContent));
-
-            if ( ($Dir eq $existingDir) && ($JobBuildReqName eq $existingJobBuildReqName) )
-            {
-               # here are the platforms of the current 'build requirement'
-               @tempPlatforms = split /\s+/, $BuildReqPlatformContent;
-
-               foreach my $BuildReqPlatform (@tempPlatforms)
-               {
-                  $tempJobBuildReqPlatforms{$BuildReqPlatform} = "";
-               }                                                                                                                                        #########
-            }
-         }
-      }
-
-      # fill the unique sorted 'build requirement platforms' in the array
-      @JobBuildReqPlatforms = sort keys %tempJobBuildReqPlatforms;
-   }
-
-   print"JobBuildReqPlatforms          =  <@JobBuildReqPlatforms>\n" if ($Debug);
-
-   return @JobBuildReqPlatforms;
-}
-
-########################################################################################
-#         sub: getJobPlatforms
-#        gets: $Dir
-#    optional: -
-#     returns: @JobPlatforms
-# description: creates and returns an array with the sorted depending 'job platforms'
-########################################################################################
-sub getJobPlatforms
-{
-   my $self = shift;
-   my $Dir = shift;
-
-   my @JobPlatforms = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      my $PlatformContent = undef;
-      my %tempJobPlatforms = ();
-
-      # control variable: if a value 'all' exists in the platform content
-      #                   it doesn't matter which platforms are also existing,
-      #                   because 'all' includes all possible values!
-      my $allExists = 0;
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref) = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get the attributes of the <task> tag
-         my $existingTaskDir = getAttribute($Task_ref, "dir");
-         $PlatformContent = getAttribute($Task_ref, "platform");
-
-         # if it is not set in the data structure,
-         # it has automatically the default value 'all'
-         $PlatformContent = "all" if (!($PlatformContent));
-
-         if ($Dir eq $existingTaskDir)
-         {
-            # if a platform value 'all' exists, we remember it
-            # and don't look further after other platforms
-            if ($PlatformContent =~ /\ball\b/)
-            {
-               $allExists = 1;
-
-               @JobPlatforms = "all";
-
-               last;
-            }
-
-            my @tempPlatforms = ();
-
-            push(@tempPlatforms, split(/\s+/, $PlatformContent));
-
-            foreach my $Platform (@tempPlatforms)
-            {
-               $tempJobPlatforms{$Platform} = "";
-            }
-         }
-      }
-
-      # fill the unique sorted 'job platforms' in the array,
-      # but only if the content "all" is not present in the platform content
-      @JobPlatforms = sort keys %tempJobPlatforms if ($allExists == 0);
-   }
-
-   print"JobPlatforms                  =  <@JobPlatforms>\n" if ($Debug);
-
-   return @JobPlatforms;
-}
-
-########################################################################################
-#                                 end of 'get' methods                                 #
-########################################################################################
-
-1 ;
diff --git a/soldep/bootstrp/XmlBuildList.cxx b/soldep/bootstrp/XmlBuildList.cxx
deleted file mode 100644
index 670a3eb7f771..000000000000
--- a/soldep/bootstrp/XmlBuildList.cxx
+++ /dev/null
@@ -1,436 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: XmlBuildList.cxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <EXTERN.h>               /* from the Perl distribution     */
-
-#ifdef WNT
-#include <tools/prewin.h>
-#include "perl.h"
-#include <tools/postwin.h>
-#else
-#include "perl.h"
-#endif
-#undef Copy                     /* from Perl handy.h */
-
-#include <soldep/XmlBuildList.hxx>
-#include "XmlBuildListDef.hxx"
-
-#ifdef __cplusplus
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C extern
-#endif
-
-static PerlInterpreter *my_perl;  /***    The Perl interpreter    ***/
-static const char * DEP_MD_SIMPLE_STR = "md-simple";
-
-EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
-static void xs_init (pTHX);
-static void dl_init (pTHX);
-
-static void xs_init(pTHX)
-{
-        char *file = __FILE__;
-        dXSUB_SYS;
-        {
-        /* DynaLoader is a special case */
-        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-        }
-}
-
-static void dl_init(pTHX)
-{
-    char *file = __FILE__;
-    dTARG;
-    dSP;
-/* Dynamicboot strapping code*/
-        SAVETMPS;
-        targ=sv_newmortal();
-        FREETMPS;
-/* end Dynamic bootstrapping code */
-#ifdef MACOSX
-    *file=0; // how does this works???
-    sp=0;
-#endif
-}
-
-FullByteStringList::FullByteStringList()
-                    : FullByteStingListImpl(),
-                    nRef (0)
-{
-}
-
-FullByteStringList::~FullByteStringList()
-{
-    ByteString* pStr = First();
-    while (pStr)
-    {
-        delete pStr;
-        pStr = Next();
-    }
-}
-
-ULONG FullByteStringList::GetPos (ByteString& rStr)
-{
-    ULONG nCurPos = GetCurPos();
-    ULONG nPos = 0;
-    ByteString* pStr = First();
-    while (pStr)
-    {
-        if (*pStr == rStr)
-        {
-            GetObject (nCurPos);
-            return nPos;
-        }
-        pStr = Next();
-        nPos ++;
-    }
-    GetObject (nCurPos);
-    return LIST_ENTRY_NOTFOUND;
-}
-
-FullByteStringListWrapper& FullByteStringListWrapper::operator=( const FullByteStringListWrapper& rFullByteStringListWrapper )
-{
-    if (pStringList)
-        if (pStringList->GetRef() == 0)
-            delete pStringList;
-        else
-            pStringList->DecRef();
-
-    pStringList = rFullByteStringListWrapper.GetStringList();
-    if (pStringList)
-        pStringList->IncRef();
-    return *this;
-}
-
-FullByteStringListWrapper::~FullByteStringListWrapper ()
-{
-    if (pStringList)
-    {
-        if (pStringList->GetRef() == 0)
-            delete pStringList;
-        else
-            pStringList->DecRef();
-    }
-}
-
-//
-// Function initializes Perl
-// ATTENTION: No check built in - YET TO DO
-//
-void XmlBuildList::initPerl(const char* ModulePath) {
-    if (PerlInitialized)
-        return;
-    my_perl = perl_alloc();
-    if (!my_perl)
-        throw XmlBuildListException("Cannot initialize perl");
-    perl_construct(my_perl);
-    char* embedding[] = {"", "-e", "0"};
-    int exitstatus = perl_parse(my_perl, xs_init, 3, embedding, (char **)NULL);
-    if (!exitstatus) {
-        dl_init(aTHX);
-        exitstatus = perl_run(my_perl);
-    }
-    //perl_run(my_perl);
-    // Create a variable (s. perlguts)
-    SV* sv = get_sv("main::module_path", TRUE);
-    sv_setpv(sv, ModulePath);
-    eval_pv("use lib $main::module_path; use XMLBuildListParser;", FALSE);
-    checkOperationSuccess();
-    eval_pv("$main::build_lst_obj = XMLBuildListParser->new();", FALSE);
-    checkOperationSuccess();
-    eval_pv("@array = ();", FALSE);
-    checkOperationSuccess();
-    PerlInitialized = TRUE;
-};
-
-// Function proves if the $@ perl variable is set, if yes -
-// last operation was unsuccessfull -> throws exception
-void XmlBuildList::checkOperationSuccess() {
-    char* op_result = SvPV_nolen(get_sv("main::@", FALSE));
-    if (strcmp(op_result, ""))
-        throw XmlBuildListException(op_result);
-}
-
-//
-// Function generates a regular array with NULL as last element
-// from the Perl-object @array
-//
-FullByteStringList* XmlBuildList::extractArray() {
-    FullByteStringList* pStringList = new FullByteStringList();
-    AV* theArrayObj = get_av("main::array", FALSE);
-    I32 arrayLength = av_len(theArrayObj); // $#array value
-    if (arrayLength == -1)
-        return pStringList;
-
-    SV** string_ptr;
-    char* pStoredString;
-    // populate vector with strings (char*)
-    for (int i = 0; i <= arrayLength; i++) {
-        string_ptr = av_fetch(theArrayObj, i, NULL);
-        //pStoredString = savepv(SvPV_nolen(*string_ptr));
-        pStoredString = SvPV_nolen(*string_ptr);
-        ByteString* pStr = new ByteString(pStoredString);
-        pStringList->Insert(pStr, LIST_APPEND);
-    };
-    return pStringList;
-};
-
-
-char* XmlBuildList::getError() {
-    eval_pv("$main::string1 = $main::build_lst_obj->getError();", FALSE);
-    checkOperationSuccess();
-    return SvPV_nolen(get_sv("main::string1", FALSE));
-};
-
-/*****************************************************************************/
-XmlBuildList::XmlBuildList(const ByteString& rModulePath)
-/*****************************************************************************/
-                : PerlInitialized (FALSE)
-{
-    initPerl(rModulePath.GetBuffer());
-    string_obj1 = get_sv("main::string1", TRUE);
-    string_obj2 = get_sv("main::string2", TRUE);
-    string_obj3 = get_sv("main::string3", TRUE);
-    if (!(string_obj1 && string_obj2 && string_obj3))
-        throw XmlBuildListException("Cannot initialize Perl string objects");
-};
-
-//
-// Function uninitializes Perl
-//
-/*****************************************************************************/
-XmlBuildList::~XmlBuildList()
-/*****************************************************************************/
-{
-    if (!PerlInitialized)
-        return;
-    perl_destruct(my_perl);
-    perl_free(my_perl);
-    PerlInitialized = FALSE;
-};
-
-/*****************************************************************************/
-void XmlBuildList::loadXMLFile(const ByteString& rBuildList)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rBuildList.GetBuffer());
-    eval_pv("$main::string2 = $main::build_lst_obj->loadXMLFile($main::string1);", FALSE);
-    checkOperationSuccess();
-    if(!SvTRUE(string_obj2)) {
-        const char* Message = getError();
-        throw XmlBuildListException(Message);
-    };
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getProducts()
-/*****************************************************************************/
-{
-    eval_pv("@array = $main::build_lst_obj->getProducts();", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobDirectories(const ByteString& rJobType, const ByteString& rJobPlatform)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobType.GetBuffer());
-    sv_setpv(string_obj2, rJobPlatform.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobDirectories($main::string1, $main::string2);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleDependencies(const ByteString& rProduct, const ByteString& rDependencyType)
-/*****************************************************************************/
-{
-    FullByteStringList* pProducts = new FullByteStringList();
-    FullByteStringListWrapper aProducts (pProducts);
-    if (rProduct != "")
-        aProducts.Insert (new ByteString(rProduct), LIST_APPEND);
-    return getModuleDependencies(aProducts, rDependencyType);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleDependencies(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType)
-/*****************************************************************************/
-{
-    eval_pv("@products = ();", FALSE);
-    checkOperationSuccess();
-    AV* theArrayObj = get_av("main::products", FALSE);
-    FullByteStringList* pProducts = rProducts.GetStringList();
-    ByteString* pStr = pProducts->First();
-    while (pStr)
-    {
-        sv_setpv(string_obj2, pStr->GetBuffer());
-        av_push(theArrayObj, string_obj2);
-        pStr = pProducts->Next();
-    }
-
-    sv_setpv(string_obj1, rDependencyType.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getModuleDependencies(\\@products, $main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobBuildReqs(const ByteString& rJobDir, const ByteString& rBuildReqPlatform)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    sv_setpv(string_obj2, rBuildReqPlatform.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobBuildReqs($main::string1, $main::string2);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-}
-
-/*****************************************************************************/
-ByteString XmlBuildList::getModuleDepType(const ByteString& rDepModuleName)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rDepModuleName.GetBuffer());
-    eval_pv("$main::string1 = $main::build_lst_obj->getModuleDepType($main::string1);", FALSE);
-    checkOperationSuccess();
-    char* pString = SvPV_nolen(get_sv("main::string1", FALSE));
-    ByteString sDependencyType(pString);
-    return sDependencyType;
-}
-
-/*****************************************************************************/
-sal_Bool XmlBuildList::hasModuleDepType(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType)
-/*****************************************************************************/
-{
-    FullByteStringListWrapper aDepencendModules = getModuleDependencies(rProducts, rDependencyType);
-    if (aDepencendModules.Count()>0)
-    {
-        return sal_True;
-    }
-    return sal_False;
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleDepTypes(FullByteStringListWrapper& rProducts)
-/*****************************************************************************/
-{
-    FullByteStringList * pList = new FullByteStringList();
-
-    ByteString aDepType = ByteString( DEP_MD_SIMPLE_STR );
-    bool bHasType = hasModuleDepType(rProducts, aDepType);
-    if (bHasType)
-        pList->Insert(new ByteString (aDepType));
-
-    aDepType = ByteString(DEP_MD_ALWAYS_STR);
-    bHasType = hasModuleDepType(rProducts, aDepType);
-    if (bHasType)
-        pList->Insert(new ByteString (aDepType));
-
-    aDepType = ByteString(DEP_MD_FORCE_STR);
-    bHasType = hasModuleDepType(rProducts, aDepType);
-    if (bHasType)
-        pList->Insert(new ByteString (aDepType));
-
-    return FullByteStringListWrapper (pList);
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleProducts(const ByteString& rDepModuleName)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rDepModuleName.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getModuleProducts($main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-ByteString XmlBuildList::getModuleName()
-/*****************************************************************************/
-{
-    eval_pv("$main::string1 = $main::build_lst_obj->getModuleName();", FALSE);
-    checkOperationSuccess();
-    char* pString = SvPV_nolen(get_sv("main::string1", FALSE));
-    ByteString sModuleName(pString);
-    return sModuleName;
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getDirDependencies(const ByteString& rJobDir, const ByteString& rJobType, const ByteString& rJobPlatform)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    sv_setpv(string_obj2, rJobType.GetBuffer());
-    sv_setpv(string_obj3, rJobPlatform.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getDirDependencies($main::string1, $main::string2, $main::string3);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobTypes(const ByteString& rJobDir)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobTypes($main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobPlatforms(const ByteString& rJobDir)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobPlatforms($main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobBuildReqPlatforms(const ByteString& rJobDir, const ByteString& rBuildReqName)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    sv_setpv(string_obj2, rBuildReqName.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobBuildReqPlatforms($main::string1, $main::string2);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index d38b25982b86..ac56f781b791 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -35,10 +35,8 @@ PRJNAME=soldep
 TARGET=bootstrpdt
 ENABLE_EXCEPTIONS=true
 
-
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/util$/perl.mk
 .INCLUDE :  settings.mk
 
 # fixme, code is not yet 64 bit clean
@@ -50,7 +48,7 @@ all:
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES= \
-          $(SLO)$/prj.obj	
+                  $(SLO)$/prj.obj
 
 SLOFILES=\
           $(SLO)$/dep.obj \
@@ -58,7 +56,8 @@ SLOFILES=\
           $(SLO)$/prodmap.obj \
           $(SLO)$/appdef.obj \
            $(SLO)$/hashtbl.obj		\
-          $(SLO)$/prj.obj \
+          $(SLO)$/prj.obj
+
 
 SHL1TARGET	=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB	=$(TARGET)
@@ -69,7 +68,7 @@ SHL1STDLIBS=\
             $(TOOLSLIB) \
             $(BTSTRPLIB)		\
             $(VOSLIB)			\
-            $(SALLIB)
+            $(SALLIB)   
 
 DEF1NAME    =$(SHL1TARGET)
 DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt
diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx
index 2d87f0a35fc6..2a8a69dbc3b5 100644
--- a/soldep/bootstrp/minormk.cxx
+++ b/soldep/bootstrp/minormk.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 #include "minormk.hxx"
+#include "prodmap.hxx"
 #include <appdef.hxx>
 #include <tools/fsys.hxx>
 #include <tools/geninfo.hxx>
-#include "prodmap.hxx"
 
 //
 // class MinorMk
diff --git a/soldep/inc/soldep/XmlBuildList.hxx b/soldep/inc/soldep/XmlBuildList.hxx
deleted file mode 100644
index cfab946d453c..000000000000
--- a/soldep/inc/soldep/XmlBuildList.hxx
+++ /dev/null
@@ -1,160 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: XmlBuildList.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _XMLBUILDLIST_HXX
-#define _XMLBUILDLIST_HXX
-
-#ifndef _STRING_HXX
-#include <tools/string.hxx>
-#endif
-
-#ifndef _LIST_HXX
-#include <tools/list.hxx>
-#endif
-
-#include <sal/types.h>
-
-class FullByteStringListWrapper;
-
-struct STRUCT_SV;
-
-DECLARE_LIST ( FullByteStingListImpl, ByteString* )
-
-class FullByteStringList : public FullByteStingListImpl
-{
-    friend  class FullByteStringListWrapper;
-    ULONG           nRef;
-    void            IncRef() { nRef ++; }
-    void            DecRef() { nRef --; }
-    ULONG           GetRef() { return nRef; }
-public:
-    FullByteStringList();
-    ~FullByteStringList();
-    ULONG           GetPos (ByteString& rStr);
-    ULONG           GetPos( const ByteString* p ) const { return FullByteStingListImpl::GetPos(p); }
-    ULONG           GetPos( const ByteString* p, ULONG nStartIndex,
-                        BOOL bForward = TRUE ) const { return
-                        FullByteStingListImpl::GetPos(p, nStartIndex, bForward); }
-};
-
-class FullByteStringListWrapper
-{
-private:
-    FullByteStringList*  pStringList;
-
-public:
-    FullByteStringListWrapper (FullByteStringList* pList) {pStringList = pList;}
-    ~FullByteStringListWrapper ();
-
-    FullByteStringList* GetStringList() const {return pStringList;}
-
-    void        Insert( ByteString* p ){pStringList->Insert(p);}
-    void        Insert( ByteString* p, ULONG nIndex ){pStringList->Insert(p, nIndex);}
-    void        Insert( ByteString* pNew, ByteString* pOld ){pStringList->Insert(pNew, pOld);}
-
-    ByteString*       Remove(){return pStringList->Remove();}
-    ByteString*       Remove( ULONG nIndex ){return pStringList->Remove(nIndex);}
-    ByteString*       Remove( ByteString* p )
-                    { return pStringList->Remove(p); }
-
-    ByteString*       Replace( ByteString* p ){ return pStringList->Replace(p); }
-    ByteString*       Replace( ByteString* p, ULONG nIndex ){ return pStringList->Replace(p, nIndex); }
-    ByteString*       Replace( ByteString* pNew, ByteString* pOld )
-                    { return pStringList->Replace( pNew, pOld ); }
-
-    ULONG       Count() const { return pStringList->Count(); }
-    void        Clear(){pStringList->Clear(); }
-
-    ByteString*       GetCurObject() const { return pStringList->GetCurObject(); }
-    ULONG       GetCurPos() const { return pStringList->GetCurPos(); }
-    ByteString*       GetObject( ULONG nIndex ) const { return pStringList->GetObject( nIndex ); }
-    ULONG       GetPos( const ByteString* p ) const { return pStringList->GetPos(p); }
-    ULONG       GetPos( const ByteString* p, ULONG nStartIndex,
-                        BOOL bForward = TRUE ) const { return
-                        pStringList->GetPos(p, nStartIndex, bForward); }
-    ULONG       GetPos (ByteString& rStr) { return pStringList->GetPos(rStr); }
-
-    ByteString*       Seek( ULONG nIndex ) { return pStringList->Seek(nIndex); }
-    ByteString*       Seek( ByteString* p ) { return pStringList->Seek(p); }
-
-    ByteString*       First() { return pStringList->First(); };
-    ByteString*       Last() { return pStringList->Last(); };
-    ByteString*       Next() { return pStringList->Next(); };
-    ByteString*       Prev() { return pStringList->Prev(); };
-
-    FullByteStringListWrapper & operator= ( const FullByteStringListWrapper &);
-};
-
-
-class XmlBuildListException {
-    private:
-        const char* ExceptionMessage;
-    public:
-        XmlBuildListException(const char* Message)
-            :ExceptionMessage(Message) {};
-        const char* getMessage() {return ExceptionMessage;};
-};
-
-class XmlBuildList {
-    protected:
-        bool PerlInitialized;
-        void initPerl(const char* ModulePath);
-        // Set of arrays for each function, which uses char* arrays
-        // as a return value. Each call to such function clears its array up
-        // before it's being populated
-        FullByteStringList* extractArray();
-        // C objects for $string1 & $string2 Perl variables
-        STRUCT_SV* string_obj1;
-        STRUCT_SV* string_obj2;
-        STRUCT_SV* string_obj3;
-        char* getError();
-        void checkOperationSuccess();
-    public:
-        // alternative to constructor
-        XmlBuildList(const ByteString& rModulePath);
-        ~XmlBuildList();
-        void loadXMLFile(const ByteString& rBuildList);
-        FullByteStringListWrapper getProducts();
-        FullByteStringListWrapper getJobDirectories(const ByteString& rJobType, const ByteString& rJobPlatform);
-        FullByteStringListWrapper getModuleDependencies(const ByteString& rProduct, const ByteString& rDependencyType);
-        FullByteStringListWrapper getModuleDependencies(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType);
-        FullByteStringListWrapper getJobBuildReqs(const ByteString& rJobDir, const ByteString& rBuildReqPlatform);
-        ByteString getModuleDepType(const ByteString& rDepModuleName);
-        FullByteStringListWrapper getModuleDepTypes(FullByteStringListWrapper& rProducts);
-        sal_Bool hasModuleDepType(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType);
-        FullByteStringListWrapper getModuleProducts(const ByteString& rDepModuleName);
-        ByteString getModuleName();
-        FullByteStringListWrapper getDirDependencies(const ByteString& rJobDir, const ByteString& rJobType, const ByteString& rJobPlatform);
-        FullByteStringListWrapper getJobTypes(const ByteString& rJobDir);
-        FullByteStringListWrapper getJobPlatforms(const ByteString& rJobDir);
-        FullByteStringListWrapper getJobBuildReqPlatforms(const ByteString& rJobDir, const ByteString& rBuildReqName);
-};
-
-#endif
diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx
index 42517832c645..7caffca8662e 100644
--- a/soldep/inc/soldep/depper.hxx
+++ b/soldep/inc/soldep/depper.hxx
@@ -74,7 +74,7 @@ class FixedText;
 #define     OBJWIN_X_SPACING        50
 #define     OBJWIN_Y_SPACING        12
 #define     DEPPER_MAX_DEPTH        100
-#define     DEPPER_MAX_WIDTH        9
+#define     DEPPER_MAX_WIDTH        12
 #define     DEPPER_MAX_LEVEL_WIDTH      10 * DEPPER_MAX_WIDTH
 
 
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index 13568561c95d..884507a2fa81 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -139,6 +139,7 @@ public:
 
         BOOL            ConnectionExistsInAnyDirection( ObjectWin *pWin );
         void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
+        BOOL    IsTop();
 };
 
 DECL_DEST_LIST( TmpObjWinList, ObjWinList, ObjectWin* )
@@ -155,6 +156,7 @@ public:
                ~ObjectList() {};
     void       ResetSelectedObject();
     ObjectWin* GetPtrByName( const ByteString& rText );
+    ObjectList* FindTopLevelModules();
 };
 
 #endif
diff --git a/soldep/prj/d.lst b/soldep/prj/d.lst
index 25dd1b8530c9..73301a558e61 100644
--- a/soldep/prj/d.lst
+++ b/soldep/prj/d.lst
@@ -27,7 +27,6 @@ mkdir: %COMMON_DEST%\res%_EXT%\img\additional
 ..\inc\soldep\prj.hxx %_DEST%\inc%_EXT%\soldep\prj.hxx
 ..\inc\dep.hxx %_DEST%\inc%_EXT%\soldep\dep.hxx
 ..\inc\prodmap.hxx %_DEST%\inc%_EXT%\soldep\prodmap.hxx
-..\inc\soldep\XmlBuildList.hxx %_DEST%\inc%_EXT%\soldep\XmlBuildList.hxx
 ..\inc\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx
 ..\inc\soldep\soldlg.hrc %_DEST%\inc%_EXT%\soldep\soldlg.hrc
 
diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx
index 8eaba9ace236..acba58ce48d9 100644
--- a/soldep/source/connctr.cxx
+++ b/soldep/source/connctr.cxx
@@ -1,168 +1,168 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: connctr.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifdef _MSC_VER
-#pragma warning(disable:4100)
-#endif
-#include <soldep/connctr.hxx>
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-#include "math.h"
-
-BOOL Connector::msbHideMode = FALSE;
-
-Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :
-mpStartWin( 0L ),
-mpEndWin( 0L ),
-mnStartId( 0 ),
-mnEndId( 0 ),
-bVisible( FALSE ),
-len( 70 )
-{
-    mpParent = pParent;
-    if ( mpParent )
-        mpParent->AddConnector( this );
-}
-
-Connector::~Connector()
-{
-    if ( mpStartWin )
-        mpStartWin->RemoveConnector( this );
-    if ( mpEndWin )
-        mpEndWin->RemoveConnector( this );
-    if ( mpParent )
-        mpParent->RemoveConnector( this );
-    mpParent->Invalidate( Rectangle( mStart, mEnd ));
-    mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
-}
-
-void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )
-{
-    mpStartWin = pStartWin;
-    mpEndWin = pEndWin;
-    mpStartWin->AddConnector( this );
-    mpEndWin->AddConnector( this );
-    mCenter = GetMiddle();
-    mStart = pStartWin->GetFixPoint( mCenter );
-    mEnd = pEndWin->GetFixPoint( mCenter );
-    mnStartId = pStartWin->GetId();
-    mnEndId = pEndWin->GetId();
-    bVisible = bVis;
-
-//  if ( mpParent->IsPaintEnabled())
-    if ( IsVisible() )
-    {
-        mpParent->DrawLine( mEnd, mStart );
-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
-    }
-    UpdateVisibility(); //null_Project
-}
-
-void Connector::UpdateVisibility()
-{
-    bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();
-}
-
-
-Point Connector::GetMiddle()
-{
-    Point aStartPoint = mpStartWin->GetPosPixel();
-    Size aStartSize = mpStartWin->GetSizePixel();
-    int nMoveHorz, nMoveVert;
-    aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );
-
-    Point aEndPoint = mpEndWin->GetPosPixel();
-    Size aEndSize = mpEndWin->GetSizePixel();
-
-    aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );
-
-    Point aRetPoint = aEndPoint;
-
-    nMoveHorz = aStartPoint.X() - aEndPoint.X();
-    if ( nMoveHorz )
-        nMoveHorz /= 2;
-    nMoveVert = aStartPoint.Y() - aEndPoint.Y();
-    if ( nMoveVert )
-        nMoveVert /= 2;
-    aRetPoint.Move( nMoveHorz, nMoveVert );
-    return aRetPoint;
-
-}
-
-void Connector::Paint( const Rectangle& rRect )
-{
-    //MyApp *pApp = (MyApp*)GetpApp();
-    //SolDep *pSoldep = pApp->GetSolDep();
-    if (msbHideMode)
-    {
-    if (!(mpStartWin->IsNullObject())) //null_project
-    {
-        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )
-        {
-            mpStartWin->SetViewMask(0); //objwin invisible
-        } else
-        {
-            mpStartWin->SetViewMask(1); //objwin visible
-        }
-    }
-    if (!(mpEndWin->IsNullObject()))
-    {
-        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )
-        {
-            mpEndWin->SetViewMask(0); //objwin invisible
-        } else
-        {
-            mpEndWin->SetViewMask(1); //objwin visible
-        }
-    }
-    UpdateVisibility();
-    } else //IsHideMode
-    {
-        //bVisible = TRUE;
-        if (!(mpStartWin->IsNullObject())) //null_project
-        {
-             mpStartWin->SetViewMask(1);
-        }
-        if (!(mpEndWin->IsNullObject())) //null_project
-        {
-             mpEndWin->SetViewMask(1);
-        }
-        UpdateVisibility();
-    }
-    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project
-         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project
-    {
-        mpParent->DrawLine( mEnd, mStart );
-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
-    }
-}
-
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2008 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * $RCSfile: connctr.cxx,v $

+ * $Revision: 1.6 $

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ ************************************************************************/

+#ifdef _MSC_VER

+#pragma warning(disable:4100)

+#endif

+#include <soldep/connctr.hxx>

+#include <soldep/objwin.hxx>

+#include <soldep/depwin.hxx>

+#include "math.h"

+

+BOOL Connector::msbHideMode = FALSE;

+

+Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :

+mpStartWin( 0L ),

+mpEndWin( 0L ),

+mnStartId( 0 ),

+mnEndId( 0 ),

+bVisible( FALSE ),

+len( 70 )

+{

+    mpParent = pParent;

+    if ( mpParent )

+        mpParent->AddConnector( this );

+}

+

+Connector::~Connector()

+{

+    if ( mpStartWin )

+        mpStartWin->RemoveConnector( this );

+    if ( mpEndWin )

+        mpEndWin->RemoveConnector( this );

+    if ( mpParent )

+        mpParent->RemoveConnector( this );

+    mpParent->Invalidate( Rectangle( mStart, mEnd ));

+    mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));

+}

+

+void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )

+{

+    mpStartWin = pStartWin;

+    mpEndWin = pEndWin;

+    mpStartWin->AddConnector( this );

+    mpEndWin->AddConnector( this );

+    mCenter = GetMiddle();

+    mStart = pStartWin->GetFixPoint( mCenter );

+    mEnd = pEndWin->GetFixPoint( mCenter );

+    mnStartId = pStartWin->GetId();

+    mnEndId = pEndWin->GetId();

+    bVisible = bVis;

+

+//  if ( mpParent->IsPaintEnabled())

+    if ( IsVisible() )

+    {

+        mpParent->DrawLine( mEnd, mStart );

+        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));

+    }

+    UpdateVisibility(); //null_Project

+}

+

+void Connector::UpdateVisibility()

+{

+    bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();

+}

+

+

+Point Connector::GetMiddle()

+{

+    Point aStartPoint = mpStartWin->GetPosPixel();

+    Size aStartSize = mpStartWin->GetSizePixel();

+    int nMoveHorz, nMoveVert;

+    aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );

+

+    Point aEndPoint = mpEndWin->GetPosPixel();

+    Size aEndSize = mpEndWin->GetSizePixel();

+

+    aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );

+

+    Point aRetPoint = aEndPoint;

+

+    nMoveHorz = aStartPoint.X() - aEndPoint.X();

+    if ( nMoveHorz )

+        nMoveHorz /= 2;

+    nMoveVert = aStartPoint.Y() - aEndPoint.Y();

+    if ( nMoveVert )

+        nMoveVert /= 2;

+    aRetPoint.Move( nMoveHorz, nMoveVert );

+    return aRetPoint;

+

+}

+

+void Connector::Paint( const Rectangle& rRect )

+{

+    //MyApp *pApp = (MyApp*)GetpApp();

+    //SolDep *pSoldep = pApp->GetSolDep();

+    if (msbHideMode)

+    {

+    if (!(mpStartWin->IsNullObject())) //null_project

+    {

+        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )

+        {

+            mpStartWin->SetViewMask(0); //objwin invisible

+        } else

+        {

+            mpStartWin->SetViewMask(1); //objwin visible

+        }

+    }

+    if (!(mpEndWin->IsNullObject()))

+    {

+        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )

+        {

+            mpEndWin->SetViewMask(0); //objwin invisible

+        } else

+        {

+            mpEndWin->SetViewMask(1); //objwin visible

+        }

+    }

+    UpdateVisibility();

+    } else //IsHideMode

+    {

+        //bVisible = TRUE;

+        if (!(mpStartWin->IsNullObject())) //null_project

+        {

+             mpStartWin->SetViewMask(1);

+        }

+        if (!(mpEndWin->IsNullObject())) //null_project

+        {

+             mpEndWin->SetViewMask(1);

+        }

+        UpdateVisibility();

+    }

+    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project

+         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project

+    {

+        mpParent->DrawLine( mEnd, mStart );

+        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));

+    }

+}

+

 void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

 {

     if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project

@@ -174,102 +174,102 @@ void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
         pDevice->DrawEllipse( aRect );

     }

 }

-
-void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )
-{
-//  more than one call ?
-//
-    Point OldStart, OldEnd;
-    static ULONG nCallCount = 0;
-
-    //MyApp *pApp = (MyApp*)GetpApp();
-    //SolDep *pSoldep = pApp->GetSolDep();
-    if (msbHideMode)
-        bVisible = 1;
-
-    if ( nCallCount )           // only one call
-        nCallCount++;
-    else
-    {
-        nCallCount++;
-        while ( nCallCount )
-        {
-            if ( bPaint )
-            {
-                OldStart = mStart;
-                OldEnd = mEnd;
-            }
-            mCenter = GetMiddle();
-            mStart=mpStartWin->GetFixPoint( mCenter, bPaint );
-            mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );
-            if ( bPaint )
-            {
-                mpParent->Invalidate( Rectangle( OldStart, OldEnd ));
-                mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));
-//Don't paint "null_project" connectors
-                if ( (mpStartWin->GetBodyText() != ByteString("null")) &&               //null_project
-                     (mpEndWin->GetBodyText() != ByteString("null")))                   //null_project
-                {
-                    Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
-                    Paint ( Rectangle( mEnd, mStart ));
-                }
-            }
-            nCallCount--;
-        }
-    }
-}
-
-USHORT Connector::Save( SvFileStream& rOutFile )
-{
-    rOutFile << mpStartWin->GetId();
-    rOutFile << mpEndWin->GetId();
-
-    return 0;
-}
-
-USHORT Connector::Load( SvFileStream& rInFile )
-{
-    rInFile >> mnStartId;
-    rInFile >> mnEndId;
-
-    return 0;
-}
-
-ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )
-{
-// get correspondent object ptr
-    if ( mpStartWin == pWin )
-        return mpEndWin;
-    else
-        if ( mpEndWin == pWin )
-            return mpStartWin;
-
-    return NULL;
-}
-
-ULONG Connector::GetOtherId( ULONG nId )
-{
-// get correspondent object id
-    if ( mnStartId == nId )
-        return mnEndId;
-    else
-        if ( mnEndId == nId )
-            return mnStartId;
-
-    return NULL;
-}
-
-ULONG Connector::GetLen()
-{
-    double dx, dy;
-
-    dx = mStart.X() - mEnd.X();
-    dy = mStart.Y() - mEnd.Y();
-
-    return (ULONG) sqrt( dx * dx + dy * dy );
-}
-
-BOOL Connector::IsStart( ObjectWin* pWin )
-{
-    return pWin == mpStartWin;
-}
+

+void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )

+{

+//  more than one call ?

+//

+    Point OldStart, OldEnd;

+    static ULONG nCallCount = 0;

+

+    //MyApp *pApp = (MyApp*)GetpApp();

+    //SolDep *pSoldep = pApp->GetSolDep();

+    if (msbHideMode)

+        bVisible = 1;

+

+    if ( nCallCount )           // only one call

+        nCallCount++;

+    else

+    {

+        nCallCount++;

+        while ( nCallCount )

+        {

+            if ( bPaint )

+            {

+                OldStart = mStart;

+                OldEnd = mEnd;

+            }

+            mCenter = GetMiddle();

+            mStart=mpStartWin->GetFixPoint( mCenter, bPaint );

+            mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );

+            if ( bPaint )

+            {

+                mpParent->Invalidate( Rectangle( OldStart, OldEnd ));

+                mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));

+//Don't paint "null_project" connectors

+                if ( (mpStartWin->GetBodyText() != ByteString("null")) &&               //null_project

+                     (mpEndWin->GetBodyText() != ByteString("null")))                   //null_project

+                {

+                    Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));

+                    Paint ( Rectangle( mEnd, mStart ));

+                }

+            }

+            nCallCount--;

+        }

+    }

+}

+

+USHORT Connector::Save( SvFileStream& rOutFile )

+{

+    rOutFile << mpStartWin->GetId();

+    rOutFile << mpEndWin->GetId();

+

+    return 0;

+}

+

+USHORT Connector::Load( SvFileStream& rInFile )

+{

+    rInFile >> mnStartId;

+    rInFile >> mnEndId;

+

+    return 0;

+}

+

+ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )

+{

+// get correspondent object ptr

+    if ( mpStartWin == pWin )

+        return mpEndWin;

+    else

+        if ( mpEndWin == pWin )

+            return mpStartWin;

+

+    return NULL;

+}

+

+ULONG Connector::GetOtherId( ULONG nId )

+{

+// get correspondent object id

+    if ( mnStartId == nId )

+        return mnEndId;

+    else

+        if ( mnEndId == nId )

+            return mnStartId;

+

+    return NULL;

+}

+

+ULONG Connector::GetLen()

+{

+    double dx, dy;

+

+    dx = mStart.X() - mEnd.X();

+    dy = mStart.Y() - mEnd.Y();

+

+    return (ULONG) sqrt( dx * dx + dy * dy );

+}

+

+BOOL Connector::IsStart( ObjectWin* pWin )

+{

+    return pWin == mpStartWin;

+}

diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx
index ab64557dbcf1..6b000cc6fbce 100644
--- a/soldep/source/depapp.cxx
+++ b/soldep/source/depapp.cxx
@@ -1,150 +1,150 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: depapp.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// -----------------------------------------------------------------------
-#include "depapp.hxx"
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2008 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * $RCSfile: depapp.cxx,v $

+ * $Revision: 1.6 $

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ ************************************************************************/

+

+// -----------------------------------------------------------------------

+#include "depapp.hxx"

 #include <ucbhelper/contentbroker.hxx>

 #include <ucbhelper/configurationkeys.hxx>

-
-void MyApp::Main()
-{
-#if defined(WNT)
-    pDebugFile = fopen( "fprintf.out", "w" );
-#endif
-
-    pMyApp = GetpApp();
-    MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
-    pAppWindow = &aMainWin;
-   // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );
-    //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));
-
-    pSolDep = new SolDep( &aMainWin );
-    pSolDep->Init();
-    aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));
-    pSolDep->Hide();
-    aMainWin.Show();
-    Help aHelp;
-    SetHelp(&aHelp);
-    aHelp.EnableContextHelp();
-    aHelp.EnableQuickHelp();
-    Execute();
-    delete pResMgr;
-    delete pSolDep;
-}
-
-// -----------------------------------------------------------------------
-
-MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
-    WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),
-        // depper aTaskBarFrame(this, 0)
-{
-//depper    aTaskBarFrame.EnableAlwaysOnTop();
-
-//depper    aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );
-//depper    aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );
-//depper    SetMenuBar( &aMenuBar );
-//depper    aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
-//    aToolBox.Show();
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseMove( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseMove( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseButtonDown( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseButtonUp( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyInput( const KeyEvent& rKEvt )
-{
-    WorkWindow::KeyInput( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyUp( const KeyEvent& rKEvt )
-{
-    WorkWindow::KeyUp( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Paint( const Rectangle& rRect )
-{
-    WorkWindow::Paint( rRect );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Resize()
-{
-    ((MyApp*)GetpApp())->GetSolDep()->Resize();
-    WorkWindow::Resize();
-}
-
-SAL_IMPLEMENT_MAIN()
-{
-    //Reference< XMultiServiceFactory > xMS;
-
-    // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini
-    Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
-
-    //xMS = cppu::createRegistryServiceFactory(
-    //              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
-
-    Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);
-
-    InitVCL( xMS );
-    ::comphelper::setProcessServiceFactory(xMS);
-    com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
+

+void MyApp::Main()

+{

+#if defined(WNT)

+    pDebugFile = fopen( "fprintf.out", "w" );

+#endif

+

+    pMyApp = GetpApp();

+    MyWin aMainWin( NULL, WB_APP | WB_STDWORK );

+    pAppWindow = &aMainWin;

+   // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );

+    //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));

+

+    pSolDep = new SolDep( &aMainWin );

+    pSolDep->Init();

+    aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));

+    pSolDep->Hide();

+    aMainWin.Show();    

+    Help aHelp;

+    SetHelp(&aHelp);

+    aHelp.EnableContextHelp();

+    aHelp.EnableQuickHelp();

+    Execute();

+    delete pResMgr;

+    delete pSolDep;

+}

+

+// -----------------------------------------------------------------------

+

+MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :

+    WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),

+        // depper aTaskBarFrame(this, 0)

+{

+//depper    aTaskBarFrame.EnableAlwaysOnTop();

+

+//depper    aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );

+//depper    aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );

+//depper    SetMenuBar( &aMenuBar );

+//depper    aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));

+//    aToolBox.Show();

+}

+

+// -----------------------------------------------------------------------

+

+void MyWin::MouseMove( const MouseEvent& rMEvt )

+{

+    WorkWindow::MouseMove( rMEvt );

+}

+

+// -----------------------------------------------------------------------

+

+void MyWin::MouseButtonDown( const MouseEvent& rMEvt )

+{

+    WorkWindow::MouseButtonDown( rMEvt );

+}

+

+// -----------------------------------------------------------------------

+

+void MyWin::MouseButtonUp( const MouseEvent& rMEvt )

+{

+    WorkWindow::MouseButtonUp( rMEvt );

+}

+

+// -----------------------------------------------------------------------

+

+void MyWin::KeyInput( const KeyEvent& rKEvt )

+{

+    WorkWindow::KeyInput( rKEvt );

+}

+

+// -----------------------------------------------------------------------

+

+void MyWin::KeyUp( const KeyEvent& rKEvt )

+{

+    WorkWindow::KeyUp( rKEvt );

+}

+

+// -----------------------------------------------------------------------

+

+void MyWin::Paint( const Rectangle& rRect )

+{

+    WorkWindow::Paint( rRect );

+}

+

+// -----------------------------------------------------------------------

+

+void MyWin::Resize()

+{

+    ((MyApp*)GetpApp())->GetSolDep()->Resize();

+    WorkWindow::Resize();

+}

+

+SAL_IMPLEMENT_MAIN()

+{

+    //Reference< XMultiServiceFactory > xMS;

+

+    // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini

+    Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();

+

+    //xMS = cppu::createRegistryServiceFactory(

+    //              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );

+

+    Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);

+

+    InitVCL( xMS );

+    ::comphelper::setProcessServiceFactory(xMS);

+    com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);

     aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );

     aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );

-
+

     ::ucbhelper::ContentBroker::initialize( xMS, aArgs );

-
-    aMyApp.Main();
-    DeInitVCL();
-    return 0;
-}
+

+    aMyApp.Main();

+    DeInitVCL();

+    return 0;

+}

diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx
index 187907e87fe0..e6cb96a63832 100644
--- a/soldep/source/depapp.hxx
+++ b/soldep/source/depapp.hxx
@@ -35,7 +35,7 @@
 #define EVENT_RESIZE                0x00000001
 
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/resmgr.hxx>
 #include <bootstrp/sstring.hxx>
 #include <vcl/event.hxx>
diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx
index 56eacedb4093..baa24d41fce0 100644
--- a/soldep/source/objwin.cxx
+++ b/soldep/source/objwin.cxx
@@ -1,487 +1,487 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: objwin.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <tools/list.hxx>
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/help.hxx>
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2008 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * $RCSfile: objwin.cxx,v $

+ * $Revision: 1.6 $

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ ************************************************************************/

+

+#include <tools/list.hxx>

+#include <tools/debug.hxx>

+#include <vcl/svapp.hxx>

+#include <vcl/help.hxx>

 #include <vcl/wall.hxx>

-
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-//#include "depapp.hxx"
-#include <soldep/depper.hxx>
-//#include "prjdep.hxx"
-#include <soldep/connctr.hxx>
-#include <stdio.h>
-
-static Color aDefaultColor = 0L;
-static Wallpaper* pDefaultWallpaper = 0L;
-
-// Initialize static class member
-BOOL ObjectWin::msbHideMode = FALSE;
-ULONG ObjectWin::msnGlobalViewMask = 0;
-
-
-UINT32 aColorMap[] = {
-    COL_TRANSPARENT,        //MARKMODE_DEFAULT    0
-    COL_GREEN,              //MARKMODE_DEPENDING  1
-    COL_RED,                //MARKMODE_NEEDED     2
-    COL_MAGENTA,            //1+2
-    COL_YELLOW,             //MARKMODE_ACTIVATED  4
-    COL_LIGHTGREEN,         //1+4
-    COL_LIGHTRED,           //2+4
-    COL_LIGHTMAGENTA,       //1+2+4
-    COL_BLUE,               //MARKMODE_SELECTED   8
-    COL_LIGHTGRAY,          //1+8
-    COL_CYAN,               //2+8
-    COL_LIGHTCYAN,          //1+2+8
-    COL_LIGHTBLUE,          //4+8
-    COL_BROWN,              //1+4+8
-    COL_BLACK,              //2+4+8
-    COL_BLUE                //1+2+4+8
-};
-
-
-//
-// class ObjectWin
-//
-
-/*****************************************************************************/
-ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
-/*****************************************************************************/
-                : Window( pParent, nWinStyle ),
-                msBodyText( "" ),
-                msTipText( "" ),
-                mnObjectId( 0 ),
-                mnMarkMode( 0 ),
-                mnViewMask( 0 ),
-                mbVisible( FALSE ),
-                mbMenuExecute( FALSE ),
-                mbVisited( FALSE ),
-                mnRootDist( 0 ),
-                mnHeadDist( 0 ),
-                mbFixed( FALSE )
-{
-    SetBackground( Wallpaper( Color( COL_WHITE )));
-
-    aTipTimer.SetTimeout( 500 );
-    aTipTimer.SetTimeoutHdl(
-    LINK( this, ObjectWin, TipHdl ));
-
-    SetFont( Font( GetFont() ) );
+

+#include <soldep/objwin.hxx>

+#include <soldep/depwin.hxx>

+//#include "depapp.hxx"

+#include <soldep/depper.hxx>

+//#include "prjdep.hxx"

+#include <soldep/connctr.hxx>

+#include <stdio.h>

+

+static Color aDefaultColor = 0L;

+static Wallpaper* pDefaultWallpaper = 0L;

+

+// Initialize static class member

+BOOL ObjectWin::msbHideMode = FALSE;

+ULONG ObjectWin::msnGlobalViewMask = 0;

+

+

+UINT32 aColorMap[] = {

+    RGB_COLORDATA( 0xFF, 0xFF, 0x80 ),             //MARKMODE_DEFAULT    0

+    COL_GREEN,              //MARKMODE_DEPENDING  1

+    COL_RED,                //MARKMODE_NEEDED     2

+    COL_MAGENTA,            //1+2

+    COL_GRAY,               //MARKMODE_ACTIVATED  4

+    COL_LIGHTGREEN,         //1+4

+    COL_LIGHTRED,           //2+4

+    COL_LIGHTMAGENTA,       //1+2+4

+    COL_BLUE,               //MARKMODE_SELECTED   8

+    COL_LIGHTGRAY,          //1+8

+    COL_CYAN,               //2+8

+    COL_LIGHTCYAN,          //1+2+8

+    COL_LIGHTBLUE,          //4+8

+    COL_BROWN,              //1+4+8

+    COL_BLACK,              //2+4+8

+    COL_BLUE                //1+2+4+8

+};

+

+

+//

+// class ObjectWin

+//

+

+/*****************************************************************************/

+ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )

+/*****************************************************************************/

+                : Window( pParent, nWinStyle ),

+                msBodyText( "" ),

+                msTipText( "" ),

+                mnObjectId( 0 ),

+                mnMarkMode( 0 ),

+                mnViewMask( 0 ),

+                mbVisible( FALSE ),

+                mbMenuExecute( FALSE ),

+                mbVisited( FALSE ),

+                mnRootDist( 0 ),

+                mnHeadDist( 0 ),

+                mbFixed( FALSE )

+{

+    SetBackground( Wallpaper( aColorMap[0] ));

+

+    aTipTimer.SetTimeout( 500 );

+    aTipTimer.SetTimeoutHdl(

+    LINK( this, ObjectWin, TipHdl ));

+

+    SetFont( Font( GetFont() ) );

     Font aFont( GetFont() );

     Size aSize = aFont.GetSize();

     aFont.SetSize( aSize );

-    SetFont( aFont );
-
-    EnableClipSiblings();
-    SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-    mpPopup = new PopupMenu();
-    mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));
-    mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));
-    mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));
-    mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));
-//  mpPopup->InsertSeparator();
-    mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));
-    mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));
-    mnPopupStaticItems = mpPopup->GetItemCount();
-
-    if ( ! pDefaultWallpaper )
-    {
-        pDefaultWallpaper = new Wallpaper( GetBackground() );
-        aDefaultColor = GetTextColor();
-    }
-    Hide();
-}
-
-/*****************************************************************************/
-ObjectWin::~ObjectWin()
-/*****************************************************************************/
-{
-    while ( mConnections.Count() > 0 )
-    {
-        delete mConnections.GetObject( 0 );
-    }
-}
-
-void ObjectWin::SetHideMode(BOOL bHide)
-{
-    msbHideMode = bHide;
-    mConnections.GetObject(0)->SetHideMode(msbHideMode);
-}
-
-BOOL ObjectWin::ToggleHideMode()
-{
-    msbHideMode = !msbHideMode;
-    mConnections.GetObject(0)->SetHideMode(msbHideMode);
-    return msbHideMode;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetViewMask( ULONG nMask )
-/*****************************************************************************/
-{
-    mnViewMask = nMask;
-    // Compares
-    if ( mnViewMask & msnGlobalViewMask) {
-        mbVisible = TRUE;
-        Show();
-    }
-    else {
-        Hide();
-        mbVisible = FALSE;
-    }
-    for ( ULONG i = 0; i < mConnections.Count(); i++ )
-        mConnections.GetObject( i )->UpdateVisibility();
-}
-
-/*****************************************************************************/
-void ObjectWin::SetBodyText( const ByteString& rNewString )
-/*****************************************************************************/
-{
-    msBodyText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetBodyText()
-/*****************************************************************************/
-{
-    return msBodyText;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetTipText( const ByteString& rNewString )
-/*****************************************************************************/
-{
-    msTipText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetTipText()
-/*****************************************************************************/
-{
-    return msTipText;
-}
-
-/*****************************************************************************/
-Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )
-/*****************************************************************************/
-{
-    Point aLocalPoint;
-    if ( bUseRealPos )
-        aLocalPoint = GetPosPixel();
-    else
-        aLocalPoint = GetCalcPosPixel();
-
-    Size aLocalSize = GetSizePixel();
-    Point aRetPoint;
-
-    USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;
-    USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;
-
-    // always false...
-    //if ( nRefX < 0 ) nRefX = 0;
-    //if ( nRefY < 0 ) nRefY = 0;
-
-    if ( rRefPoint.X() > nRefX )
-    {
-        if ( rRefPoint.Y() > nRefY )
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
-            }
-        }
-        else
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y();
-            }
-        }
-    }
-    else
-    {
-        if ( rRefPoint.Y() > nRefY )
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
-            }
-        }
-        else
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y();
-            }
-        }
-    }
-
-    return PixelToLogic(aRetPoint);
-
-}
-
-/*****************************************************************************/
-void ObjectWin::AddConnector( Connector* pNewCon )
-/*****************************************************************************/
-{
-    mConnections.Insert( pNewCon );
-}
-
-/*****************************************************************************/
-BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )
-/*****************************************************************************/
-{
-    for ( ULONG i = 0; i < mConnections.Count(); i++ )
-        if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )
-            return TRUE;
-
-    return FALSE;
-}
-
-/*****************************************************************************/
-void ObjectWin::RemoveConnector( Connector* pOldCon )
-/*****************************************************************************/
-{
-    mConnections.Remove( pOldCon );
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( ULONG nIndex )
-/*****************************************************************************/
-{
-    ULONG nConCount = mConnections.Count();
-
-    if ( nIndex < nConCount )
-        return mConnections.GetObject( nIndex );
-    return NULL;
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )
-/*****************************************************************************/
-{
-    if ( mnObjectId != nStartId )
-        return NULL;
-
-    USHORT i;
-    Connector* pCon;
-    ULONG nConCount = mConnections.Count();
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon->GetOtherWin( this )->GetId() == nEndId )
-            return pCon;
-    }
-    return NULL;
-}
-
-void ObjectWin::SetAllConnectorsUnvisible()
-{
-    Connector* pCon;
-    ULONG nConCount = mConnections.Count();
-    for ( ULONG i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if (pCon) pCon->SetVisibility( FALSE );
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::SetMarkMode( ULONG nMarkMode )
-/*****************************************************************************/
-{
-    //Wallpaper aWallpaper;
-
-    if ( nMarkMode == MARKMODE_DEFAULT )
-    {
-        if ( pDefaultWallpaper )
-        {
-            maObjWallpaper = GetBackground();
-            maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
-            SetBackground( maObjWallpaper );
-            SetTextColor( aDefaultColor );
-        }
-    }
-    else
-    {
-        mnMarkMode |= nMarkMode;
-        maObjWallpaper = GetBackground();
-        maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );
-        SetBackground( maObjWallpaper );
-        SetTextColor( COL_WHITE );
-    }
-
-    Invalidate();
-}
-
-/*****************************************************************************/
-void ObjectWin::UnsetMarkMode( ULONG nMarkMode )
-/*****************************************************************************/
-{
-    //Wallpaper aWallpaper;
-
-    ULONG nOldMode = mnMarkMode;
-    mnMarkMode &= ( !nMarkMode );
-
-    if ( nOldMode != mnMarkMode ) {
-        if ( mnMarkMode == MARKMODE_DEFAULT )
-        {
-            if ( pDefaultWallpaper )
-            {
-                maObjWallpaper = GetBackground();
-                maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
-                SetBackground( maObjWallpaper );
-                SetTextColor( aDefaultColor );
-            }
-        }
-        else
-        {
-            maObjWallpaper = GetBackground();
-            maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode
-            SetBackground( maObjWallpaper );
-            SetTextColor( COL_WHITE );
-        }
-        Invalidate();
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkNeeded( BOOL bReset )
-/*****************************************************************************/
-{
-    Connector* pCon;
-    ObjectWin* pWin;
-
-    ULONG nConCount = mConnections.Count();
-    ULONG i;
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon && !pCon->IsStart( this))
-        {
-            pWin = pCon->GetOtherWin( this );
-            if ( pWin )
-            {
-                if ( bReset )
-                    pWin->UnsetMarkMode( MARKMODE_NEEDED );
-                else
-                    pWin->SetMarkMode( MARKMODE_NEEDED );
-                pWin->MarkNeeded( bReset );                    // recursive call
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkDepending( BOOL bReset )
-/*****************************************************************************/
-{
-    //if ( !bReset )
-    //  return;
-
-    Connector* pCon;
-    ObjectWin* pWin;
-
-    ULONG nConCount = mConnections.Count();
-    ULONG i;
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon && pCon->IsStart( this) )
-        {
-            pWin = pCon->GetOtherWin( this );
-            if ( pWin )
-            {
-                if ( bReset )
-                    pWin->UnsetMarkMode( MARKMODE_DEPENDING );
-                else
-                    pWin->SetMarkMode( MARKMODE_DEPENDING );
-                pWin->MarkDepending( bReset );                  // recursive call
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::Paint( const Rectangle& rRect )
-/*****************************************************************************/
-{
-    Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );
-    Size  aTextSize;
-    ByteString sbt = msBodyText;                         //debug
-    //sbt += " ";                                         //debug
-    //sbt += ByteString::CreateFromInt32(mnMarkMode);     //debug
-    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
-    aTextSize.Height() = GetTextHeight();
-    Point aPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,
-                aWinSize.Height() / 2 - aTextSize.Height() / 2 );
-
-    //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));
-    if (msBodyText =="null") //don't paint this "window"
-    {
-        Hide();
-        Invalidate();
-    } else
-        DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug
-}
-
+    SetFont( aFont );

+

+    EnableClipSiblings();

+    SetZOrder( NULL, WINDOW_ZORDER_FIRST );

+    mpPopup = new PopupMenu();

+    mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));

+    mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));

+    mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));

+    mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));

+//  mpPopup->InsertSeparator();

+    mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));

+    mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));

+    mnPopupStaticItems = mpPopup->GetItemCount();

+

+    if ( ! pDefaultWallpaper )

+    {

+        pDefaultWallpaper = new Wallpaper( GetBackground() );

+        aDefaultColor = GetTextColor();

+    }

+    Hide();

+}

+

+/*****************************************************************************/

+ObjectWin::~ObjectWin()

+/*****************************************************************************/

+{

+    while ( mConnections.Count() > 0 )

+    {

+        delete mConnections.GetObject( 0 );

+    }

+}

+

+void ObjectWin::SetHideMode(BOOL bHide)

+{

+    msbHideMode = bHide;

+    mConnections.GetObject(0)->SetHideMode(msbHideMode);

+}

+

+BOOL ObjectWin::ToggleHideMode()

+{

+    msbHideMode = !msbHideMode;

+    mConnections.GetObject(0)->SetHideMode(msbHideMode);

+    return msbHideMode;

+}

+

+/*****************************************************************************/

+void ObjectWin::SetViewMask( ULONG nMask )

+/*****************************************************************************/

+{

+    mnViewMask = nMask;

+    // Compares

+    if ( mnViewMask & msnGlobalViewMask) {

+        mbVisible = TRUE;

+        Show();

+    }

+    else {

+        Hide();

+        mbVisible = FALSE;

+    }

+    for ( ULONG i = 0; i < mConnections.Count(); i++ )

+        mConnections.GetObject( i )->UpdateVisibility();

+}

+

+/*****************************************************************************/

+void ObjectWin::SetBodyText( const ByteString& rNewString )

+/*****************************************************************************/

+{

+    msBodyText = rNewString;

+}

+

+/*****************************************************************************/

+ByteString& ObjectWin::GetBodyText()

+/*****************************************************************************/

+{

+    return msBodyText;

+}

+

+/*****************************************************************************/

+void ObjectWin::SetTipText( const ByteString& rNewString )

+/*****************************************************************************/

+{

+    msTipText = rNewString;

+}

+

+/*****************************************************************************/

+ByteString& ObjectWin::GetTipText()

+/*****************************************************************************/

+{

+    return msTipText;

+}

+

+/*****************************************************************************/

+Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )

+/*****************************************************************************/

+{

+    Point aLocalPoint;

+    if ( bUseRealPos )

+        aLocalPoint = GetPosPixel();

+    else

+        aLocalPoint = GetCalcPosPixel();

+

+    Size aLocalSize = GetSizePixel();

+    Point aRetPoint;

+

+    USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;

+    USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;

+

+    // always false...

+    //if ( nRefX < 0 ) nRefX = 0;

+    //if ( nRefY < 0 ) nRefY = 0;

+

+    if ( rRefPoint.X() > nRefX )

+    {

+        if ( rRefPoint.Y() > nRefY )

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();

+            }

+        }

+        else

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y();

+            }

+        }

+    }

+    else

+    {

+        if ( rRefPoint.Y() > nRefY )

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();

+            }

+        }

+        else

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y();

+            }

+        }

+    }

+

+    return PixelToLogic(aRetPoint);

+

+}

+

+/*****************************************************************************/

+void ObjectWin::AddConnector( Connector* pNewCon )

+/*****************************************************************************/

+{

+    mConnections.Insert( pNewCon );

+}

+

+/*****************************************************************************/

+BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )

+/*****************************************************************************/

+{

+    for ( ULONG i = 0; i < mConnections.Count(); i++ )

+        if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )

+            return TRUE;

+

+    return FALSE;

+}

+

+/*****************************************************************************/

+void ObjectWin::RemoveConnector( Connector* pOldCon )

+/*****************************************************************************/

+{

+    mConnections.Remove( pOldCon );

+}

+

+/*****************************************************************************/

+Connector* ObjectWin::GetConnector( ULONG nIndex )

+/*****************************************************************************/

+{

+    ULONG nConCount = mConnections.Count();

+

+    if ( nIndex < nConCount )

+        return mConnections.GetObject( nIndex );

+    return NULL;

+}

+

+/*****************************************************************************/

+Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )

+/*****************************************************************************/

+{

+    if ( mnObjectId != nStartId )

+        return NULL;

+

+    USHORT i;

+    Connector* pCon;

+    ULONG nConCount = mConnections.Count();

+

+    for ( i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if ( pCon->GetOtherWin( this )->GetId() == nEndId )

+            return pCon;

+    }

+    return NULL;

+}

+

+void ObjectWin::SetAllConnectorsUnvisible()

+{

+    Connector* pCon;

+    ULONG nConCount = mConnections.Count();

+    for ( ULONG i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if (pCon) pCon->SetVisibility( FALSE );

+    }

+}

+

+/*****************************************************************************/

+void ObjectWin::SetMarkMode( ULONG nMarkMode )

+/*****************************************************************************/

+{

+    //Wallpaper aWallpaper;

+

+    if ( nMarkMode == MARKMODE_DEFAULT )

+    {

+        if ( pDefaultWallpaper )

+        {

+            maObjWallpaper = GetBackground();

+            maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );

+            SetBackground( maObjWallpaper );

+            SetTextColor( aDefaultColor );

+        }

+    }

+    else

+    {

+        mnMarkMode |= nMarkMode;

+        maObjWallpaper = GetBackground();

+        maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );

+        SetBackground( maObjWallpaper );

+        SetTextColor( COL_WHITE );

+    }

+

+    Invalidate();

+}

+

+/*****************************************************************************/

+void ObjectWin::UnsetMarkMode( ULONG nMarkMode )

+/*****************************************************************************/

+{

+    //Wallpaper aWallpaper;

+

+    ULONG nOldMode = mnMarkMode;

+    mnMarkMode &= ( !nMarkMode );

+

+    if ( nOldMode != mnMarkMode ) {

+        if ( mnMarkMode == MARKMODE_DEFAULT )

+        {

+            if ( pDefaultWallpaper )

+            {

+                maObjWallpaper = GetBackground();

+                maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );

+                SetBackground( maObjWallpaper );

+                SetTextColor( aDefaultColor );

+            }

+        }

+        else

+        {

+            maObjWallpaper = GetBackground();

+            maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode

+            SetBackground( maObjWallpaper );

+            SetTextColor( COL_WHITE );

+        }

+        Invalidate();

+    }

+}

+

+/*****************************************************************************/

+void ObjectWin::MarkNeeded( BOOL bReset )

+/*****************************************************************************/

+{

+    Connector* pCon;

+    ObjectWin* pWin;

+

+    ULONG nConCount = mConnections.Count();

+    ULONG i;

+

+    for ( i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if ( pCon && !pCon->IsStart( this))

+        {

+            pWin = pCon->GetOtherWin( this );

+            if ( pWin )

+            {

+                if ( bReset )

+                    pWin->UnsetMarkMode( MARKMODE_NEEDED );

+                else

+                    pWin->SetMarkMode( MARKMODE_NEEDED );

+                pWin->MarkNeeded( bReset );                    // recursive call

+            }

+        }

+    }

+}

+

+/*****************************************************************************/

+void ObjectWin::MarkDepending( BOOL bReset )

+/*****************************************************************************/

+{

+    //if ( !bReset )

+    //  return;

+

+    Connector* pCon;

+    ObjectWin* pWin;

+

+    ULONG nConCount = mConnections.Count();

+    ULONG i;

+

+    for ( i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if ( pCon && pCon->IsStart( this) )

+        {

+            pWin = pCon->GetOtherWin( this );

+            if ( pWin )

+            {

+                if ( bReset )

+                    pWin->UnsetMarkMode( MARKMODE_DEPENDING );

+                else

+                    pWin->SetMarkMode( MARKMODE_DEPENDING );

+                pWin->MarkDepending( bReset );                  // recursive call

+            }

+        }

+    }

+}

+

+/*****************************************************************************/

+void ObjectWin::Paint( const Rectangle& rRect )

+/*****************************************************************************/

+{

+    Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );

+    Size  aTextSize;

+    ByteString sbt = msBodyText;                         //debug

+    //sbt += " ";                                         //debug

+    //sbt += ByteString::CreateFromInt32(mnMarkMode);     //debug

+    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));

+    aTextSize.Height() = GetTextHeight();

+    Point aPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,

+                aWinSize.Height() / 2 - aTextSize.Height() / 2 );

+

+    //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));

+    if (msBodyText =="null") //don't paint this "window"

+    {

+        Hide();

+        Invalidate();

+    } else

+        DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug

+}

+

 void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

 /*****************************************************************************/

 {

@@ -508,291 +508,317 @@ void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
         pDevice->SetTextColor( GetTextColor() );

         pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );

     }

-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    //Notify Soldep to clear ObjectList
-    SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-    GrabFocus();
-
-    // workaround fuer vcl-bug
-//  GetWindow( WINDOW_REALPARENT)->Invalidate();
-//    MyApp *pApp = (MyApp*)GetpApp();
-//    SolDep *pSoldep = pApp->GetSolDep();
-
-    maMouseOffset = rMEvt.GetPosPixel();
-    if ( rMEvt.IsLeft() )
-    {
-
-        if ( rMEvt.IsMod2() )               // alt + mouse click left
-        {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );
-        }
-        else {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );
-        }
-        if( rMEvt.GetClicks() == 2 )
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );
-        else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())
-        {
-            //((DepWin*)GetParent())->SaveSelectedObjWin(&this);
-            CaptureMouse();
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    fprintf(stdout,"ObjectWin::MouseButtonUp\n");
-    if ( rMEvt.IsLeft() )
-    {
-        if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );
-//          ((DepWin*)GetParent())->NewConnector( this );
-        else
-        {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );
-            if ( IsMouseCaptured() ) ReleaseMouse();
-        }
-    }
-    else if ( rMEvt.IsRight() )
-    {
-        USHORT i;
-
-        while ( mnPopupStaticItems < mpPopup->GetItemCount() )
-        {
-            mpPopup->RemoveItem( mnPopupStaticItems );
-        }
-
-        if ( mConnections.Count()) {
-            mpPopup->InsertSeparator();
-
-            for( i = 0; i < mConnections.Count() ; i++ )
-            {
-                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
-            }
-        }
-        mbMenuExecute = TRUE;
-        mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseMove( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    if ( IsMouseCaptured() )
-    {
-        USHORT i;
-
-        Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );
-
-        aNewWinPos.X() = Max( 0L, aNewWinPos.X());
-        aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());
-        SetPosPixel( aNewWinPos );
-        //int t = mConnections.Count();
-
-        for ( i=0; i < mConnections.Count();i++)
-        {
-            mConnections.GetObject( i )->UpdatePosition( this );
-        }
-    }
-    else // !IsMouseCaptured()
-    {
-        if ( rMEvt.IsLeaveWindow() )
-            aTipTimer.Stop();
-        else
-            aTipTimer.Start();
-
-        MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());
-
-        GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove
-    }
-}
-
-/*****************************************************************************/
-USHORT ObjectWin::Save( SvFileStream& rOutFile )
-/*****************************************************************************/
-{
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT ObjectWin::Load( SvFileStream& rInFile )
-/*****************************************************************************/
-{
-    return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetId( ULONG nId )
-/*****************************************************************************/
-{
-    mnObjectId = nId;
-}
-
-/*****************************************************************************/
-ULONG ObjectWin::GetId()
-/*****************************************************************************/
-{
-    return mnObjectId;
-}
-
-/*****************************************************************************/
-void ObjectWin::UpdateConnectors()
-/*****************************************************************************/
-{
-    USHORT i;
-
-    for ( i = 0; i < mConnections.Count(); i++ )
-    {
-        mConnections.GetObject( i )->UpdatePosition( this );
-    }
-}
-
-IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
-{
-    USHORT nItemId = mpPopup_l->GetCurItemId();
-
-    switch( nItemId )
-    {
-        case OBJWIN_EDIT_TEXT :
-            DBG_ASSERT( FALSE,"edit");
-                break;
-        case OBJWIN_REMOVE_WIN :
-//          DBG_ASSERT( FALSE,"remove");
-//          DBG_ASSERT( mpDepperDontuseme,"remove");
-            //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());
-                break;
-        case OBJWIN_ADD_CONNECTOR :
-//          DBG_ASSERT( FALSE,"add con");
-            ((DepWin*)GetParent())->NewConnector( this );
-                break;
-        case OBJWIN_VIEW_CONTENT :
-//          DBG_ASSERT( FALSE,"view cnt");
-//          mpDepperDontuseme->ViewContent( msBodyText );
-//          TBD: CallEventListener
-                break;
-        default :
-//          DBG_ASSERT( FALSE, String (nItemId) );
-            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);
-            pCon = 0;
-//          delete pCon;
-//          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
-//          TBD: CallEventListener
-
-                break;
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )
-/*****************************************************************************/
-{
-    aTipTimer.Stop();
-
-    if ( msTipText.Len()) {
-        Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());
-        Help::ShowBalloon( GetpApp()->GetAppWindow(),
-            Point( aPos.X(), aPos.Y()),
-            String( msTipText, RTL_TEXTENCODING_UTF8 ));
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-//void ObjectWin::GetFocus()
-/*****************************************************************************/
-//{
-    //SetMarkMode( MARKMODE_SELECTED );
-//}
-
-/*****************************************************************************/
-void ObjectWin::LoseFocus()
-/*****************************************************************************/
-{
-    if ( !mbMenuExecute && !msbHideMode ) {
-        UnsetMarkMode( MARKMODE_SELECTED );
-        UnsetMarkMode( MARKMODE_ACTIVATED );
-        MarkNeeded( TRUE );
-        MarkDepending( TRUE );
-    }
-    else
-        mbMenuExecute = FALSE;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )
-/*****************************************************************************/
-{
-    mbMenuExecute = FALSE;
-
-    if ( !HasFocus()) {
-        UnsetMarkMode( MARKMODE_SELECTED );
-        UnsetMarkMode( MARKMODE_ACTIVATED );
-           MarkNeeded( TRUE );
-        MarkDepending( TRUE );
-    }
-
-    return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::Command( const CommandEvent& rEvent)
-/*****************************************************************************/
-{
-    fprintf(stdout, "ObjectWin::Command");
-//  mpDepperDontuseme->GetGraphWin()->Command( rEvent );
-//          TBD: CallEventListener
-
-}
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-ObjectList::ObjectList() : ObjWinList()
-{
-}
-
-/*****************************************************************************/
-void ObjectList::ResetSelectedObject()
-/*****************************************************************************/
-{
-//    return;
-
-    ULONG nCount_l = Count();
-    ObjectWin* pObjectWin = NULL;
-    for (ULONG i=0; i < nCount_l; i++ )
-    {
-        pObjectWin = GetObject( i );
-        pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );
-        pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );
-        pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );
-        pObjectWin->SetActualWallpaper(*pDefaultWallpaper);
-        pObjectWin->SetAllConnectorsUnvisible();
-    }
-    return;
-}
-
-/*****************************************************************************/
-ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
-/*****************************************************************************/
-{
-    ULONG i = 0;
-    ULONG nCount_l = Count();
-    ObjectWin* pObjectWin = NULL;
-    while ( i < nCount_l )
-    {
-       pObjectWin = GetObject( i );
-       ByteString sPrj = pObjectWin->GetBodyText();
-       if (sPrj == rText) return pObjectWin;
-       i++;
-    }
-    return 0;
+}

+

+/*****************************************************************************/

+void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )

+/*****************************************************************************/

+{

+    //Notify Soldep to clear ObjectList

+    SetZOrder( NULL, WINDOW_ZORDER_FIRST );

+    GrabFocus();

+

+    // workaround fuer vcl-bug

+//  GetWindow( WINDOW_REALPARENT)->Invalidate();

+//    MyApp *pApp = (MyApp*)GetpApp();

+//    SolDep *pSoldep = pApp->GetSolDep();

+

+    maMouseOffset = rMEvt.GetPosPixel();

+    if ( rMEvt.IsLeft() )

+    {

+

+        if ( rMEvt.IsMod2() )               // alt + mouse click left

+        {

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );

+        }

+        else {

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );

+        }

+        if( rMEvt.GetClicks() == 2 )

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );

+        else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())

+        {

+            //((DepWin*)GetParent())->SaveSelectedObjWin(&this);

+            CaptureMouse();

+        }

+    }

+}

+

+/*****************************************************************************/

+void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )

+/*****************************************************************************/

+{

+    fprintf(stdout,"ObjectWin::MouseButtonUp\n");

+    if ( rMEvt.IsLeft() )

+    {

+        if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );

+//          ((DepWin*)GetParent())->NewConnector( this );

+        else

+        {

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );

+            if ( IsMouseCaptured() ) ReleaseMouse();

+        }

+    }

+    else if ( rMEvt.IsRight() )

+    {

+        USHORT i;

+

+        while ( mnPopupStaticItems < mpPopup->GetItemCount() )

+        {

+            mpPopup->RemoveItem( mnPopupStaticItems );

+        }

+

+        if ( mConnections.Count()) {

+            mpPopup->InsertSeparator();

+

+            for( i = 0; i < mConnections.Count() ; i++ )

+            {

+                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));

+            }

+        }

+        mbMenuExecute = TRUE;

+        mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());

+    }

+}

+

+/*****************************************************************************/

+void ObjectWin::MouseMove( const MouseEvent& rMEvt )

+/*****************************************************************************/

+{

+    if ( IsMouseCaptured() )

+    {

+        USHORT i;

+

+        Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );

+

+        aNewWinPos.X() = Max( 0L, aNewWinPos.X());

+        aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());

+        SetPosPixel( aNewWinPos );

+        //int t = mConnections.Count();

+

+        for ( i=0; i < mConnections.Count();i++)

+        {

+            mConnections.GetObject( i )->UpdatePosition( this );

+        }

+    }

+    else // !IsMouseCaptured()

+    {

+        if ( rMEvt.IsLeaveWindow() )

+            aTipTimer.Stop();

+        else

+            aTipTimer.Start();

+

+        MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());

+

+        GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove

+    }

+}

+

+/*****************************************************************************/

+USHORT ObjectWin::Save( SvFileStream& rOutFile )

+/*****************************************************************************/

+{

+    return 0;

+}

+

+/*****************************************************************************/

+USHORT ObjectWin::Load( SvFileStream& rInFile )

+/*****************************************************************************/

+{

+    return 0;

+}

+

+/*****************************************************************************/

+void ObjectWin::SetId( ULONG nId )

+/*****************************************************************************/

+{

+    mnObjectId = nId;

+}

+

+/*****************************************************************************/

+ULONG ObjectWin::GetId()

+/*****************************************************************************/

+{

+    return mnObjectId;

+}

+

+/*****************************************************************************/

+void ObjectWin::UpdateConnectors()

+/*****************************************************************************/

+{

+    USHORT i;

+

+    for ( i = 0; i < mConnections.Count(); i++ )

+    {

+        mConnections.GetObject( i )->UpdatePosition( this );

+    }

+}

+

+IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )

+{

+    USHORT nItemId = mpPopup_l->GetCurItemId();

+

+    switch( nItemId )

+    {

+        case OBJWIN_EDIT_TEXT :

+            DBG_ASSERT( FALSE,"edit");

+                break;

+        case OBJWIN_REMOVE_WIN :

+//          DBG_ASSERT( FALSE,"remove");

+//          DBG_ASSERT( mpDepperDontuseme,"remove");

+            //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());

+                break;

+        case OBJWIN_ADD_CONNECTOR :

+//          DBG_ASSERT( FALSE,"add con");

+            ((DepWin*)GetParent())->NewConnector( this );

+                break;

+        case OBJWIN_VIEW_CONTENT :

+//          DBG_ASSERT( FALSE,"view cnt");

+//          mpDepperDontuseme->ViewContent( msBodyText );

+//          TBD: CallEventListener

+                break;

+        default :

+//          DBG_ASSERT( FALSE, String (nItemId) );

+            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);

+            pCon = 0;

+//          delete pCon;

+//          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());

+//          TBD: CallEventListener

+

+                break;

+    }

+    return 0;

+}

+

+/*****************************************************************************/

+IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )

+/*****************************************************************************/

+{

+    aTipTimer.Stop();

+

+    if ( msTipText.Len()) {

+        Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());

+        Help::ShowBalloon( GetpApp()->GetAppWindow(),

+            Point( aPos.X(), aPos.Y()),

+            String( msTipText, RTL_TEXTENCODING_UTF8 ));

+    }

+    return 0;

+}

+

+/*****************************************************************************/

+//void ObjectWin::GetFocus()

+/*****************************************************************************/

+//{

+    //SetMarkMode( MARKMODE_SELECTED );

+//}

+

+/*****************************************************************************/

+void ObjectWin::LoseFocus()

+/*****************************************************************************/

+{

+    if ( !mbMenuExecute && !msbHideMode ) {

+        UnsetMarkMode( MARKMODE_SELECTED );

+        UnsetMarkMode( MARKMODE_ACTIVATED );

+        MarkNeeded( TRUE );

+        MarkDepending( TRUE );

+    }

+    else

+        mbMenuExecute = FALSE;

+}

+

+/*****************************************************************************/

+IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )

+/*****************************************************************************/

+{

+    mbMenuExecute = FALSE;

+

+    if ( !HasFocus()) {

+        UnsetMarkMode( MARKMODE_SELECTED );

+        UnsetMarkMode( MARKMODE_ACTIVATED );

+           MarkNeeded( TRUE );

+        MarkDepending( TRUE );

+    }

+

+    return 0;

+}

+

+/*****************************************************************************/

+void ObjectWin::Command( const CommandEvent& rEvent)

+/*****************************************************************************/

+{

+    fprintf(stdout, "ObjectWin::Command");

+//  mpDepperDontuseme->GetGraphWin()->Command( rEvent );

+//          TBD: CallEventListener

+

+}

+

+/*****************************************************************************/

+/*****************************************************************************/

+

+ObjectList::ObjectList() : ObjWinList()

+{

+}

+

+/*****************************************************************************/

+void ObjectList::ResetSelectedObject()

+/*****************************************************************************/

+{

+//    return;

+

+    ULONG nCount_l = Count();

+    ObjectWin* pObjectWin = NULL;

+    for (ULONG i=0; i < nCount_l; i++ )

+    {

+        pObjectWin = GetObject( i );

+        pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );

+        pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );

+        pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );

+        pObjectWin->SetActualWallpaper(*pDefaultWallpaper);

+        pObjectWin->SetAllConnectorsUnvisible();

+    }

+    return;

+}

+

+/*****************************************************************************/

+ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )

+/*****************************************************************************/

+{

+    ULONG i = 0;

+    ULONG nCount_l = Count();

+    ObjectWin* pObjectWin = NULL;

+    while ( i < nCount_l )

+    {

+       pObjectWin = GetObject( i );

+       ByteString sPrj = pObjectWin->GetBodyText();

+       if (sPrj == rText) return pObjectWin;

+       i++;

+    }

+    return 0;

+}

+

+ObjectList* ObjectList::FindTopLevelModules()

+{

+    ObjectList* pList = new ObjectList;

+    for ( USHORT i=0; i<Count(); i++ )

+    {

+       ObjectWin* pObjectWin = GetObject( i );

+       if ( pObjectWin->IsTop() )

+           pList->Insert( pObjectWin );

+    }

+

+    return pList;

+}

+

+BOOL ObjectWin::IsTop()

+{

+    ULONG nConCount = mConnections.Count();

+    for ( ULONG i = 0; i < nConCount; i++ )

+    {

+        Connector* pCon = mConnections.GetObject( i );

+        if ( pCon && pCon->IsStart( this) )

+            return FALSE;

+    }

+

+    return TRUE;

 }
\ No newline at end of file
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index 6c6abf80c33b..bc4d096f764e 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -1,243 +1,243 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: soldep.cxx,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-//TBD: ToolBox handling prjview/back
-
-#include <osl/file.hxx>
-#include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
-#include <bootstrp/sstring.hxx>
-#include <svtools/filedlg.hxx>
-#include <tools/iparser.hxx>
-#include <tools/geninfo.hxx>
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ *

+ * Copyright 2008 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * $RCSfile: soldep.cxx,v $

+ * $Revision: 1.9 $

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+ ************************************************************************/

+//TBD: ToolBox handling prjview/back

+

+#include <osl/file.hxx>

+#include <rtl/ustring.hxx>

+#include <tools/debug.hxx>

+#include <bootstrp/sstring.hxx>

+#include <svtools/filedlg.hxx>

+#include <tools/iparser.hxx>

+#include <tools/geninfo.hxx>

 #include <vcl/gdimtf.hxx>

 #include <vcl/bitmap.hxx>

-#include <appdef.hxx>
-#include "time.h"
-#include <soldep/depper.hxx>
-#include <soldep/soldep.hxx>
-#include <soldep/soldlg.hxx>
-#include "dtsodcmp.hrc"
-
-IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );
-//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );
-#define EVENT_RESIZE                0x00000001
-#define MIN(a,b) (a)<(b)?(a):(b)
-#define MAX(a,b) (a)>(b)?(a):(b)
-
-
-//ByteString sDelimiterLine("#==========================================================================");
-
-
-//
-// class SolDep
-//
-
-/*****************************************************************************/
-SolDep::SolDep( Window* pBaseWindow )
-/*****************************************************************************/
-                : Depper( pBaseWindow ),
-                mbBServer(FALSE),
-                mpTravellerList( NULL ),
-                mbIsHide( FALSE )
-{
-    mnSolWinCount = 0;
-    mnSolLastId = 0;
-//    mpPrjIdMapper = new SolIdMapper( 63997 );
-    maTaskBarFrame.EnableAlwaysOnTop();
-    maTaskBarFrame.Show();
-    maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
-    maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));
-    maToolBox.Show();
-
-    mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));
-
-    // Kontext-Menue (geh�rt zu soldep.cxx)
-    InitContextMenueMainWnd();
-    InitContextMenuePrjViewWnd( mpBasePrjWin );
-}
-
-/*****************************************************************************/
-SolDep::~SolDep()
-/*****************************************************************************/
-{
-    mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );
-    delete mpSolIdMapper;
-    delete mpStarWriter;
-    delete mpStandLst;
-}
-
-/*****************************************************************************/
-void SolDep::Init()
-/*****************************************************************************/
-{
-    InformationParser aParser;
-    String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
-    mpStandLst = aParser.Execute( sStandLst );
-    ByteString aUpdater( getenv("UPDATER") );
-    if ( mpStandLst && (aUpdater == "YES") ) {
-        if ( GetVersion() )
-            ReadSource( TRUE );
-    } else
-    {
-        ReadSource();   // if stand.lst isn't available
-    }
-}
-
-/*****************************************************************************/
-void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )
-/*****************************************************************************/
-{
-    // Interface for bs
-    mbBServer=TRUE;
-    if ( pVersionList )
-        mpStandLst = new GenericInformationList( *pVersionList );
-    else {
-        InformationParser aParser;
-        String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
-        mpStandLst = aParser.Execute( sStandLst );
-    }
-    if ( mpStandLst ) {
-        msVersionMajor = ByteString( rVersion );
-        ReadSource(TRUE); //call from build server set UPDATER to TRUE
-    }
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )
-/*****************************************************************************/
-{
-    if ( pEvent && pEvent->ISA( VclWindowEvent ) )
-    {
-        ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
-    }
-    return 0;
-}
-
-
-/*****************************************************************************/
-void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
-/*****************************************************************************/
-{
-    Window* pChildWin = _rVclWindowEvent.GetWindow();
-//    Window* pParentWin = pChildWin->GetParent();
-//Resize();
-    if ( isAlive() )
-        {
-            ULONG id = _rVclWindowEvent.GetId();
-            switch ( id )
-            {
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            // handle mouse click on ObjectWin object
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            //GetObjectList()->ResetSelectedObject();
-                            if (IsHideMode())      // simple mouse click left
-                            {
-                                pWin->CaptureMouse();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->MarkNeeded();
-                                pWin->MarkDepending();
-                                pWin->Invalidate();
-                            } else
-                            {
-                                pWin->LoseFocus();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
-                                pWin->MarkNeeded( TRUE );
-                                pWin->MarkDepending( TRUE );
-                            }
-
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            MarkObjects( pWin );
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            if (IsHideMode()) ToggleHideDependency();
-                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
-                            ViewContent(text);
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            GetDepWin()->NewConnector( pWin );
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP:
-                     {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            pWin->ReleaseMouse();
-                            pWin->SetMarkMode(MARKMODE_SELECTED);
-                            GetDepWin()->Invalidate();
-                        }
-                     }
-                     break;
-            }    // switch
-        }  // if isAlive
-        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
-/*****************************************************************************/
-{
-    USHORT nItemId = pBox->GetCurItemId();
-    switch ( nItemId )
-    {
-        case TID_SOLDEP_FIND:
-            FindProject();
-            break;
+#include <appdef.hxx>

+#include "time.h"

+#include <soldep/depper.hxx>

+#include <soldep/soldep.hxx>

+#include <soldep/soldlg.hxx>

+#include "dtsodcmp.hrc"

+

+IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );

+//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );

+#define EVENT_RESIZE                0x00000001

+#define MIN(a,b) (a)<(b)?(a):(b)

+#define MAX(a,b) (a)>(b)?(a):(b)

+

+

+//ByteString sDelimiterLine("#==========================================================================");

+

+

+//

+// class SolDep

+//

+

+/*****************************************************************************/

+SolDep::SolDep( Window* pBaseWindow )

+/*****************************************************************************/

+                : Depper( pBaseWindow ),

+                mbBServer(FALSE),

+                mpTravellerList( NULL ),

+                mbIsHide( FALSE )

+{

+    mnSolWinCount = 0;

+    mnSolLastId = 0;

+//    mpPrjIdMapper = new SolIdMapper( 63997 );

+    maTaskBarFrame.EnableAlwaysOnTop();

+    maTaskBarFrame.Show();

+    maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));

+    maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));

+    maToolBox.Show();

+

+    mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));

+

+    // Kontext-Menue (geh�rt zu soldep.cxx)

+    InitContextMenueMainWnd();

+    InitContextMenuePrjViewWnd( mpBasePrjWin );

+}

+

+/*****************************************************************************/

+SolDep::~SolDep()

+/*****************************************************************************/

+{

+    mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );

+    delete mpSolIdMapper;

+    delete mpStarWriter;

+    delete mpStandLst;

+}

+

+/*****************************************************************************/

+void SolDep::Init()

+/*****************************************************************************/

+{

+    InformationParser aParser;

+    String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );

+    mpStandLst = aParser.Execute( sStandLst );

+    ByteString aUpdater( getenv("UPDATER") );

+    if ( mpStandLst && (aUpdater == "YES") ) {

+        if ( GetVersion() )

+            ReadSource( TRUE );

+    } else

+    {

+        ReadSource();   // if stand.lst isn't available

+    }

+}

+

+/*****************************************************************************/

+void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )

+/*****************************************************************************/

+{

+    // Interface for bs

+    mbBServer=TRUE;

+    if ( pVersionList )

+        mpStandLst = new GenericInformationList( *pVersionList );

+    else {

+        InformationParser aParser;

+        String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );

+        mpStandLst = aParser.Execute( sStandLst );

+    }

+    if ( mpStandLst ) {

+        msVersionMajor = ByteString( rVersion );

+        ReadSource(TRUE); //call from build server set UPDATER to TRUE

+    }

+}

+

+/*****************************************************************************/

+IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )

+/*****************************************************************************/

+{

+    if ( pEvent && pEvent->ISA( VclWindowEvent ) )

+    {

+        ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );

+    }

+    return 0;

+}

+

+

+/*****************************************************************************/

+void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )

+/*****************************************************************************/

+{

+    Window* pChildWin = _rVclWindowEvent.GetWindow();

+//    Window* pParentWin = pChildWin->GetParent();

+//Resize();

+    if ( isAlive() )

+        {

+            ULONG id = _rVclWindowEvent.GetId();

+            switch ( id )

+            {

+                case VCLEVENT_USER_MOUSEBUTTON_DOWN:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            // handle mouse click on ObjectWin object

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            //GetObjectList()->ResetSelectedObject();

+                            if (IsHideMode())      // simple mouse click left

+                            {

+                                pWin->CaptureMouse();

+                                pWin->SetMarkMode( MARKMODE_SELECTED );

+                                pWin->MarkNeeded();

+                                pWin->MarkDepending();

+                                pWin->Invalidate();

+                            } else

+                            {

+                                pWin->LoseFocus();

+                                pWin->SetMarkMode( MARKMODE_SELECTED );

+                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );

+                                pWin->MarkNeeded( TRUE );

+                                pWin->MarkDepending( TRUE );

+                            }

+

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            MarkObjects( pWin );

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            if (IsHideMode()) ToggleHideDependency();

+                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();

+                            ViewContent(text);

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            GetDepWin()->NewConnector( pWin );

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_UP:

+                     {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            pWin->ReleaseMouse();

+                            pWin->SetMarkMode(MARKMODE_SELECTED);

+                            GetDepWin()->Invalidate();

+                        }

+                     }

+                     break;

+            }    // switch

+        }  // if isAlive

+        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);

+}

+

+/*****************************************************************************/

+IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)

+/*****************************************************************************/

+{

+    USHORT nItemId = pBox->GetCurItemId();

+    switch ( nItemId )

+    {

+        case TID_SOLDEP_FIND:

+            FindProject();

+            break;

         case TID_SOLDEP_CREATEMETA :

         {

             VirtualDevice   aVDev;

@@ -282,1515 +282,1529 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
             SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );

             aMtf.Write( aStream );

             break;

-        }
-        case TID_SOLDEP_HIDE_INDEPENDEND:
-            {
-                ToggleHideDependency();
+        }

+        case TID_SOLDEP_HIDE_INDEPENDEND:

+            {

+                ToggleHideDependency();

                 for ( USHORT i=0; i<mpObjectList->Count(); i++ )

                     mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);

-
-                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
-                   GetDepWin()->Invalidate(); //repaint Main-View
-            }
-            break;
-        case TID_SOLDEP_SELECT_WORKSPACE:
-            if (mpStandLst)
-            {
-                if (GetVersion()) // Version dialog box
-                {
-                    delete mpSolIdMapper;
-                    delete mpStarWriter;
-                    mpObjectList->ClearAndDelete();
-                    ReadSource(TRUE);
-                }
-            }
-            break;
-        case TID_SOLDEP_BACK:
-            maToolBox.HideItem(TID_SOLDEP_BACK);
-            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)
-            maToolBox.Resize();
-            TogglePrjViewStatus();
-            break;
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ToggleHideDependency()
-/*****************************************************************************/
-{
-    mbIsHide = !mbIsHide;
-    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
-    ObjectWin* pWin = GetObjectList()->GetObject( 0 );
-    pWin->ToggleHideMode();
-};
-
-/*****************************************************************************/
-BOOL SolDep::GetVersion()
-/*****************************************************************************/
-{
-    SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );
-    if ( aVersionDlg.Execute() == RET_OK ) {
-        msVersionMajor = aVersionDlg.GetVersionMajor();
-        msVersionMinor = aVersionDlg.GetVersionMinor();
-        return TRUE;
-    }
-    return FALSE;
-}
-
-void SolDep::InitContextMenueMainWnd()
-{
-    InitContextMenuePrjViewWnd( mpBaseWin );
-    return; // Disable not actually supported items
-
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;
-    mpBaseWin->mpPopup->InsertSeparator();
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );
-    mpBaseWin->mpPopup->InsertSeparator();
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );
-}
-
-void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )
-{
-    // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );
-    pBaseWin->mpPopup->InsertSeparator();
-    // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );
-}
-
-/*****************************************************************************/
-ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )
-/*****************************************************************************/
-{
-    Prj* pPrj;
-
-//hshtable auf stand halten
-    ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );
-    if ( pWin )
-    {
-        ByteString aBodyText( pWin->GetBodyText() );
-        if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )
-        {
-            mpStarWriter->Remove( pPrj );
-//cleanup ist teuer...
-            mpStarWriter->CleanUp();
-            delete pPrj;
-        }
-        else
-            DBG_ASSERT( FALSE, "project not found - write" );
-
-        mpSolIdMapper->Delete( aBodyText );
-        if ( bDelete )
-            delete pWin;
-        return pWin;
-    }
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )
-/*****************************************************************************/
-{
-    ULONG nObjectId;
-    if ( bInteract )
-    {
-        nObjectId = HandleNewPrjDialog( rBodyText );
-    }
-    else
-    {
-//hashtable auf stand halten
-        MyHashObject* pHObject;
-        nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );
-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));
-        mpSolIdMapper->Insert( rBodyText, pHObject );
-    }
-    return nObjectId;
-}
-
-/*****************************************************************************/
-ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )
-/*****************************************************************************/
-{
-    ULONG nObjectId;
-    if ( bInteract )
-    {
-        nObjectId = HandleNewDirectoryDialog( rBodyText );
-    }
-    else
-    {
-//hshtable auf stand halten
-        MyHashObject* pHObject;
-        nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );
-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
-        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
-    }
-    return nObjectId;
-}
-
-/*****************************************************************************/
-USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "not yet" );
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-
-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
-    if ( pPrj )
-    {
-        pPrj->AddDependencies( sStartName );
-        return AddConnectorToObjects( pStartWin, pEndWin );
-    }
-    else
-    {
-        DBG_ASSERT( FALSE , "non existing Project" );
-        return 1;
-    }
-}
-
-/*****************************************************************************/
-USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
-    SByteStringList* pPrjDeps = NULL;
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-
-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
-    pPrjDeps = pPrj->GetDependencies( FALSE );
-    if ( pPrjDeps )
-    {
-        ByteString* pString;
-        ULONG nPrjDepsCount = pPrjDeps->Count();
-        for ( ULONG j = nPrjDepsCount; j > 0; j-- )
-        {
-            pString = pPrjDeps->GetObject( j - 1 );
-            if ( pString->GetToken( 0, '.') == sStartName )
-                pPrjDeps->Remove( pString );
-        }
-    }
-
-    return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-/*****************************************************************************/
-void SolDep::RemoveAllObjects( ObjectList* pObjLst )
-/*****************************************************************************/
-{
-
-    Depper::RemoveAllObjects( pObjLst );
-
-    if ( mpSolIdMapper )
-    {
-        delete mpSolIdMapper;
-        mpSolIdMapper = NULL;
-    }
-    if ( mpStarWriter )
-    {
-        delete mpStarWriter;
-        mpStarWriter = NULL;
-    }
-}
-
-/*****************************************************************************/
-ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "soldep" );
-    MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project
-
-    if ( !pHObject ) {
-        ByteString sNullPrj = "null";//null_project
-        ULONG nObjectId = AddObject( sNullPrj, FALSE );
-        ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );
-        return nObjectId;
-    }
-
-    return pHObject->GetId();
-}
-
-/*****************************************************************************/
-ULONG SolDep::GetStartPrj(SolIdMapper* pIdMapper, ObjectList* pObjList)
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "prjdep" );
-    MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir
-    if ( !pHObject )
-    {
-        ByteString bsNull("null");
-        ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir
-        return nObjectId;
-    }
-    else
-        return pHObject->GetId();
-}
-
-/*****************************************************************************/
-USHORT SolDep::OpenSource()
-/*****************************************************************************/
-{
-    if ( mpStandLst ) {
-        if ( GetVersion())
-            return ReadSource();
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT SolDep::ReadSource(BOOL bUpdater)
-/*****************************************************************************/
-{
-    mpBaseWin->EnablePaint( FALSE );
-    mpBaseWin->Hide();
-    ULONG nObjectId, nHashedId;
-    ULONG i;
-    MyHashObject* pHObject;
-    ByteString* pStr;
-    ObjectWin *pStartWin, *pEndWin;
-
-    mpSolIdMapper = new SolIdMapper( 63997 );
-    if (mpStandLst && bUpdater)
-    {
-        mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );
-    } else
-    {
-        SolarFileList* pSolarFileList;
-        pSolarFileList = GetPrjListFromDir();
-        mpStarWriter = new StarWriter( pSolarFileList, TRUE );
-    }
-    ByteString sTitle( SOLDEPL_NAME );
-    if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {
-        sTitle += ByteString( " - mode: single file [" );
-           sTitle += (ByteString) mpStarWriter->GetName();
-        sTitle += ByteString( "]" );
-    }
-    else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {
-        sTitle += ByteString( " - mode: multiple files [" );
-        sTitle += ByteString( "]" );
-    }
-    SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );
-
-    ULONG nCount = mpStarWriter->Count();
-    for ( i=0; i<nCount; i++ )
-    {
-        Prj *pPrj = mpStarWriter->GetObject(i);
-        ByteString sPrjName = pPrj->GetProjectName();
-        nObjectId = AddObject( sPrjName, FALSE );
-        ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );
-    }
-    for ( i=0; i<nCount; i++ )
-    {
-        Prj *pPrj = mpStarWriter->GetObject(i);
-        SByteStringList *pLst = pPrj->GetDependencies( FALSE );
-        if ( pLst )
-        {
-            ULONG nDepCount = pLst->Count();
-            for ( ULONG m=0; m<nDepCount; m++)
-            {
-                pStr = pLst->GetObject(m);
-                pHObject = mpSolIdMapper->Find( *pStr );
-                /*if ( !pHObject )
-                {
-    // create new prj
-                    Prj *pNewPrj = new Prj( *pStr );
-                    ByteString sPrjName = pNewPrj->GetProjectName();
-                    nObjectId = AddObject( sPrjName, FALSE );
-                    pHObject = mpSolIdMapper->Find( *pStr );
-                    ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );
-                }*/
-
-                if ( pHObject )
-                {
-                nHashedId = pHObject->GetId();
-                ByteString sF_Os2 = pPrj->GetProjectName();
-                pStr = &sF_Os2;
-                pHObject = mpSolIdMapper->Find( *pStr );
-                nObjectId = pHObject->GetId();
-                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
-                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
-                AddConnectorToObjects( pStartWin, pEndWin );
-            }
-        }
-    }
-    }
-    if (!IsPrjView())
-    {
-        AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
-        GetDepWin()->EnablePaint( TRUE );
-    }
-    return 0;
-}
-
-SolarFileList* SolDep::GetPrjListFromDir()
-{
-    SolarFileList* pSolarFileList = new SolarFileList();
-    String sPrjDir( String::CreateFromAscii( "prj" ));
-    String sBuildLst( String::CreateFromAscii( "build.lst" ));
-    DirEntry aCurrent( getenv( SOURCEROOT ) );
-
-    aCurrent.ToAbs();
-    Dir aDir( aCurrent, FSYS_KIND_DIR );
-
-    USHORT nEntries = aDir.Count();
-    if( nEntries )
-    {
-        UniStringList aSortDirList;
-        for ( USHORT n = 0; n < nEntries; n++ )
-        {
-            DirEntry& rEntry = aDir[n];
-            UniString aName( rEntry.GetName() );
-            if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )
-            {
-                rEntry += DirEntry( sPrjDir );
-                rEntry += DirEntry( sBuildLst );
-                if (rEntry.Exists())
-                {
-                    pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );
-                    ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);
-                    fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());
-                }
-            }
-        }
-    }
-    if ( !pSolarFileList->Count() )
-    {
-         //is empty!! TBD
-         delete pSolarFileList;
-         return NULL;
-    }
-    return pSolarFileList;
-}
-
-/*****************************************************************************/
-USHORT SolDep::WriteSource()
-/*****************************************************************************/
-{
-/* zur Sicherheit deaktiviert
-    USHORT nMode = mpStarWriter->GetMode();
-    if ( nMode == STAR_MODE_SINGLE_PARSE ) {
-        ByteString sFileName = mpStarWriter->GetName();
-        if ( sFileName.Len()) {
-            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );
-            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project
-        }
-    }
-    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {
-    // *OBO*
-    //String sRoot = mpStarWriter->GetSourceRoot();
-    //nicht mehr unterst�tzt mpStarWriter->GetSourceRoot()
-        ByteString sFileName = mpStarWriter->GetName();
-        DirEntry aEntry( sFileName );
-        aEntry.ToAbs();
-        aEntry = aEntry.GetPath().GetPath().GetPath();
-        String sRoot = aEntry.GetFull();
-
-        if ( sRoot.Len()) {
-            mpStarWriter->RemoveProject( ByteString( "null")); //null_project
-            mpStarWriter->WriteMultiple( sRoot );
-        }
-    }
-*/
-    return 1;
-}
-
-USHORT SolDep::Load( const ByteString& rFileName )
-{
-// moved from depper class
-    DBG_ASSERT( FALSE , "you are dead!" );
-    SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );
-    depper_head dh;
-    ULONG i;
-    ULONG nLoadOffs = mnSolLastId;     //or Prj??
-    ObjectWin* pNewWin;
-    aInFile.Read( &dh, sizeof( dh ));
-
-    ULONG nObjCount = dh.nObjectCount;
-    ULONG nCnctrCount = dh.nCnctrCount;
-
-    for ( i=0; i < nObjCount ; i++ )
-    {
-        ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );
-        pWin->Load( aInFile );
-        pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));
-        pNewWin->SetId( nLoadOffs + pWin->GetId());
-        pNewWin->SetPosPixel( pWin->GetPosPixel());
-        pNewWin->SetSizePixel( pWin->GetSizePixel());
-    }
-
-    ULONG nStartId;
-    ULONG nEndId;
-//  ueber addconnector fuehren!
-    for ( i=0; i < nCnctrCount ; i++ )
-    {
-        Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );
-        pCon->Load( aInFile );
-
-        nStartId = nLoadOffs + pCon->GetStartId();
-        nEndId = nLoadOffs + pCon->GetEndId();
-
-        ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );
-        ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );
-
-        pCon->Initialize( pStartWin, pEndWin );
-    }
-
-
-    return 0;
-}
-
-/*****************************************************************************/
-BOOL SolDep::ViewContent( ByteString& rObjectName )
-/*****************************************************************************/
-{
-    mpFocusWin = NULL;
-    SetPrjViewStatus(TRUE);
-
-    for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )
-        if ( mpObjectList->GetObject( i )->HasFocus())
-            mpFocusWin = mpObjectList->GetObject( i );
-    //HideObjectsAndConnections( mpObjectList );
-    mpProcessWin->Resize();
-    GetDepWin()->Show();
-    return InitPrj( rObjectName );
-}
-
-/*****************************************************************************/
-BOOL SolDep::InitPrj( ByteString& rListName )
-/*****************************************************************************/
-{
-    ULONG nObjectId, nHashedId;
-    ULONG i, j;
-    MyHashObject* pHObject;
-    ByteString *pDepName;
-    ByteString *pFlagName;
-    Prj* pPrj;
-    ObjectWin *pStartWin, *pEndWin;
-    maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);
-    maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);
-    maToolBox.HideItem(TID_SOLDEP_FIND);
-    maToolBox.ShowItem(TID_SOLDEP_BACK);
-    maToolBox.Invalidate();
-
-    //clean up
-    mpObjectPrjList->ClearAndDelete();
-    GetDepWin()->ClearConnectorList();
-    if (mpPrjIdMapper) delete mpPrjIdMapper;
-    mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper
-    mnPrjWinCount = 0;
-    mnPrjLastId = 0;
-
-    ULONG nCount = mpStarWriter->Count();
-    GetDepWin()->EnablePaint( FALSE );
-    Point aPnt = GetGraphWin()->GetPosPixel();
-    Size aSize = GetGraphWin()->GetSizePixel();
-
-    GetGraphWin()->SetPosSizePixel( aPnt, aSize );         // Hier wird das Window gesetzt
-
-    BOOL bReturn = FALSE;
-
-    for ( i=0; i<nCount; i++ )
-    {
-// pPrj->GetProjectName() returns the name of
-// the project e.g. svtools
-        pPrj = mpStarWriter->GetObject(i);
-        ByteString sPrjName = pPrj->GetProjectName();
-        if ( sPrjName == rListName )
-        {
-            bReturn = TRUE;
-
-            mpPrj = mpStarWriter->GetObject(i);
-            ULONG nDirCount = mpPrj->Count();
-            for ( j=0; j<nDirCount; j++ )
-            {
-                CommandData *pData = mpPrj->GetObject(j);
-                fprintf( stdout, "\tProjectDir : %s\n",
-                        pData->GetLogFile().GetBuffer());
-// pData->GetLogFile() contains internal project IDs
-// e.g. st_mkout etc.
-                if ( pData->GetLogFile() != "" )
-                {
-                    ByteString sItem = pData->GetLogFile();
-                    nObjectId = AddPrjObject( sItem, FALSE);
-// there may be faster ways......
-                    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-                    pWin->SetViewMask( 0x0001 );
-// pData->GetPath() contains internal project directories
-// e.g. svtools/inc etc.
-                    ByteString sPath = pData->GetPath();
-                    pWin->SetTipText( sPath );
-                }
-            }
-
-// set connectors for dependencies here
-            for ( j=0; j<nDirCount; j++ )
-            {
-                CommandData *pData = mpPrj->GetObject(j);
-                SByteStringList *pDeps = pData->GetDependencies();
-                if ( pDeps )
-                {
-                    ByteString sFlagName = pData->GetLogFile();
-                    pFlagName = &sFlagName;
-                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()
-                    pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));
-                    if (pHObject)
-                    {
-
-                        nObjectId = pHObject->GetId();
-
-                        ULONG nDepCount = pDeps->Count();
-                        for ( ULONG k=0; k<nDepCount; k++ )
-                        {
-                            pDepName = pDeps->GetObject(k);
-                            pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));
-                            if (pHObject )
-                            {
-                                nHashedId = pHObject->GetId();
-                                pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );
-                                pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-
-                                AddConnectorToObjects( pStartWin, pEndWin );
-                            }
-                            else
-                            {
-                                String sMessage;
-                                sMessage += String::CreateFromAscii("can't find ");
-                                sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );
-                                sMessage += String::CreateFromAscii(".\ndependency ignored");
-                                WarningBox aBox( GetDepWin(), WB_OK, sMessage);
-                                aBox.Execute();
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            break;
-        }
-    }
-    ByteString sNullDir = "null";
-    nObjectId = AddPrjObject( sNullDir, FALSE);
-    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-    pWin->SetViewMask( 0x0001 );
-    mpGraphPrjWin->EnablePaint( TRUE );
-    //debug
-//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);
-//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );
-    AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );
-    mpGraphWin->Hide();
-    mpGraphPrjWin->Show();
-    mpGraphPrjWin->Invalidate();
-
-    return bReturn;
-}
-
-/*****************************************************************************/
-USHORT SolDep::CloseWindow()
-/*****************************************************************************/
-{
-
-    ((SystemWindow*)mpProcessWin)->Close();
-    return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ShowHelp()
-/*****************************************************************************/
-{
-    SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );
-    String aHelpText;
-    ByteString aGetStr;
-
-    if ( aHelpFile.IsOpen() )
-    {
-        while ( aHelpFile.ReadLine( aGetStr ) )
-        {
-            aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);
-            aHelpText += String::CreateFromAscii("\n");
-        }
-    }
-    else
-        aHelpText = String::CreateFromAscii("No Helpfile found.");
-
-    SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));
-    aHelpDlg.maMLEHelp.SetText( aHelpText );
-    aHelpDlg.maMLEHelp.SetReadOnly();
-    aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );
-    aHelpDlg.Execute();
-}
-
-/*****************************************************************************/
-BOOL SolDep::FindProject()
-/*****************************************************************************/
-{
-    SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );
-    ObjectWin* pObjectWin = NULL;
-    mpObjectList->ResetSelectedObject();
-    if (IsHideMode())
-    {
-        GetDepWin()->Invalidate();
-    }
-
-    mpFocusWin=NULL;
-
-    if ( aFindProjectDlg.Execute() == RET_OK ) {
-        msProject = aFindProjectDlg.GetProject();
-        //now we have a project string
-        pObjectWin = mpObjectList->GetPtrByName( msProject );
-        mpObjectList->ResetSelectedObject();
-        MarkObjects( pObjectWin );
-    }
-    return FALSE;
-}
-
-BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )
-{
-    if (pObjectWin)
-    {
-        if (!(pObjectWin->IsNullObject()))
-        {
-            pObjectWin->SetMarkMode( MARKMODE_SELECTED );
-              pObjectWin->MarkNeeded();
-            pObjectWin->MarkDepending();
-            if (IsHideMode())
-            {
-                GetDepWin()->Invalidate();
-            }
-        } else
-        {
-            fprintf(stdout,"null\n");
-        }
-    }
-    return TRUE;
-}
-
-void SolDep::Resize()
-{
-//funzt! mu� aber von der applikation aufgerufen werden.
-    Point aOutPos = Point( 0, 0 );
-    Size aOutSize = mpProcessWin->GetOutputSizePixel();
-        // calculate output size
-    ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();
-    ULONG nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();
-    Size aSize( aOutSize.Width(), nTaskHeight );
-
-//  ULONG nMenuHeight = 0;
-    Point aGraphWinPos = Point(0,0);
-    Size  aGraphWinSize = Size(0,0);
-
-//wei� nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //H�he des Menues
-
-    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
-    // Set Docking-Rectangle for ToolBar
-    Rectangle aInRect;
-
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))
-    {
-        // waagerechte Toolbar oben
-        maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, nTaskHeight );
-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))
-    {
-        // waagerechte Toolbar unten
-        Point aTbPos  = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-        Size  aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());
-        maToolBox.SetPosSizePixel( aTbPos, aTbSize );
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, 0 );
-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))
-    {
-        // senkrechte ToolBar links
-        maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( nTaskWidth, 0 );
-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))
-    {
-        // senkrechte ToolBar rechts
-        Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-        Size  aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-        maToolBox.SetPosSizePixel( aTbPos, aTbSize);
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, 0 );
-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
-        }
-    }
-
-    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-/*
-    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-*/
-    maToolBox.SetDockingRects( rout, rin );
-
-    BOOL bFloating = maToolBox.IsFloatingMode();
-
-    if ( bFloating )
-    {
-        GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);
-        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();
-        if (maToolBox.IsVisible()) maToolBox.Show();
-    } else
-    {
-        GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );
-    }
-    if (maToolBox.IsVisible()) maToolBox.Show();
-}
-
-USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-//  DBG_ASSERT( FALSE , "not yet" );
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-    if ( sStartName != ByteString("null"))
-    {
-        CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
-        SByteStringList* pDeps = pEndData->GetDependencies();
-        if ( pDeps )
-            pDeps->PutString( &sStartName );
-        else
-        {
-            pDeps = new SByteStringList();
-            pEndData->SetDependencies( pDeps );
-            pDeps->PutString( &sStartName );
-            pEndData->GetDependencies();
-        }
-    }
-    return AddConnectorToObjects( pStartWin, pEndWin );
-}
-
-USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-    CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
-    SByteStringList* pDeps = pEndData->GetDependencies();
-    if ( pDeps )
-    {
-        ByteString* pString;
-        ULONG nDepsCount = pDeps->Count();
-        for ( ULONG j = nDepsCount; j > 0; j-- )
-        {
-            pString = pDeps->GetObject( j - 1 );
-            if ( pString->GetToken( 0, '.') == sStartName )
-                pDeps->Remove( pString );
-        }
-    }
-    return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
-{
-    AutoArrangeDlgStart();
-    OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );
-    AutoArrangeDlgStop();
-    return 0;
-}
-
-Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )
-{
-    int nRowIndex = nIndex / DEPPER_MAX_WIDTH;
-    ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );
-
-    ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;
-    Point aPos( nPosX, nPosY );
-    return aPos;
-}
-
-ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )
-{
-    long nDynXOffs;
-    long nXMiddle;
-    ULONG nTrigger;
-
-    nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;
-    if ( nObjectsToFit > DEPPER_MAX_WIDTH )
-        nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;
-    nTrigger = ( nObjectsToFit - 1 ) / 2;
-    nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;
-    ULONG nXOffs = nXMiddle - nDynXOffs;
-
-    if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )
-        mnMinDynXOffs = nXMiddle - nDynXOffs;
-
-    return nXOffs;
-
-}
-
-double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )
-{
-    ObjectWin* pWin;
-    Connector* pCon;
-    ULONG nObjCount = pObjList->Count();
-    double dRetVal = 0;
-    double dWinVal;
-    USHORT i, j;
-    BOOL bIsStart;
-
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjList->GetObject( i );
-
-        if ( pWin && pWin->IsVisible())
-        {
-            j = 0;
-            dWinVal = 0;
-            while ( (pCon = pWin->GetConnector( j )) )
-            {
-                if ( pCon->IsVisible()) {
-                    bIsStart = pCon->IsStart( pWin );
-                    if ( eDistType != BOTH )
-                        if ( eDistType == TOPDOWN )
-                        {
-                            if ( bIsStart )
-                            {
-                                pCon->UpdatePosition( pWin, FALSE );
-                                dWinVal += pCon->GetLen() * pWin->mnHeadDist;
-                            }
-                        }
-                        else
-                        {
-                            if ( !bIsStart )
-                            {
-                                pCon->UpdatePosition( pWin, FALSE );
-                                dWinVal += pCon->GetLen() * pWin->mnRootDist;
-                            }
-
-                        }
-                    else
-                    {
-                        pCon->UpdatePosition( pWin, FALSE );
-                        if ( !bIsStart )
-                            dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );
-                        else
-                            dWinVal += pCon->GetLen() * pWin->mnRootDist;
-                    }
-                }
-                j++;
-            }
-//          if ( j != 0 )
-//              dWinVal /= j;
-            dRetVal += dWinVal;
-        }
-    }
-
-    return dRetVal;
-}
-
-USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )
-{
-    USHORT i = 0;
-    ObjectWin* pNewWin;
-    Connector* pCon;
-
-    nDepth++;
-
-    USHORT nMaxDepth = nDepth;
-
-    pWin->mbVisited = TRUE;
-    pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );
-    if ( nDepth > DEPPER_MAX_DEPTH )
-    {
-        DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabh�ngigkeit!" );
-        nDepth++;
-        return DEP_ENDLES_RECURSION_FOUND;
-    }
-
-    while ( (pCon = pWin->GetConnector( i )) )
-    {
-        if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project
-        {
-            pNewWin = pCon->GetOtherWin( pWin );
-            nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );
-            if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )
-            {
-                mpTravellerList->Insert( pWin, LIST_APPEND );
-                return DEP_ENDLES_RECURSION_FOUND;
-            }
-        }
-        i++;
-    }
-    pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );
-    return nMaxDepth;
-}
-
-
-double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )
-{
-
-    ULONG i, j, l;
-    ULONG nEnd = nStart + nSize;
-    ObjectWin* pSwapWin;
-    ULONG nLevelObjCount = rObjList.Count();
-
-//dont use full recusion for more than 6 objects
-    if ( nLevelObjCount > 6 )
-    {
-        srand(( unsigned ) time( NULL ));
-
-        ULONG nIdx1, nIdx2;
-        for ( i = 0; i < 101; i++ )
-        {
-            UpdateSubProgrssBar(i);
-            for ( j = 0; j < 100; j++ )
-            {
-                nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                while ( rObjList.GetObject( nIdx1 ) == NULL )
-                    nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )
-                    nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-
-                pSwapWin = rObjList.GetObject( nIdx1 );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
-                pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
-                rObjList.Replace( pSwapWin, nIdx1 );
-
-                double dCurDist = CalcDistSum( &rObjList, eDistType );
-
-                if ( dCurDist < dMinDist )
-                {
-                    dMinDist = dCurDist;
-                    rResultList.Clear();
-                    for ( l = 0; l < nLevelObjCount; l++ )
-                    {
-                        pSwapWin = rObjList.GetObject( l );
-                        rResultList.Insert( pSwapWin, LIST_APPEND);
-                    }
-                }
-//              if ( dCurDist > dMinDist * 1.5 )
-                if ( dCurDist > dMinDist * 15 )
-                {
-                    pSwapWin = rObjList.GetObject( nIdx1 );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
-                    pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
-                    rObjList.Replace( pSwapWin, nIdx1 );
-                }
-            }
-        }
-    }
-    else
-    {
-        for ( i = nStart ; i < nEnd; i++)
-        {
-            if ( nSize > 1 )
-            {
-                pSwapWin = rObjList.GetObject( i );
-                pSwapWin = rObjList.Replace( pSwapWin, nStart );
-                rObjList.Replace( pSwapWin, i );
-                double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );
-                dMinDist = MIN( dMinDist, dPermuteDist);
-                pSwapWin = rObjList.GetObject( i );
-                pSwapWin = rObjList.Replace( pSwapWin, nStart );
-                rObjList.Replace( pSwapWin, i );
-
-            }
-            else
-            {
-                for ( l = 0; l < nLevelObjCount; l++ )
-                {
-                    pSwapWin = rObjList.GetObject( l );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ l ] );
-                }
-
-                double dCurDist = CalcDistSum( &rObjList, eDistType );
-
-                if ( dCurDist < dMinDist )
-                {
-                    dMinDist = dCurDist;
-                    rResultList.Clear();
-                    for ( l = 0; l < nLevelObjCount; l++ )
-                    {
-                        pSwapWin = rObjList.GetObject( l );
-                        rResultList.Insert( pSwapWin, LIST_APPEND);
-                    }
-                }
-
-            }
-        }
-    }
-
-    return dMinDist;
-}
-
-
-USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
-{
-    ObjWinList aWorkList;
-    ObjectWin* pWin;
-    Connector* pCon;
-    USHORT nRootDist = (USHORT) -1;
-    USHORT i, j, k, l, nRetVal;
-    USHORT LevelUse[ DEPPER_MAX_DEPTH ];
-    USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];
-    ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];
-    ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];
-    Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];
-
-    mnMinDynXOffs = 0xffff;
-
-    for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )
-    {
-        LevelUse[ i ] = 0;
-        LevelList[ i ] = NULL;
-        LevelSecUse[ i ] = 0;
-        LevelSecList[ i ] = NULL;
-    }
-
-    GetDepWin()->EnablePaint( FALSE );
-
-    ULONG nObjCount = pObjLst->Count();
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjLst->GetObject( i );
-        if ( pWin->IsVisible()) {
-            pWin->mbVisited = FALSE;
-            pWin->mnHeadDist = 0;
-            pWin->mnRootDist = 0;
-
-            // find initial objects which need to be connected with
-            // root object
-            j = 0;
-            USHORT nStartCount = 0;
-            USHORT nEndCount = 0;
-            while ( (pCon = pWin->GetConnector( j )) )
-            {
-                if ( pCon->IsVisible()) {                   //null_project
-                    if( pCon->IsStart( pWin ))
-                        nStartCount++;
-                    else
-                    {
-                        nEndCount = 1;
-                        break;
-                    }
-                }
-                j++;
-            }
-
-            if ( nStartCount > 0 && nEndCount == 0 )
-                if ( nTopId != pWin->GetId())
-                    AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());
-
-        }
-    }
-
-    pWin = ObjIdToPtr( pObjLst, nTopId );
-
-    if ( mpTravellerList )
-    {
-        mpTravellerList->Clear();
-        delete mpTravellerList;
-    }
-    mpTravellerList = new ObjWinList();
-    // set root and top distance
-    nRetVal = Impl_Traveller( pWin, nRootDist );
-
-    DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );
-    if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )
-    {
-        WriteToErrorFile();
-        return nRetVal;
-    }
-
-    ULONG nUnvisited = 0;
-    ULONG nUnvisYOffs = 0;
-
-    // seperate mainstream, secondary and unconnected
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjLst->GetObject( i );
-        if ( pWin->IsVisible()) {
-            if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )
-            {
-                if ( !LevelList[ pWin->mnHeadDist ] )
-                        LevelList[ pWin->mnHeadDist ] = new ObjWinList;
-                LevelList[ pWin->mnHeadDist ]->Insert( pWin );
-                LevelUse[ pWin->mnHeadDist ]++;
-            }
-            else
-                if ( pWin->mbVisited )
-                {
-                    if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )
-                        LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;
-                    LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );
-                    LevelSecUse[ nRetVal - pWin->mnRootDist ]++;
-                }
-                else
-                {
-    //              need to be arranged more intelligent...
-                    Point aPos( 5, nUnvisYOffs );
-                    pWin->SetCalcPosPixel( aPos );
-
-                    Point aTmpPos = pWin->GetCalcPosPixel();
-                    pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));
-
-                    nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();
-                    nUnvisited++;
-                }
-        }
-    }
-
-    mnLevelOffset = 0;
-
-    USHORT nScaleVal;
-
-    if ( nRetVal == 0 )
-        nScaleVal = 1;
-    else
-        nScaleVal = nRetVal;
-
-    i = 0;
-
-    USHORT nStep = 0;
-
-    while ( LevelList[ i ] )
-    {
-        UpdateMainProgressBar(i, nScaleVal, nStep);
-        DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );
-        ObjectWin* pSwapWin;
-        ULONG nLevelObjCount = LevelList[ i ]->Count();
-
-        if ( nLevelObjCount % 2 == 0 )
-        {
-            LevelList[ i ]->Insert( NULL, LIST_APPEND );
-            nLevelObjCount++;
-//          LevelUse bleibt orginal...
-//          LevelUse[ i ]++;
-        }
-
-// catch too big lists
-        DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
-        if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
-        {
-            WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
-            aWBox.Execute();
-            break;
-        }
-        mnXOffset = CalcXOffset( nLevelObjCount );
-        aWorkList.Clear();
-
-        // initial positioning for mainstream
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = LevelList[ i ]->GetObject( j );
-            aWorkList.Insert( pSwapWin, LIST_APPEND);
-            Point aPos = CalcPos( i, j );
-            aPosArray[ j ] = aPos;
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        double dMinDist = CalcDistSum( LevelList[ i ] );
-
-        // optimize mainstream order and return best matching list in "aWorkList"
-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));
-
-        // set optimized positions - may still be wrong from later tries
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = aWorkList.GetObject( j );
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
-        }
-
-        if ( LevelSecList[ i ] != NULL )
-        {
-            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
-            // expand list for better positioning
-            while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )
-            {
-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
-                nLevelSecObjCount++;
-            }
-            if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )
-            {
-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
-                nLevelSecObjCount++;
-            }
-
-            DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
-            if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
-            {
-                WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
-                aWBox.Execute();
-                break;
-            }
-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
-            aWorkList.Clear();
-
-            l = 0;
-            BOOL bUsedPos;
-
-            // find free positions for secondary objects
-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
-            {
-                Point aPos = CalcPos( i, j );
-                bUsedPos = FALSE;
-                // is already occupied?
-                for ( k = 0; k < nLevelObjCount; k++ )
-                {
-                    if ( LevelList[ i ]->GetObject( k ) )
-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
-                            bUsedPos = TRUE;
-                }
-                // if its free, add to pool
-                if ( !bUsedPos )
-                {
-                    aPosArray[ l ] = aPos;
-                    l++;
-                }
-            }
-
-            // initial positioning for secodaries
-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
-            {
-                pSwapWin = LevelSecList[ i ]->GetObject( j );
-                aWorkList.Insert( pSwapWin, LIST_APPEND);
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-            dMinDist = CalcDistSum( LevelSecList[ i ] );
-
-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));
-
-            // set optimized positions - may still be wrong from later tries
-            for ( j = 0; j < nLevelSecObjCount; j++ )
-            {
-                pSwapWin = aWorkList.GetObject( j );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
-            }
-            if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-                mnLevelOffset++;
-        }
-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-            mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
-        i++;
-    }
-
-    mnMinDynXOffs = 0xffff;
-
-// and back again...
-    // get better results form already preoptimized upper and lower rows
-
-    do
-    {
-        i--;
-        UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down
-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-            mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
-        ObjectWin* pSwapWin;
-        ULONG nLevelObjCount = LevelList[ i ]->Count();
-        mnXOffset = CalcXOffset( nLevelObjCount );
-        aWorkList.Clear();
-
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = LevelList[ i ]->GetObject( j );
-            aWorkList.Insert( pSwapWin, LIST_APPEND);
-            Point aPos = CalcPos( i, j );
-            aPosArray[ j ] = aPos;
-//no need to do this stuff.......   ?????
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        double dMinDist = CalcDistSum( LevelList[ i ], BOTH );
-
-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = aWorkList.GetObject( j );
-            if ( pSwapWin )
-//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        if ( LevelSecList[ i ] != NULL )
-        {
-            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
-            aWorkList.Clear();
-
-            l = 0;
-            BOOL bUsedPos;
-
-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
-            {
-                Point aPos = CalcPos( i, j );
-                bUsedPos = FALSE;
-// could be faster
-                for ( k = 0; k < nLevelObjCount; k++ )
-                {
-                    if ( LevelList[ i ]->GetObject( k ) )
-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
-                            bUsedPos = TRUE;
-                }
-                if ( !bUsedPos )
-                {
-                    aPosArray[ l ] = aPos;
-                    l++;
-                }
-            }
-
-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
-            {
-                pSwapWin = LevelSecList[ i ]->GetObject( j );
-                aWorkList.Insert( pSwapWin, LIST_APPEND);
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-            dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );
-
-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
-            for ( j = 0; j < nLevelSecObjCount; j++ )
-            {
-                pSwapWin = aWorkList.GetObject( j );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-        }
-//      i--;
-    } while ( i != 0 );
-    SetMainProgressBar( 100 );
-
-    ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );
-
-    //    ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier mu� man switchen GetStart/GetPrjStart oder so
-
-    ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
-
-    ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;
-    if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )
-        nNewYSize = nUnvisYOffs + GetDefSize().Height();
-
-    MapMode aMapMode = GetDepWin()->GetMapMode();
-    Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));
-
-    Size aNowSize( GetGraphWin()->GetSizePixel());
-
-    if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )
-        aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;
-
-    if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )
-        aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;
-
-//  if ( nZoomed <= 0 )
-//  {
-//      mpBaseWin->SetSizePixel( aTmpSize );
-//      mpGraphWin->SetTotalSize( aTmpSize );
-//      mpGraphWin->EndScroll( 0, 0 );
-//  }
-
-// now remap all objects
-    ULONG nAllObjCount = pObjLst->Count();
-    Point aTmpPos;
-    for ( j = 0; j < nAllObjCount; j++ )
-    {
-        pWin = pObjLst->GetObject( j );
-        if ( pWin->IsVisible()) {
-            aTmpPos = pWin->GetCalcPosPixel();
-            if ( pWin->mbVisited )
-            {
-// reserve space for unconnected
-                aTmpPos.X() -= mnMinDynXOffs;
-                aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;
-// center window
-                aTmpPos.X() += GetDefSize().Width() / 2;
-                aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;
-            }
-            pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));
-        }
-    }
-    aWorkList.Clear();
-    GetDepWin()->EnablePaint( TRUE );
-    GetDepWin()->Invalidate();
-//LevelListen loeschen                  H�? Welche Levellisten?
-
-//Update all Connectors
-// --> To be done: Don't call twice Object1-Connector-Object2
-    ObjectWin* pObject1;
-    for ( i = 0 ; i < nObjCount ; i++)
-    {
-        pObject1 = pObjLst->GetObject( i );
-        if ( pObject1->IsVisible())
-            pObject1->UpdateConnectors();
-    };
-    return 0;
-}
-
-void SolDep::WriteToErrorFile()
-{
-//Needs some improvement
-    ObjectWin* pWin;
-    WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));
-    aWBox.Execute();
-    char *tmpdir = getenv("TMP");
-    char *errfilebasename = "depper.err";
-    char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );
-    *ErrFileName = '\0';
-    strcat( ErrFileName, tmpdir );
-    strcat( ErrFileName, "\\" );
-    strcat( ErrFileName, errfilebasename );
-    FILE* pErrFile = fopen( "depper.err", "w+" );
-    if ( pErrFile )
-    {
-        for ( USHORT i = 0; i < mpTravellerList->Count(); i++ )
-        {
-            pWin = mpTravellerList->GetObject( i );
-            fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());
-        }
-        fclose( pErrFile );
-    }
-}
+

+                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());

+                   GetDepWin()->Invalidate(); //repaint Main-View

+            }

+            break;

+        case TID_SOLDEP_SELECT_WORKSPACE:

+            if (mpStandLst)

+            {

+                if (GetVersion()) // Version dialog box

+                {

+                    delete mpSolIdMapper;

+                    delete mpStarWriter;

+                    mpObjectList->ClearAndDelete();

+                    ReadSource(TRUE);

+                }

+            }

+            break;

+        case TID_SOLDEP_BACK:

+            maToolBox.HideItem(TID_SOLDEP_BACK);

+            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)

+            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)

+            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)

+            maToolBox.Resize();

+            TogglePrjViewStatus();

+            break;

+    }

+    return 0;

+}

+

+/*****************************************************************************/

+void SolDep::ToggleHideDependency()

+/*****************************************************************************/

+{

+    mbIsHide = !mbIsHide;

+    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());

+    ObjectWin* pWin = GetObjectList()->GetObject( 0 );

+    pWin->ToggleHideMode();

+};

+

+/*****************************************************************************/

+BOOL SolDep::GetVersion()

+/*****************************************************************************/

+{

+    SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );

+    if ( aVersionDlg.Execute() == RET_OK ) {

+        msVersionMajor = aVersionDlg.GetVersionMajor();

+        msVersionMinor = aVersionDlg.GetVersionMinor();

+        return TRUE;

+    }

+    return FALSE;

+}

+

+void SolDep::InitContextMenueMainWnd()

+{

+    InitContextMenuePrjViewWnd( mpBaseWin );

+    return; // Disable not actually supported items

+

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;

+    mpBaseWin->mpPopup->InsertSeparator();

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );

+    mpBaseWin->mpPopup->InsertSeparator();

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );

+}

+

+void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )

+{

+    // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );

+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );

+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );

+    pBaseWin->mpPopup->InsertSeparator();

+    // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );

+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );

+}

+

+/*****************************************************************************/

+ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )

+/*****************************************************************************/

+{

+    Prj* pPrj;

+

+//hshtable auf stand halten

+    ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );

+    if ( pWin )

+    {

+        ByteString aBodyText( pWin->GetBodyText() );

+        if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )

+        {

+            mpStarWriter->Remove( pPrj );

+//cleanup ist teuer...

+            mpStarWriter->CleanUp();

+            delete pPrj;

+        }

+        else

+            DBG_ASSERT( FALSE, "project not found - write" );

+

+        mpSolIdMapper->Delete( aBodyText );

+        if ( bDelete )

+            delete pWin;

+        return pWin;

+    }

+    else

+        return NULL;

+}

+

+/*****************************************************************************/

+ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )

+/*****************************************************************************/

+{

+    ULONG nObjectId;

+    if ( bInteract )

+    {

+        nObjectId = HandleNewPrjDialog( rBodyText );

+    }

+    else

+    {

+//hashtable auf stand halten

+        MyHashObject* pHObject;

+        nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );

+        pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));

+        mpSolIdMapper->Insert( rBodyText, pHObject );

+    }

+    return nObjectId;

+}

+

+/*****************************************************************************/

+ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )

+/*****************************************************************************/

+{

+    ULONG nObjectId;

+    if ( bInteract )

+    {

+        nObjectId = HandleNewDirectoryDialog( rBodyText );

+    }

+    else

+    {

+//hshtable auf stand halten

+        MyHashObject* pHObject;

+        nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );

+        pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));

+        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper

+    }

+    return nObjectId;

+}

+

+/*****************************************************************************/

+USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )

+/*****************************************************************************/

+{

+//  DBG_ASSERT( FALSE , "not yet" );

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+

+    Prj* pPrj = mpStarWriter->GetPrj( sEndName );

+    if ( pPrj )

+    {

+        pPrj->AddDependencies( sStartName );

+        return AddConnectorToObjects( pStartWin, pEndWin );

+    }

+    else

+    {

+        DBG_ASSERT( FALSE , "non existing Project" );

+        return 1;

+    }

+}

+

+/*****************************************************************************/

+USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )

+/*****************************************************************************/

+{

+    SByteStringList* pPrjDeps = NULL;

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+

+    Prj* pPrj = mpStarWriter->GetPrj( sEndName );

+    pPrjDeps = pPrj->GetDependencies( FALSE );

+    if ( pPrjDeps )

+    {

+        ByteString* pString;

+        ULONG nPrjDepsCount = pPrjDeps->Count();

+        for ( ULONG j = nPrjDepsCount; j > 0; j-- )

+        {

+            pString = pPrjDeps->GetObject( j - 1 );

+            if ( pString->GetToken( 0, '.') == sStartName )

+                pPrjDeps->Remove( pString );

+        }

+    }

+

+    return RemoveConnectorFromObjects( pStartWin, pEndWin );

+}

+

+/*****************************************************************************/

+void SolDep::RemoveAllObjects( ObjectList* pObjLst )

+/*****************************************************************************/

+{

+

+    Depper::RemoveAllObjects( pObjLst );

+

+    if ( mpSolIdMapper )

+    {

+        delete mpSolIdMapper;

+        mpSolIdMapper = NULL;

+    }

+    if ( mpStarWriter )

+    {

+        delete mpStarWriter;

+        mpStarWriter = NULL;

+    }

+}

+

+/*****************************************************************************/

+ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)

+/*****************************************************************************/

+{

+//  DBG_ASSERT( FALSE , "soldep" );

+    MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project

+

+    if ( !pHObject ) {

+        ByteString sNullPrj = "null";//null_project

+        ULONG nObjectId = AddObject( sNullPrj, FALSE );

+        ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );

+        return nObjectId;

+    }

+

+    return pHObject->GetId();

+}

+

+/*****************************************************************************/

+ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* )

+/*****************************************************************************/

+{

+//  DBG_ASSERT( FALSE , "prjdep" );

+    MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir

+    if ( !pHObject )

+    {

+        ByteString bsNull("null");

+        ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir

+        return nObjectId;

+    }

+    else

+        return pHObject->GetId();

+}

+

+/*****************************************************************************/

+USHORT SolDep::OpenSource()

+/*****************************************************************************/

+{

+    if ( mpStandLst ) {

+        if ( GetVersion())

+            return ReadSource();

+    }

+    return 0;

+}

+

+/*****************************************************************************/

+USHORT SolDep::ReadSource(BOOL bUpdater)

+/*****************************************************************************/

+{

+    mpBaseWin->EnablePaint( FALSE );

+    mpBaseWin->Hide();

+    ULONG nObjectId, nHashedId;

+    ULONG i;

+    MyHashObject* pHObject;

+    ByteString* pStr;

+    ObjectWin *pStartWin, *pEndWin;

+

+    mpSolIdMapper = new SolIdMapper( 63997 );

+    if (mpStandLst && bUpdater)

+    {

+        mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );

+    } else

+    {

+        SolarFileList* pSolarFileList;

+        pSolarFileList = GetPrjListFromDir();

+        mpStarWriter = new StarWriter( pSolarFileList, TRUE );

+    }

+    ByteString sTitle( SOLDEPL_NAME );

+    if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {

+        sTitle += ByteString( " - mode: single file [" );

+           sTitle += (ByteString) mpStarWriter->GetName();

+        sTitle += ByteString( "]" );

+    }

+    else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {

+        sTitle += ByteString( " - mode: multiple files [" );

+        sTitle += ByteString( "]" );

+    }

+    SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );

+

+    ULONG nCount = mpStarWriter->Count();

+    for ( i=0; i<nCount; i++ )

+    {

+        Prj *pPrj = mpStarWriter->GetObject(i);

+        ByteString sPrjName = pPrj->GetProjectName();

+        nObjectId = AddObject( sPrjName, FALSE );

+        ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );

+    }

+    for ( i=0; i<nCount; i++ )

+    {

+        Prj *pPrj = mpStarWriter->GetObject(i);

+        SByteStringList *pLst = pPrj->GetDependencies( FALSE );

+        if ( pLst )

+        {

+            ULONG nDepCount = pLst->Count();

+            for ( ULONG m=0; m<nDepCount; m++)

+            {

+                pStr = pLst->GetObject(m);

+                pHObject = mpSolIdMapper->Find( *pStr );

+                /*if ( !pHObject )

+                {

+    // create new prj

+                    Prj *pNewPrj = new Prj( *pStr );

+                    ByteString sPrjName = pNewPrj->GetProjectName();

+                    nObjectId = AddObject( sPrjName, FALSE );

+                    pHObject = mpSolIdMapper->Find( *pStr );

+                    ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );

+                }*/

+

+                if ( pHObject )

+                {

+                nHashedId = pHObject->GetId();

+                ByteString sF_Os2 = pPrj->GetProjectName();

+                pStr = &sF_Os2;

+                pHObject = mpSolIdMapper->Find( *pStr );

+                nObjectId = pHObject->GetId();

+                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );

+                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );

+                AddConnectorToObjects( pStartWin, pEndWin );

+            }

+        }

+    }

+    }

+    if (!IsPrjView())

+    {

+        AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );

+        GetDepWin()->EnablePaint( TRUE );

+    }

+    return 0;

+}

+

+SolarFileList* SolDep::GetPrjListFromDir()

+{

+    SolarFileList* pSolarFileList = new SolarFileList();

+    String sPrjDir( String::CreateFromAscii( "prj" ));

+    String sBuildLst( String::CreateFromAscii( "build.lst" ));

+    DirEntry aCurrent( getenv( SOURCEROOT ) );

+

+    aCurrent.ToAbs();

+    Dir aDir( aCurrent, FSYS_KIND_DIR );

+

+    USHORT nEntries = aDir.Count();

+    if( nEntries )

+    {

+        UniStringList aSortDirList;

+        for ( USHORT n = 0; n < nEntries; n++ )

+        {

+            DirEntry& rEntry = aDir[n];

+            UniString aName( rEntry.GetName() );

+            if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )

+            {

+                rEntry += DirEntry( sPrjDir );

+                rEntry += DirEntry( sBuildLst );

+                if (rEntry.Exists())

+                {

+                    pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );

+                    ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);

+                    fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());

+                }

+            }

+        }

+    }

+    if ( !pSolarFileList->Count() )

+    {

+         //is empty!! TBD

+         delete pSolarFileList;

+         return NULL;

+    }

+    return pSolarFileList;

+}

+

+/*****************************************************************************/

+USHORT SolDep::WriteSource()

+/*****************************************************************************/

+{

+/* zur Sicherheit deaktiviert

+    USHORT nMode = mpStarWriter->GetMode();

+    if ( nMode == STAR_MODE_SINGLE_PARSE ) {

+        ByteString sFileName = mpStarWriter->GetName();

+        if ( sFileName.Len()) {

+            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );

+            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project

+        }

+    }

+    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {

+    // *OBO*

+    //String sRoot = mpStarWriter->GetSourceRoot();

+    //nicht mehr unterst�tzt mpStarWriter->GetSourceRoot()

+        ByteString sFileName = mpStarWriter->GetName();

+        DirEntry aEntry( sFileName );

+        aEntry.ToAbs();

+        aEntry = aEntry.GetPath().GetPath().GetPath();

+        String sRoot = aEntry.GetFull();

+

+        if ( sRoot.Len()) {

+            mpStarWriter->RemoveProject( ByteString( "null")); //null_project

+            mpStarWriter->WriteMultiple( sRoot );

+        }

+    }

+*/

+    return 1;

+}

+

+USHORT SolDep::Load( const ByteString& rFileName )

+{

+// moved from depper class

+    DBG_ASSERT( FALSE , "you are dead!" );

+    SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );

+    depper_head dh;

+    ULONG i;

+    ULONG nLoadOffs = mnSolLastId;     //or Prj??

+    ObjectWin* pNewWin;

+    aInFile.Read( &dh, sizeof( dh ));

+

+    ULONG nObjCount = dh.nObjectCount;

+    ULONG nCnctrCount = dh.nCnctrCount;

+

+    for ( i=0; i < nObjCount ; i++ )

+    {

+        ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );

+        pWin->Load( aInFile );

+        pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));

+        pNewWin->SetId( nLoadOffs + pWin->GetId());

+        pNewWin->SetPosPixel( pWin->GetPosPixel());

+        pNewWin->SetSizePixel( pWin->GetSizePixel());

+    }

+

+    ULONG nStartId;

+    ULONG nEndId;

+//  ueber addconnector fuehren!

+    for ( i=0; i < nCnctrCount ; i++ )

+    {

+        Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );

+        pCon->Load( aInFile );

+

+        nStartId = nLoadOffs + pCon->GetStartId();

+        nEndId = nLoadOffs + pCon->GetEndId();

+

+        ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );

+        ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );

+

+        pCon->Initialize( pStartWin, pEndWin );

+    }

+

+

+    return 0;

+}

+

+/*****************************************************************************/

+BOOL SolDep::ViewContent( ByteString& rObjectName )

+/*****************************************************************************/

+{

+    mpFocusWin = NULL;

+    SetPrjViewStatus(TRUE);

+

+    for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )

+        if ( mpObjectList->GetObject( i )->HasFocus())

+            mpFocusWin = mpObjectList->GetObject( i );

+    //HideObjectsAndConnections( mpObjectList );

+    mpProcessWin->Resize();

+    GetDepWin()->Show();

+    return InitPrj( rObjectName );

+}

+

+/*****************************************************************************/

+BOOL SolDep::InitPrj( ByteString& rListName )

+/*****************************************************************************/

+{

+    ULONG nObjectId, nHashedId;

+    ULONG i, j;

+    MyHashObject* pHObject;

+    ByteString *pDepName;

+    ByteString *pFlagName;

+    Prj* pPrj;

+    ObjectWin *pStartWin, *pEndWin;

+    maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);

+    maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);

+    maToolBox.HideItem(TID_SOLDEP_FIND);

+    maToolBox.ShowItem(TID_SOLDEP_BACK);

+    maToolBox.Invalidate();

+

+    //clean up

+    mpObjectPrjList->ClearAndDelete();

+    GetDepWin()->ClearConnectorList();

+    if (mpPrjIdMapper) delete mpPrjIdMapper;

+    mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper

+    mnPrjWinCount = 0;

+    mnPrjLastId = 0;

+

+    ULONG nCount = mpStarWriter->Count();

+    GetDepWin()->EnablePaint( FALSE );

+    Point aPnt = GetGraphWin()->GetPosPixel();

+    Size aSize = GetGraphWin()->GetSizePixel();

+

+    GetGraphWin()->SetPosSizePixel( aPnt, aSize );         // Hier wird das Window gesetzt

+

+    BOOL bReturn = FALSE;

+

+    for ( i=0; i<nCount; i++ )

+    {

+// pPrj->GetProjectName() returns the name of

+// the project e.g. svtools

+        pPrj = mpStarWriter->GetObject(i);

+        ByteString sPrjName = pPrj->GetProjectName();

+        if ( sPrjName == rListName )

+        {

+            bReturn = TRUE;

+

+            mpPrj = mpStarWriter->GetObject(i);

+            ULONG nDirCount = mpPrj->Count();

+            for ( j=0; j<nDirCount; j++ )

+            {

+                CommandData *pData = mpPrj->GetObject(j);

+                fprintf( stdout, "\tProjectDir : %s\n",

+                        pData->GetLogFile().GetBuffer());

+// pData->GetLogFile() contains internal project IDs

+// e.g. st_mkout etc.

+                if ( pData->GetLogFile() != "" )

+                {

+                    ByteString sItem = pData->GetLogFile();

+                    nObjectId = AddPrjObject( sItem, FALSE);

+// there may be faster ways......

+                    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

+                    pWin->SetViewMask( 0x0001 );

+// pData->GetPath() contains internal project directories

+// e.g. svtools/inc etc.

+                    ByteString sPath = pData->GetPath();

+                    pWin->SetTipText( sPath );

+                }

+            }

+

+// set connectors for dependencies here

+            for ( j=0; j<nDirCount; j++ )

+            {

+                CommandData *pData = mpPrj->GetObject(j);

+                SByteStringList *pDeps = pData->GetDependencies();

+                if ( pDeps )

+                {

+                    ByteString sFlagName = pData->GetLogFile();

+                    pFlagName = &sFlagName;

+                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()

+                    pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));

+                    if (pHObject)

+                    {

+

+                        nObjectId = pHObject->GetId();

+

+                        ULONG nDepCount = pDeps->Count();

+                        for ( ULONG k=0; k<nDepCount; k++ )

+                        {

+                            pDepName = pDeps->GetObject(k);

+                            pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));

+                            if (pHObject )

+                            {

+                                nHashedId = pHObject->GetId();

+                                pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );

+                                pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

+

+                                AddConnectorToObjects( pStartWin, pEndWin );

+                            }

+                            else

+                            {

+                                String sMessage;

+                                sMessage += String::CreateFromAscii("can't find ");

+                                sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );

+                                sMessage += String::CreateFromAscii(".\ndependency ignored");

+                                WarningBox aBox( GetDepWin(), WB_OK, sMessage);

+                                aBox.Execute();

+                            }

+                        }

+                    }

+                }

+

+            }

+

+            break;

+        }

+    }

+    ByteString sNullDir = "null";

+    nObjectId = AddPrjObject( sNullDir, FALSE);

+    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

+    pWin->SetViewMask( 0x0001 );

+    mpGraphPrjWin->EnablePaint( TRUE );

+    //debug

+//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);

+//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );

+    AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );

+    mpGraphWin->Hide();

+    mpGraphPrjWin->Show();

+    mpGraphPrjWin->Invalidate();

+

+    return bReturn;

+}

+

+/*****************************************************************************/

+USHORT SolDep::CloseWindow()

+/*****************************************************************************/

+{

+

+    ((SystemWindow*)mpProcessWin)->Close();

+    return 0;

+}

+

+/*****************************************************************************/

+void SolDep::ShowHelp()

+/*****************************************************************************/

+{

+    SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );

+    String aHelpText;

+    ByteString aGetStr;

+

+    if ( aHelpFile.IsOpen() )

+    {

+        while ( aHelpFile.ReadLine( aGetStr ) )

+        {

+            aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);

+            aHelpText += String::CreateFromAscii("\n");

+        }

+    }

+    else

+        aHelpText = String::CreateFromAscii("No Helpfile found.");

+

+    SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));

+    aHelpDlg.maMLEHelp.SetText( aHelpText );

+    aHelpDlg.maMLEHelp.SetReadOnly();

+    aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );

+    aHelpDlg.Execute();

+}

+

+/*****************************************************************************/

+BOOL SolDep::FindProject()

+/*****************************************************************************/

+{

+    SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );

+    ObjectWin* pObjectWin = NULL;

+    mpObjectList->ResetSelectedObject();

+    if (IsHideMode())

+    {

+        GetDepWin()->Invalidate();

+    }

+

+    mpFocusWin=NULL;

+

+    if ( aFindProjectDlg.Execute() == RET_OK ) {

+        msProject = aFindProjectDlg.GetProject();

+        //now we have a project string

+

+        pObjectWin = mpObjectList->GetPtrByName( msProject );

+        if (pObjectWin)

+        {

+            mpObjectList->ResetSelectedObject();

+            MarkObjects( pObjectWin );

+        }

+        else

+        {

+            mpObjectList->ResetSelectedObject();

+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )

+            {

+               ObjectWin* pObjectWin = mpObjectList->GetObject( i );

+               if ( !pObjectWin->IsTop() )

+                    pObjectWin->SetViewMask(FALSE);

+            }

+        }

+    }

+    return FALSE;

+}

+

+BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )

+{

+    if (pObjectWin)

+    {

+        if (!(pObjectWin->IsNullObject()))

+        {

+            pObjectWin->SetMarkMode( MARKMODE_SELECTED );

+              pObjectWin->MarkNeeded();

+            pObjectWin->MarkDepending();

+            if (IsHideMode())

+            {

+                GetDepWin()->Invalidate();

+            }

+        } else

+        {

+            fprintf(stdout,"null\n");

+        }

+    }

+    return TRUE;

+}

+

+void SolDep::Resize()

+{

+//funzt! mu� aber von der applikation aufgerufen werden.

+    Point aOutPos = Point( 0, 0 );

+    Size aOutSize = mpProcessWin->GetOutputSizePixel();

+        // calculate output size

+    ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();

+    ULONG nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();

+    Size aSize( aOutSize.Width(), nTaskHeight );

+

+//  ULONG nMenuHeight = 0;

+    Point aGraphWinPos = Point(0,0);

+    Size  aGraphWinSize = Size(0,0);

+

+//wei� nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //H�he des Menues

+

+    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );

+    // Set Docking-Rectangle for ToolBar

+    Rectangle aInRect;

+

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))

+    {

+        // waagerechte Toolbar oben

+        maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());

+            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( 0, nTaskHeight );

+            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);

+        }

+    }

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))

+    {

+        // waagerechte Toolbar unten

+        Point aTbPos  = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

+        Size  aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());

+        maToolBox.SetPosSizePixel( aTbPos, aTbSize );

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());

+            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( 0, 0 );

+            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);

+        }

+    }

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))

+    {

+        // senkrechte ToolBar links

+        maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

+            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( nTaskWidth, 0 );

+            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());

+        }

+    }

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))

+    {

+        // senkrechte ToolBar rechts

+        Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

+        Size  aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

+        maToolBox.SetPosSizePixel( aTbPos, aTbSize);

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

+            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( 0, 0 );

+            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());

+        }

+    }

+

+    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )

+    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())

+                Size( aOutSize.Width(), aOutSize.Height()));

+/*

+    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );

+    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())

+                Size( aOutSize.Width(), aOutSize.Height()));

+*/

+    maToolBox.SetDockingRects( rout, rin );

+

+    BOOL bFloating = maToolBox.IsFloatingMode();

+

+    if ( bFloating )

+    {

+        GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);

+        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();

+        if (maToolBox.IsVisible()) maToolBox.Show();

+    } else

+    {

+        GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );

+    }

+    if (maToolBox.IsVisible()) maToolBox.Show();

+}

+

+USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )

+{

+//  DBG_ASSERT( FALSE , "not yet" );

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+    if ( sStartName != ByteString("null"))

+    {

+        CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );

+        SByteStringList* pDeps = pEndData->GetDependencies();

+        if ( pDeps )

+            pDeps->PutString( &sStartName );

+        else

+        {

+            pDeps = new SByteStringList();

+            pEndData->SetDependencies( pDeps );

+            pDeps->PutString( &sStartName );

+            pEndData->GetDependencies();

+        }

+    }

+    return AddConnectorToObjects( pStartWin, pEndWin );

+}

+

+USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )

+{

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+    CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );

+    SByteStringList* pDeps = pEndData->GetDependencies();

+    if ( pDeps )

+    {

+        ByteString* pString;

+        ULONG nDepsCount = pDeps->Count();

+        for ( ULONG j = nDepsCount; j > 0; j-- )

+        {

+            pString = pDeps->GetObject( j - 1 );

+            if ( pString->GetToken( 0, '.') == sStartName )

+                pDeps->Remove( pString );

+        }

+    }

+    return RemoveConnectorFromObjects( pStartWin, pEndWin );

+}

+

+USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )

+{

+    AutoArrangeDlgStart();

+    OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );

+    AutoArrangeDlgStop();

+    return 0;

+}

+

+Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )

+{

+    int nRowIndex = nIndex / DEPPER_MAX_WIDTH;

+    ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );

+

+    ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;

+    Point aPos( nPosX, nPosY );

+    return aPos;

+}

+

+ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )

+{

+    long nDynXOffs;

+    long nXMiddle;

+    ULONG nTrigger;

+

+    nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;

+    if ( nObjectsToFit > DEPPER_MAX_WIDTH )

+        nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;

+    nTrigger = ( nObjectsToFit - 1 ) / 2;

+    nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;

+    ULONG nXOffs = nXMiddle - nDynXOffs;

+

+    if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )

+        mnMinDynXOffs = nXMiddle - nDynXOffs;

+

+    return nXOffs;

+

+}

+

+double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )

+{

+    ObjectWin* pWin;

+    Connector* pCon;

+    ULONG nObjCount = pObjList->Count();

+    double dRetVal = 0;

+    double dWinVal;

+    USHORT i, j;

+    BOOL bIsStart;

+

+    for ( i = 0; i < nObjCount; i++ )

+    {

+        pWin = pObjList->GetObject( i );

+

+        if ( pWin && pWin->IsVisible())

+        {

+            j = 0;

+            dWinVal = 0;

+            while ( (pCon = pWin->GetConnector( j )) )

+            {

+                if ( pCon->IsVisible()) {

+                    bIsStart = pCon->IsStart( pWin );

+                    if ( eDistType != BOTH )

+                        if ( eDistType == TOPDOWN )

+                        {

+                            if ( bIsStart )

+                            {

+                                pCon->UpdatePosition( pWin, FALSE );

+                                dWinVal += pCon->GetLen() * pWin->mnHeadDist;

+                            }

+                        }

+                        else

+                        {

+                            if ( !bIsStart )

+                            {

+                                pCon->UpdatePosition( pWin, FALSE );

+                                dWinVal += pCon->GetLen() * pWin->mnRootDist;

+                            }

+

+                        }

+                    else

+                    {

+                        pCon->UpdatePosition( pWin, FALSE );

+                        if ( !bIsStart )

+                            dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );

+                        else

+                            dWinVal += pCon->GetLen() * pWin->mnRootDist;

+                    }

+                }

+                j++;

+            }

+//          if ( j != 0 )

+//              dWinVal /= j;

+            dRetVal += dWinVal;

+        }

+    }

+

+    return dRetVal;

+}

+

+USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )

+{

+    USHORT i = 0;

+    ObjectWin* pNewWin;

+    Connector* pCon;

+

+    nDepth++;

+

+    USHORT nMaxDepth = nDepth;

+

+    pWin->mbVisited = TRUE;

+    pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );

+    if ( nDepth > DEPPER_MAX_DEPTH )

+    {

+        DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabh�ngigkeit!" );

+        nDepth++;

+        return DEP_ENDLES_RECURSION_FOUND;

+    }

+

+    while ( (pCon = pWin->GetConnector( i )) )

+    {

+        if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project

+        {

+            pNewWin = pCon->GetOtherWin( pWin );

+            nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );

+            if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )

+            {

+                mpTravellerList->Insert( pWin, LIST_APPEND );

+                return DEP_ENDLES_RECURSION_FOUND;

+            }

+        }

+        i++;

+    }

+    pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );

+    return nMaxDepth;

+}

+

+

+double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )

+{

+

+    ULONG i, j, l;

+    ULONG nEnd = nStart + nSize;

+    ObjectWin* pSwapWin;

+    ULONG nLevelObjCount = rObjList.Count();

+

+//dont use full recusion for more than 6 objects

+    if ( nLevelObjCount > 6 )

+    {

+        srand(( unsigned ) time( NULL ));

+

+        ULONG nIdx1, nIdx2;

+        for ( i = 0; i < 101; i++ )

+        {

+            UpdateSubProgrssBar(i);

+            for ( j = 0; j < 100; j++ )

+            {

+                nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+                while ( rObjList.GetObject( nIdx1 ) == NULL )

+                    nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+                nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+                while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )

+                    nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+

+                pSwapWin = rObjList.GetObject( nIdx1 );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );

+                pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );

+                rObjList.Replace( pSwapWin, nIdx1 );

+

+                double dCurDist = CalcDistSum( &rObjList, eDistType );

+

+                if ( dCurDist < dMinDist )

+                {

+                    dMinDist = dCurDist;

+                    rResultList.Clear();

+                    for ( l = 0; l < nLevelObjCount; l++ )

+                    {

+                        pSwapWin = rObjList.GetObject( l );

+                        rResultList.Insert( pSwapWin, LIST_APPEND);

+                    }

+                }

+//              if ( dCurDist > dMinDist * 1.5 )

+                if ( dCurDist > dMinDist * 15 )

+                {

+                    pSwapWin = rObjList.GetObject( nIdx1 );

+                    if ( pSwapWin )

+                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );

+                    pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );

+                    if ( pSwapWin )

+                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );

+                    rObjList.Replace( pSwapWin, nIdx1 );

+                }

+            }

+        }

+    }

+    else

+    {

+        for ( i = nStart ; i < nEnd; i++)

+        {

+            if ( nSize > 1 )

+            {

+                pSwapWin = rObjList.GetObject( i );

+                pSwapWin = rObjList.Replace( pSwapWin, nStart );

+                rObjList.Replace( pSwapWin, i );

+                double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );

+                dMinDist = MIN( dMinDist, dPermuteDist);

+                pSwapWin = rObjList.GetObject( i );

+                pSwapWin = rObjList.Replace( pSwapWin, nStart );

+                rObjList.Replace( pSwapWin, i );

+

+            }

+            else

+            {

+                for ( l = 0; l < nLevelObjCount; l++ )

+                {

+                    pSwapWin = rObjList.GetObject( l );

+                    if ( pSwapWin )

+                        pSwapWin->SetCalcPosPixel( pPosArray[ l ] );

+                }

+

+                double dCurDist = CalcDistSum( &rObjList, eDistType );

+

+                if ( dCurDist < dMinDist )

+                {

+                    dMinDist = dCurDist;

+                    rResultList.Clear();

+                    for ( l = 0; l < nLevelObjCount; l++ )

+                    {

+                        pSwapWin = rObjList.GetObject( l );

+                        rResultList.Insert( pSwapWin, LIST_APPEND);

+                    }

+                }

+

+            }

+        }

+    }

+

+    return dMinDist;

+}

+

+

+USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )

+{

+    ObjWinList aWorkList;

+    ObjectWin* pWin;

+    Connector* pCon;

+    USHORT nRootDist = (USHORT) -1;

+    USHORT i, j, k, l, nRetVal;

+    USHORT LevelUse[ DEPPER_MAX_DEPTH ];

+    USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];

+    ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];

+    ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];

+    Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];

+

+    mnMinDynXOffs = 0xffff;

+

+    for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )

+    {

+        LevelUse[ i ] = 0;

+        LevelList[ i ] = NULL;

+        LevelSecUse[ i ] = 0;

+        LevelSecList[ i ] = NULL;

+    }

+

+    GetDepWin()->EnablePaint( FALSE );

+

+    ULONG nObjCount = pObjLst->Count();

+    for ( i = 0; i < nObjCount; i++ )

+    {

+        pWin = pObjLst->GetObject( i );

+        if ( pWin->IsVisible()) {

+            pWin->mbVisited = FALSE;

+            pWin->mnHeadDist = 0;

+            pWin->mnRootDist = 0;

+

+            // find initial objects which need to be connected with

+            // root object

+            j = 0;

+            USHORT nStartCount = 0;

+            USHORT nEndCount = 0;

+            while ( (pCon = pWin->GetConnector( j )) )

+            {

+                if ( pCon->IsVisible()) {                   //null_project

+                    if( pCon->IsStart( pWin ))

+                        nStartCount++;

+                    else

+                    {

+                        nEndCount = 1;

+                        break;

+                    }

+                }

+                j++;

+            }

+

+            if ( nStartCount > 0 && nEndCount == 0 )

+                if ( nTopId != pWin->GetId())

+                    AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());

+

+        }

+    }

+

+    pWin = ObjIdToPtr( pObjLst, nTopId );

+

+    if ( mpTravellerList )

+    {

+        mpTravellerList->Clear();

+        delete mpTravellerList;

+    }

+    mpTravellerList = new ObjWinList();

+    // set root and top distance

+    nRetVal = Impl_Traveller( pWin, nRootDist );

+

+    DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );

+    if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )

+    {

+        WriteToErrorFile();

+        return nRetVal;

+    }

+

+    ULONG nUnvisited = 0;

+    ULONG nUnvisYOffs = 0;

+

+    // seperate mainstream, secondary and unconnected

+    for ( i = 0; i < nObjCount; i++ )

+    {

+        pWin = pObjLst->GetObject( i );

+        if ( pWin->IsVisible()) {

+            if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )

+            {

+                if ( !LevelList[ pWin->mnHeadDist ] )

+                        LevelList[ pWin->mnHeadDist ] = new ObjWinList;

+                LevelList[ pWin->mnHeadDist ]->Insert( pWin );

+                LevelUse[ pWin->mnHeadDist ]++;

+            }

+            else

+                if ( pWin->mbVisited )

+                {

+                    if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )

+                        LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;

+                    LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );

+                    LevelSecUse[ nRetVal - pWin->mnRootDist ]++;

+                }

+                else

+                {

+    //              need to be arranged more intelligent...

+                    Point aPos( 5, nUnvisYOffs );

+                    pWin->SetCalcPosPixel( aPos );

+

+                    Point aTmpPos = pWin->GetCalcPosPixel();

+                    pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));

+

+                    nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();

+                    nUnvisited++;

+                }

+        }

+    }

+

+    mnLevelOffset = 0;

+

+    USHORT nScaleVal;

+

+    if ( nRetVal == 0 )

+        nScaleVal = 1;

+    else

+        nScaleVal = nRetVal;

+

+    i = 0;

+

+    USHORT nStep = 0;

+

+    while ( LevelList[ i ] )

+    {

+        UpdateMainProgressBar(i, nScaleVal, nStep);

+        DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );

+        ObjectWin* pSwapWin;

+        ULONG nLevelObjCount = LevelList[ i ]->Count();

+

+        if ( nLevelObjCount % 2 == 0 )

+        {

+            LevelList[ i ]->Insert( NULL, LIST_APPEND );

+            nLevelObjCount++;

+//          LevelUse bleibt orginal...

+//          LevelUse[ i ]++;

+        }

+

+// catch too big lists

+        DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );

+        if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )

+        {

+            WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));

+            aWBox.Execute();

+            break;

+        }

+        mnXOffset = CalcXOffset( nLevelObjCount );

+        aWorkList.Clear();

+

+        // initial positioning for mainstream

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = LevelList[ i ]->GetObject( j );

+            aWorkList.Insert( pSwapWin, LIST_APPEND);

+            Point aPos = CalcPos( i, j );

+            aPosArray[ j ] = aPos;

+            if ( pSwapWin )

+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+        }

+

+        double dMinDist = CalcDistSum( LevelList[ i ] );

+

+        // optimize mainstream order and return best matching list in "aWorkList"

+        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));

+

+        // set optimized positions - may still be wrong from later tries

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = aWorkList.GetObject( j );

+            if ( pSwapWin )

+                pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );

+        }

+

+        if ( LevelSecList[ i ] != NULL )

+        {

+            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();

+            // expand list for better positioning

+            while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )

+            {

+                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );

+                nLevelSecObjCount++;

+            }

+            if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )

+            {

+                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );

+                nLevelSecObjCount++;

+            }

+

+            DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );

+            if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )

+            {

+                WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));

+                aWBox.Execute();

+                break;

+            }

+            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );

+            aWorkList.Clear();

+

+            l = 0;

+            BOOL bUsedPos;

+

+            // find free positions for secondary objects

+            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )

+            {

+                Point aPos = CalcPos( i, j );

+                bUsedPos = FALSE;

+                // is already occupied?

+                for ( k = 0; k < nLevelObjCount; k++ )

+                {

+                    if ( LevelList[ i ]->GetObject( k ) )

+                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )

+                            bUsedPos = TRUE;

+                }

+                // if its free, add to pool

+                if ( !bUsedPos )

+                {

+                    aPosArray[ l ] = aPos;

+                    l++;

+                }

+            }

+

+            // initial positioning for secodaries

+            for ( j = 0 ; j < nLevelSecObjCount ; j++ )

+            {

+                pSwapWin = LevelSecList[ i ]->GetObject( j );

+                aWorkList.Insert( pSwapWin, LIST_APPEND);

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+            }

+            dMinDist = CalcDistSum( LevelSecList[ i ] );

+

+            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));

+

+            // set optimized positions - may still be wrong from later tries

+            for ( j = 0; j < nLevelSecObjCount; j++ )

+            {

+                pSwapWin = aWorkList.GetObject( j );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );

+            }

+            if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

+                mnLevelOffset++;

+        }

+        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

+            mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;

+        i++;

+    }

+

+    mnMinDynXOffs = 0xffff;

+

+// and back again...

+    // get better results form already preoptimized upper and lower rows

+

+    do

+    {

+        i--;

+        UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down

+        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

+            mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;

+        ObjectWin* pSwapWin;

+        ULONG nLevelObjCount = LevelList[ i ]->Count();

+        mnXOffset = CalcXOffset( nLevelObjCount );

+        aWorkList.Clear();

+

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = LevelList[ i ]->GetObject( j );

+            aWorkList.Insert( pSwapWin, LIST_APPEND);

+            Point aPos = CalcPos( i, j );

+            aPosArray[ j ] = aPos;

+//no need to do this stuff.......   ?????

+            if ( pSwapWin )

+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+        }

+

+        double dMinDist = CalcDistSum( LevelList[ i ], BOTH );

+

+        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));

+// wrong position for remaping - keep old positions for comparing

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = aWorkList.GetObject( j );

+            if ( pSwapWin )

+//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));

+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+        }

+

+        if ( LevelSecList[ i ] != NULL )

+        {

+            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();

+            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );

+            aWorkList.Clear();

+

+            l = 0;

+            BOOL bUsedPos;

+

+            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )

+            {

+                Point aPos = CalcPos( i, j );

+                bUsedPos = FALSE;

+// could be faster

+                for ( k = 0; k < nLevelObjCount; k++ )

+                {

+                    if ( LevelList[ i ]->GetObject( k ) )

+                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )

+                            bUsedPos = TRUE;

+                }

+                if ( !bUsedPos )

+                {

+                    aPosArray[ l ] = aPos;

+                    l++;

+                }

+            }

+

+            for ( j = 0 ; j < nLevelSecObjCount ; j++ )

+            {

+                pSwapWin = LevelSecList[ i ]->GetObject( j );

+                aWorkList.Insert( pSwapWin, LIST_APPEND);

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+            }

+            dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );

+

+            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));

+// wrong position for remaping - keep old positions for comparing

+            for ( j = 0; j < nLevelSecObjCount; j++ )

+            {

+                pSwapWin = aWorkList.GetObject( j );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+            }

+        }

+//      i--;

+    } while ( i != 0 );

+    SetMainProgressBar( 100 );

+

+    ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );

+

+    //    ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier mu� man switchen GetStart/GetPrjStart oder so

+

+    ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);

+

+    ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;

+    if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )

+        nNewYSize = nUnvisYOffs + GetDefSize().Height();

+

+    MapMode aMapMode = GetDepWin()->GetMapMode();

+    Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));

+

+    Size aNowSize( GetGraphWin()->GetSizePixel());

+

+    if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )

+        aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;

+

+    if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )

+        aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;

+

+//  if ( nZoomed <= 0 )

+//  {

+//      mpBaseWin->SetSizePixel( aTmpSize );

+//      mpGraphWin->SetTotalSize( aTmpSize );

+//      mpGraphWin->EndScroll( 0, 0 );

+//  }

+

+// now remap all objects

+    ULONG nAllObjCount = pObjLst->Count();

+    Point aTmpPos;

+    for ( j = 0; j < nAllObjCount; j++ )

+    {

+        pWin = pObjLst->GetObject( j );

+        if ( pWin->IsVisible()) {

+            aTmpPos = pWin->GetCalcPosPixel();

+            if ( pWin->mbVisited )

+            {

+// reserve space for unconnected

+                aTmpPos.X() -= mnMinDynXOffs;

+                aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;

+// center window

+                aTmpPos.X() += GetDefSize().Width() / 2;

+                aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;

+            }

+            pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));

+        }

+    }

+    aWorkList.Clear();

+    GetDepWin()->EnablePaint( TRUE );

+    GetDepWin()->Invalidate();

+//LevelListen loeschen                  H�? Welche Levellisten?

+

+//Update all Connectors

+// --> To be done: Don't call twice Object1-Connector-Object2

+    ObjectWin* pObject1;

+    for ( i = 0 ; i < nObjCount ; i++)

+    {

+        pObject1 = pObjLst->GetObject( i );

+        if ( pObject1->IsVisible())

+            pObject1->UpdateConnectors();

+    };

+    return 0;

+}

+

+void SolDep::WriteToErrorFile()

+{

+//Needs some improvement

+    ObjectWin* pWin;

+    WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));

+    aWBox.Execute();

+    char *tmpdir = getenv("TMP");

+    char *errfilebasename = "depper.err";

+    char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );

+    *ErrFileName = '\0';

+    strcat( ErrFileName, tmpdir );

+    strcat( ErrFileName, "\\" );

+    strcat( ErrFileName, errfilebasename );

+    FILE* pErrFile = fopen( "depper.err", "w+" );

+    if ( pErrFile )

+    {

+        for ( USHORT i = 0; i < mpTravellerList->Count(); i++ )

+        {

+            pWin = mpTravellerList->GetObject( i );

+            fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());

+        }

+        fclose( pErrFile );

+    }

+}

diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index d4d6c9c0bf5a..0d6c8b27afa4 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -552,7 +552,7 @@ sub get_base
     }
 
     if ( $#field == -1 ) {
-        print_error("can't determine module");
+        print_error("can't find d.lst");
         exit(2);
     }
     else {
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 7550f86aedc5..be1fc69fa487 100644..100755
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -1,17 +1,12 @@
-common 
+common
 {
-	environment 
+	environment
 	{
-		btarget 
-		{
-			BTARGET btarget=%BUILD_TARGET%
-		}
-		common 
+		common
 		{
 			ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
-			BTARGET 1
 			BUILD_SPECIAL TRUE
 			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE
 			common_build TRUE
@@ -50,7 +45,6 @@ common
 			WITH_FONTOOO YES
 			WITH_LDAP YES
 			wrapper_override_cc_wrapper TRUE
-			ZIPSOURCE 1
             BUILD_QADEVOOO YES
 			MAXPROC maxproc=15
 		}
@@ -71,9 +65,8 @@ common
 		}
 		common:3 IF %UPDATER% != YES
 		{
-			ENABLE_CRASHDUMP DUMMY
 		}
-		crashdump 
+		crashdump
 		{
 			ENABLE_CRASHDUMP STATIC
 		}
@@ -89,10 +82,6 @@ common
 		{
 			UPDMINOREXT .%UPDMINOR%
 		}
-		nojava 
-		{
-			DISABLE_JAVA TRUE
-		}
 		nosource
 		{
 			LU_NOSOURCE no_source
@@ -100,7 +89,6 @@ common
 		pro:0 IF %UPDATER% == YES
 		{
 			DELIVER_TO_ZIP TRUE
-			ENABLE_CRASHDUMP STATIC
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
@@ -116,74 +104,67 @@ common
 		{
 			LU_RFLAG r_only
 		}
-		shell 
+		shell
 		{
 			SHELL %STAR_USE_SHELL%
 			USE_SHELL %STAR_USE_SHELL%
 		}
-		tmp 
+		tmp
 		{
 			SOL_TMP %SOL_TMP_DIR%
 		}
-		verbose 
+		verbose
 		{
 			VERBOSE VERBOSE
 		}
-		zipsource 
-		{
-			ZIPSOURCE zipsource=%ZIP_SOURCE_URL%
-		}
 	}
-	extern 
+	extern
 	{
-		ENVROOT 
-		PATH 
-		SRC_ROOT 
-		STL_ROOT 
-		UPDATER 
+		ENVROOT
+		PATH
+		SRC_ROOT
+		UPDATER
 	}
-	order minorext common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource
-	reset 
+	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource
+	reset
 	{
 		ALT_L10N_MODULE
-		ENVCFLAGS 
-		HOMEDRIVE 
-		HOMEPATH 
-		JAVAHOME 
-		JAVA_HOME 
+		ENVCFLAGS
+		HOMEDRIVE
+		HOMEPATH
+		JAVAHOME
+		JAVA_HOME
  		LU_HGFLAG
  		LU_NOSOURCE
  		LU_RFLAGS
         MKDIRHIER
-		PROEXT 
-		PROFULLSWITCH 
-		SHIPDRIVE 
-		SOLARSRC 
-		SOLAR_JAVA 
-		SPEW 
-		STLPORT4 
+		PROEXT
+		PROFULLSWITCH
+		SHIPDRIVE
+		SOLARSRC
+		SOLAR_JAVA
+		SPEW
+		STLPORT4
 		UPDMINOREXT
-		WITH_FONTOOO 
-		WITH_LANG 
+		WITH_FONTOOO
+		WITH_LANG
 	}
-	restore 
+	restore
 	{
-		PATH 
+		PATH
 	}
-	standlst 
+	standlst
 	{
 		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
 		DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
 	}
-	switches 
+	switches
 	{
-		btarget BUILD_TARGET
-		crashdump 
+		crashdump
 		cwsname CWS_WORK_STAMP
-		envroot 
+		envroot
 		hg
 		minorext
-		nojava
 		nosource
 		pro
 		maxproc MAXPROCESS
@@ -191,40 +172,34 @@ common
 		shell STAR_USE_SHELL
 		tmp SOL_TMP_DIR
 		verbose VERBOSE
-		zipsource ZIP_SOURCE_URL
 	}
 }
-finish 
+finish
 {
-	environment 
+	environment
 	{
-		ca 
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
-		cap 
+		cap
 		{
 			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
-		cax 
+		cax
 		{
 			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
 		common_0:0 IF %OS% == MACOSX
 		{
-			ENABLE_GCONF 
-			ENABLE_GNOMEVFS 
-			ENABLE_GTK 
+			ENABLE_GCONF
+			ENABLE_GNOMEVFS
+			ENABLE_GTK
 			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
 		}
 		common_0:3 IF %SOLARINCLUDES% ==
 		{
 			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
 		}
-		common_1 
+		common_1
 		{
 			BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
 			BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
@@ -255,8 +230,8 @@ finish
 		}
 		cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT SOURCE_ROOT_not_used
 			SOLARINC SOURCE_ROOT_not_used
 			SOLARINCLUDE SOURCE_ROOT_not_used
@@ -270,8 +245,8 @@ finish
 		}
 		cwsname:1 IF X%SOURCE_ROOT%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT SOURCE_ROOT_not_set
 			SOLARINC SOURCE_ROOT_not_set
 			SOLARINCLUDE SOURCE_ROOT_not_set
@@ -285,8 +260,8 @@ finish
 		}
 		cwsname:2 IF X%UPDMINOR%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT UPDMINOR_not_used
 			SOLARINC UPDMINOR_not_used
 			SOLARINCLUDE UPDMINOR_not_used
@@ -298,63 +273,47 @@ finish
 			SO_GEN_ERROR2 ...resetting path to source tree
 			SRC_ROOT UPDMINOR_not_used
 		}
-		jdk13 
+		jdk14
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
-		jdk14 
+		jdk15
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
-		jdk15 
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
-		}
-		l10n 
+		l10n
 		{
 			framework %L10N_framework%
 			L10N-framework %L10N_framework%
 		}
-		ojdk16 
+		ojdk16
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
 	}
-	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a
-	switches 
+	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
+	switches
 	{
 		cwsname CWS_WORK_STAMP
 	}
 }
-unxfbsdi 
+unxfbsdi
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -366,7 +325,7 @@ unxfbsdi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -377,7 +336,7 @@ unxfbsdi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice perl %SOLARENV%/bin/build_client.pl
@@ -398,12 +357,12 @@ unxfbsdi
 			SOLAR_JAVA TRUE
 			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -420,7 +379,7 @@ unxfbsdi
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
 			COM GCC
@@ -446,11 +405,11 @@ unxfbsdi
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
-		debug 
+		debug
 		{
 			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
 		}
@@ -464,22 +423,7 @@ unxfbsdi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -494,7 +438,7 @@ unxfbsdi
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -509,19 +453,7 @@ unxfbsdi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -530,48 +462,38 @@ unxfbsdi
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -579,10 +501,10 @@ unxfbsdi
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -600,54 +522,37 @@ unxfbsdi
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxlngi6 
+unxlngi6
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -660,7 +565,7 @@ unxlngi6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -672,7 +577,7 @@ unxlngi6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -696,15 +601,15 @@ unxlngi6
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2            
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2
 		}
-		common1 
+		common1
 		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32            
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32
 			DEVROOT %SOLAR_ENV_ROOT%
 			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
@@ -722,7 +627,7 @@ unxlngi6
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -759,7 +664,7 @@ unxlngi6
 		{
 			FORCE2ARCHIVE TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -773,22 +678,7 @@ unxlngi6
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -803,7 +693,7 @@ unxlngi6
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -818,11 +708,7 @@ unxlngi6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -837,14 +723,7 @@ unxlngi6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -853,48 +732,38 @@ unxlngi6
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -902,10 +771,10 @@ unxlngi6
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -923,56 +792,39 @@ unxlngi6
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxlngx6 
+unxlngx6
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -985,7 +837,7 @@ unxlngx6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -997,7 +849,7 @@ unxlngx6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1021,13 +873,13 @@ unxlngx6
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -1048,7 +900,7 @@ unxlngx6
 			USE_SYSTEM_STL YES
 			XAU_LIBS -lXau
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -1086,7 +938,7 @@ unxlngx6
 		{
 			FORCE2ARCHIVE TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1100,7 +952,7 @@ unxlngx6
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1115,7 +967,7 @@ unxlngx6
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1130,11 +982,7 @@ unxlngx6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -1149,14 +997,7 @@ unxlngx6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1165,48 +1006,38 @@ unxlngx6
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2  common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1214,10 +1045,10 @@ unxlngx6
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1235,54 +1066,39 @@ unxlngx6
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxmacxi 
+unxmacxi
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -1295,7 +1111,7 @@ unxmacxi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -1307,7 +1123,7 @@ unxmacxi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1329,7 +1145,7 @@ unxmacxi
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
 			SOLAR_ENV_ROOT /so/env
@@ -1337,7 +1153,7 @@ unxmacxi
 			SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
             MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
 		}
-		common1 
+		common1
 		{
 			BUILD_OS_APPLEOSX TRUE
 			BUILD_OS_MAJOR 10
@@ -1365,7 +1181,6 @@ unxmacxi
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/mac_jdk13_unknown
 			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
@@ -1380,7 +1195,7 @@ unxmacxi
 			BUILD_PIXMAN YES
 			WITH_MOZILLA YES
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
 			COM GCC
@@ -1407,7 +1222,7 @@ unxmacxi
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1421,22 +1236,7 @@ unxmacxi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1451,7 +1251,7 @@ unxmacxi
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1466,18 +1266,7 @@ unxmacxi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1486,48 +1275,38 @@ unxmacxi
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1535,10 +1314,10 @@ unxmacxi
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1556,54 +1335,37 @@ unxmacxi
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxsoli4 
+unxsoli4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -1616,7 +1378,7 @@ unxsoli4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -1628,7 +1390,7 @@ unxsoli4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1649,13 +1411,13 @@ unxsoli4
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -1675,7 +1437,7 @@ unxsoli4
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
 			COM C52
@@ -1703,7 +1465,7 @@ unxsoli4
 			TEMP /var/tmp
 			TMP /var/tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1717,22 +1479,7 @@ unxsoli4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
-			JDKLIB %JDK13PATH%/jre/lib/i386:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/i386/native_threads:%JDK13PATH%/jre/plugin/i386:%JDK13PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/i386/native_threads -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -1747,7 +1494,7 @@ unxsoli4
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -1762,11 +1509,7 @@ unxsoli4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -1781,13 +1524,7 @@ unxsoli4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1796,43 +1533,33 @@ unxsoli4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1840,10 +1567,10 @@ unxsoli4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1861,55 +1588,38 @@ unxsoli4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxsols4 
+unxsols4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -1922,7 +1632,7 @@ unxsols4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -1934,7 +1644,7 @@ unxsols4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1955,14 +1665,14 @@ unxsols4
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -1982,7 +1692,7 @@ unxsols4
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
 			COM C52
@@ -2016,7 +1726,7 @@ unxsols4
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2030,22 +1740,7 @@ unxsols4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
-			JDKLIB %JDK13PATH%/jre/lib/sparc:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/sparc/native_threads:%JDK13PATH%/jre/plugin/sparc:%JDK13PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK13PATH%/jre/lib/sparc -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/sparc/native_threads -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -2060,7 +1755,7 @@ unxsols4
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2075,11 +1770,7 @@ unxsols4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -2094,13 +1785,7 @@ unxsols4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -2109,44 +1794,34 @@ unxsols4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LM_LICENSE_FILE 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2154,10 +1829,10 @@ unxsols4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2175,55 +1850,38 @@ unxsols4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxsolu4 
+unxsolu4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -2236,7 +1894,7 @@ unxsolu4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -2248,7 +1906,7 @@ unxsolu4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2261,7 +1919,7 @@ unxsolu4
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
-			ENABLE_GNOMEVFS 
+			ENABLE_GNOMEVFS
 			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
 			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
@@ -2279,13 +1937,13 @@ unxsolu4
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -2302,7 +1960,7 @@ unxsolu4
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			USE_SYSTEM_STL YES
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
 			COM C52
@@ -2331,7 +1989,7 @@ unxsolu4
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2345,7 +2003,7 @@ unxsolu4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2360,17 +2018,7 @@ unxsolu4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -2379,44 +2027,34 @@ unxsolu4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LM_LICENSE_FILE 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
-		csh 
+		csh
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2424,10 +2062,10 @@ unxsolu4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2445,49 +2083,34 @@ unxsolu4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxubti8 
+unxubti8
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -2500,7 +2123,7 @@ unxubti8
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -2512,7 +2135,7 @@ unxubti8
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2533,12 +2156,12 @@ unxubti8
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 		}
-		common1 
+		common1
 		{
 			AGG_VERSION 2300
 			ANT /usr/share/ant/bin/ant
@@ -2579,7 +2202,7 @@ unxubti8
 			XINERAMA_LINK dynamic
 			ZIPDEP zipdep.pl
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
@@ -2602,11 +2225,11 @@ unxubti8
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH /usr/bin
 		}
-		debug 
+		debug
 		{
 			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
 		}
@@ -2619,7 +2242,7 @@ unxubti8
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2633,11 +2256,7 @@ unxubti8
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2651,17 +2270,11 @@ unxubti8
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
-		shell 
+		shell
 		{
 			USE_SHELL STAR_USE_SHELL
 		}
@@ -2670,109 +2283,82 @@ unxubti8
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
-		ENABLE_CRASHDUMP 
+		CLASSPATH
+		COPYALL
+		ENABLE_CRASHDUMP
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
-		csh 
+		csh
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
-		debug 
-		distroot 
-		envroot 
-		jdk15 
+		bsclient
+		cap
+		cax
+		debug
+		distroot
+		envroot
+		jdk15
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
 	}
 }
-wntgcci1 
+wntgcci1
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2783,11 +2369,12 @@ wntgcci1
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL FALSE
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2798,7 +2385,7 @@ wntgcci1
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -2810,7 +2397,7 @@ wntgcci1
 			*r cd %SOLARROOT%
 			*s cd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX 
+			BIG_SVX
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
 			DMAKEROOT %SOLARENV%$/inc$/startup
@@ -2827,13 +2414,13 @@ wntgcci1
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL bash
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/MinGW
 			#			FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
@@ -2852,7 +2439,7 @@ wntgcci1
 			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
@@ -2881,7 +2468,7 @@ wntgcci1
 			SORT sort -T %TMP%
 			use_shl_versions TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2895,26 +2482,7 @@ wntgcci1
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk141
@@ -2933,7 +2501,7 @@ wntgcci1
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk151
@@ -2952,16 +2520,11 @@ wntgcci1
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib$:%ILIB%
-			LIB %PRE%$/lib$:%LIB%
-		}
-		psdk 
+		psdk
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell 
+		shell
 		{
 			USE_SHELL STAR_USE_SHELL
 		}
@@ -2970,42 +2533,32 @@ wntgcci1
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+	reset
 	{
-		COPYALL 
-		NSIS_PATH 
-		SOLAR_ENV_ROOT 
-		WST 
+		COPYALL
+		NSIS_PATH
+		SOLAR_ENV_ROOT
+		WST
 	}
-	script 
+	script
 	{
-		csh 
+		csh
 		{
 			150: setenv MYENV_PATH $PATH
 			160: setenv PATH $SSX_PATH
-			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			260: setenv PATH $MYENV_PATH
 			270: unsetenv MYENV_PATH
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -3013,14 +2566,14 @@ wntgcci1
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			150: export MYENV_PATH=$PATH
 			160: export PATH=$SSX_PATH
 			260: export PATH=$MYENV_PATH
 			270: unset MYENV_PATH
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
 			851: export SO_GEN_ERROR
@@ -3036,59 +2589,37 @@ wntgcci1
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		pre PRE
-		pro 
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 	}
 }
-wntmsci11 
+wntmsci11
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
-			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
 			COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3107,7 +2638,7 @@ wntmsci11
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
 			COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3124,7 +2655,7 @@ wntmsci11
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3136,7 +2667,7 @@ wntmsci11
 			*r cdd %SOLARROOT%
 			*s cdd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX 
+			BIG_SVX
 			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -3159,14 +2690,14 @@ wntmsci11
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			BS_ROOT n:
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL 4nt
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
@@ -3185,7 +2716,7 @@ wntmsci11
 			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
@@ -3217,7 +2748,7 @@ wntmsci11
 			SORT sort -T %TMP%
 			use_shl_versions TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -3231,26 +2762,7 @@ wntmsci11
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk141
@@ -3269,7 +2781,7 @@ wntmsci11
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk151
@@ -3288,16 +2800,11 @@ wntmsci11
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib$:%ILIB%
-			LIB %PRE%$/lib$:%LIB%
-		}
-		psdk 
+		psdk
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell 
+		shell
 		{
 			use_shell STAR_USE_SHELL
 		}
@@ -3306,105 +2813,68 @@ wntmsci11
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+	reset
 	{
-		COPYALL 
-		SOLAR_ENV_ROOT 
-		WST 
+		COPYALL
+		SOLAR_ENV_ROOT
+		WST
 	}
-	script 
+	script
 	{
-		post 
+		post
 		{
 			150: set MYENV_PATH=%PATH
 			160: set PATH=%SSX_PATH
-			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			260: set PATH=%MYENV_PATH
 			270: unset MYENV_PATH
 			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
 			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		pre PRE
-		pro 
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 	}
 }
-wntmsci12 
+wntmsci12
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-		}
-		cap 
+		cap
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3416,6 +2886,7 @@ wntmsci12
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3428,7 +2899,7 @@ wntmsci12
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
 		}
-		cax 
+		cax
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3438,6 +2909,7 @@ wntmsci12
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3449,7 +2921,7 @@ wntmsci12
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3462,7 +2934,7 @@ wntmsci12
 			*s cd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX 
+			BIG_SVX
 			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
@@ -3507,7 +2979,7 @@ wntmsci12
 		{
 			PERL perl
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
@@ -3530,7 +3002,7 @@ wntmsci12
 #			TEMP $dp(%TEMP%)
 #			TMP $dp(%TMP%)
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
@@ -3569,7 +3041,7 @@ wntmsci12
 		{
 			SHIPDRIVE %BS_ROOT%$/ship$/install
 		}
-		compath 
+		compath
 		{
 			COMPATH $dp(%STAR_COMPATH%)
 		}
@@ -3583,26 +3055,7 @@ wntmsci12
 		{
 			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
 		}
-		jdk13 
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH $dp(%JDK_PATH%)
-		}
-		jdk14 
+		jdk14
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk141
@@ -3621,7 +3074,7 @@ wntmsci12
 		{
 			SOLAR_JDK14PATH $dp(%JDK_PATH%)
 		}
-		jdk15 
+		jdk15
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk151
@@ -3640,11 +3093,7 @@ wntmsci12
 		{
 			SOLAR_JDK15PATH $dp(%JDK_PATH%)
 		}
-		nojava 
-		{
-			DISABLE_JAVA TRUE
-		}
-		ojdk16 
+		ojdk16
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/openjdk-6-b08-windows-i586
@@ -3662,16 +3111,11 @@ wntmsci12
 		{
 			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib;%ILIB%
-			LIB %PRE%$/lib;%LIB%
-		}
-		pro 
+		pro
 		{
 			RES_ENUS TRUE
 		}
-		psdk 
+		psdk
 		{
 			PSDK $dp(%STAR_PSDK%)
 		}
@@ -3680,59 +3124,49 @@ wntmsci12
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
-			SOLAR_STLPATH $dp(%STL_ROOT%)
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		tmp 
+		tmp
 		{
 			SOL_TMP $dp(%SOL_TMP_DIR%)
 		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
 		OSTYPE
-		$dp(SOL_TMP) 
-		$dp(SOURCE_ROOT) 
-		$dp(STL_ROOT) 
+		$dp(SOL_TMP)
+		$dp(SOURCE_ROOT)
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
-	reset 
-	{
-		COPYALL 
-		CXX_X64_BINARY 
-		DB2IMP 
-		GCRINC 
-		GCRLIB 
-		GCRPATH 
-		LIBMGR_X64_BINARY 
-		LINK_X64_BINARY 
-		NSIS_PATH 
-		OLD_CHAOS 
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+	reset
+	{
+		COPYALL
+		CXX_X64_BINARY
+		DB2IMP
+		GCRINC
+		GCRLIB
+		GCRPATH
+		LIBMGR_X64_BINARY
+		LINK_X64_BINARY
+		NSIS_PATH
+		OLD_CHAOS
 		PERLDIR
-		SOLAR_ENV_ROOT 
-		TFDEF 
-		TFDIR 
-		WST 
+		SOLAR_ENV_ROOT
+		TFDEF
+		TFDIR
+		WST
 	}
-	script 
+	script
 	{
          sh
             {
             400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
             415: fi
             600: umask 002
             800: hash -r
@@ -3750,68 +3184,40 @@ wntmsci12
             882: fi
         }
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nojava 
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
+		ojdk16
+		ojdk16path
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 		tmp SOL_TMP_DIR
 	}
 }
-wntmsci13 
+wntmsci13
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-		}
-		cap 
+		cap
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3823,6 +3229,7 @@ wntmsci13
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3835,7 +3242,7 @@ wntmsci13
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
 		}
-		cax 
+		cax
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3845,6 +3252,7 @@ wntmsci13
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3856,7 +3264,7 @@ wntmsci13
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3869,7 +3277,7 @@ wntmsci13
 			*s cd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX 
+			BIG_SVX
 			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
@@ -3914,7 +3322,7 @@ wntmsci13
 		{
 			PERL perl
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
@@ -3937,7 +3345,7 @@ wntmsci13
 #			TEMP $dp(%TEMP%)
 #			TMP $dp(%TMP%)
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
@@ -3976,7 +3384,7 @@ wntmsci13
 		{
 			SHIPDRIVE %BS_ROOT%$/ship$/install
 		}
-		compath 
+		compath
 		{
 			COMPATH $dp(%STAR_COMPATH%)
 		}
@@ -3990,26 +3398,7 @@ wntmsci13
 		{
 			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
 		}
-		jdk13 
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH $dp(%JDK_PATH%)
-		}
-		jdk14 
+		jdk14
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk141
@@ -4028,7 +3417,7 @@ wntmsci13
 		{
 			SOLAR_JDK14PATH $dp(%JDK_PATH%)
 		}
-		jdk15 
+		jdk15
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk151
@@ -4047,11 +3436,7 @@ wntmsci13
 		{
 			SOLAR_JDK15PATH $dp(%JDK_PATH%)
 		}
-		nojava 
-		{
-			DISABLE_JAVA TRUE
-		}
-		ojdk16 
+		ojdk16
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/openjdk-6-b08-windows-i586
@@ -4069,16 +3454,11 @@ wntmsci13
 		{
 			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib;%ILIB%
-			LIB %PRE%$/lib;%LIB%
-		}
-		pro 
+		pro
 		{
 			RES_ENUS TRUE
 		}
-		psdk 
+		psdk
 		{
 			PSDK $dp(%STAR_PSDK%)
 		}
@@ -4087,59 +3467,49 @@ wntmsci13
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
-			SOLAR_STLPATH $dp(%STL_ROOT%)
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		tmp 
+		tmp
 		{
 			SOL_TMP $dp(%SOL_TMP_DIR%)
 		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
 		OSTYPE
-		$dp(SOL_TMP) 
-		$dp(SOURCE_ROOT) 
-		$dp(STL_ROOT) 
+		$dp(SOL_TMP)
+		$dp(SOURCE_ROOT)
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
-	reset 
-	{
-		COPYALL 
-		CXX_X64_BINARY 
-		DB2IMP 
-		GCRINC 
-		GCRLIB 
-		GCRPATH 
-		LIBMGR_X64_BINARY 
-		LINK_X64_BINARY 
-		NSIS_PATH 
-		OLD_CHAOS 
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+	reset
+	{
+		COPYALL
+		CXX_X64_BINARY
+		DB2IMP
+		GCRINC
+		GCRLIB
+		GCRPATH
+		LIBMGR_X64_BINARY
+		LINK_X64_BINARY
+		NSIS_PATH
+		OLD_CHAOS
 		PERLDIR
-		SOLAR_ENV_ROOT 
-		TFDEF 
-		TFDIR 
-		WST 
+		SOLAR_ENV_ROOT
+		TFDEF
+		TFDIR
+		WST
 	}
-	script 
+	script
 	{
          sh
             {
             400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
             415: fi
             600: umask 002
             800: hash -r
@@ -4157,32 +3527,26 @@ wntmsci13
             882: fi
         }
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nojava 
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
+		ojdk16
+		ojdk16path
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 		tmp SOL_TMP_DIR
 	}
 }
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index e63b590a2e9e..4d40600ba368 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -243,7 +243,7 @@ SFXDEBUGLIB=
 FWELIB=-lfwe$(DLLPOSTFIX)
 FWILIB=-lfwi$(DLLPOSTFIX)
 SVXCORELIB=-lsvxcore$(DLLPOSTFIX)
-SVXMSFILTERLIB=-lsvxmsfilter$(DLLPOSTFIX)
+MSFILTERLIB=-lmsfilter$(DLLPOSTFIX)
 SVXLIB=-lsvx$(DLLPOSTFIX)
 BASCTLLIB=-lbasctl$(DLLPOSTFIX)
 BASICIDELIB=-lybctl
@@ -271,10 +271,11 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 JVMACCESSLIB = -ljvmaccess$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 CPPUNITLIB = -lcppunit$(DLLPOSTFIX)
+TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX)
 .IF "$(SYSTEM_LIBXSLT)"=="YES"
 XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE
-XSLTLIB=-lxslt $(ZLIB3RDLIB) $(LIBXML2LIB)
+XSLTLIB=-lxslt $(LIBXML2LIB)
 .ENDIF
 .IF "$(GUI)$(COM)"=="WNTGCC"
 JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
@@ -429,7 +430,7 @@ VBAHELPERLIB=vbahelper.lib
 TKTLIB=tkt.lib
 SJLIB=sj.lib
 SVXCORELIB=isvxcore.lib
-SVXMSFILTERLIB=isvxmsfilter.lib
+MSFILTERLIB=imsfilter.lib
 SVXLIB=isvx.lib
 BASCTLLIB=basctl.lib
 BASICIDELIB=ybctl.lib
@@ -478,7 +479,8 @@ PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
 JVMACCESSLIB = ijvmaccess.lib
 CPPUNITLIB = cppunit.lib
-XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
+TESTSHL2LIB = testshl2.lib
+XSLTLIB = libxslt.lib $(LIBXML2LIB)
 .IF "$(GUI)"=="OS2"
 REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib
 .ELSE
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a7c1a50e911b..b27b78230620 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m67(Build:9466)
-BUILD=9466
-LAST_MINOR=m67
+RSCREVISION=300m68(Build:9474)
+BUILD=9474
+LAST_MINOR=m68
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 7b8e6f2aaadd..991309d6de6e 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -160,7 +160,7 @@ $(SLO)/precompiled_ex.% .PHONY:
 
 $(SLO)/%.obj : %.cxx
     @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
-.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
+.IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
 # just a helper var	
     @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
 # cleanup first
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 8d068bd28c04..6110498edd29 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -191,7 +191,6 @@ CDEFSPROF=
 CDEFSDEBUG=
 CDEFSDBGUTIL=
 CDEFSOPT=
-HDEFS=
 
 CFLAGS=
 CFLAGSCALL=
@@ -849,12 +848,7 @@ LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
 .ENDIF			# "$(LOCALIZESDF)"==""
 .ENDIF			# "$(WITH_LANG)"!=""
 
-.IF "$(PRE)"==""
-#JARDIR=$(CLASSDIR)
 JARDIR=$(OUT)/class
-.ELSE
-JARDIR=$(PRE)/class
-.ENDIF
 
 # needs to be expanded!!!
 
@@ -897,9 +891,6 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
 
 UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
 
-.IF "$(PRE)"!=""
-UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC)
-.ENDIF
 UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
 
 CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
@@ -928,7 +919,6 @@ CDEFSDEBUG=-DDEBUG
 .ENDIF
 CDEFSDBGUTIL=-DDBG_UTIL
 CDEFSOPT=-DOPTIMIZE
-HDEFS=-D:$(GUI) -D:$(COM)
 
 MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/)
 MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
@@ -1136,11 +1126,8 @@ RSCDEFS+=-DDBG_UTIL
 
 .IF "$(product)"!=""
 CDEFS+= -DPRODUCT -DNDEBUG
-HDEFS+= -D:PRODUCT
 RSCDEFS+= -DPRODUCT 
-CDEFS+=-DPRODUCT_FULL
-HDEFS+=-D:PRODUCT_FULL
-RSCDEFS+= -DPRODUCT_FULL -DNDEBUG
+RSCDEFS+= -DNDEBUG
 .ENDIF
 
 .IF "$(DBG_LEVEL)"!=""
@@ -1231,26 +1218,9 @@ STDLIB+=$(FILLUPARC)
 STDSHL+=$(FILLUPARC)
 .ENDIF			# "$(FILUPARC)"!=""
 
-.IF "$(DISABLE_JAVA)"==""
 .IF "$(SOLAR_JAVA)"!=""
 CDEFS+=$(JAVADEF)
 .ENDIF          # "$(SOLAR_JAVA)"!=""
-.ELSE           # "$(DISABLE_JAVA)"==""
-SOLAR_JAVA!:=
-.EXPORT : SOLAR_JAVA
-.IF "$(JDKPATH)"!=""
-environment_confusion:
-    @echo ----------------------------------------------------------
-    @echo -
-    @echo - Error!
-    @echo -
-    @echo - $$JDKPATH and $$DISABLE_JAVA are set. this will lead
-    @echo - to impropper results.
-    @echo -
-    @echo ----------------------------------------------------------
-    force_dmake_to_error
-.ENDIF          # "$(JDKPATH)"!=""
-.ENDIF          # "$(DISABLE_JAVA)"==""
 
 .INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk
 
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 07853e84862e..c114458617de 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -29,7 +29,7 @@
 #define LG_D 					// generate always german version
 #endif
 
-#define VER_FIRSTYEAR	2008
+#define VER_FIRSTYEAR	2010
 
 
 #if defined(OS2)
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index eb4b35008e8a..2330aa64e49b 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -55,9 +55,6 @@ target_empty=warn_target_empty
 INCEXT*=.
 INCPRE*=.
 INCPOST*=.
-.IF "$(PRE)"!=""
-ENVINCPRE+=-I$(PRE)/inc
-.ENDIF			# "$(PRE)"!=""
 .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
 UNOINCLUDES=$(SOLARINCDIR)/offuh
 .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
@@ -66,9 +63,9 @@ SOLARINC+=$(JDKINCS)
 INCLUDE:=
 .EXPORT : INCLUDE
 .IF "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ELSE		# "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ENDIF		# "$(PRJINC)"!=""
 INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 .EXPORT : LIB
@@ -1259,9 +1256,6 @@ CPPUMAKERFLAGS*=-L
 .IF "$(UNOTYPES)" != ""
 # makeing all in one
 .DIRCACHE=no
-.IF "$(ENVINCPRE)"!=""
-MKDEPFLAGS+=-I:$(ENVINCPRE)
-.ENDIF			# "$(ENVINCPRE))"!=""
 .IF "$(OBJFILES)"!=""
 $(OBJFILES) : $(UNOUCRTARGET)
 .ENDIF			# "$(OBJFILES)"!=""
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 6de6b3c99763..048b59205e08 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -38,8 +38,8 @@
 #define VER_FINAL       0

 

 #define VER_DAY         1

-#define VER_MONTH       9

-#define VER_YEAR        2009

+#define VER_MONTH       1

+#define VER_YEAR        2010

 

 #ifndef VER_FIRSTYEAR

 #define VER_FIRSTYEAR   VER_YEAR

diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 6eb9a183d6bd..852af90168b0 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -38,8 +38,8 @@
 #define VER_FINAL       0

 

 #define VER_DAY         1

-#define VER_MONTH       9

-#define VER_YEAR        2009

+#define VER_MONTH       1

+#define VER_YEAR        2010

 

 #ifndef VER_FIRSTYEAR

 #define VER_FIRSTYEAR   VER_YEAR

diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index a4963b2eb071..4c8f03942793 100644..100755
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -53,6 +53,9 @@ DEPOBJFILES	=	$(APP1OBJ)
 APP1STDLIBS =   -lelf
 APP1RPATH   =   NONE
 
+#APP1STDLIBS+=-lstlport
+APP1STDLIBS+=-lCstd
+
 .ENDIF "$(OS)"=="SOLARIS"
 
 # --- Targets ------------------------------------------------------
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index 95cd3da8d857..691996d56cca 100755
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -64,7 +64,7 @@ bool IncludesCollection::exists(string filePath) {
     } else {
         return true;
     };
-    return false;
+    //return false;
 };
 
 extern "C" {
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index ca6f57ef1c7b..af4bae825601 100644..100755
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -37,6 +37,7 @@ LIBTARGET=NO
 # noadjust here to have dependencies over there
 noadjust=TRUE
 nodep=true
+ENABLE_EXCEPTIONS=TRUE
 
 # "mkdepend" is written in K&R style C. Modern compilers will generate
 # lots of warning. There is no point in cleaning this up, so we just
@@ -49,7 +50,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 LIBSALCPPRT=
 UWINAPILIB=
 
-CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS
+CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS  
 
 OBJFILES=  \
         $(OBJ)$/cppsetup.obj \
@@ -65,6 +66,21 @@ APP1TARGET=makedepend
 APP1OBJS=$(OBJFILES)
 APP1RPATH=NONE
 
+.IF "$(COM)"=="MSC"
+.IF "$(dbgutil)"==""
+APP1STDLIBS+=msvcprt.lib
+.ELSE
+APP1STDLIBS+=msvcprtd.lib
+CDEFS+=-D_DEBUG
+.ENDIF                        # "$(DBG_UTIL)"==""
+.ENDIF                        # "$(COM)"=="MSC"
+
+.IF "$(OS)"=="SOLARIS"
+#APP1STDLIBS+=-lstlport
+APP1STDLIBS+=-lCstd
+.ENDIF
+
+
 .INCLUDE : target.mk
 
 
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 0a3ed598db0e..3c4e50eb0cda 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -1,4 +1,4 @@
-so  soltools :   stlport SUN:so_prereq NULL
+so  soltools :   SUN:so_prereq NULL
 so	soltools								usr1	-	all	so_usr1 NULL
 so	soltools\inc							get	-	all	so_inc NULL
 so	soltools\ldump							nmake	-	all	so_ldump so_mkdep NULL
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index ad80f13bf8b9..a119dd844472 100644..100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -34,3 +34,19 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
 
 # find 'adjustvisibility' in own output tree
 ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
+
+# avoid STLPort
+NO_DEFAULT_STL=TRUE
+SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
+
+.IF "$(OS)"=="SOLARIS"
+# hack due to #i53089#
+.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
+HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
+.ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+HELP_COMPATH:=$(COMPATH)
+.ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4
+#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4
+SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
+.ENDIF
diff --git a/splitbuild/base.lst b/splitbuild/base.lst
new file mode 100644
index 000000000000..cda4527f3496
--- /dev/null
+++ b/splitbuild/base.lst
@@ -0,0 +1 @@
+reportdesign dbaccess
diff --git a/splitbuild/binfilter.lst b/splitbuild/binfilter.lst
new file mode 100644
index 000000000000..1baa90b768cf
--- /dev/null
+++ b/splitbuild/binfilter.lst
@@ -0,0 +1 @@
+binfilter
diff --git a/splitbuild/bm b/splitbuild/bm
new file mode 100755
index 000000000000..16872f1413d5
--- /dev/null
+++ b/splitbuild/bm
@@ -0,0 +1,4 @@
+build --genconf --clear
+build --genconf --add `cat $1`
+build --all $2 $3 $4 
+
diff --git a/splitbuild/build.lst b/splitbuild/build.lst
new file mode 100644
index 000000000000..e19d9cebed73
--- /dev/null
+++ b/splitbuild/build.lst
@@ -0,0 +1 @@
+crashrep javainstaller2 packimages postprocess scp2 testtools instsetoo_native
diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst
new file mode 100644
index 000000000000..2c13a4c6d503
--- /dev/null
+++ b/splitbuild/calc.lst
@@ -0,0 +1 @@
+scaddins sccomp sc
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
new file mode 100644
index 000000000000..7b7214f0d227
--- /dev/null
+++ b/splitbuild/common.lst
@@ -0,0 +1 @@
+basebmp basegfx bean comphelper configmgr connectivity embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards
diff --git a/splitbuild/content.lst b/splitbuild/content.lst
new file mode 100644
index 000000000000..dd8d40c75da7
--- /dev/null
+++ b/splitbuild/content.lst
@@ -0,0 +1 @@
+dictionaries extras helpcontent2
diff --git a/splitbuild/draw.lst b/splitbuild/draw.lst
new file mode 100644
index 000000000000..6f83eca0069d
--- /dev/null
+++ b/splitbuild/draw.lst
@@ -0,0 +1 @@
+animations sd slideshow
diff --git a/splitbuild/extensions.lst b/splitbuild/extensions.lst
new file mode 100644
index 000000000000..86fe24b8830d
--- /dev/null
+++ b/splitbuild/extensions.lst
@@ -0,0 +1 @@
+migrationanalysis reportbuilder sdext swext
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
new file mode 100644
index 000000000000..334ad19a5b10
--- /dev/null
+++ b/splitbuild/extern.lst
@@ -0,0 +1 @@
+afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
diff --git a/splitbuild/filter.lst b/splitbuild/filter.lst
new file mode 100755
index 000000000000..9659e019d7cb
--- /dev/null
+++ b/splitbuild/filter.lst
@@ -0,0 +1 @@
+filter hwpfilter oox writerfilter writerperfect xmerge
\ No newline at end of file
diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst
new file mode 100644
index 000000000000..89ed01c617d6
--- /dev/null
+++ b/splitbuild/framework.lst
@@ -0,0 +1 @@
+automation avmedia basic basctl cui desktop drawinglayer embeddedobj extensions forms formula framework idl scripting sfx2 svx xmlsecurity
diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst
new file mode 100644
index 000000000000..55c2e7a20309
--- /dev/null
+++ b/splitbuild/gui.lst
@@ -0,0 +1 @@
+accessibility canvas cppcanvas dtrans fpicker goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl
diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst
new file mode 100644
index 000000000000..24bc4e91e33c
--- /dev/null
+++ b/splitbuild/prj/build.lst
@@ -0,0 +1,2 @@
+spl      splitbuild     ::      reportdesign dbaccess packimages postprocess scp2 testtools instsetoo_native scaddins sccomp sc basebmp basegfx bean comphelper configmgr connectivity crashrep embedserv eventattacher fileaccess i18npool i18nutil javainstaller2 linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb  ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards animations sd slideshow migrationanalysis reportbuilder sdext swext afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu JFREEREPORT:jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib automation avmedia basic drawinglayer embeddedobj filter formula fpicker framework idl oox sfx2 svx uui accessibility canvas cppcanvas dtrans goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls vcl binfilter dictionaries extras helpcontent2 soltools basctl chart2 cui desktop extensions forms scripting starmath xmlsecurity autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp hwpfilter sw writerfilter writerperfect NULL
+
diff --git a/splitbuild/prj/d.lst b/splitbuild/prj/d.lst
new file mode 100644
index 000000000000..b87dd52c7da2
--- /dev/null
+++ b/splitbuild/prj/d.lst
@@ -0,0 +1 @@
+#dummy d.lst file
diff --git a/splitbuild/start.lst b/splitbuild/start.lst
new file mode 100644
index 000000000000..3838044a8c4a
--- /dev/null
+++ b/splitbuild/start.lst
@@ -0,0 +1 @@
+soltools
diff --git a/splitbuild/uno.lst b/splitbuild/uno.lst
new file mode 100644
index 000000000000..31ee787564de
--- /dev/null
+++ b/splitbuild/uno.lst
@@ -0,0 +1 @@
+autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp
diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst
new file mode 100644
index 000000000000..619d7c52d9c7
--- /dev/null
+++ b/splitbuild/writer.lst
@@ -0,0 +1 @@
+hwpfilter sw writerfilter writerperfect
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index 6e2375331de9..6a816a447d8c 100644
--- a/starmath/inc/action.hxx
+++ b/starmath/inc/action.hxx
@@ -30,7 +30,7 @@
 #ifndef ACTION_HXX
 #define ACTION_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "format.hxx"
 
 class SmDocShell;
diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx
index 6528c81b45ac..ecf30b244f80 100644
--- a/starmath/inc/config.hxx
+++ b/starmath/inc/config.hxx
@@ -30,8 +30,8 @@
 #ifndef CONFIG_HXX
 #define CONFIG_HXX
 
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include "format.hxx"
 
 #include "cfgitem.hxx"
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index fac4f1b0faa4..94bffbaad48d 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -35,7 +35,7 @@
 #include <sot/storage.hxx>
 #include <sot/sotref.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/docfac.hxx>
 #include <vcl/virdev.hxx>
 #include "format.hxx"
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index 05375f8a73e0..6b9b5ad650b5 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -31,8 +31,8 @@
 #define FORMAT_HXX
 
 
-#include <svtools/smplhint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/brdcst.hxx>
 #include "utility.hxx"
 #include <types.hxx>
 
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 4b493c0cbca7..722efd82595c 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -34,7 +34,7 @@
 #ifndef _SV_RESARY_HXX
 #include <tools/resary.hxx>
 #endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/colorcfg.hxx>
 
 #include <tools/shl.hxx>
@@ -44,6 +44,8 @@
 #include "starmath.hrc"
 #endif
 
+#include <unotools/options.hxx>
+
 class SvxErrorHandler;
 class SfxObjectFactory;
 class SmConfig;
@@ -124,7 +126,7 @@ public:
 
 /////////////////////////////////////////////////////////////////
 
-class SmModule : public SfxModule, public SfxListener
+class SmModule : public SfxModule, utl::ConfigurationListener
 {
     svtools::ColorConfig        *pColorConfig;
     SmConfig                *pConfig;
@@ -145,8 +147,7 @@ public:
     SmModule(SfxObjectFactory* pObjFact);
     virtual ~SmModule();
 
-    // SfxListener
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     svtools::ColorConfig &  GetColorConfig();
 
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 6d117bcc9524..0f93e6551cc9 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -31,7 +31,7 @@
 #define _STARMATH_HRC
 
 #ifndef _SVX_SVXIDS_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #ifndef _SFXSIDS_HRC //autogen
 #include <sfx2/sfxsids.hrc>
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index d39376c30ed0..9d0707a19690 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -37,8 +37,8 @@
 #include <tools/list.hxx>
 #include <tools/debug.hxx>
 #include <tools/dynary.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/lstner.hxx>
+#include <svl/svarray.hxx>
 #include "utility.hxx"
 #include <smmod.hxx>
 
diff --git a/starmath/sdi/makefile.mk b/starmath/sdi/makefile.mk
index 768280af9747..f868756f5990 100644
--- a/starmath/sdi/makefile.mk
+++ b/starmath/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,12 @@ SVSDIINC=$(PRJ)$/inc
 SDI1NAME=$(TARGET)
 
 SVSDI1DEPEND= \
-    $(SOLARINCDIR)$/svxslots.ilb \
-    smath.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        smath.sdi \
     smslots.sdi \
     $(SVSDIINC)$/starmath.hrc
 
diff --git a/starmath/sdi/svxitems.sdi b/starmath/sdi/smitems.sdi
index ddbf0f2fc185..ddbf0f2fc185 100644
--- a/starmath/sdi/svxitems.sdi
+++ b/starmath/sdi/smitems.sdi
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 40b9da78d7ff..88bd108bddff 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "312C4240-35E7-101C-B12A-04021C007002"
 "58216740-35E7-101C-B12A-04021C007002"
@@ -39,9 +37,13 @@ StarMath
     SlotIdFile ( "starmath.hrc" )
     SlotIdFile ( "sfx2/sfxsids.hrc" )
     SlotIdFile ( "svx/svxids.hrc" )
-    TypeLibFile ( "smslots.tlb" )
 ]
 {
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
     include "smath.sdi"
     interface StarMath
     [
@@ -59,7 +61,7 @@ shell SmModule
     import StarMath[Automation];
 }
 
-interface FormulaDocument : OfficeDocument
+interface FormulaDocument
 [
     uuid ( "815CBB20-2FC3-11CF-89CA-008029E4B0B1" )
 ]
@@ -149,13 +151,13 @@ interface FormulaDocument : OfficeDocument
     ]
 }
 
-shell SmDocShell : SfxObjectShell
+shell SmDocShell
 {
     import FormulaDocument[Automation];
 }
 
 
-interface FormulaView : View
+interface FormulaView
 [
     uuid ( "CE1A6C00-2FC3-11CF-89CA-008029E4B0B1" )
 ]
@@ -323,7 +325,7 @@ interface FormulaView : View
         ]
 }
 
-shell SmViewShell : SfxViewShell
+shell SmViewShell
 {
     import FormulaView[Automation];
 }
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index f258d7f31176..823e5bbd926e 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -51,7 +51,7 @@
 #include <vcl/unohelp2.hxx>
 #include <tools/gen.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <svx/editobj.hxx>
 #include <svx/editdata.hxx>
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 7199583dd4ff..07217bee9f1a 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -52,7 +52,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase6.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 #include <svx/editeng.hxx>
 #include <svx/unoedsrc.hxx> // SvxEditSource, SvxTextForwarder, SvxViewForwarder, SvxEditViewForwarder
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 175c41c173eb..e9a816fc76a4 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -1279,6 +1279,8 @@ void SmMathConfig::SetShowFormulaCursor( BOOL bVal )
     SetOtherIfNotEqual( pOther->bFormulaCursor, bVal );
 }
 
+void SmMathConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{}
 
 /////////////////////////////////////////////////////////////////
 
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 4c028039ea5e..a56a503d7bfd 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -44,7 +44,7 @@
 #include <tools/solar.h>
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/timer.hxx>
 
 #include <symbol.hxx>
@@ -174,7 +174,7 @@ public:
     virtual ~SmMathConfig();
 
     // utl::ConfigItem
-    //virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
     virtual void    Commit();
 
     // make some protected functions of utl::ConfigItem public
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index b778571a5c0f..284a7898499d 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -32,15 +32,15 @@
 #include "precompiled_starmath.hxx"
 
 
-#include <svtools/itemset.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/itemset.hxx>
+#include <svl/hint.hxx>
+#include <svl/smplhint.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/eitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <tools/stream.hxx>
 
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 0f7e233cde87..95b2e0c36aad 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -34,9 +34,9 @@
 
 #define SMDLL 1
 #include "tools/rcid.h"
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/ctrltool.hxx>
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 03beb26f7bb2..b9064a78a5f5 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -55,22 +55,22 @@
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/fstathelper.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/fstathelper.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/ptitem.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/undo.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/undo.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/whiter.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editstat.hxx>
 #include <svx/eeitem.hxx>
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 8435b7b5f35a..6f69f52539aa 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -52,13 +52,13 @@
 #include <svx/editstat.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/lrspitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/fontitem.hxx>
 #include <sfx2/viewfrm.hxx>
 
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 5ea88307fb2d..6dba5ec80379 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -48,11 +48,11 @@
 #include <tools/rtti.hxx>
 #include <tools/ref.hxx>
 #include <tools/link.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/svarray.hxx>
 #include <tools/debug.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/hint.hxx>
+#include <svl/smplhint.hxx>
 #include <sot/sotref.hxx>
 #include <tools/globname.hxx>
 #include <sot/factory.hxx>
@@ -130,9 +130,9 @@
 #include <smdll.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <chaos/cntids.hrc>
-#include <svtools/cntwids.hrc>
-#include <svtools/solar.hrc>
-#include <svtools/lstner.hxx>
+#include <svl/cntwids.hrc>
+#include <svl/solar.hrc>
+#include <svl/lstner.hxx>
 #include <starmath.hrc>
 #include <basic/sbx.hxx>
 #include <basic/sbxform.hxx>
@@ -143,7 +143,7 @@
 #include <basic/sbxmeth.hxx>
 #include <tools/unqid.hxx>
 #include <tools/unqidx.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/args.hxx>
 #include <smmod.hxx>
 #include <vos/thread.hxx>
@@ -156,7 +156,7 @@
 #include <vcl/timer.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfx.hrc>
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <vcl/syswin.hxx>
 #include <vcl/virdev.hxx>
 #include <tools/datetime.hxx>
@@ -736,7 +736,7 @@
 #endif
 #include <usr/refl.hxx>
 #include <sfx2/msg.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/dialog.hxx>
@@ -745,10 +745,10 @@
 #include <sfx2/frame.hxx>
 #include <sfx2/objface.hxx>
 #include <vcl/event.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <symbol.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metric.hxx>
 #include <sfx2/inimgr.hxx>
@@ -756,14 +756,14 @@
 #include <tools/pstm.hxx>
 #include <tools/table.hxx>
 #include <sfx2/docfac.hxx>
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/mapmod.hxx>
 #include <sfx2/ipfrm.hxx>
 #include <vcl/dialog.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sfx2/bindings.hxx>
 #include <dialog.hxx>
 #include <vcl/button.hxx>
@@ -822,9 +822,9 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/dockwin.hxx>
 #include <smslots.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/prntypes.hxx>
 #include <vcl/jobset.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 9ddabab9c325..c9b12abcdb90 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************

  *

  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

+ *

  * Copyright 2008 by Sun Microsystems, Inc.

  *

  * OpenOffice.org - a multi-platform office productivity suite

@@ -61,9 +61,9 @@
 #include <tools/debug.hxx>

 #include <tools/urlobj.hxx>

 #include <svtools/sfxecode.hxx>

-#include <svtools/saveopt.hxx>

-#include <svtools/stritem.hxx>

-#include <svtools/itemprop.hxx>

+#include <unotools/saveopt.hxx>

+#include <svl/stritem.hxx>

+#include <svl/itemprop.hxx>

 #include <unotools/processfactory.hxx>

 #include <unotools/streamwrap.hxx>

 #include <xmloff/xmlnmspe.hxx>

@@ -403,8 +403,8 @@ SmXMLExport::SmXMLExport(
 {

 }

 

-sal_Int64 SAL_CALL SmXMLExport::getSomething( 

-    const uno::Sequence< sal_Int8 >& rId ) 

+sal_Int64 SAL_CALL SmXMLExport::getSomething(

+    const uno::Sequence< sal_Int8 >& rId )

 throw(uno::RuntimeException)

 {

     if ( rId.getLength() == 16 &&

@@ -833,7 +833,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel)
     if (nSize >= 1 && pNode->GetSubNode(nSize-1)->GetNumSubNodes() == 0)

         --nSize;

 

-    // try to avoid creating a mtable element when the formula consists only 

+    // try to avoid creating a mtable element when the formula consists only

     // of a single output line

     if (nLevel || (nSize >1))

         pTable = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTABLE, sal_True, sal_True);

@@ -902,7 +902,7 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/)
 

 void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/)

 {

-    //!! exports an empty <mi> tag since for example "~_~" is allowed in 

+    //!! exports an empty <mi> tag since for example "~_~" is allowed in

     //!! Math (so it has no sense at all) but must not result in an empty

     //!! <msub> tag in MathML !!

 

@@ -910,7 +910,7 @@ void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/)
     //const SmBlankNode *pTemp = static_cast<const SmBlankNode *>(pNode);

 

     pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI, sal_True, sal_False);

-    

+

     GetDocHandler()->characters( OUString() );

     delete pText;

 }

@@ -1203,10 +1203,10 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel)
 

 static bool lcl_HasEffectOnMathvariant( const SmTokenType eType )

 {

-    return  eType == TBOLD || eType == TNBOLD || 

+    return  eType == TBOLD || eType == TNBOLD ||

             eType == TITALIC || eType == TNBOLD ||

             eType == TSANS || eType == TSERIF || eType == TFIXED;

-}    

+}

 

 void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)

 {

@@ -1480,7 +1480,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
                     // thus at least it will not vanish into nothing

                     ExportText(pNode, nLevel);

                 }

-                else    

+                else

                 {

                     //To fully handle generic MathML we need to implement the full

                     //operator dictionary, we will generate MathML with explicit

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 1f7336db6d3c..bdbb7de5e8a9 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************

  *

  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

+ *

  * Copyright 2008 by Sun Microsystems, Inc.

  *

  * OpenOffice.org - a multi-platform office productivity suite

@@ -57,9 +57,9 @@ one go*/
 #include <tools/debug.hxx>

 #include <tools/urlobj.hxx>

 #include <svtools/sfxecode.hxx>

-#include <svtools/saveopt.hxx>

-#include <svtools/stritem.hxx>

-#include <svtools/itemprop.hxx>

+#include <unotools/saveopt.hxx>

+#include <svl/stritem.hxx>

+#include <svl/itemprop.hxx>

 #include <unotools/processfactory.hxx>

 #include <unotools/streamwrap.hxx>

 #include <xmloff/xmlnmspe.hxx>

@@ -337,7 +337,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent(
         packages::zip::ZipIOException aBrokenPackage;

         if ( aSaxEx.WrappedException >>= aBrokenPackage )

             return ERRCODE_IO_BROKENPACKAGE;

-        

+

         if ( bEncrypted )

             nError = ERRCODE_SFX_WRONGPASSWORD;

     }

@@ -346,7 +346,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent(
         packages::zip::ZipIOException aBrokenPackage;

         if ( r.WrappedException >>= aBrokenPackage )

             return ERRCODE_IO_BROKENPACKAGE;

- 

+

         if ( bEncrypted )

             nError = ERRCODE_SFX_WRONGPASSWORD;

     }

@@ -553,8 +553,8 @@ rtl::OUString SAL_CALL SmXMLImport::getImplementationName()
 }

 

 

-sal_Int64 SAL_CALL SmXMLImport::getSomething( 

-    const uno::Sequence< sal_Int8 >&rId ) 

+sal_Int64 SAL_CALL SmXMLImport::getSomething(

+    const uno::Sequence< sal_Int8 >&rId )

 throw(uno::RuntimeException)

 {

     if ( rId.getLength() == 16 &&

@@ -625,17 +625,17 @@ public:
     SmXMLImportContext( SmXMLImport &rImport, sal_uInt16 nPrfx,

         const OUString& rLName)

         : SvXMLImportContext(rImport, nPrfx, rLName) {}

-    

+

     const SmXMLImport& GetSmImport() const

     {

         return (const SmXMLImport&)GetImport();

     }

-    

+

     SmXMLImport& GetSmImport()

     {

         return (SmXMLImport&)GetImport();

     }

-    

+

     virtual void TCharacters(const OUString & /*rChars*/);

     virtual void Characters(const OUString &rChars);

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/);

@@ -644,7 +644,7 @@ public:
 void SmXMLImportContext::TCharacters(const OUString & /*rChars*/)

 {

 }

-    

+

 void SmXMLImportContext::Characters(const OUString &rChars)

 {

     /*

@@ -678,10 +678,10 @@ struct SmXMLContext_Helper
     OUString sColor;

 

     SmXMLImportContext rContext;

-    

-    SmXMLContext_Helper(SmXMLImportContext &rImport) : 

+

+    SmXMLContext_Helper(SmXMLImportContext &rImport) :

         nIsBold(-1), nIsItalic(-1), nFontSize(0.0), rContext(rImport)  {}

-    

+

     void RetrieveAttrs(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void ApplyAttrs();

 };

@@ -845,9 +845,9 @@ public:
     SmXMLDocContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrfx,rLName) {}

-    

+

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);

-    

+

     void EndElement();

 };

 

@@ -864,13 +864,13 @@ public:
         const OUString& rLName)

         : SmXMLDocContext_Impl(rImport,nPrefix,rLName)

         { nElementCount = GetSmImport().GetNodeStack().Count(); }

-    

+

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);

-    

+

     SvXMLImportContext *StrictCreateChildContext(sal_uInt16 nPrefix,

         const OUString& rLocalName,

         const uno::Reference< xml::sax::XAttributeList > &xAttrList);

-    

+

     void EndElement();

 };

 

@@ -882,7 +882,7 @@ public:
     SmXMLFracContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -894,7 +894,7 @@ public:
     SmXMLSqrtContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -906,7 +906,7 @@ public:
     SmXMLRootContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -922,7 +922,7 @@ public:
     SmXMLStyleContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName),

         aStyleHelper(*this) {}

-    

+

     void EndElement();

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

 };

@@ -1100,7 +1100,7 @@ public:
     SmXMLPaddedContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1124,7 +1124,7 @@ public:
     SmXMLPhantomContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1164,7 +1164,7 @@ public:
         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName),

         cBegin('('), cEnd(')') {}

-    

+

     void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList );

     void EndElement();

 };

@@ -1255,7 +1255,7 @@ public:
     SmXMLErrorContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1293,9 +1293,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TNUMBER;

     }

-    

+

     virtual void TCharacters(const OUString &rChars);

-    

+

     void EndElement();

 };

 

@@ -1319,9 +1319,9 @@ public:
     SmXMLAnnotationContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(sal_False) {}

-    

+

     virtual void Characters(const OUString &rChars);

-    

+

     void StartElement(const uno::Reference<xml::sax::XAttributeList > & xAttrList );

 };

 

@@ -1374,9 +1374,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TTEXT;

     }

-    

+

     virtual void TCharacters(const OUString &rChars);

-    

+

     void EndElement();

 };

 

@@ -1407,9 +1407,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TTEXT;

     }

-    

+

     virtual void TCharacters(const OUString &rChars);

-    

+

     void EndElement();

 };

 

@@ -1454,9 +1454,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TIDENT;

     }

-    

+

     void TCharacters(const OUString &rChars);

-    void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) 

+    void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList )

     {

         aStyleHelper.RetrieveAttrs(xAttrList);

     };

@@ -1519,7 +1519,7 @@ public:
         aToken.eType = TSPECIAL;

         aToken.nLevel = 5;

     }

-    

+

     void TCharacters(const OUString &rChars);

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void EndElement();

@@ -1578,7 +1578,7 @@ public:
     SmXMLSpaceContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrefix,rLName) {}

-    

+

     void StartElement(const uno::Reference< xml::sax::XAttributeList >& xAttrList );

 };

 

@@ -1606,10 +1606,10 @@ public:
     SmXMLSubContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

-    void EndElement() 

-    { 

-        GenericEndElement(TRSUB,RSUB); 

+

+    void EndElement()

+    {

+        GenericEndElement(TRSUB,RSUB);

     }

 };

 

@@ -1647,7 +1647,7 @@ public:
     SmXMLSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement()

     {

         GenericEndElement(TRSUP,RSUP);

@@ -1665,9 +1665,9 @@ public:
     SmXMLSubSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

-    void EndElement() 

-    { 

+

+    void EndElement()

+    {

         GenericEndElement(TRSUB,RSUB,RSUP);

     }

 };

@@ -1711,7 +1711,7 @@ public:
     SmXMLUnderContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void EndElement();

     void HandleAccent();

@@ -1782,7 +1782,7 @@ public:
     SmXMLOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubContext_Impl(rImport,nPrefix,rLName), nAttrCount(0) {}

-    

+

     void EndElement();

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void HandleAccent();

@@ -1836,9 +1836,9 @@ public:
     SmXMLUnderOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubSupContext_Impl(rImport,nPrefix,rLName) {}

-    

-    void EndElement() 

-    { 

+

+    void EndElement()

+    {

         GenericEndElement(TCSUB,CSUB,CSUP);

     }

 };

@@ -1854,7 +1854,7 @@ public:
         const OUString& rLName) :

         SmXMLSubSupContext_Impl(rImport,nPrefix,rLName),

         bHasPrescripts(FALSE) {}

-    

+

     void EndElement();

     void MiddleElement();

     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,

@@ -1870,7 +1870,7 @@ public:
     SmXMLNoneContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1906,7 +1906,7 @@ public:
         const OUString& rLName) :

         SmXMLRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,

         const OUString& rLocalName,

         const uno::Reference< xml::sax::XAttributeList > &xAttrList);

@@ -1922,7 +1922,7 @@ public:
         const OUString& rLName) :

         SmXMLTableRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     void EndElement();

     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,

         const OUString& rLocalName,

@@ -1950,9 +1950,9 @@ public:
         const OUString& rLName) :

         SmXMLRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     /*Don't do anything with alignment for now*/

-    void EndElement() 

+    void EndElement()

     {

     }

 };

@@ -1966,7 +1966,7 @@ public:
         const OUString& rLName) :

         SmXMLRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     void EndElement();

 };

 

@@ -1980,7 +1980,7 @@ public:
     SmXMLOfficeContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx,

         const OUString& rLName)

         : SvXMLImportContext(rImport,nPrfx,rLName) {}

-    

+

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);

 };

 

@@ -1990,10 +1990,10 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref
 {

     SvXMLImportContext *pContext = 0;

     if ( XML_NAMESPACE_OFFICE == nPrefix &&

-        rLocalName == GetXMLToken(XML_META) ) 

+        rLocalName == GetXMLToken(XML_META) )

     {

         DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?");

-    } 

+    }

     else if ( XML_NAMESPACE_OFFICE == nPrefix &&

         rLocalName == GetXMLToken(XML_SETTINGS) )

     {

@@ -2049,8 +2049,8 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext(
     {

         return SvXMLMetaDocumentContext::CreateChildContext(

                     i_nPrefix, i_rLocalName, i_xAttrList );

-    } 

-    else 

+    }

+    else

     {

         return SmXMLOfficeContext_Impl::CreateChildContext(

                     i_nPrefix, i_rLocalName, i_xAttrList );

@@ -2837,10 +2837,10 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
     const OUString &rLocalName,

     const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)

 {

-    if ( XML_NAMESPACE_OFFICE == nPrefix ) 

+    if ( XML_NAMESPACE_OFFICE == nPrefix )

     {

         if ( (IsXMLToken(rLocalName, XML_DOCUMENT) ||

-              IsXMLToken(rLocalName, XML_DOCUMENT_META))) 

+              IsXMLToken(rLocalName, XML_DOCUMENT_META)))

         {

             uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(

                 mxServiceFactory->createInstance(

@@ -2856,12 +2856,12 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
                 // flat OpenDocument file format -- this has not been tested...

                 : new SmXMLFlatDocContext_Impl( *this, nPrefix, rLocalName,

                             xDPS->getDocumentProperties(), xDocBuilder);

-        } 

-        else 

+        }

+        else

         {

             return new SmXMLOfficeContext_Impl( *this,nPrefix,rLocalName);

         }

-    } 

+    }

     else

         return new SmXMLDocContext_Impl(*this,nPrefix,rLocalName);

 }

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 83662e50b123..727d595b40ea 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -40,7 +40,7 @@
 #include <i18npool/lang.h>
 #include <unotools/charclass.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include "parse.hxx"
 #ifndef _STARMATH_HRC
 #include "starmath.hrc"
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index f65b7fcdc764..f7008403cddf 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -60,10 +60,10 @@
 
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 20cfc284d006..8ad99121acfa 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/viewsh.hxx>
@@ -47,7 +47,7 @@
 #endif
 #include <vcl/msgbox.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/rtti.hxx>
 #include "smmod.hxx"
 #include "symbol.hxx"
@@ -251,6 +251,8 @@ SmModule::SmModule(SfxObjectFactory* pObjFact) :
 SmModule::~SmModule()
 {
     delete pConfig;
+    if (pColorConfig)
+        pColorConfig->RemoveListener(this);
     delete pColorConfig;
     delete pLocSymbolData;
     delete pSysLocale;
@@ -295,19 +297,14 @@ svtools::ColorConfig & SmModule::GetColorConfig()
     {
         pColorConfig = new svtools::ColorConfig;
         ApplyColorConfigValues( *pColorConfig );
-        StartListening( *pColorConfig );
+        pColorConfig->AddListener(this);
     }
     return *pColorConfig;
 }
 
-void SmModule::Notify( SfxBroadcaster & /*rBC*/, const SfxHint &rHint )
+void SmModule::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    if (rHint.ISA(SfxSimpleHint))
-    {
-        ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
-        if (SFX_HINT_COLORS_CHANGED == nHintId)
-            ApplyColorConfigValues(*pColorConfig);
-    }
+    ApplyColorConfigValues(*pColorConfig);
 }
 
 SmConfig * SmModule::GetConfig()
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 0c108967e0c1..c775f9be038b 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -33,9 +33,9 @@
 
 
 #include <rtl/logfile.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/imgdef.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/imgmgr.hxx>
diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx
index d0e796533e3f..bc61839af470 100644
--- a/starmath/source/typemap.cxx
+++ b/starmath/source/typemap.cxx
@@ -141,10 +141,10 @@
 #define SvxCellVerJustifyEnumItem SfxVoidItem
 #define SvxCellOrientationEnumItem SfxVoidItem
 #include <sfx2/msg.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/zoomitem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 
 #define SFX_TYPEMAP
 #include "smslots.hxx"
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index ed6e5b6bd23f..6a4a65b7e228 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/printer.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/processfactory.hxx>
 #include <svx/paperinf.hxx>
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 5492553e46fe..855831fc9e9f 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -51,15 +51,15 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/undo.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/undo.hxx>
+#include <svl/whiter.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/editeng.hxx>
 #include <svx/svxdlg.hxx>
@@ -1653,7 +1653,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
-                        pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet, RID_SVXDLG_ZOOM);
+                        pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet);
                         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
                     }
                     pDlg->SetLimits( MINZOOM, MAXZOOM );
diff --git a/stoc/test/javavm/testapplet/TestApplet.java b/stoc/test/javavm/testapplet/TestApplet.java
index 07467cc54c0f..55916cff784b 100644
--- a/stoc/test/javavm/testapplet/TestApplet.java
+++ b/stoc/test/javavm/testapplet/TestApplet.java
@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.io.InputStream;
 import java.net.MalformedURLException;
-import com.sun.star.lib.sandbox.*;
 /*
  * TestApplet.java
  *
diff --git a/stoc/test/javavm/testapplet/makefile.mk b/stoc/test/javavm/testapplet/makefile.mk
index 706180655f06..da5a21e4f166 100644
--- a/stoc/test/javavm/testapplet/makefile.mk
+++ b/stoc/test/javavm/testapplet/makefile.mk
@@ -40,7 +40,7 @@ TARGET  = TestApplet
 #.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE : settings.mk
 # Files --------------------------------------------------------
-JARFILES = sandbox.jar ridl.jar jurt.jar unoil.jar
+JARFILES = ridl.jar jurt.jar unoil.jar
 
 JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 
diff --git a/stoc/test/javavm/testcomponent/TestComponent.java b/stoc/test/javavm/testcomponent/TestComponent.java
index a0fb1d01a858..5622ba087d7a 100644
--- a/stoc/test/javavm/testcomponent/TestComponent.java
+++ b/stoc/test/javavm/testcomponent/TestComponent.java
@@ -4,7 +4,7 @@ import com.sun.star.uno.*;
 import com.sun.star.registry.XRegistryKey;
 import java.io.*;
 import java.net.*;
-import com.sun.star.lib.sandbox.*;
+//import com.sun.star.lib.sandbox.*;
 
 
 /** This component implements XTypeProvider for use with StarBasic.
@@ -74,10 +74,11 @@ public class TestComponent implements XServiceInfo, XTypeProvider
         }catch( IOException e) {
             String s= e.getMessage();
             System.out.println(s);
-        }catch( SandboxSecurityException sse) {
+        }/*catch( SandboxSecurityException sse) {
             String s= sse.getMessage();
             System.out.println("s");
         }
+*/
 
         return __serviceName;
     }
diff --git a/stoc/test/javavm/testcomponent/makefile.mk b/stoc/test/javavm/testcomponent/makefile.mk
index 68f3f5bd6431..9fcd390b02a1 100644
--- a/stoc/test/javavm/testcomponent/makefile.mk
+++ b/stoc/test/javavm/testcomponent/makefile.mk
@@ -40,7 +40,7 @@ TARGET  = JavaTestComponent
 #.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE : settings.mk
 # Files --------------------------------------------------------
-JARFILES = sandbox.jar ridl.jar jurt.jar unoil.jar
+JARFILES = ridl.jar jurt.jar unoil.jar
 
 CUSTOMMANIFESTFILE= manifest
 
diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk
index 85e3a294f434..78b54bb2a5a2 100644
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ UNOTYPES = \
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_uriproc.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index f1032276eb89..71f92e504d64 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -47,7 +47,7 @@
 #include "com/sun/star/uri/XVndSunStarScriptUrlReference.hpp"
 #include "com/sun/star/util/XMacroExpander.hpp"
 #include "cppuhelper/servicefactory.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "osl/thread.h"
 #include "rtl/string.h"
diff --git a/svtools/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx
index 7139a3ebe361..c915ebe3854a 100644
--- a/svtools/inc/PasswordHelper.hxx
+++ b/svl/inc/PasswordHelper.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVTOOLS_PASSWORDHELPER_HXX
 #define _SVTOOLS_PASSWORDHELPER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include "sal/types.h"
 #include "com/sun/star/uno/Sequence.hxx"
 
diff --git a/svtools/inc/adrparse.hxx b/svl/inc/adrparse.hxx
index 439168441057..a317e27b2779 100644
--- a/svtools/inc/adrparse.hxx
+++ b/svl/inc/adrparse.hxx
@@ -31,7 +31,7 @@
 #ifndef _ADRPARSE_HXX
 #define _ADRPARSE_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/list.hxx>
 #include <tools/string.hxx>
 
diff --git a/svtools/inc/broadcast.hxx b/svl/inc/broadcast.hxx
index e3e409c46e96..e80a2e446ebf 100644
--- a/svtools/inc/broadcast.hxx
+++ b/svl/inc/broadcast.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVT_BROADCAST_HXX
 #define _SVT_BROADCAST_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
 
 class SvtListener;
diff --git a/svtools/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx
index 13553f7f16fd..13553f7f16fd 100644
--- a/svtools/inc/cntnrsrt.hxx
+++ b/svl/inc/cntnrsrt.hxx
diff --git a/svtools/inc/cntwids.hrc b/svl/inc/cntwids.hrc
index fcb9f855453b..fcb9f855453b 100644
--- a/svtools/inc/cntwids.hrc
+++ b/svl/inc/cntwids.hrc
diff --git a/svtools/source/svsql/converter.hxx b/svl/inc/converter.hxx
index f6a5d67ca966..d012a56e7416 100644
--- a/svtools/source/svsql/converter.hxx
+++ b/svl/inc/converter.hxx
@@ -30,7 +30,7 @@
 #ifndef _SV_CONVERTER_HXX_
 #define _SV_CONVERTER_HXX_
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 
 class SvDbaseConverter
diff --git a/svtools/inc/filenotation.hxx b/svl/inc/filenotation.hxx
index 460d425d471a..c74c6c39c803 100644
--- a/svtools/inc/filenotation.hxx
+++ b/svl/inc/filenotation.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_FILENOTATION_HXX
 #define SVTOOLS_FILENOTATION_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <rtl/ustring.hxx>
 
 //.........................................................................
diff --git a/svtools/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx
index f7e683b31ad6..82fb4e1efef5 100644
--- a/svtools/inc/folderrestriction.hxx
+++ b/svl/inc/folderrestriction.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_FOLDER_RESTRICTION_HXX
 #define SVTOOLS_FOLDER_RESTRICTION_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/string.hxx>
 
 #ifndef INCLUDED_VECTOR
diff --git a/svtools/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx
index b9761d7131a0..1e613782b4e6 100644
--- a/svtools/inc/fstathelper.hxx
+++ b/svl/inc/fstathelper.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVTOOLS_FSTATHELPER_HXX
 #define _SVTOOLS_FSTATHELPER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 
 class UniString;
diff --git a/svtools/inc/inetdef.hxx b/svl/inc/inetdef.hxx
index 6ea380529147..6ea380529147 100644
--- a/svtools/inc/inetdef.hxx
+++ b/svl/inc/inetdef.hxx
diff --git a/svtools/inc/inetmsg.hxx b/svl/inc/inetmsg.hxx
index f011102a79e2..f011102a79e2 100644
--- a/svtools/inc/inetmsg.hxx
+++ b/svl/inc/inetmsg.hxx
diff --git a/svtools/inc/inetstrm.hxx b/svl/inc/inetstrm.hxx
index 46e15d5e4cf4..46e15d5e4cf4 100644
--- a/svtools/inc/inetstrm.hxx
+++ b/svl/inc/inetstrm.hxx
diff --git a/svtools/inc/instrm.hxx b/svl/inc/instrm.hxx
index 58a70fcc6917..add43d4cc380 100644
--- a/svtools/inc/instrm.hxx
+++ b/svl/inc/instrm.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_INSTRM_HXX
 #define SVTOOLS_INSTRM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <com/sun/star/uno/Reference.h>
 #include <tools/stream.hxx>
 
diff --git a/svtools/inc/listener.hxx b/svl/inc/listener.hxx
index 6d70f135eb92..a121197b1dd0 100644
--- a/svtools/inc/listener.hxx
+++ b/svl/inc/listener.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVT_LISTENER_HXX
 #define _SVT_LISTENER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
 
 class SvtBroadcaster;
diff --git a/svtools/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx
index e531ead6bf5d..a2ac5693f741 100644
--- a/svtools/inc/listeneriter.hxx
+++ b/svl/inc/listeneriter.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVT_LISTENERITER_HXX
 #define _SVT_LISTENERITER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
 
 class SvtListener;
diff --git a/svtools/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx
index 6bfe7b1c737c..55322246f773 100644
--- a/svtools/inc/lngmisc.hxx
+++ b/svl/inc/lngmisc.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVTOOLS_LNGMISC_HXX_
 #define _SVTOOLS_LNGMISC_HXX_
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/svl/inc/makefile.mk b/svl/inc/makefile.mk
new file mode 100644
index 000000000000..9368bce7cde1
--- /dev/null
+++ b/svl/inc/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.4 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..
+
+PRJNAME=svl
+TARGET=inc
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
+
+# --- Files --------------------------------------------------------
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+    $(SLO)$/precompiled.pch \
+    $(SLO)$/precompiled_ex.pch
+    
+.ENDIF			# "$(ENABLE_PCH)"!=""
+
diff --git a/svtools/inc/memberid.hrc b/svl/inc/memberid.hrc
index c917bd993e97..c917bd993e97 100644
--- a/svtools/inc/memberid.hrc
+++ b/svl/inc/memberid.hrc
diff --git a/svtools/inc/nfsymbol.hxx b/svl/inc/nfsymbol.hxx
index 46fe47599359..46fe47599359 100644
--- a/svtools/inc/nfsymbol.hxx
+++ b/svl/inc/nfsymbol.hxx
diff --git a/svtools/inc/numuno.hxx b/svl/inc/numuno.hxx
index c31829dec020..d243c49a3113 100644
--- a/svtools/inc/numuno.hxx
+++ b/svl/inc/numuno.hxx
@@ -30,7 +30,7 @@
 #ifndef _NUMUNO_HXX
 #define _NUMUNO_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -57,7 +57,7 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
 //  SvNumberFormatsSupplierObj: aggregate to document,
 //  construct with SvNumberFormatter
 
-class SVT_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
+class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
                                     com::sun::star::util::XNumberFormatsSupplier,
                                     com::sun::star::lang::XUnoTunnel>
 {
diff --git a/svtools/inc/outstrm.hxx b/svl/inc/outstrm.hxx
index e11c7ed1c1a9..c01d8f460c58 100644
--- a/svtools/inc/outstrm.hxx
+++ b/svl/inc/outstrm.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_OUTSTRM_HXX
 #define SVTOOLS_OUTSTRM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <com/sun/star/uno/Reference.h>
 #include <tools/stream.hxx>
 
diff --git a/sandbox/com/sun/star/lib/sandbox/Permission.java b/svl/inc/pch/precompiled_svl.cxx
index b10c298e480d..27b37170856c 100644
--- a/sandbox/com/sun/star/lib/sandbox/Permission.java
+++ b/svl/inc/pch/precompiled_svl.cxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Permission.java,v $
+ * $RCSfile: precompiled_svl.cxx,v $
  * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
@@ -28,9 +28,5 @@
  *
  ************************************************************************/
 
-package com.sun.star.lib.sandbox;
-
-interface Permission {
-    boolean implies(Permission permission);
-}
+#include "precompiled_svl.hxx"
 
diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
new file mode 100644
index 000000000000..3a813a2db2dd
--- /dev/null
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -0,0 +1,435 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: precompiled_svl.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:05.076676
+
+#ifdef PRECOMPILED_HEADERS
+
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
+#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/io/XAsyncOutputMonitor.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/ucb/Command.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/IllegalIdentifierException.hpp"
+#include "com/sun/star/ucb/UnsupportedCommandException.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XCommandProcessor.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentIdentifier.hpp"
+#include "com/sun/star/ucb/XContentIdentifierFactory.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XContentProviderManager.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uri/XUriReference.hpp"
+#include "com/sun/star/uri/XUriReferenceFactory.hpp"
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/LineEndFormat.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <com/sun/star/awt/XImageConsumer.hpp>
+#include <com/sun/star/awt/XItemEventBroadcaster.hpp>
+#include <com/sun/star/awt/XTextArea.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyChangeEvent.hpp>
+#include <com/sun/star/beans/PropertyState.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/beans/XFastPropertySet.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/datatransfer/XMimeContentType.hpp>
+#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
+#include <com/sun/star/document/XEventsSupplier.hpp>
+#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/document/XTypeDetection.hpp>
+#include <com/sun/star/document/XViewDataSupplier.hpp>
+#include <com/sun/star/embed/Actions.hpp>
+#include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/EmbedMisc.hpp>
+#include <com/sun/star/embed/EmbedStates.hpp>
+#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
+#include <com/sun/star/embed/XActionsApproval.hpp>
+#include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/embed/XEmbedPersist.hpp>
+#include <com/sun/star/embed/XExtendedStorageStream.hpp>
+#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
+#include <com/sun/star/embed/XStateChangeListener.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/frame/DoubleInitializationException.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/frame/XConfigManager.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XDocumentTemplates.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
+#include <com/sun/star/frame/status/ItemState.hpp>
+#include <com/sun/star/frame/status/ItemStatus.hpp>
+#include <com/sun/star/frame/status/Visibility.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/i18n/AmPmValue.hpp>
+#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
+#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
+#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/CollatorOptions.hpp>
+#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
+#include <com/sun/star/i18n/KNumberFormatType.hpp>
+#include <com/sun/star/i18n/KNumberFormatUsage.hpp>
+#include <com/sun/star/i18n/NumberFormatCode.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <com/sun/star/i18n/Weekdays.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/i18n/XExtendedCalendar.hpp>
+#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <com/sun/star/io/XActiveDataControl.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XPersist.hpp>
+#include <com/sun/star/io/XPersistObject.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/io/XTruncate.hpp>
+#include <com/sun/star/java/InvalidJavaSettingsException.hpp>
+#include <com/sun/star/java/JavaDisabledException.hpp>
+#include <com/sun/star/java/JavaNotFoundException.hpp>
+#include <com/sun/star/java/JavaVMCreationFailureException.hpp>
+#include <com/sun/star/java/RestartRequiredException.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/registry/XSimpleRegistry.hpp>
+#include <com/sun/star/script/XTypeConverter.hpp>
+#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/sdb/XCompletedConnection.hpp>
+#include <com/sun/star/sdbc/SQLWarning.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/svg/XSVGWriter.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/system/XProxySettings.hpp>
+#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/task/DocumentPasswordRequest.hpp>
+#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
+#include <com/sun/star/task/MasterPasswordRequest.hpp>
+#include <com/sun/star/task/NoMasterException.hpp>
+#include <com/sun/star/task/PasswordRequestMode.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionContinuation.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/XInteractionPassword.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/task/XJobExecutor.hpp>
+#include <com/sun/star/task/XPasswordContainer.hpp>
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/ContentCreationException.hpp>
+#include <com/sun/star/ucb/FileSystemNotation.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
+#include <com/sun/star/ucb/InteractiveIOException.hpp>
+#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
+#include <com/sun/star/ucb/TransferResult.hpp>
+#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
+#include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/XContentProviderManager.hpp>
+#include <com/sun/star/ucb/XDynamicResultSet.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
+#include <com/sun/star/ui/XImageManager.hpp>
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/XAggregation.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/XCurrentContext.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/XWeak.hpp>
+#include <com/sun/star/util/AliasProgrammaticPair.hpp>
+#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/DateTimeRange.hpp>
+#include <com/sun/star/util/SearchAlgorithms.hpp>
+#include <com/sun/star/util/SearchFlags.hpp>
+#include <com/sun/star/util/SearchOptions.hpp>
+#include <com/sun/star/util/SearchResult.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/util/XCloseBroadcaster.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
+#include <com/sun/star/util/XStringSubstitution.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/util/XUpdatable.hpp>
+#include <com/sun/star/view/XPrintable.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <com/sun/star/xml/sax/XParser.hpp>
+
+#include <algorithm>
+#include <deque>
+#include <hash_map>
+#include <limits>
+
+#include <list>
+#include <map>
+#include <memory>
+#include <queue>
+#include <set>
+#include <stack>
+#include <utility>
+#include <vector>
+
+
+#include <i18npool/lang.h>
+#include <i18npool/mslangid.hxx>
+
+#include "comphelper/processfactory.hxx"
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/configurationhelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/regpathhelper.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/servicehelper.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/storagehelper.hxx>
+#include <comphelper/types.hxx>
+#include <comphelper/uno3.hxx>
+
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/weakref.hxx"
+#include <cppuhelper/bootstrap.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/interfacecontainer.h>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/propshlp.hxx>
+#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/servicefactory.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakagg.hxx>
+#include <cppuhelper/weakref.hxx>
+
+#include <osl/conditn.hxx>
+#include <osl/conditn.hxx>
+#include <osl/diagnose.h>
+#include <osl/endian.h>
+#include <osl/file.h>
+#include <osl/file.hxx>
+#include <osl/module.h>
+#include <osl/module.hxx>
+#include <osl/mutex.h>
+#include <osl/mutex.hxx>
+#include <osl/process.h>
+#include <osl/thread.h>
+#include <osl/thread.hxx>
+
+#include <rsc/rscsfx.hxx>
+
+#include "rtl/crc.h"
+#include "rtl/memory.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include <rtl/alloc.h>
+#include <rtl/byteseq.hxx>
+#include <rtl/cipher.h>
+#include <rtl/crc.h>
+#include <rtl/digest.h>
+#include <rtl/logfile.hxx>
+#include <rtl/math.hxx>
+#include <rtl/memory.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/tencinfo.h>
+#include <rtl/textcvt.h>
+#include <rtl/textenc.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <rtl/uuid.h>
+
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+
+#include <sot/clsids.hxx>
+
+#include <tools/inetdef.hxx>
+
+#include <ucbhelper/commandenvironment.hxx>
+#include <ucbhelper/content.hxx>
+#include <ucbhelper/contentbroker.hxx>
+#include <ucbhelper/fileidentifierconverter.hxx>
+
+#include <uno/mapping.hxx>
+
+#include <unotools/bootstrap.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <unotools/configitem.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/confignode.hxx>
+#include <unotools/configpathes.hxx>
+#include <unotools/nativenumberwrapper.hxx>
+#include <unotools/numberformatcodewrapper.hxx>
+#include <unotools/processfactory.hxx>
+
+#include <vos/mutex.hxx>
+#include <vos/process.hxx>
+#include <vos/ref.hxx>
+#include <vos/refernce.hxx>
+#include <vos/security.hxx>
+#include <vos/thread.hxx>
+#include <vos/timer.hxx>
+
+//---MARKER---
+
+#endif
+
diff --git a/svtools/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx
index 4be84296c678..e8ef23e145d4 100644
--- a/svtools/inc/pickerhelper.hxx
+++ b/svl/inc/pickerhelper.hxx
@@ -31,7 +31,7 @@
 #ifndef _PICKERHELPER_HXX
 #define _PICKERHELPER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include "sal/types.h"
 #include "com/sun/star/uno/Reference.hxx"
 
diff --git a/svtools/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx
index f99ad5dcc0f1..e67729a1bbd8 100644
--- a/svtools/inc/pickerhistory.hxx
+++ b/svl/inc/pickerhistory.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_PICKERHISTORY_HXX
 #define SVTOOLS_PICKERHISTORY_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <com/sun/star/uno/XInterface.hpp>
 
 //.........................................................................
diff --git a/svtools/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx
index 983b0c416ef3..210fd9b92139 100644
--- a/svtools/inc/pickerhistoryaccess.hxx
+++ b/svl/inc/pickerhistoryaccess.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_PICKERHISTORYACCESS_HXX
 #define SVTOOLS_PICKERHISTORYACCESS_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 
 #ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/svtools/inc/poolcach.hxx b/svl/inc/poolcach.hxx
index 20d9e4d19c43..21cfec4662a0 100644
--- a/svtools/inc/poolcach.hxx
+++ b/svl/inc/poolcach.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFXPOOLCACH_HXX
 #define _SFXPOOLCACH_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 
 class SfxItemModifyArr_Impl;
@@ -39,7 +39,7 @@ class SfxItemSet;
 class SfxPoolItem;
 class SfxSetItem;
 
-class SVT_DLLPUBLIC SfxItemPoolCache
+class SVL_DLLPUBLIC SfxItemPoolCache
 {
     SfxItemPool             *pPool;
     SfxItemModifyArr_Impl   *pCache;
diff --git a/svtools/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx
index 7a080c1c7bcc..2fd190f9adef 100644
--- a/svtools/inc/strmadpt.hxx
+++ b/svl/inc/strmadpt.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_STRMADPT_HXX
 #define SVTOOLS_STRMADPT_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
diff --git a/svtools/inc/stylepool.hxx b/svl/inc/stylepool.hxx
index 1b1f129d7f4c..d69bb928e432 100644
--- a/svtools/inc/stylepool.hxx
+++ b/svl/inc/stylepool.hxx
@@ -32,7 +32,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <rtl/ustring.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 class StylePoolImpl;
 class StylePoolIterImpl;
diff --git a/svtools/inc/svtools/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 5cfd3d0fc15e..446d9b8aeeb7 100644
--- a/svtools/inc/svtools/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
@@ -30,14 +30,14 @@
 #ifndef _AEITEM_HXX
 #define _AEITEM_HXX
 
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
 
 class SfxAllEnumValueArr;
 class SvUShorts;
 
-class SVT_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
+class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
 {
     SfxAllEnumValueArr*     pValues;
     SvUShorts*              pDisabledValues;
diff --git a/svtools/inc/svtools/brdcst.hxx b/svl/inc/svl/brdcst.hxx
index 2f9270f3cd4b..cfa45d5aa89a 100644
--- a/svtools/inc/svtools/brdcst.hxx
+++ b/svl/inc/svl/brdcst.hxx
@@ -30,9 +30,9 @@
 #ifndef _SFXBRDCST_HXX
 #define _SFXBRDCST_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxListener;
 class SfxHint;
diff --git a/svtools/inc/svtools/cancel.hxx b/svl/inc/svl/cancel.hxx
index 5929fc4db47a..2808b77d3139 100644
--- a/svtools/inc/svtools/cancel.hxx
+++ b/svl/inc/svl/cancel.hxx
@@ -30,16 +30,16 @@
 #ifndef _SFXCANCEL_HXX
 #define _SFXCANCEL_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/string.hxx>
 #include <tools/ref.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/smplhint.hxx>
 
 class SfxCancellable;
 
 #ifdef _SFX_CANCEL_CXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 SV_DECL_PTRARR( SfxCancellables_Impl, SfxCancellable*, 0, 4 )
 
diff --git a/svtools/inc/svtools/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index d65825849869..3d354899cd9d 100644
--- a/svtools/inc/svtools/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -31,9 +31,9 @@
 #ifndef _SVTOOLS_CENUMITM_HXX
 #define _SVTOOLS_CENUMITM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //============================================================================
 DBG_NAMEEX(SfxEnumItemInterface)
diff --git a/svtools/inc/svtools/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index a944e2139818..72421f93e0cb 100644
--- a/svtools/inc/svtools/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
@@ -31,9 +31,9 @@
 #ifndef _SVTOOLS_CINTITEM_HXX
 #define _SVTOOLS_CINTITEM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //============================================================================
 DBG_NAMEEX_VISIBILITY(CntByteItem, SVL_DLLPUBLIC)
diff --git a/svtools/inc/svtools/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx
index e4298b4d162c..720ead5422f0 100644
--- a/svtools/inc/svtools/cjkoptions.hxx
+++ b/svl/inc/svl/cjkoptions.hxx
@@ -30,15 +30,15 @@
 #ifndef _SVTOOLS_CJKOPTIONS_HXX
 #define _SVTOOLS_CJKOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <sal/types.h>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 class SvtCJKOptions_Impl;
 
 // class SvtCJKOptions --------------------------------------------------
 
-class SVT_DLLPUBLIC SvtCJKOptions: public svt::detail::Options
+class SVL_DLLPUBLIC SvtCJKOptions: public utl::detail::Options
 {
 private:
     SvtCJKOptions_Impl*    pImp;
diff --git a/svtools/inc/svtools/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx
index 38781a6c2143..a2ce75ac1a4b 100644
--- a/svtools/inc/svtools/cnclhint.hxx
+++ b/svl/inc/svl/cnclhint.hxx
@@ -30,8 +30,8 @@
 #ifndef _SFXCNCLHINT_HXX
 #define _SFXCNCLHINT_HXX
 
-#include <svtools/hint.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/hint.hxx>
+#include <svl/cancel.hxx>
 #include <tools/rtti.hxx>
 
 #define SFXCANCELHINT_REMOVED       1
diff --git a/svtools/inc/svtools/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index 51b2982fe1dd..dca27f2284e6 100644
--- a/svtools/inc/svtools/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
@@ -30,14 +30,14 @@
 #ifndef _CNTWALL_HXX
 #define _CNTWALL_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 
 #ifndef SHL_HXX
 #include <tools/shl.hxx>
 #endif
 #include <tools/rtti.hxx>
 #include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvStream;
 
diff --git a/svtools/inc/svtools/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 6c09ad98a45e..28b2191cad94 100644
--- a/svtools/inc/svtools/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
@@ -30,18 +30,17 @@
 #ifndef _SVTOOLS_CTLOPTIONS_HXX
 #define _SVTOOLS_CTLOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <sal/types.h>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/options.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/options.hxx>
 
 class SvtCTLOptions_Impl;
 
 // class SvtCTLOptions --------------------------------------------------------
 
-class SVT_DLLPUBLIC SvtCTLOptions:
-    public svt::detail::Options, public SfxBroadcaster, public SfxListener
+class SVL_DLLPUBLIC SvtCTLOptions : public utl::detail::Options
 {
 private:
     SvtCTLOptions_Impl*    m_pImp;
@@ -52,8 +51,6 @@ public:
     SvtCTLOptions( sal_Bool bDontLoad = sal_False );
     virtual ~SvtCTLOptions();
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
     void            SetCTLFontEnabled( sal_Bool _bEnabled );
     sal_Bool        IsCTLFontEnabled() const;
 
diff --git a/svtools/inc/svtools/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index 2592c6e0f388..808596397aa0 100644
--- a/svtools/inc/svtools/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
@@ -30,8 +30,8 @@
 #ifndef _SVTOOLS_CTYPEITM_HXX
 #define _SVTOOLS_CTYPEITM_HXX
 
-#include <svtools/inettype.hxx>
-#include <svtools/custritm.hxx>
+#include <svl/inettype.hxx>
+#include <svl/custritm.hxx>
 
 //=========================================================================
 
diff --git a/svtools/inc/svtools/custritm.hxx b/svl/inc/svl/custritm.hxx
index 83a88b1f240f..8a3344f6dc0b 100644
--- a/svtools/inc/svtools/custritm.hxx
+++ b/svl/inc/svl/custritm.hxx
@@ -31,9 +31,9 @@
 #ifndef _SVTOOLS_CUSTRITM_HXX
 #define _SVTOOLS_CUSTRITM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //============================================================================
 DBG_NAMEEX_VISIBILITY(CntUnencodedStringItem, SVL_DLLPUBLIC)
diff --git a/svtools/inc/svtools/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index 073c1a6ef825..c66c9a84285d 100644
--- a/svtools/inc/svtools/dateitem.hxx
+++ b/svl/inc/svl/dateitem.hxx
@@ -33,7 +33,7 @@
 #include <tools/rtti.hxx>
 #include <tools/datetime.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvStream;
 
diff --git a/svtools/inc/svtools/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx
index f2625f7955bb..c62f81bc77ef 100644
--- a/svtools/inc/svtools/documentlockfile.hxx
+++ b/svl/inc/svl/documentlockfile.hxx
@@ -32,7 +32,7 @@
 #ifndef _SVT_DOCUMENTLOCKFILE_HXX
 #define _SVT_DOCUMENTLOCKFILE_HXX
 
-#include <svtools/svtdllapi.h>
+#include <svl/svldllapi.h>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -41,11 +41,11 @@
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <svtools/lockfilecommon.hxx>
+#include <svl/lockfilecommon.hxx>
 
 namespace svt {
 
-class SVT_DLLPUBLIC DocumentLockFile : public LockFileCommon
+class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
 {
     // the workaround for automated testing!
     static sal_Bool m_bAllowInteraction;
diff --git a/svtools/inc/svtools/eitem.hxx b/svl/inc/svl/eitem.hxx
index f9e1927a881d..55ed3c47ee33 100644
--- a/svtools/inc/svtools/eitem.hxx
+++ b/svl/inc/svl/eitem.hxx
@@ -31,11 +31,11 @@
 #ifndef _SFXENUMITEM_HXX
 #define _SFXENUMITEM_HXX
 
-#include "svtools/svtdllapi.h"
-#include <svtools/cenumitm.hxx>
+#include "svl/svldllapi.h"
+#include <svl/cenumitm.hxx>
 
 //============================================================================
-class SVT_DLLPUBLIC SfxEnumItem: public CntEnumItem
+class SVL_DLLPUBLIC SfxEnumItem: public CntEnumItem
 {
 protected:
     SfxEnumItem(USHORT which = 0, USHORT nValue = 0):
@@ -50,7 +50,7 @@ public:
 };
 
 //============================================================================
-class SVT_DLLPUBLIC SfxBoolItem: public CntBoolItem
+class SVL_DLLPUBLIC SfxBoolItem: public CntBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svtools/inc/svtools/filerec.hxx b/svl/inc/svl/filerec.hxx
index 77ba6c1b5c52..d28bb3033b56 100644
--- a/svtools/inc/svtools/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
@@ -33,10 +33,10 @@
 
 //=========================================================================
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 )
 
diff --git a/svtools/inc/svtools/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index 5298bbd1678b..fa056bb00488 100644
--- a/svtools/inc/svtools/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
@@ -30,10 +30,10 @@
 #ifndef _SFXFLAGITEM_HXX
 #define _SFXFLAGITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 #include <tools/rtti.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvStream;
 
@@ -41,9 +41,9 @@ extern USHORT nSfxFlagVal[16];
 
 // -----------------------------------------------------------------------
 
-DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC)
 
-class SVT_DLLPUBLIC SfxFlagItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
 {
     USHORT                   nVal;
 
diff --git a/svtools/inc/svtools/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
index f19ea1dd8457..4422220fe640 100644
--- a/svtools/inc/svtools/globalnameitem.hxx
+++ b/svl/inc/svl/globalnameitem.hxx
@@ -30,15 +30,15 @@
 #ifndef _GLOBALNAMEITEM_HXX
 #define _GLOBALNAMEITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 #include <tools/rtti.hxx>
 #include <tools/globname.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
 {
     SvGlobalName            m_aName;
 
diff --git a/svtools/inc/svtools/hint.hxx b/svl/inc/svl/hint.hxx
index 9417b2bc1702..e2d43ea602ca 100644
--- a/svtools/inc/svtools/hint.hxx
+++ b/svl/inc/svl/hint.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFXHINT_HXX
 #define _SFXHINT_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
 
 class SVL_DLLPUBLIC SfxHint
diff --git a/svtools/inc/svtools/httpcook.hxx b/svl/inc/svl/httpcook.hxx
index 354680a86f30..09769396eb11 100644
--- a/svtools/inc/svtools/httpcook.hxx
+++ b/svl/inc/svl/httpcook.hxx
@@ -34,7 +34,7 @@
 #include <tools/datetime.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 /*=======================================================================
  *
diff --git a/svtools/inc/svtools/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx
index 0bc76f1d0627..c581f938197f 100644
--- a/svtools/inc/svtools/ilstitem.hxx
+++ b/svl/inc/svl/ilstitem.hxx
@@ -31,8 +31,8 @@
 #ifndef _SFXILSTITEM_HXX
 #define _SFXILSTITEM_HXX
 
-#include "svtools/svldllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 class SvULongs;
diff --git a/svtools/inc/svtools/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index e0151729c2e0..bfd888bdd944 100644
--- a/svtools/inc/svtools/imageitm.hxx
+++ b/svl/inc/svl/imageitm.hxx
@@ -31,13 +31,13 @@
 #ifndef _SVT_IMAGEITM_HXX
 #define _SVT_IMAGEITM_HXX
 
-#include "svtools/svtdllapi.h"
-#include <svtools/intitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/intitem.hxx>
 
 class String;
 
 struct SfxImageItem_Impl;
-class SVT_DLLPUBLIC SfxImageItem : public SfxInt16Item
+class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item
 {
     SfxImageItem_Impl*      pImp;
 public:
diff --git a/svtools/inc/svtools/inethist.hxx b/svl/inc/svl/inethist.hxx
index ad64e1131bf3..7d4577897faf 100644
--- a/svtools/inc/svtools/inethist.hxx
+++ b/svl/inc/svl/inethist.hxx
@@ -30,12 +30,12 @@
 #ifndef _INETHIST_HXX
 #define _INETHIST_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/hint.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/hint.hxx>
 
 /*========================================================================
  *
diff --git a/svtools/inc/svtools/inettype.hxx b/svl/inc/svl/inettype.hxx
index 2d9f0ba8694c..5f3bfbaab225 100644
--- a/svtools/inc/svtools/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -31,7 +31,7 @@
 #ifndef _INETTYPE_HXX
 #define _INETTYPE_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/inetmime.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 
diff --git a/svtools/inc/svtools/intitem.hxx b/svl/inc/svl/intitem.hxx
index fe2a3543e630..7bfa3433c6b6 100644
--- a/svtools/inc/svtools/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -31,11 +31,11 @@
 #ifndef _SFXINTITEM_HXX
 #define _SFXINTITEM_HXX
 
-#include "svtools/svtdllapi.h"
-#include <svtools/cintitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/cintitem.hxx>
 
 //============================================================================
-class SVT_DLLPUBLIC SfxByteItem: public CntByteItem
+class SVL_DLLPUBLIC SfxByteItem: public CntByteItem
 {
 public:
     TYPEINFO();
@@ -53,9 +53,9 @@ public:
 };
 
 //============================================================================
-DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVL_DLLPUBLIC)
 
-class SVT_DLLPUBLIC SfxInt16Item: public SfxPoolItem
+class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem
 {
     INT16 m_nValue;
 
@@ -115,7 +115,7 @@ inline void SfxInt16Item::SetValue(INT16 nTheValue)
 }
 
 //============================================================================
-class SVT_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
+class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
 {
 public:
     TYPEINFO();
@@ -134,7 +134,7 @@ public:
 };
 
 //============================================================================
-class SVT_DLLPUBLIC SfxInt32Item: public CntInt32Item
+class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item
 {
 public:
     TYPEINFO();
@@ -154,7 +154,7 @@ public:
 };
 
 //============================================================================
-class SVT_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
+class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
 {
 public:
     TYPEINFO();
diff --git a/svtools/inc/svtools/isethint.hxx b/svl/inc/svl/isethint.hxx
index d30fc4a65b27..d08819723f43 100644
--- a/svtools/inc/svtools/isethint.hxx
+++ b/svl/inc/svl/isethint.hxx
@@ -30,10 +30,10 @@
 #ifndef _SFXISETHINT_HXX
 #define _SFXISETHINT_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 
 #ifndef _HINT_HXX
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #endif
 
 class SfxItemSet;
diff --git a/svtools/inc/svtools/itemiter.hxx b/svl/inc/svl/itemiter.hxx
index 6a9b5e212720..50bbe7902e83 100644
--- a/svtools/inc/svtools/itemiter.hxx
+++ b/svl/inc/svl/itemiter.hxx
@@ -30,9 +30,9 @@
 #ifndef _SFXITEMITER_HXX
 #define _SFXITEMITER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 class SfxPoolItem;
 class SfxItemSet;
diff --git a/svtools/inc/svtools/itempool.hxx b/svl/inc/svl/itempool.hxx
index 81407cee2d0c..d99f29626d38 100644
--- a/svtools/inc/svtools/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -31,7 +31,7 @@
 #ifndef _SFXITEMPOOL_HXX
 #define _SFXITEMPOOL_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 
 #ifndef INCLUDED_LIMITS_H
 #include <limits.h>
@@ -39,8 +39,8 @@
 #endif
 #include <tools/solar.h>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/svarray.hxx>
+#include <svl/poolitem.hxx>
 #include <vector>
 
 class SvStream;
diff --git a/svtools/inc/svtools/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index feab0eab004b..873c34785d5f 100644
--- a/svtools/inc/svtools/itemprop.hxx
+++ b/svl/inc/svl/itemprop.hxx
@@ -30,10 +30,10 @@
 #ifndef _SFX_ITEMPROP_HXX
 #define _SFX_ITEMPROP_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 #include <tools/string.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
diff --git a/svtools/inc/svtools/itemset.hxx b/svl/inc/svl/itemset.hxx
index 4cc3edcf65c7..a09cfbc2bbb2 100644
--- a/svtools/inc/svtools/itemset.hxx
+++ b/svl/inc/svl/itemset.hxx
@@ -30,14 +30,14 @@
 #ifndef _SFXITEMSET_HXX
 #define _SFXITEMSET_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 
 #if STLPORT_VERSION<321
 #include <stdarg.h>
 #else
 #include <cstdarg>  // std::va_list and friends
 #endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
 #include <tools/solar.h>
 
diff --git a/svtools/inc/svtools/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index ed247ac01fa3..0cba5235674a 100644
--- a/svtools/inc/svtools/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
@@ -30,11 +30,12 @@
 #ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX
 #define _SVTOOLS_LANGUAGEOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <sal/types.h>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <unotools/configitem.hxx>
+#include <unotools/options.hxx>
 #include <i18npool/lang.h>
 
 // class SvtLanguageOptions ----------------------------------------------------
@@ -47,7 +48,7 @@
 class SvtCJKOptions;
 class SvtCTLOptions;
 
-class SVT_DLLPUBLIC SvtLanguageOptions : public SfxBroadcaster, public SfxListener
+class SVL_DLLPUBLIC SvtLanguageOptions : public ::utl::detail::Options
 {
 private:
     SvtCJKOptions*  m_pCJKOptions;
@@ -78,8 +79,6 @@ public:
     SvtLanguageOptions( sal_Bool _bDontLoad = sal_False );
     ~SvtLanguageOptions();
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
     // CJK options
     sal_Bool    IsCJKFontEnabled() const;
     sal_Bool    IsVerticalTextEnabled() const;
@@ -113,7 +112,7 @@ public:
 };
 /** #i42730# Gives access to the Windows 16bit system locale
  */
-class SVT_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem
+class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem
 {
 private:
     ::rtl::OUString m_sWin16SystemLocale;
@@ -123,6 +122,7 @@ public:
     ~SvtSystemLanguageOptions();
 
     virtual void    Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
 
     LanguageType GetWin16SystemLanguage();
 };
diff --git a/svtools/inc/svtools/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx
index b21e91a3fd46..77cb63414f4e 100644
--- a/svtools/inc/svtools/lckbitem.hxx
+++ b/svl/inc/svl/lckbitem.hxx
@@ -30,11 +30,11 @@
 #ifndef _LCKBITEM_HXX
 #define _LCKBITEM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/solar.h>
 #include <tools/rtti.hxx>
 #include <tools/stream.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 // -----------------------------------------------------------------------
 
diff --git a/svtools/inc/svtools/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx
index c8bd6251f9cb..c1e18aac7e14 100644
--- a/svtools/inc/svtools/lockfilecommon.hxx
+++ b/svl/inc/svl/lockfilecommon.hxx
@@ -32,7 +32,7 @@
 #ifndef _SVT_LOCKFILECOMMON_HXX
 #define _SVT_LOCKFILECOMMON_HXX
 
-#include <svtools/svtdllapi.h>
+#include <svl/svldllapi.h>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -54,7 +54,7 @@
 namespace svt {
 
 // This is a general implementation that is used in document lock file implementation and in sharing control file implementation
-class SVT_DLLPUBLIC LockFileCommon
+class SVL_DLLPUBLIC LockFileCommon
 {
 protected:
     ::osl::Mutex m_aMutex;
diff --git a/svtools/inc/svtools/lstner.hxx b/svl/inc/svl/lstner.hxx
index 99a6e10701f5..c9993834b42a 100644
--- a/svtools/inc/svtools/lstner.hxx
+++ b/svl/inc/svl/lstner.hxx
@@ -30,9 +30,9 @@
 #ifndef _SFXLSTNER_HXX
 #define _SFXLSTNER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxBroadcaster;
 class SfxHint;
diff --git a/svtools/inc/svtools/macitem.hxx b/svl/inc/svl/macitem.hxx
index 2e43120f653d..747b9ec0bf17 100644
--- a/svtools/inc/svtools/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -32,8 +32,8 @@
 
 // class SvxMacroItem ----------------------------------------------------
 
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
@@ -72,7 +72,7 @@ public:
 
 class SjJSbxObject;
 
-class SVT_DLLPUBLIC SvxMacro
+class SVL_DLLPUBLIC SvxMacro
 {
     String aMacName;
     String aLibName;
@@ -125,7 +125,7 @@ DECLARE_TABLE( _SvxMacroTableDtor, SvxMacro* )
 
 #define SVX_MACROTBL_AKTVERSION SVX_MACROTBL_VERSION40
 
-class SVT_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor
+class SVL_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor
 {
 public:
     inline SvxMacroTableDtor( const USHORT nInitSz = 0, const USHORT nReSz = 1 );
@@ -152,7 +152,7 @@ inline SvxMacroTableDtor::SvxMacroTableDtor( const USHORT nInitSz,
 Dieses Item beschreibt eine Makro-Tabelle.
 */
 
-class SVT_DLLPUBLIC SvxMacroItem: public SfxPoolItem
+class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem
 {
 public:
     TYPEINFO();
diff --git a/svtools/inc/svtools/metitem.hxx b/svl/inc/svl/metitem.hxx
index a37d119d57c1..5a1e6627542f 100644
--- a/svtools/inc/svtools/metitem.hxx
+++ b/svl/inc/svl/metitem.hxx
@@ -30,14 +30,14 @@
 #ifndef _SFXMETRICITEM_HXX
 #define _SFXMETRICITEM_HXX
 
-#include "svtools/svtdllapi.h"
-#include <svtools/intitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/intitem.hxx>
 
-DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC)
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxMetricItem: public SfxInt32Item
+class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
 {
 public:
                              TYPEINFO();
diff --git a/svtools/inc/svtools/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx
index ba8c24f319f6..ba8c24f319f6 100644
--- a/svtools/inc/svtools/nfkeytab.hxx
+++ b/svl/inc/svl/nfkeytab.hxx
diff --git a/svtools/inc/svtools/nfversi.hxx b/svl/inc/svl/nfversi.hxx
index 23375369ddb3..23375369ddb3 100644
--- a/svtools/inc/svtools/nfversi.hxx
+++ b/svl/inc/svl/nfversi.hxx
diff --git a/svtools/inc/svtools/nranges.hxx b/svl/inc/svl/nranges.hxx
index 6996669cdeb1..e527a456a014 100644
--- a/svtools/inc/svtools/nranges.hxx
+++ b/svl/inc/svl/nranges.hxx
@@ -40,12 +40,12 @@
 
 #define NUMTYPE USHORT
 #define SfxNumRanges SfxUShortRanges
-#include <svtools/nranges.hxx>
+#include <svl/nranges.hxx>
 
 #undef NUMTYPE
 #define NUMTYPE ULONG
 #define SfxNumRanges SfxULongRanges
-#include <svtools/nranges.hxx>
+#include <svl/nranges.hxx>
 
 #define _SFXNRANGES_HXX
 
diff --git a/svtools/inc/svtools/ondemand.hxx b/svl/inc/svl/ondemand.hxx
index e8361307eb9e..3369f286b2cd 100644
--- a/svtools/inc/svtools/ondemand.hxx
+++ b/svl/inc/svl/ondemand.hxx
@@ -31,7 +31,7 @@
 #ifndef INCLUDED_SVTOOLS_ONDEMAND_HXX
 #define INCLUDED_SVTOOLS_ONDEMAND_HXX
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <i18npool/lang.h>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
diff --git a/svtools/inc/svtools/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 472f50e6ef60..21e9ffa74210 100644
--- a/svtools/inc/svtools/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -31,7 +31,7 @@
 #ifndef _OWNLIST_HXX
 #define _OWNLIST_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/stream.hxx>
 #include <tools/ownlist.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -79,7 +79,7 @@ public:
 };
 
 //=========================================================================
-class SVT_DLLPUBLIC SvCommandList
+class SVL_DLLPUBLIC SvCommandList
 /*  [Beschreibung]
 
     Die Liste enth"alt Objekte vom Typ SvCommand. Wird ein Objekt
@@ -95,8 +95,8 @@ class SVT_DLLPUBLIC SvCommandList
     BOOL FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
     void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
 
-    SVT_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & );
-    SVT_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & );
+    SVL_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & );
+    SVL_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & );
 };
 
 #endif // _OWNLIST_HXX
diff --git a/svtools/inc/svtools/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 7e0fea44b87a..1d0a2e982fae 100644
--- a/svtools/inc/svtools/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFXPOOLITEM_HXX
 #define _SFXPOOLITEM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <com/sun/star/uno/Any.hxx>
 
 #define TF_POOLABLE
@@ -40,8 +40,8 @@
 #include <tools/solar.h>
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/hint.hxx>
+#include <svl/svarray.hxx>
+#include <svl/hint.hxx>
 
 typedef long SfxArgumentError;
 
diff --git a/svtools/inc/svtools/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 923ab73da1d5..b0deff81e884 100644
--- a/svtools/inc/svtools/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -30,17 +30,17 @@
 #ifndef _SFXPTITEM_HXX
 #define _SFXPTITEM_HXX
 
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
 #include <tools/gen.hxx>
 
 class SvStream;
 
-DBG_NAMEEX_VISIBILITY(SfxPointItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC)
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxPointItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem
 {
     Point                    aVal;
 
diff --git a/svtools/inc/svtools/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index 39c85d9ab228..1f944bab4102 100644
--- a/svtools/inc/svtools/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -30,18 +30,18 @@
 #ifndef _SFXRECTITEM_HXX
 #define _SFXRECTITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvStream;
 
-DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC)
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
 {
     Rectangle                aVal;
 
diff --git a/svtools/inc/svtools/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx
index 218e34cd4556..a3ced1b93019 100644
--- a/svtools/inc/svtools/restrictedpaths.hxx
+++ b/svl/inc/svl/restrictedpaths.hxx
@@ -31,15 +31,15 @@
 #ifndef SVTOOLS_RESTRICTEDPATHS_HXX
 #define SVTOOLS_RESTRICTEDPATHS_HXX
 
-#include <svtools/urlfilter.hxx>
-#include <svtools/svtdllapi.h>
+#include <svl/urlfilter.hxx>
+#include <svl/svldllapi.h>
 #include <tools/string.hxx>
 
 #include <vector>
 
 namespace svt
 {
-    class SVT_DLLPUBLIC RestrictedPaths : public IUrlFilter
+    class SVL_DLLPUBLIC RestrictedPaths : public IUrlFilter
     {
     private:
         ::std::vector< String >     m_aUnrestrictedURLs;
diff --git a/svtools/inc/svtools/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 52831f93f71f..d55ba25a06c2 100644
--- a/svtools/inc/svtools/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -35,7 +35,7 @@
 #define NUMTYPE USHORT
 #define SfxXRangeItem SfxRangeItem
 #define SfxXRangesItem SfxUShortRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #undef NUMTYPE
 #undef SfxXRangeItem
 #undef SfxXRangesItem
@@ -44,7 +44,7 @@
 #define NUMTYPE ULONG
 #define SfxXRangeItem SfxULongRangeItem
 #define SfxXRangesItem SfxULongRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #undef NUMTYPE
 #undef SfxXRangeItem
 #undef SfxXRangesItem
@@ -53,14 +53,14 @@
 #define _SFXRNGITEM_HXX
 
 #else
-#include "svtools/svtdllapi.h"
-#include <svtools/poolitem.hxx>
+#include "svl/svldllapi.h"
+#include <svl/poolitem.hxx>
 
 class SvStream;
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
 {
 private:
     NUMTYPE                     nFrom;
@@ -89,7 +89,7 @@ public:
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
 {
 private:
     NUMTYPE*                    _pRanges;
diff --git a/svtools/inc/svtools/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index e1394dec91b3..a12466519d1b 100644
--- a/svtools/inc/svtools/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.hxx
@@ -34,7 +34,7 @@
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 #include <i18npool/lang.h>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //============================================================================
 class SfxFontItem: public SfxPoolItem
diff --git a/svtools/inc/svtools/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx
index 8735f8c5ccf7..1febb4e77583 100644
--- a/svtools/inc/svtools/sharecontrolfile.hxx
+++ b/svl/inc/svl/sharecontrolfile.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVT_SHARECONTROLFILE_HXX
 #define _SVT_SHARECONTROLFILE_HXX
 
-#include <svtools/svtdllapi.h>
+#include <svl/svldllapi.h>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -40,7 +40,7 @@
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <svtools/lockfilecommon.hxx>
+#include <svl/lockfilecommon.hxx>
 
 #define SHARED_OOOUSERNAME_ID   LOCKFILE_OOOUSERNAME_ID
 #define SHARED_SYSUSERNAME_ID   LOCKFILE_SYSUSERNAME_ID
@@ -51,7 +51,7 @@
 
 namespace svt {
 
-class SVT_DLLPUBLIC ShareControlFile : public LockFileCommon
+class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
diff --git a/svtools/inc/svtools/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index 742d437fb842..9b1c0050cf6b 100644
--- a/svtools/inc/svtools/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -30,10 +30,10 @@
 #ifndef _SFXSLSTITM_HXX
 #define _SFXSLSTITM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
 #include <tools/list.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Sequence.h>
 
 class SfxImpStringList;
diff --git a/svtools/inc/svtools/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index 9858fefd86f0..089a86dae3f2 100644
--- a/svtools/inc/svtools/smplhint.hxx
+++ b/svl/inc/svl/smplhint.hxx
@@ -30,8 +30,8 @@
 #ifndef _SFXSMPLHINT_HXX
 #define _SFXSMPLHINT_HXX
 
-#include "svtools/svldllapi.h"
-#include <svtools/hint.hxx>
+#include "svl/svldllapi.h"
+#include <svl/hint.hxx>
 #include <tools/rtti.hxx>
 
 #define SFX_HINT_DYING              0x00000001
diff --git a/svtools/inc/svtools/solar.hrc b/svl/inc/svl/solar.hrc
index 00211573f876..96149b89131c 100644
--- a/svtools/inc/svtools/solar.hrc
+++ b/svl/inc/svl/solar.hrc
@@ -189,17 +189,11 @@
 
 // FREE
 
-#define HID_SO2_START               (HID_LIB_START+1100)
-#define HID_SO2_END                 (HID_LIB_START+1149)
+#define HID_CUI_START               (HID_LIB_START+1100)
+#define HID_CUI_END                 (HID_LIB_START+1699)
 
-#define HID_MAIL_START              (HID_LIB_START+1150)
-#define HID_MAIL_END                (HID_LIB_START+1199)
-
-#define HID_INET_START              (HID_LIB_START+1200)
-#define HID_INET_END                (HID_LIB_START+1259)
-
-#define HID_OFA_START               (HID_LIB_START+1260)
-#define HID_OFA_END                 (HID_LIB_START+1399)
+#define HID_OFA_START               (HID_LIB_START+1760)
+#define HID_OFA_END                 (HID_LIB_START+1999)
 
 #define HID_HELP_START              (HID_LIB_START+2000)
 #define HID_HELP_END                (HID_LIB_START+2050)
@@ -273,8 +267,8 @@
 #define HID_OBJ_START               (HID_START+30000)
 #define HID_OBJ_END                 (HID_START+32767)
 
-#define HID_SIM_START               (HID_OBJ_START+   0)
-#define HID_SIM_END                 (HID_OBJ_START+ 239)
+#define HID_CUI3_START              (HID_OBJ_START+   0)
+#define HID_CUI3_END                (HID_OBJ_START+ 239)
 
 #define HID_AVMEDIA_START           (HID_OBJ_START+ 240)
 #define HID_AVMEDIA_END             (HID_OBJ_START+ 255)
diff --git a/svtools/inc/svtools/stritem.hxx b/svl/inc/svl/stritem.hxx
index a2430b142c1d..21ee9fadd1ec 100644
--- a/svtools/inc/svtools/stritem.hxx
+++ b/svl/inc/svl/stritem.hxx
@@ -31,11 +31,11 @@
 #ifndef _SFXSTRITEM_HXX
 #define _SFXSTRITEM_HXX
 
-#include "svtools/svtdllapi.h"
-#include <svtools/custritm.hxx>
+#include "svl/svldllapi.h"
+#include <svl/custritm.hxx>
 
 //============================================================================
-class SVT_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
+class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
 {
 public:
     TYPEINFO();
diff --git a/svtools/inc/svtools/style.hrc b/svl/inc/svl/style.hrc
index ed4db1bf46d0..ed4db1bf46d0 100644
--- a/svtools/inc/svtools/style.hrc
+++ b/svl/inc/svl/style.hrc
diff --git a/svtools/inc/svtools/style.hxx b/svl/inc/svl/style.hxx
index 17e4bf7b9c06..66c130d346dd 100644
--- a/svtools/inc/svtools/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -38,16 +38,16 @@
 #include <vector>
 #include <comphelper/weak.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <rsc/rscsfx.hxx>
 #include <tools/string.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/hint.hxx>
+#include <svl/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/poolitem.hxx>
 
 #ifndef _SFX_STYLE_HRC
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #endif
 
 class SfxItemSet;
@@ -91,7 +91,7 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from:
 
 #define VIRTUAL510 virtual
 
-class SVT_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
+class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
 {
     friend class SfxStyleSheetBasePool;
 
@@ -165,7 +165,7 @@ typedef std::vector< rtl::Reference< SfxStyleSheetBase > > SfxStyles;
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetIterator
+class SVL_DLLPUBLIC SfxStyleSheetIterator
 
 /*  [Beschreibung]
 
@@ -195,8 +195,8 @@ protected:
 
 private:
     USHORT                  GetPos(){return nAktPosition;}
-    SVT_DLLPRIVATE BOOL                     IsTrivialSearch();
-    SVT_DLLPRIVATE BOOL                     DoesStyleMatch(SfxStyleSheetBase *pStyle);
+    SVL_DLLPRIVATE BOOL                     IsTrivialSearch();
+    SVL_DLLPRIVATE BOOL                     DoesStyleMatch(SfxStyleSheetBase *pStyle);
 
     void*                   pImp;
     SfxStyleSheetBase*      pAktStyle;
@@ -210,7 +210,7 @@ friend class SfxStyleSheetBasePool;
 
 class SfxStyleSheetBasePool_Impl;
 
-class SVT_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject
+class SVL_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject
 {
 friend class SfxStyleSheetIterator;
 friend class SfxStyleSheetBase;
@@ -218,8 +218,8 @@ friend class SfxStyleSheetBase;
     SfxStyleSheetBasePool_Impl *pImp;
 
 private:
-    SVT_DLLPRIVATE BOOL                         Load1_Impl( SvStream& );
-    SVT_DLLPRIVATE SfxStyleSheetIterator&      GetIterator_Impl();
+    SVL_DLLPRIVATE BOOL                         Load1_Impl( SvStream& );
+    SVL_DLLPRIVATE SfxStyleSheetIterator&      GetIterator_Impl();
 protected:
     String                      aAppName;
     SfxItemPool&                rPool;
@@ -287,7 +287,7 @@ public:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
+class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
                      public SfxListener, public SfxBroadcaster
 {
 public:
@@ -306,7 +306,7 @@ protected:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
+class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
 {
 protected:
     using SfxStyleSheetBasePool::Create;
@@ -334,7 +334,7 @@ public:
 
 //========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
+class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
 {
     USHORT nHint;
 
@@ -348,7 +348,7 @@ public:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetHint: public SfxHint
+class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint
 {
     SfxStyleSheetBase*  pStyleSh;
     USHORT              nHint;
@@ -364,7 +364,7 @@ public:
                         { return nHint; }
 };
 
-class SVT_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
+class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
 {
     String              aName;
 
@@ -379,7 +379,7 @@ public:
     const String&       GetOldName() { return aName; }
 };
 
-class SVT_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
+class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
 {
 public:
     SfxUnoStyleSheet( const UniString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, USHORT _nMaske );
diff --git a/svtools/inc/svtools/svarray.hxx b/svl/inc/svl/svarray.hxx
index 3ab3676fa5e0..d2479cd5364f 100644
--- a/svtools/inc/svtools/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -101,7 +101,7 @@
 ***********************************************************************
 #endif
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 
 #ifndef INCLUDED_STRING_H
 #include <string.h>     // memmove()
diff --git a/svtools/inc/svtools/svdde.hxx b/svl/inc/svl/svdde.hxx
index 82681ed9d240..96a1ffa6bf22 100644
--- a/svtools/inc/svtools/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVDDE_HXX
 #define _SVDDE_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <sot/exchange.hxx>
 #include <tools/string.hxx>
 #include <tools/list.hxx>
@@ -84,7 +84,7 @@ DECLARE_LIST( StringList, String * )
 // - DdeData -
 // -----------
 
-class SVT_DLLPUBLIC DdeData
+class SVL_DLLPUBLIC DdeData
 {
     friend class    DdeInternal;
     friend class    DdeService;
@@ -93,7 +93,7 @@ class SVT_DLLPUBLIC DdeData
     DdeDataImp*     pImp;
 
 //#if 0 // _SOLAR__PRIVATE
-    SVT_DLLPRIVATE void            Lock();
+    SVL_DLLPRIVATE void            Lock();
 //#endif
     void            SetFormat( ULONG nFmt );
 
@@ -155,7 +155,7 @@ public:
 // - DdeTransaction -
 // ------------------
 
-class SVT_DLLPUBLIC DdeTransaction
+class SVL_DLLPUBLIC DdeTransaction
 {
 public:
     virtual void    Data( const DdeData* );
@@ -205,7 +205,7 @@ private:
 // - DdeLink -
 // -----------
 
-class SVT_DLLPUBLIC DdeLink : public DdeTransaction
+class SVL_DLLPUBLIC DdeLink : public DdeTransaction
 {
     Link            aNotify;
 
@@ -222,7 +222,7 @@ public:
 // - DdeWarmLink -
 // ---------------
 
-class SVT_DLLPUBLIC DdeWarmLink : public DdeLink
+class SVL_DLLPUBLIC DdeWarmLink : public DdeLink
 {
 public:
             DdeWarmLink( DdeConnection&, const String&, long = 0 );
@@ -232,7 +232,7 @@ public:
 // - DdeHotLink -
 // --------------
 
-class SVT_DLLPUBLIC DdeHotLink : public DdeLink
+class SVL_DLLPUBLIC DdeHotLink : public DdeLink
 {
 public:
             DdeHotLink( DdeConnection&, const String&, long = 0 );
@@ -242,7 +242,7 @@ public:
 // - DdeRequest -
 // --------------
 
-class SVT_DLLPUBLIC DdeRequest : public DdeTransaction
+class SVL_DLLPUBLIC DdeRequest : public DdeTransaction
 {
 public:
             DdeRequest( DdeConnection&, const String&, long = 0 );
@@ -252,7 +252,7 @@ public:
 // - DdePoke -
 // -----------
 
-class SVT_DLLPUBLIC DdePoke : public DdeTransaction
+class SVL_DLLPUBLIC DdePoke : public DdeTransaction
 {
 public:
             DdePoke( DdeConnection&, const String&, const char*, long,
@@ -265,7 +265,7 @@ public:
 // - DdeExecute -
 // --------------
 
-class SVT_DLLPUBLIC DdeExecute : public DdeTransaction
+class SVL_DLLPUBLIC DdeExecute : public DdeTransaction
 {
 public:
             DdeExecute( DdeConnection&, const String&, long = 0 );
@@ -275,7 +275,7 @@ public:
 // - DdeConnection -
 // -----------------
 
-class SVT_DLLPUBLIC DdeConnection
+class SVL_DLLPUBLIC DdeConnection
 {
     friend class    DdeInternal;
     friend class    DdeTransaction;
@@ -307,7 +307,7 @@ private:
 // - DdeItem -
 // -----------
 
-class SVT_DLLPUBLIC DdeItem
+class SVL_DLLPUBLIC DdeItem
 {
     friend class    DdeInternal;
     friend class    DdeTopic;
@@ -336,7 +336,7 @@ public:
 // - DdeItem -
 // -----------
 
-class SVT_DLLPUBLIC DdeGetPutItem : public DdeItem
+class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem
 {
 public:
                     DdeGetPutItem( const sal_Unicode* p );
@@ -352,9 +352,9 @@ public:
 // - DdeTopic -
 // ------------
 
-class SVT_DLLPUBLIC DdeTopic
+class SVL_DLLPUBLIC DdeTopic
 {
-    SVT_DLLPRIVATE void _Disconnect( long );
+    SVL_DLLPRIVATE void _Disconnect( long );
 
 public:
     virtual void    Connect( long );
@@ -421,7 +421,7 @@ private:
 // - DdeService -
 // --------------
 
-class SVT_DLLPUBLIC DdeService
+class SVL_DLLPUBLIC DdeService
 {
     friend class    DdeInternal;
 
@@ -448,7 +448,7 @@ private:
     ConvList*       pConv;
     short           nStatus;
 
-    SVT_DLLPRIVATE BOOL            HasCbFormat( USHORT );
+    SVL_DLLPRIVATE BOOL            HasCbFormat( USHORT );
 
 public:
                     DdeService( const String& );
diff --git a/svtools/source/misc1/iniadrtk.cxx b/svl/inc/svl/svldata.hxx
index 8d4c929fc988..468e6025cb5a 100644
--- a/svtools/source/misc1/iniadrtk.cxx
+++ b/svl/inc/svl/svldata.hxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iniadrtk.cxx,v $
- * $Revision: 1.5 $
+ * $RCSfile: svldata.hxx,v $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,49 +28,48 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <tools/string.hxx>
-#include <iniadrtk.hxx>
+#ifndef _SVL_SVLDATA_HXX
+#define _SVL_SVLDATA_HXX
+
+#include <tools/simplerm.hxx>
+
+class SfxItemPool;
 
 //============================================================================
-//
-//  class SfxIniManagerAddressEntry
-//
-//============================================================================
+class ImpSvlData
+{
+public:
+    const SfxItemPool * pStoringPool;
+    void*           m_pThreadsafeRMs;
+        // one SimpleResMgr for each language for which a resource was requested
+        // (When using the 'non-simple' resmgr, the first request for any language wins, any
+        // further request for any other language supply the resmgr of the first call.
+        // For the simple resmgr we have a mgr for each language ever requested).
+
+private:
+    ImpSvlData():
+        pStoringPool(0), m_pThreadsafeRMs(NULL)
+    {}
 
-// static
-String SfxIniManagerAddressEntry::get(const String & rAddress,
-                                      AddressToken eToken)
+    ~ImpSvlData();
+
+public:
+    SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale);
+    static ImpSvlData & GetSvlData();
+};
+
+//============================================================================
+class SvtSimpleResId
 {
-    String aToken;
-    USHORT i = 0, nTxt = 0;
+    String  m_sValue;
+
+public:
+    SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvlData::GetSvlData().GetSimpleRM(aLocale)->ReadString(nId)) { };
+
+    operator String () const { return m_sValue; }
+};
 
-    while ( i < rAddress.Len() )
-    {
-        while ( i < rAddress.Len() && rAddress.GetChar(i) != '#' )
-        {
-            if ( rAddress.GetChar(i) == '\\' )
-                i++;
-            aToken += rAddress.GetChar(i++);
-        }
 
-        // rAddress[i] == '#' oder am Ende, also eine Position weiter gehen
-        i++;
 
-        if ( eToken == (AddressToken)nTxt )
-            break;
-        else if ( i >= rAddress.Len() )
-        {
-            aToken.Erase();
-            break;
-        }
-        else
-        {
-            aToken.Erase();
-            nTxt++;
-        }
-    }
-    return aToken;
-}
+#endif //  _SVL_SVLDATA_HXX
 
diff --git a/svtools/inc/svtools/svldllapi.h b/svl/inc/svl/svldllapi.h
index 29b2ae29100a..29b2ae29100a 100644
--- a/svtools/inc/svtools/svldllapi.h
+++ b/svl/inc/svl/svldllapi.h
diff --git a/svtools/inc/svtools/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 050b228be4ab..869c70e1cac6 100644
--- a/svtools/inc/svtools/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -43,8 +43,8 @@
 ***********************************************************************
 #endif
 
-#include "svtools/svldllapi.h"
-#include <svtools/svarray.hxx>
+#include "svl/svldllapi.h"
+#include <svl/svarray.hxx>
 
 //#ifdef _SVSTDARR_BOOLS
 #ifndef _SVSTDARR_BOOLS_DECL
diff --git a/svtools/inc/svtools/svtools.hrc b/svl/inc/svl/svtools.hrc
index 245d31a2dd21..e4cc91cfcb49 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svl/inc/svl/svtools.hrc
@@ -30,7 +30,7 @@
 #ifndef _SVTOOLS_HRC
 #define _SVTOOLS_HRC "$Revision:   1.0"
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_SVTOOLS_BITMAP_START        (RID_SVTOOLS_START + 0)
 #define RID_SVTOOLS_IMAGELIST_START     (RID_SVTOOLS_START + 0)
@@ -90,17 +90,7 @@
 #define STR_SVT_SAMPLES_HELP            (RID_SVTOOLS_START+66)
 
 #define STR_WARNING_ITEM                (RID_SVTOOLS_START+90)
-#define STR_CSTAT_NEVER_UPD             (RID_SVTOOLS_START+91)
-#define STR_CSTAT_IN_UPD                (RID_SVTOOLS_START+92)
-#define STR_CSTAT_UPD_NEWER             (RID_SVTOOLS_START+93)
-#define STR_CSTAT_UPD_NOT_NEWER         (RID_SVTOOLS_START+94)
-#define STR_CSTAT_UPD_CANCEL            (RID_SVTOOLS_START+95)
-#define STR_CSTAT_ERR_GENERAL           (RID_SVTOOLS_START+96)
-#define STR_CSTAT_ERR_NOTEXISTS         (RID_SVTOOLS_START+97)
-#define STR_CSTAT_ERR_NOTREACHED        (RID_SVTOOLS_START+98)
 #define STR_COLUM_DT_AUTO               (RID_SVTOOLS_START+99)
-#define STR_CSTAT_UPD_IMMEDIATELY       (RID_SVTOOLS_START+100)
-#define STR_CSTAT_ERR_OFFLINE           (RID_SVTOOLS_START+101)
 
 #define CONFIG_BASIC_FORMAT_START       (RID_SVTOOLS_START+102)
 #define STR_BASICKEY_FORMAT_ON          (RID_SVTOOLS_START+103)
diff --git a/svtools/inc/svtools/szitem.hxx b/svl/inc/svl/szitem.hxx
index d3fb920aa012..c4b52d4939c0 100644
--- a/svtools/inc/svtools/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
@@ -32,7 +32,7 @@
 
 #include <tools/gen.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SfxArguments;
 class SvStream;
diff --git a/svtools/inc/svtools/undo.hxx b/svl/inc/svl/undo.hxx
index 38cbfb227f1b..354de8b451c7 100644
--- a/svtools/inc/svtools/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -30,14 +30,14 @@
 #ifndef _UNDO_HXX
 #define _UNDO_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 //====================================================================
 
-class SVT_DLLPUBLIC SfxRepeatTarget
+class SVL_DLLPUBLIC SfxRepeatTarget
 {
 public:
                         TYPEINFO();
@@ -46,7 +46,7 @@ public:
 
 //====================================================================
 
-class SVT_DLLPUBLIC SfxUndoAction
+class SVL_DLLPUBLIC SfxUndoAction
 {
     BOOL bLinked;
 public:
@@ -79,7 +79,7 @@ SV_DECL_PTRARR( SfxUndoActions, SfxUndoAction*, 20, 8 )
 
 /** do not make use of this implementation details, unless you
     really really have to! */
-struct SVT_DLLPUBLIC SfxUndoArray
+struct SVL_DLLPUBLIC SfxUndoArray
 {
     SfxUndoActions          aUndoActions;
     USHORT                  nMaxUndoActions;
@@ -95,7 +95,7 @@ struct SVT_DLLPUBLIC SfxUndoArray
 
 /** do not make use of this implementation details, unless you
     really really have to! */
-class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray
+class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray
 
 /*  [Beschreibung]
 
@@ -135,7 +135,7 @@ class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxUndoManager
+class SVL_DLLPUBLIC SfxUndoManager
 {
     friend class SfxLinkUndoAction;
 
@@ -197,7 +197,7 @@ public:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
+class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
 
 /*  [Beschreibung]
 
diff --git a/svtools/inc/svtools/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx
index 6370a75a1fd7..6370a75a1fd7 100644
--- a/svtools/inc/svtools/urlfilter.hxx
+++ b/svl/inc/svl/urlfilter.hxx
diff --git a/svtools/inc/svtools/visitem.hxx b/svl/inc/svl/visitem.hxx
index 9ace1212d967..1a3918526def 100644
--- a/svtools/inc/svtools/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -31,9 +31,9 @@
 #ifndef _SFXVISIBILITYITEM_HXX
 #define _SFXVISIBILITYITEM_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/debug.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
 //============================================================================
diff --git a/svtools/inc/svtools/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 814ca385d61a..4e653caf0238 100644
--- a/svtools/inc/svtools/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -30,20 +30,20 @@
 #ifndef _ZFORLIST_HXX
 #define _ZFORLIST_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/string.hxx>
 #ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
 #endif
 #include <i18npool/lang.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/NumberFormatCode.hpp>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/ondemand.hxx>
+#include <svl/ondemand.hxx>
 #include <tools/link.hxx>
-#include <svtools/nfkeytab.hxx>
+#include <svl/nfkeytab.hxx>
 
 #include <map>
 
@@ -231,7 +231,7 @@ typedef ::std::map< sal_uInt32, sal_uInt32 > SvNumberFormatterMergeMap;
 
 /** Language/country dependent currency entries
  */
-class SVT_DLLPUBLIC NfCurrencyEntry
+class SVL_DLLPUBLIC NfCurrencyEntry
 {
     String          aSymbol;            /// currency symbol
     String          aBankSymbol;        /// currency abbreviation
@@ -251,7 +251,7 @@ private:
 //#if 0 // _SOLAR__PRIVATE
                         // nDecimalFormat := 0, 1, 2
                         // #,##0 or #,##0.00 or #,##0.-- are assigned
-    SVT_DLLPRIVATE void             Impl_BuildFormatStringNumChars( String&,
+    SVL_DLLPRIVATE void             Impl_BuildFormatStringNumChars( String&,
                             const LocaleDataWrapper&, USHORT nDecimalFormat ) const;
 //#endif    // __PRIVATE
 
@@ -328,12 +328,12 @@ public:
 typedef NfCurrencyEntry* NfCurrencyEntryPtr;
 SV_DECL_PTRARR_DEL( NfCurrencyTable, NfCurrencyEntryPtr, 128, 1 )
 typedef String* WSStringPtr;
-SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVT_DLLPUBLIC )
+SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVL_DLLPUBLIC )
 
 
 class SvNumberFormatterRegistry_Impl;
 
-class SVT_DLLPUBLIC SvNumberFormatter
+class SVL_DLLPUBLIC SvNumberFormatter
 {
 public:
 
@@ -813,37 +813,37 @@ private:
 
 #ifdef _ZFORLIST_CXX                // ----- private Methoden -----
 
-    SVT_DLLPRIVATE static BOOL          bCurrencyTableInitialized;
-    SVT_DLLPRIVATE static USHORT            nSystemCurrencyPosition;
-    SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
+    SVL_DLLPRIVATE static BOOL          bCurrencyTableInitialized;
+    SVL_DLLPRIVATE static USHORT            nSystemCurrencyPosition;
+    SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
 
     // get the registry, create one if none exists
-    SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry();
+    SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry();
 
     // called by ctors
-    SVT_DLLPRIVATE void ImpConstruct( LanguageType eLang );
+    SVL_DLLPRIVATE void ImpConstruct( LanguageType eLang );
 
     // Changes initialized language/country, clears the entries and generates
     // new ones, may ONLY be called by the binary file format load
-    SVT_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 );
+    SVL_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 );
 
     // Generate builtin formats provided by i18n behind CLOffset,
     // if bLoadingSO5==FALSE also generate additional i18n formats.
-    SVT_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 );
+    SVL_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 );
 
     // Generate additional formats provided by i18n
-    SVT_DLLPRIVATE void ImpGenerateAdditionalFormats(
+    SVL_DLLPRIVATE void ImpGenerateAdditionalFormats(
                 sal_uInt32 CLOffset,
                 NumberFormatCodeWrapper& rNumberFormatCode,
                 BOOL bAfterLoadingSO5 );
 
-    SVT_DLLPRIVATE SvNumberformat* ImpInsertFormat(
+    SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat(
                 const ::com::sun::star::i18n::NumberFormatCode& rCode,
                 sal_uInt32 nPos,
                 BOOL bAfterLoadingSO5 = FALSE,
                 sal_Int16 nOrgIndex = 0 );
     // ImpInsertNewStandardFormat for new (since version ...) builtin formats
-    SVT_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat(
+    SVL_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat(
                 const ::com::sun::star::i18n::NumberFormatCode& rCode,
                 sal_uInt32 nPos,
                 USHORT nVersion,
@@ -851,41 +851,41 @@ private:
                 sal_Int16 nOrgIndex = 0 );
 
     // Return CLOffset or (MaxCLOffset + SV_COUNTRY_LANGUAGE_OFFSET) if new language/country
-    SVT_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const;
+    SVL_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const;
 
     // Test whether format code already exists, then return index key,
     // otherwise NUMBERFORMAT_ENTRY_NOT_FOUND
-    SVT_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString,
+    SVL_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString,
                         sal_uInt32 CLOffset,
                         LanguageType eLnge );
 
     // Create builtin formats for language/country if necessary, return CLOffset
-    SVT_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE );
+    SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE );
 
     // Build negative currency format, old compatibility style
-    SVT_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol );
+    SVL_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol );
     // Build positive currency format, old compatibility style
-    SVT_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol );
+    SVL_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol );
 
     // Create <type>theCurrencyTable</type> with all <type>NfCurrencyEntry</type>
-    SVT_DLLPRIVATE static void ImpInitCurrencyTable();
+    SVL_DLLPRIVATE static void ImpInitCurrencyTable();
 
     // Return the format index of the currency format of the system locale.
     // Format is created if not already present.
-    SVT_DLLPRIVATE sal_uInt32   ImpGetDefaultSystemCurrencyFormat();
+    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultSystemCurrencyFormat();
 
     // Return the format index of the currency format of the current locale.
     // Format is created if not already present.
-    SVT_DLLPRIVATE sal_uInt32   ImpGetDefaultCurrencyFormat();
+    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultCurrencyFormat();
 
     // Return the default format for a given type and current locale.
     // May ONLY be called from within GetStandardFormat().
-    SVT_DLLPRIVATE sal_uInt32   ImpGetDefaultFormat( short nType );
+    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultFormat( short nType );
 
     // Return the index in a sequence of format codes matching an enum of
     // NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't
     // contain any format code elements a default element is created and inserted.
-    SVT_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex(
+    SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex(
         ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq,
         const NfIndexTableOffset nTabOff );
 
@@ -895,13 +895,13 @@ private:
     // Return the default index in the sequence.
     // Non-PRODUCT version may check locale data for matching defaults in one
     // FormatElement group.
-    SVT_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault(
+    SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault(
         ::com::sun::star::i18n::NumberFormatCode * pFormatArr,
         sal_Int32 nCount, BOOL bCheckCorrectness = TRUE
         );
 
     // used as a loop body inside of GetNewCurrencySymbolString() and GetCurrencyEntry()
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     inline
 #endif
         static BOOL ImpLookupCurrencyEntryLoopBody(
diff --git a/svtools/inc/svtools/zformat.hxx b/svl/inc/svl/zformat.hxx
index ae7d961c0bc6..991460015e6d 100644
--- a/svtools/inc/svtools/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -30,12 +30,12 @@
 #ifndef _ZFORMAT_HXX
 #define _ZFORMAT_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include <tools/string.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/nfversi.hxx>
-#include <svtools/nfkeytab.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/nfversi.hxx>
+#include <svl/nfkeytab.hxx>
 
 // We need ImpSvNumberformatScan for the private SvNumberformat definitions.
 #ifdef _ZFORMAT_CXX
@@ -175,7 +175,7 @@ private:
 
 };
 
-class SVT_DLLPUBLIC SvNumberformat
+class SVL_DLLPUBLIC SvNumberformat
 {
 public:
     // Ctor for Load
@@ -461,11 +461,11 @@ private:
     BOOL bStandard;                 // If this is a default standard format
     BOOL bIsUsed;                   // Flag as used for storing
 
-    SVT_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const;
+    SVL_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const;
 
-    SVT_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
+    SVL_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
 
-    SVT_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
+    SVL_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
             double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const;
 
 #ifdef _ZFORMAT_CXX     // ----- private implementation methods -----
@@ -476,36 +476,36 @@ private:
     const SvNumberFormatter& GetFormatter() const   { return *rScan.GetNumberformatter(); }
 
     // divide in substrings and color conditions
-    SVT_DLLPRIVATE short ImpNextSymbol( String& rString,
+    SVL_DLLPRIVATE short ImpNextSymbol( String& rString,
                      xub_StrLen& nPos,
                      String& sSymbol );
 
     // read string until ']' and strip blanks (after condition)
-    SVT_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString,
+    SVL_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString,
                    xub_StrLen& nPos,
                    String& sSymbol );
 
     // get xxx of "[$-xxx]" as LanguageType, starting at and advancing position nPos
-    SVT_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos );
+    SVL_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos );
 
     // standard number output
-    SVT_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString );
+    SVL_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString );
     // numbers in input line
-    SVT_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString );
+    SVL_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString );
 
     // check subcondition
     // OP undefined => -1
     // else 0 or 1
-    SVT_DLLPRIVATE short ImpCheckCondition(double& fNumber,
+    SVL_DLLPRIVATE short ImpCheckCondition(double& fNumber,
                          double& fLimit,
                          SvNumberformatLimitOps eOp);
 
-    SVT_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y);
-    SVT_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y);
+    SVL_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y);
+    SVL_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y);
 
     // Helper function for number strings
     // append string symbols, insert leading 0 or ' ', or ...
-    SVT_DLLPRIVATE BOOL ImpNumberFill( String& sStr,
+    SVL_DLLPRIVATE BOOL ImpNumberFill( String& sStr,
                     double& rNumber,
                     xub_StrLen& k,
                     USHORT& j,
@@ -513,7 +513,7 @@ private:
                     short eSymbolType );
 
     // Helper function to fill in the integer part and the group (AKA thousand) separators
-    SVT_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr,
+    SVL_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr,
                                  double& rNumber,
                                  xub_StrLen k,
                                  USHORT j,
@@ -524,20 +524,20 @@ private:
 
     // Helper function to fill in the group (AKA thousand) separators
     // or to skip additional digits
-    SVT_DLLPRIVATE void ImpDigitFill( String& sStr,
+    SVL_DLLPRIVATE void ImpDigitFill( String& sStr,
                     xub_StrLen nStart,
                     xub_StrLen& k,
                     USHORT nIx,
                     xub_StrLen & nDigitCount,
                     utl::DigitGroupingIterator & );
 
-    SVT_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber,
                        USHORT nIx,
                        String& OutString );
-    SVT_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber,
                        USHORT nIx,
                        String& OutString );
-    SVT_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber,
                            USHORT nIx,
                            String& OutString );
 
@@ -546,23 +546,23 @@ private:
     // know a "before" era (like zh_TW ROC or ja_JP Gengou). If switched and
     // rOrgCalendar was "gregorian" the string is emptied. If rOrgCalendar was
     // empty the previous calendar name and date/time are returned.
-    SVT_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
+    SVL_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
 
     // Append a "G" short era string of the given calendar. In the case of a
     // Gengou calendar this is a one character abbreviation, for other
     // calendars the XExtendedCalendar::getDisplayString() method is called.
-    SVT_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal,
+    SVL_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal,
             sal_Int16 nNatNum );
 
-    SVT_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber,
                          USHORT nIx,
                          String& OutString );
 
-    SVT_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
+    SVL_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
 
     // normal digits or other digits, depending on ImpSvNumFor.aNatNum,
     // [NatNum1], [NatNum2], ...
-    SVT_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal,
+    SVL_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal,
             USHORT nMinDigits = 0  ) const;
 
     String ImpIntToString( USHORT nIx, sal_Int32 nVal, USHORT nMinDigits = 0 ) const
@@ -574,7 +574,7 @@ private:
         }
 
     // transliterate according to NativeNumber
-    SVT_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
+    SVL_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
 
     void ImpTransliterate( String& rStr, const SvNumberNatNum& rNum ) const
         {
diff --git a/svtools/inc/urihelper.hxx b/svl/inc/urihelper.hxx
index 209f3f04e28a..8be500e438ce 100644
--- a/svtools/inc/urihelper.hxx
+++ b/svl/inc/urihelper.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_URIHELPER_HXX
 #define SVTOOLS_URIHELPER_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svl/svldllapi.h"
 #include "com/sun/star/uno/Reference.hxx"
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <rtl/textenc.h>
@@ -64,7 +64,7 @@ namespace URIHelper {
    existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
    if you want to generate file URLs without checking for their existence.
 */
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
              ByteString const & rTheRelURIRef,
              Link const & rMaybeFileHdl = Link(),
@@ -91,7 +91,7 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
    existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
    if you want to generate file URLs without checking for their existence.
 */
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
              UniString const & rTheRelURIRef,
              Link const & rMaybeFileHdl = Link(),
@@ -106,10 +106,10 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
              INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
 
 //============================================================================
-SVT_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
+SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
 
 //============================================================================
-SVT_DLLPUBLIC Link GetMaybeFileHdl();
+SVL_DLLPUBLIC Link GetMaybeFileHdl();
 
 /**
    Converts a URI reference to a relative one, ignoring certain differences (for
@@ -131,7 +131,7 @@ SVT_DLLPUBLIC Link GetMaybeFileHdl();
 
    @exception com::sun::star::uno::RuntimeException if any error occurs
  */
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
+SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
 normalizedMakeRelative(
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
     const & context,
@@ -159,11 +159,11 @@ normalizedMakeRelative(
    @deprecated
    No code should rely on the default component context.
 */
-SVT_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative(
+SVL_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative(
     rtl::OUString const & baseUriReference, rtl::OUString const & uriReference);
 
 //============================================================================
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 FindFirstURLInText(UniString const & rText,
                    xub_StrLen & rBegin,
                    xub_StrLen & rEnd,
@@ -200,7 +200,7 @@ FindFirstURLInText(UniString const & rText,
 
     @return  The input URI with any password component removed.
  */
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 removePassword(UniString const & rURI,
                INetURLObject::EncodeMechanism eEncodeMechanism
                    = INetURLObject::WAS_ENCODED,
@@ -229,7 +229,7 @@ removePassword(UniString const & rURI,
     @return  The style bit corresponding to the queried content provider's
     conventions, or FSysStyle(0) if these cannot be determined.
  */
-SVT_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl,
+SVL_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl,
                                         bool bAddConvenienceStyles = true)
     throw (com::sun::star::uno::RuntimeException);
 
diff --git a/svtools/inc/urlbmk.hxx b/svl/inc/urlbmk.hxx
index d3342b398878..d3342b398878 100644
--- a/svtools/inc/urlbmk.hxx
+++ b/svl/inc/urlbmk.hxx
diff --git a/svtools/inc/whiter.hxx b/svl/inc/whiter.hxx
index 87ed2cbc76f0..d2bd7c88d521 100644
--- a/svtools/inc/whiter.hxx
+++ b/svl/inc/whiter.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFX_WHITER_HXX
 #define _SFX_WHITER_HXX
 
-#include "svtools/svldllapi.h"
+#include "svl/svldllapi.h"
 
 #ifndef INCLUDED_LIMITS_H
 #include <limits.h>
diff --git a/svtools/inc/xmlement.hxx b/svl/inc/xmlement.hxx
index ed0e4dafc57a..ed0e4dafc57a 100644
--- a/svtools/inc/xmlement.hxx
+++ b/svl/inc/xmlement.hxx
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
new file mode 100644
index 000000000000..f2d4bf324d01
--- /dev/null
+++ b/svl/prj/build.lst
@@ -0,0 +1,22 @@
+sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL
+sl	svl								usr1	-	all	svl_mkout NULL
+sl	svl\inc							nmake	-	all	svl_inc NULL
+sl	svl\unx\source\svdde			nmake	-	u	svl_usdde svl_inc NULL
+sl	svl\unx\source\svdde			nmake	-	p	svl_psdde svl_inc NULL
+sl	svl\source\config				nmake	-	all	svl_conf svl_inc NULL
+sl	svl\source\filepicker           nmake	-	all	svl_filepick svl_inc NULL
+sl	svl\source\filerec				nmake	-	all	svl_file svl_inc NULL
+sl	svl\source\items				nmake	-	all	svl__item svl_inc NULL
+sl	svl\source\memtools				nmake	-	all	svl_mem svl_inc NULL
+sl	svl\source\misc					nmake	-	all	svl__misc svl_inc NULL
+sl	svl\source\notify				nmake	-	all	svl_not svl_inc NULL
+sl	svl\source\numbers				nmake	-	all	svl_num svl_inc NULL
+sl	svl\source\svdde				nmake	-	all	svl__dde svl_inc NULL
+sl	svl\source\svsql				nmake	-	all	svl_sql svl_inc NULL
+sl	svl\source\undo					nmake	-	all	svl_undo svl_inc NULL
+sl	svl\source\uno					nmake	-	all	svl_uno svl_inc NULL
+sl  svl\util                        nmake   -   all svl_util svl_usdde.u svl_psdde.p svl_conf svl_filepick svl_file svl__item svl_mem svl__misc svl_not svl_num svl__dde svl_sql svl_undo svl_uno NULL
+sl	svl\source\fsstor				nmake	-	all	svl_fsstor svl_inc NULL
+sl	svl\source\passwordcontainer	nmake	-	all	svl_passcont svl_inc NULL
+
+
diff --git a/svl/prj/d.lst b/svl/prj/d.lst
new file mode 100644
index 000000000000..a5c2564e81cd
--- /dev/null
+++ b/svl/prj/d.lst
@@ -0,0 +1,22 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+mkdir: %_DEST%\inc%_EXT%\svl
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
+..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
+
+..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
+..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
+..\inc\svl\*.h %_DEST%\inc%_EXT%\svl\*.h
+..\inc\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
+..\inc\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
+..\inc\*.h %_DEST%\inc%_EXT%\svl\*.h
+
+dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
+
+*.xml %_DEST%\xml%_EXT%\*.xml
+
diff --git a/svtools/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java
index 97cc21fdec9f..6f4d0ba3d945 100644
--- a/svtools/qa/complex/ConfigItems/CheckConfigItems.java
+++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java
@@ -102,7 +102,7 @@ public class CheckConfigItems extends ComplexTestCase
         // create module manager
         m_xTest = (XJob)UnoRuntime.queryInterface(
                     XJob.class,
-                    m_xSmgr.createInstance("com.sun.star.comp.svtools.ConfigItemTest"));
+                    m_xSmgr.createInstance("com.sun.star.comp.svl.ConfigItemTest"));
     }
 
     //-------------------------------------------
diff --git a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
index d853bf926467..d853bf926467 100644
--- a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
index fc2f4681e4fe..58bb58f8c215 100644
--- a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
@@ -37,7 +37,7 @@
 #define  SVTOOLS_ACCESSIBILITYOPTTEST_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/accessibilityoptions.hxx>
+#include <svl/accessibilityoptions.hxx>
 
 namespace css = ::com::sun::star;
 
diff --git a/svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index b21d9d76755e..ad9dda313a5c 100644
--- a/svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
@@ -51,7 +51,7 @@
 //=============================================================================
 namespace css = ::com::sun::star;
 
-namespace svtools{
+namespace svl{
 
 //=============================================================================
 static const ::rtl::OUString PROP_TEST                  = ::rtl::OUString::createFromAscii("Test");
@@ -196,7 +196,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::getSupportedServi
 //=============================================================================
 ::rtl::OUString SAL_CALL ConfigItemTest::st_getImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.svtools.ConfigItemTest");
+    return ::rtl::OUString::createFromAscii("com.sun.star.comp.svl.ConfigItemTest");
 }
 
 //=============================================================================
@@ -215,15 +215,15 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ConfigItemTest::st_create(c
     return xObject;
 }
 
-} // namespace svtools
+} // namespace svl
 
 //=============================================================================
 static ::cppu::ImplementationEntry const lRegEntries[] =
 {
     {
-        &::svtools::ConfigItemTest::st_create,
-        &::svtools::ConfigItemTest::st_getImplementationName,
-        &::svtools::ConfigItemTest::st_getSupportedServiceNames,
+        &::svl::ConfigItemTest::st_create,
+        &::svl::ConfigItemTest::st_getImplementationName,
+        &::svl::ConfigItemTest::st_getSupportedServiceNames,
         &::cppu::createSingleComponentFactory, 0, 0
     },
 
diff --git a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index 723b3e44f3e5..082328835fca 100644
--- a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
@@ -34,7 +34,7 @@
  ************************************************************************/
 
 #include "HistoryOptTest.hxx"
-#include "configitems/historyoptions_const.hxx"
+#include <unotools/historyoptions_const.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
index fca9802d2781..8415d9f989b9 100644
--- a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
@@ -37,7 +37,7 @@
 #define  SVTOOLS_HISTORYOPTTEST_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 
 namespace css = ::com::sun::star;
 
diff --git a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
index 69504e4d5d7e..69504e4d5d7e 100644
--- a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
index 14d4267b8878..79505a4e6faf 100644
--- a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
@@ -37,7 +37,7 @@
 #define  SVTOOLS_PRINTOPTTEST_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/printoptions.hxx>
+#include <svl/printoptions.hxx>
 
 namespace css = ::com::sun::star;
 
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
index 14ee513ee0cb..14ee513ee0cb 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
index 8234b0b7edf4..72ff71cafe2d 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
@@ -37,7 +37,7 @@
 #define  SVTOOLS_USEROPTTEST_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 namespace css = ::com::sun::star;
 
diff --git a/svtools/qa/complex/ConfigItems/helper/exports.map b/svl/qa/complex/ConfigItems/helper/exports.map
index 85610ad80888..85610ad80888 100644
--- a/svtools/qa/complex/ConfigItems/helper/exports.map
+++ b/svl/qa/complex/ConfigItems/helper/exports.map
diff --git a/svtools/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index 6070d25b7bd4..d41fe6c129c6 100644
--- a/svtools/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/makefile.mk
@@ -34,7 +34,7 @@
 #*************************************************************************
 PRJ=..$/..$/..$/..
 
-PRJNAME=			svtools
+PRJNAME=			svl
 TARGET=				ConfigItemTest
 USE_DEFFILE=		TRUE
 ENABLE_EXCEPTIONS=	TRUE
@@ -60,7 +60,7 @@ SHL1OBJS=       \
                 $(SLO)$/ConfigItemTest.obj
 
 SHL1STDLIBS=	\
-                $(SVTOOLLIB) 						\
+                $(SVLIB) 						\
                 $(SVLLIB) 						    \
                 $(UNOTOOLSLIB)						\
                 $(COMPHELPERLIB)					\
diff --git a/svtools/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk
index f85c5b0a8e65..1291184346bc 100644
--- a/svtools/qa/complex/ConfigItems/makefile.mk
+++ b/svl/qa/complex/ConfigItems/makefile.mk
@@ -34,7 +34,7 @@
 #*************************************************************************
 PRJ = ..$/..$/..
 TARGET  = CheckConfigItems
-PRJNAME = svtools
+PRJNAME = svl
 PACKAGE = complex$/ConfigItems
 
 # --- Settings -----------------------------------------------------
diff --git a/svtools/qa/complex/passwordcontainer/MasterPasswdHandler.java b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java
index bf6159ee38c5..bf6159ee38c5 100644
--- a/svtools/qa/complex/passwordcontainer/MasterPasswdHandler.java
+++ b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java
diff --git a/svtools/qa/complex/passwordcontainer/PasswordContainerTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
index 5da0676f8bb9..5da0676f8bb9 100644
--- a/svtools/qa/complex/passwordcontainer/PasswordContainerTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
diff --git a/svtools/qa/complex/passwordcontainer/PasswordContainerUnitTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
index aee1c9355a3f..aee1c9355a3f 100644
--- a/svtools/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
diff --git a/svtools/qa/complex/passwordcontainer/Test01.java b/svl/qa/complex/passwordcontainer/Test01.java
index 6de96de05ec9..6de96de05ec9 100644
--- a/svtools/qa/complex/passwordcontainer/Test01.java
+++ b/svl/qa/complex/passwordcontainer/Test01.java
diff --git a/svtools/qa/complex/passwordcontainer/Test02.java b/svl/qa/complex/passwordcontainer/Test02.java
index 5d65d8090cf9..5d65d8090cf9 100644
--- a/svtools/qa/complex/passwordcontainer/Test02.java
+++ b/svl/qa/complex/passwordcontainer/Test02.java
diff --git a/svtools/qa/complex/passwordcontainer/Test03.java b/svl/qa/complex/passwordcontainer/Test03.java
index 69de8b88578b..69de8b88578b 100644
--- a/svtools/qa/complex/passwordcontainer/Test03.java
+++ b/svl/qa/complex/passwordcontainer/Test03.java
diff --git a/svtools/qa/complex/passwordcontainer/TestHelper.java b/svl/qa/complex/passwordcontainer/TestHelper.java
index 0f83a9ef9963..0f83a9ef9963 100644
--- a/svtools/qa/complex/passwordcontainer/TestHelper.java
+++ b/svl/qa/complex/passwordcontainer/TestHelper.java
diff --git a/svtools/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk
index 4ce811bd3616..c3ff7538af0f 100644
--- a/svtools/qa/complex/passwordcontainer/makefile.mk
+++ b/svl/qa/complex/passwordcontainer/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ = ..$/..$/..
 TARGET  = PasswordContainerUnitTest
-PRJNAME = svtools
+PRJNAME=svl
 PACKAGE = complex$/passwordcontainer
 
 # --- Settings -----------------------------------------------------
diff --git a/svtools/qa/export.map b/svl/qa/export.map
index 80373c145ac1..80373c145ac1 100755
--- a/svtools/qa/export.map
+++ b/svl/qa/export.map
diff --git a/svtools/qa/makefile.mk b/svl/qa/makefile.mk
index cbb59a0d10ac..439277ea62b0 100644
--- a/svtools/qa/makefile.mk
+++ b/svl/qa/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 PRJ = ..
-PRJNAME = svtools
+PRJNAME=svl
 TARGET = qa
 
 ENABLE_EXCEPTIONS = true
@@ -40,7 +40,7 @@ ENABLE_EXCEPTIONS = true
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl 
+# auto generated Target:job by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/test_URIHelper.obj
 
@@ -49,10 +49,11 @@ SHL1STDLIBS=\
      $(CPPULIB) \
      $(CPPUHELPERLIB) \
      $(SALLIB) \
-     $(SVTOOLLIB) \
+     $(SVLLIB) \
      $(TOOLSLIB) \
      $(UNOTOOLSLIB) \
-   $(CPPUNITLIB) 
+     $(TESTSHL2LIB)    \
+     $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -71,15 +72,15 @@ SHL1VERSIONMAP= export.map
 
 # LLA: old stuff
 # USE_DEFFILE = true
-# 
+#
 # .INCLUDE: settings.mk
-# 
+#
 # .IF "$(OS)" == "WNT"
 # REGEXP = "s/^[\#].*$$//"
 # .ELSE # OS, WNT
 # REGEXP = 's/^[\#].*$$//'
 # .ENDIF # OS, WNT
-# 
+#
 # SHL1TARGET = URIHelper
 # SHL1OBJS = \
 # 	$(SLO)$/test_URIHelper.obj
@@ -90,12 +91,12 @@ SHL1VERSIONMAP= export.map
 #     $(SVTOOLLIB) \
 #     $(TOOLSLIB) \
 #     $(UNOTOOLSLIB)
-# 
+#
 # DEF1NAME = $(SHL1TARGET)
 # DEF1EXPORTFILE = $(MISC)$/$(SHL1TARGET).dxp
-# 
+#
 # .INCLUDE: target.mk
-# 
+#
 # $(MISC)$/$(SHL1TARGET).dxp: sce$/$(SHL1TARGET).sce
 #     + $(TYPE) $< | sed $(REGEXP) > $@
 #     + $(TYPE) $@ | sed "s/^/test_/" > $(MISC)$/$(SHL1TARGET).tst
diff --git a/svtools/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx
index d60780132903..3cf6d30d1813 100644
--- a/svtools/qa/test_URIHelper.cxx
+++ b/svl/qa/test_URIHelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "sal/config.h"
 
@@ -57,7 +57,7 @@
 #include "cppuhelper/bootstrap.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implbase2.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "rtl/strbuf.hxx"
 #include "rtl/string.h"
diff --git a/svtools/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 66d70cd1e2a3..c149c91c86f5 100644
--- a/svtools/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -29,16 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
+#include <svl/cjkoptions.hxx>
 
-#include <svtools/cjkoptions.hxx>
-
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <i18npool/lang.h>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -173,6 +168,7 @@ void    SvtCJKOptions_Impl::SetAll(sal_Bool bSet)
 
         SetModified();
         Commit();
+        NotifyListeners(0);
     }
 }
 /*-- 10.04.01 12:41:56---------------------------------------------------
@@ -245,6 +241,7 @@ void SvtCJKOptions_Impl::Load()
 void    SvtCJKOptions_Impl::Notify( const Sequence< OUString >& )
 {
     Load();
+    NotifyListeners(0);
 }
 /*-- 10.04.01 12:41:57---------------------------------------------------
 
diff --git a/svtools/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 5d2bf131add1..a776bc4b807c 100644
--- a/svtools/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -29,16 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
+#include <svl/ctloptions.hxx>
 
-#include <svtools/ctloptions.hxx>
-
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -46,10 +41,9 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/smplhint.hxx>
-#include <vcl/svapp.hxx>
+#include <svl/smplhint.hxx>
 #include <rtl/instance.hxx>
-
+#include <unotools/syslocale.hxx>
 #include <itemholder2.hxx>
 
 using namespace ::com::sun::star;
@@ -60,7 +54,7 @@ using namespace ::com::sun::star::uno;
 
 // SvtCJKOptions_Impl ----------------------------------------------------------
 
-class SvtCTLOptions_Impl : public utl::ConfigItem, public SfxBroadcaster
+class SvtCTLOptions_Impl : public utl::ConfigItem
 {
 private:
     sal_Bool                        m_bIsLoaded;
@@ -160,7 +154,7 @@ SvtCTLOptions_Impl::~SvtCTLOptions_Impl()
 void SvtCTLOptions_Impl::Notify( const Sequence< rtl::OUString >& )
 {
     Load();
-    Broadcast(SfxSimpleHint(SFX_HINT_CTL_SETTINGS_CHANGED));
+    NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED);
 }
 // -----------------------------------------------------------------------------
 void SvtCTLOptions_Impl::Commit()
@@ -252,7 +246,7 @@ void SvtCTLOptions_Impl::Commit()
     aValues.realloc(nRealCount);
     PutProperties( aNames, aValues );
     //broadcast changes
-    Broadcast(SfxSimpleHint(SFX_HINT_CTL_SETTINGS_CHANGED));
+    NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED);
 }
 // -----------------------------------------------------------------------------
 void SvtCTLOptions_Impl::Load()
@@ -314,7 +308,7 @@ void SvtCTLOptions_Impl::Load()
             ((eSystemLanguage != LANGUAGE_SYSTEM)  && ( nWinScript & SCRIPTTYPE_COMPLEX )))  )
     {
         m_bCTLFontEnabled = sal_True;
-        sal_uInt16 nLanguage = Application::GetSettings().GetLanguage();
+        sal_uInt16 nLanguage = SvtSysLocale().GetLanguage();
         //enable sequence checking for the appropriate languages
         m_bCTLSequenceChecking = m_bCTLRestricted = m_bCTLTypeAndReplace =
             (MsLangId::needsSequenceChecking( nLanguage) ||
@@ -330,6 +324,7 @@ void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
     {
         m_bCTLFontEnabled = _bEnabled;
         SetModified();
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -339,6 +334,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
     {
         SetModified();
         m_bCTLSequenceChecking = _bEnabled;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -348,6 +344,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled )
     {
         SetModified();
         m_bCTLRestricted = _bEnabled;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -357,6 +354,7 @@ void  SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnabl
     {
         SetModified();
         m_bCTLTypeAndReplace = _bEnabled;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -366,6 +364,7 @@ void SvtCTLOptions_Impl::SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eM
     {
         SetModified();
         m_eCTLCursorMovement = _eMovement;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -375,6 +374,7 @@ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumer
     {
         SetModified();
         m_eCTLTextNumerals = _eNumerals;
+        NotifyListeners(0);
     }
 }
 // global ----------------------------------------------------------------
@@ -399,7 +399,7 @@ SvtCTLOptions::SvtCTLOptions( sal_Bool bDontLoad )
 
     ++nCTLRefCount;
     m_pImp = pCTLOptions;
-    StartListening( *m_pImp);
+    m_pImp->AddListener(this);
 }
 
 // -----------------------------------------------------------------------
@@ -409,6 +409,7 @@ SvtCTLOptions::~SvtCTLOptions()
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( CTLMutex::get() );
 
+    m_pImp->RemoveListener(this);
     if ( !--nCTLRefCount )
         DELETEZ( pCTLOptions );
 }
@@ -490,14 +491,5 @@ sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->IsReadOnly(eOption);
 }
-/* -----------------30.04.2003 10:40-----------------
-
- --------------------------------------------------*/
-void SvtCTLOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
-    Broadcast( rHint );
-}
-
 // -----------------------------------------------------------------------------
 
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
new file mode 100644
index 000000000000..695c6598140c
--- /dev/null
+++ b/svl/source/config/itemholder2.cxx
@@ -0,0 +1,182 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: itemholder2.cxx,v $
+ * $Revision: 1.13 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svl.hxx"
+
+#include "itemholder2.hxx"
+
+//-----------------------------------------------
+// includes
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XComponent.hpp>
+
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <unotools/options.hxx>
+
+#include <tools/debug.hxx>
+
+//-----------------------------------------------
+// namespaces
+
+namespace css = ::com::sun::star;
+
+//-----------------------------------------------
+// declarations
+
+//-----------------------------------------------
+ItemHolder2::ItemHolder2()
+    : ItemHolderMutexBase()
+{
+    try
+    {
+        css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
+        css::uno::Reference< css::lang::XComponent > xCfg(
+            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            css::uno::UNO_QUERY);
+        if (xCfg.is())
+            xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
+    }
+// #i37892  got errorhandling from   ConfigManager::GetConfigurationProvider()
+    catch(css::uno::RuntimeException& rREx)
+    {
+        throw rREx;
+    }
+#ifdef DBG_UTIL
+    catch(css::uno::Exception& rEx)
+    {
+        static sal_Bool bMessage = sal_True;
+        if(bMessage)
+        {
+            bMessage = sal_False;
+            ::rtl::OString sMsg("CreateInstance with arguments exception: ");
+            sMsg += ::rtl::OString(rEx.Message.getStr(),
+                        rEx.Message.getLength(),
+                        RTL_TEXTENCODING_ASCII_US);
+            DBG_ERROR(sMsg.getStr());
+        }
+    }
+#else
+    catch(css::uno::Exception&){}
+#endif
+}
+
+//-----------------------------------------------
+ItemHolder2::~ItemHolder2()
+{
+    impl_releaseAllItems();
+}
+
+//-----------------------------------------------
+void ItemHolder2::holdConfigItem(EItem eItem)
+{
+    static ItemHolder2* pHolder = new ItemHolder2();
+    pHolder->impl_addItem(eItem);
+}
+
+//-----------------------------------------------
+void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&)
+    throw(css::uno::RuntimeException)
+{
+    impl_releaseAllItems();
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_addItem(EItem eItem)
+{
+    ::osl::ResettableMutexGuard aLock(m_aLock);
+
+    TItems::const_iterator pIt;
+    for (  pIt  = m_lItems.begin();
+           pIt != m_lItems.end()  ;
+         ++pIt                    )
+    {
+        const TItemInfo& rInfo = *pIt;
+        if (rInfo.eItem == eItem)
+            return;
+    }
+
+    TItemInfo aNewItem;
+    aNewItem.eItem = eItem;
+    impl_newItem(aNewItem);
+    if (aNewItem.pItem)
+        m_lItems.push_back(aNewItem);
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_releaseAllItems()
+{
+    ::osl::ResettableMutexGuard aLock(m_aLock);
+
+    TItems::iterator pIt;
+    for (  pIt  = m_lItems.begin();
+           pIt != m_lItems.end()  ;
+         ++pIt                    )
+    {
+        TItemInfo& rInfo = *pIt;
+        impl_deleteItem(rInfo);
+    }
+    m_lItems.clear();
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_newItem(TItemInfo& rItem)
+{
+    switch(rItem.eItem)
+    {
+        case E_CJKOPTIONS :
+            rItem.pItem = new SvtCJKOptions();
+            break;
+
+        case E_CTLOPTIONS :
+            rItem.pItem = new SvtCTLOptions();
+            break;
+
+        case E_LANGUAGEOPTIONS :
+// capsulate CTL and CJL options !            rItem.pItem = new SvtLanguageOptions();
+            break;
+
+        default:
+            OSL_ASSERT(false);
+            break;
+    }
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_deleteItem(TItemInfo& rItem)
+{
+    if (rItem.pItem)
+    {
+        delete rItem.pItem;
+        rItem.pItem = 0;
+    }
+}
diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
new file mode 100644
index 000000000000..192df8f746c9
--- /dev/null
+++ b/svl/source/config/itemholder2.hxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: itemholder2.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
+#define INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
+
+//-----------------------------------------------
+// includes
+
+#include <unotools/itemholderbase.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/lang/XEventListener.hpp>
+
+//-----------------------------------------------
+// namespaces
+
+#ifdef css
+#error "Cant use css as namespace alias."
+#else
+#define css ::com::sun::star
+#endif
+
+//-----------------------------------------------
+// definitions
+
+class ItemHolder2 : private ItemHolderMutexBase
+                  , public  ::cppu::WeakImplHelper1< css::lang::XEventListener >
+{
+    //...........................................
+    // member
+    private:
+
+        TItems m_lItems;
+
+    //...........................................
+    // c++ interface
+    public:
+
+        ItemHolder2();
+        virtual ~ItemHolder2();
+        static void holdConfigItem(EItem eItem);
+
+    //...........................................
+    // uno interface
+    public:
+
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
+            throw(css::uno::RuntimeException);
+
+    //...........................................
+    // helper
+    private:
+
+        void impl_addItem(EItem eItem);
+        void impl_releaseAllItems();
+        void impl_newItem(TItemInfo& rItem);
+        void impl_deleteItem(TItemInfo& rItem);
+};
+
+//-----------------------------------------------
+// namespaces
+
+#undef css
+
+#endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
diff --git a/svtools/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 0dffafee86d2..f16c0b6add49 100644
--- a/svtools/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -29,23 +29,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
-#include <svtools/languageoptions.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/ctloptions.hxx>
-#include <vcl/svapp.hxx>
+#include <svl/languageoptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <i18npool/mslangid.hxx>
 #include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <unotools/syslocale.hxx>
 
 using namespace ::com::sun::star;
 // global ----------------------------------------------------------------------
@@ -61,7 +55,8 @@ SvtLanguageOptions::SvtLanguageOptions( sal_Bool _bDontLoad )
 
     m_pCJKOptions = new SvtCJKOptions( _bDontLoad );
     m_pCTLOptions = new SvtCTLOptions( _bDontLoad );
-    StartListening(*m_pCTLOptions);
+    m_pCTLOptions->AddListener(this);
+    m_pCJKOptions->AddListener(this);
 }
 //------------------------------------------------------------------------------
 SvtLanguageOptions::~SvtLanguageOptions()
@@ -69,6 +64,9 @@ SvtLanguageOptions::~SvtLanguageOptions()
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( ALMutex::get() );
 
+    m_pCTLOptions->RemoveListener(this);
+    m_pCJKOptions->RemoveListener(this);
+
     delete m_pCJKOptions;
     delete m_pCTLOptions;
 }
@@ -205,23 +203,15 @@ sal_Bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) con
     }
     return bReadOnly;
 }
-/* -----------------30.04.2003 11:03-----------------
-
- --------------------------------------------------*/
-void SvtLanguageOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
-    Broadcast( rHint );
-}
+/* -----------------30.04.2003 11:03-----------------*/
 
-// -----------------------------------------------------------------------------
 // returns for a language the scripttype
 sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang )
 {
     if( LANGUAGE_DONTKNOW == nLang )
         nLang = LANGUAGE_ENGLISH_US;
     else if( LANGUAGE_SYSTEM == nLang  )
-        nLang = Application::GetSettings().GetLanguage();
+        nLang = SvtSysLocale().GetLanguage();
 
     sal_Int16 nScriptType = MsLangId::getScriptType( nLang );
     USHORT nScript;
@@ -270,6 +260,12 @@ void    SvtSystemLanguageOptions::Commit()
 {
     //does nothing
 }
+
+void    SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+    // no listeners supported yet
+}
+
 /*-- 27.10.2005 08:36:14---------------------------------------------------
 
   -----------------------------------------------------------------------*/
diff --git a/sandbox/test/com/sun/star/lib/sandbox/makefile.mk b/svl/source/config/makefile.mk
index 1216817d4bf7..82c4ae12828f 100644
--- a/sandbox/test/com/sun/star/lib/sandbox/makefile.mk
+++ b/svl/source/config/makefile.mk
@@ -1,14 +1,14 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.3 $
+# $Revision: 1.61 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -28,26 +28,25 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+PRJ=..$/..
+
+PRJNAME=svl
+TARGET=config
 
-PRJ 	= ..$/..$/..$/..$/..$/..
-PRJNAME = sandbox
-TARGET  = lib_sandbox
-PACKAGE = com$/sun$/star$/lib$/sandbox
+ENABLE_EXCEPTIONS := TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-
-JARFILES=
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
 
 # --- Files --------------------------------------------------------
 
-JAVAFILES=						    \
-    ResourceTest.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-RC_SUBDIRSDEPS=$(JAVATARGET)
+SLOFILES=  \
+        $(SLO)$/cjkoptions.obj          \
+        $(SLO)$/ctloptions.obj          \
+        $(SLO)$/itemholder2.obj \
+        $(SLO)$/languageoptions.obj  
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk
index d00ac5170e1a..644c70af0b1a 100644
--- a/svtools/source/filepicker/makefile.mk
+++ b/svl/source/filepicker/makefile.mk
@@ -30,7 +30,7 @@
 #*************************************************************************
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=filepicker
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/svtools/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx
index 0d8b2db9d8a0..cda263338d5d 100644
--- a/svtools/source/filepicker/pickerhelper.cxx
+++ b/svl/source/filepicker/pickerhelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "pickerhelper.hxx"
 #include "rtl/ustring.hxx"
diff --git a/svtools/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx
index 5bd584618f09..5cc12779f0b5 100644
--- a/svtools/source/filepicker/pickerhistory.cxx
+++ b/svl/source/filepicker/pickerhistory.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include "pickerhistory.hxx"
 #include "pickerhistoryaccess.hxx"
 #include <cppuhelper/weakref.hxx>
diff --git a/svtools/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index 262e5135572a..ac35a748eef7 100644
--- a/svtools/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/filerec.hxx>
+#include "precompiled_svl.hxx"
+#include <svl/filerec.hxx>
 #include <osl/endian.h>
 
 //========================================================================
diff --git a/svtools/source/filerec/makefile.mk b/svl/source/filerec/makefile.mk
index 33e4b4923183..c590e38a7ea1 100644
--- a/svtools/source/filerec/makefile.mk
+++ b/svl/source/filerec/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=filerec
 
 # --- Settings -----------------------------------------------------
diff --git a/svtools/source/fsstor/exports.map b/svl/source/fsstor/exports.map
index f4ed78b9e970..f4ed78b9e970 100644
--- a/svtools/source/fsstor/exports.map
+++ b/svl/source/fsstor/exports.map
diff --git a/svtools/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 33df962be846..e47593ba8f8b 100644
--- a/svtools/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "fsfactory.hxx"
 #include "cppuhelper/factory.hxx"
diff --git a/svtools/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index cec018533a9a..bae02feae1dd 100644
--- a/svtools/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
diff --git a/svtools/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 670a6917dd40..670a6917dd40 100644
--- a/svtools/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
diff --git a/svtools/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
index f55f6747f9e1..7f46009750fd 100644
--- a/svtools/source/fsstor/makefile.mk
+++ b/svl/source/fsstor/makefile.mk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 PRJ=..$/..
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=fsstorage.uno
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
diff --git a/svtools/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index dc08a7a34602..53be03699ba0 100644
--- a/svtools/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "oinputstreamcontainer.hxx"
 #include <cppuhelper/typeprovider.hxx>
diff --git a/svtools/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index 308f4283b430..308f4283b430 100644
--- a/svtools/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
diff --git a/svtools/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index d801f49532b2..dac7c9c31375 100644
--- a/svtools/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "ostreamcontainer.hxx"
 
diff --git a/svtools/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index 6198587c3d35..6198587c3d35 100644
--- a/svtools/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
diff --git a/svtools/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index 5954ecebabc2..5954ecebabc2 100644
--- a/svtools/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
diff --git a/svtools/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index a067672f3cf6..a067672f3cf6 100644
--- a/svtools/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
diff --git a/svtools/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index fb30fc04832d..0018b403796f 100644
--- a/svtools/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 
 #ifndef DELETEZ
diff --git a/svtools/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 63fbd1db6227..55dc818d0160 100644
--- a/svtools/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -29,16 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
 #include <tools/string.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/svarray.hxx>
+#include <svl/aeitem.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svtools/source/items1/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 1906e62a8cf8..3c2f7764a351 100644
--- a/svtools/source/items1/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
-#include <svtools/cenumitm.hxx>
+#include <svl/cenumitm.hxx>
 #include <whassert.hxx>
 
 #ifndef _CPPUHELPER_EXTRACT_HXX_
diff --git a/svtools/source/items1/cintitem.cxx b/svl/source/items/cintitem.cxx
index 97cce9b75591..9d9d58421fc4 100644
--- a/svtools/source/items1/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
-#include <svtools/cintitem.hxx>
+#include <svl/cintitem.hxx>
 
 //============================================================================
 //
diff --git a/svtools/source/items1/cntwall.cxx b/svl/source/items/cntwall.cxx
index 67e9387fbe26..824ad6b2b5b0 100644
--- a/svtools/source/items1/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 
-#include <svtools/cntwall.hxx>
+#include <svl/cntwall.hxx>
 
 #define CNTWALLPAPERITEM_STREAM_MAGIC   ( (UINT32)0xfefefefe )
 #define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( UINT32 ) ) ) )
diff --git a/svtools/source/misc/config.src b/svl/source/items/cstitem.src
index e11aeb86f402..54951dd3761e 100644
--- a/svtools/source/misc/config.src
+++ b/svl/source/items/cstitem.src
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: config.src,v $
- * $Revision: 1.29 $
+ * $RCSfile: cstitem.src,v $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,11 +28,10 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
-
-String STR_WARNING_ITEM
+#include <svl/svtools.hrc>
+String STR_COLUM_DT_AUTO
 {
-    Text [ en-US ] = "Incorrect Version!" ;
+    Text [ en-US ] = "automatic" ;
 };
 
 
@@ -64,3 +63,10 @@ String STR_WARNING_ITEM
 
 
 
+
+
+
+
+
+
+
diff --git a/svtools/source/items1/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 552d4a6a9041..69302ebdb868 100644
--- a/svtools/source/items1/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <com/sun/star/uno/Any.hxx>
 
 #include <unotools/intlwrapper.hxx>
 #include <tools/stream.hxx>
-#include <svtools/ctypeitm.hxx>
+#include <svl/ctypeitm.hxx>
 
 //============================================================================
 // The following defines are copied from chaos/source/items/cstritem.cxx:
diff --git a/svtools/source/items1/custritm.cxx b/svl/source/items/custritm.cxx
index 9f573beb56fd..8687aafbae49 100644
--- a/svtools/source/items1/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <com/sun/star/uno/Any.hxx>
 
 #include <unotools/intlwrapper.hxx>
 #include <tools/stream.hxx>
-#include <svtools/custritm.hxx>
+#include <svl/custritm.hxx>
 
 //============================================================================
 //
diff --git a/svtools/source/items1/dateitem.cxx b/svl/source/items/dateitem.cxx
index 4ba6e1d460f9..d6ef8fdc7c9e 100644
--- a/svtools/source/items1/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -29,17 +29,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 // include ---------------------------------------------------------------
 
 #define _DATETIMEITEM_CXX
-#include <svtools/dateitem.hxx>
+#include <svl/dateitem.hxx>
+#include <svl/svldata.hxx>
+#include <svl/svtools.hrc>
 
 #include <unotools/intlwrapper.hxx>
 #include <comphelper/processfactory.hxx>
 
-
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <tools/datetime.hxx>
@@ -48,11 +49,6 @@
 #include <com/sun/star/lang/Locale.hpp>
 
 
-#include <vcl/svapp.hxx>
-
-#include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
-
 // STATIC DATA -----------------------------------------------------------
 
 DBG_NAME(SfxDateTimeItem)
@@ -259,10 +255,12 @@ SfxItemPresentation SfxColumnDateTimeItem::GetPresentation
 
     ::com::sun::star::lang::Locale aLocale;
     if (GetDateTime() == DateTime(Date(1, 2, 3), Time(3, 2, 1)))
-        rText = String(SvtResId(STR_COLUM_DT_AUTO,
+    {
+        rText = String(SvtSimpleResId(STR_COLUM_DT_AUTO,
                                 pIntlWrapper ?
                                  pIntlWrapper->getLocale() :
                                  aLocale));
+    }
     else if (pIntlWrapper)
     {
         rText = pIntlWrapper->getLocaleData()->getDate(GetDateTime());
diff --git a/svtools/source/items/eitem.cxx b/svl/source/items/eitem.cxx
index f7b95665391d..16d5aae5a16f 100644
--- a/svtools/source/items/eitem.cxx
+++ b/svl/source/items/eitem.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/eitem.hxx>
+#include "precompiled_svl.hxx"
+#include <svl/eitem.hxx>
 //============================================================================
 //
 //  class SfxEnumItem
diff --git a/svtools/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index e59f981c5afa..537632db04ff 100644
--- a/svtools/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/flagitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/flagitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/stream.hxx>
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svtools/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 6a8359fb39b8..1b676a95bf71 100644
--- a/svtools/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/script/XTypeConverter.hpp>
@@ -38,7 +38,7 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <svtools/globalnameitem.hxx>
+#include <svl/globalnameitem.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svtools/source/items1/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index a26c054eeadb..4d2cb0a3b5b9 100644
--- a/svtools/source/items1/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -29,16 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <comphelper/processfactory.hxx>
 
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 TYPEINIT1_AUTOFACTORY(SfxIntegerListItem, SfxPoolItem);
 
diff --git a/svtools/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index cc4a2ebd4f3b..dec2626472cc 100644
--- a/svtools/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/imageitm.hxx>
+#include <svl/imageitm.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 TYPEINIT1( SfxImageItem, SfxInt16Item );
diff --git a/svtools/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index b20f245f964b..1133cdf553d1 100644
--- a/svtools/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/bigint.hxx>
 #include <tools/stream.hxx>
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 
 //============================================================================
 //
diff --git a/svtools/source/items1/itemiter.cxx b/svl/source/items/itemiter.cxx
index 9a7fa4d72c88..c8c6eea67c82 100644
--- a/svtools/source/items1/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #ifndef GCC
 #endif
 
-#include <svtools/itemiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svtools/source/items1/itempool.cxx b/svl/source/items/itempool.cxx
index e54bca8d3c19..5f34560e8471 100644
--- a/svtools/source/items1/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -29,17 +29,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <string.h>
 #include <stdio.h>
 #ifndef GCC
 #endif
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include "whassert.hxx"
-#include <svtools/brdcst.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/smplhint.hxx>
 #include "poolio.hxx"
 #include <algorithm>
 
@@ -589,7 +589,7 @@ void SfxItemPool::Delete()
                     for ( USHORT n = (*ppItemArr)->Count(); n; --n, ++ppHtArr )
                         if (*ppHtArr)
                         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                             ReleaseRef( **ppHtArr, (*ppHtArr)->GetRefCount() );
 #endif
                             delete *ppHtArr;
@@ -598,7 +598,7 @@ void SfxItemPool::Delete()
                 }
                 if ( *ppDefaultItem )
                 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     SetRefCount( **ppDefaultItem, 0 );
 #endif
                     DELETEZ( *ppDefaultItem );
@@ -621,7 +621,7 @@ void SfxItemPool::Delete()
             for ( USHORT n = (*ppItemArr)->Count(); n; --n, ++ppHtArr )
                 if (*ppHtArr)
                 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ReleaseRef( **ppHtArr, (*ppHtArr)->GetRefCount() );
 #endif
                     delete *ppHtArr;
@@ -630,7 +630,7 @@ void SfxItemPool::Delete()
         }
         if ( *ppDefaultItem )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             SetRefCount( **ppDefaultItem, 0 );
 #endif
             delete *ppDefaultItem;
diff --git a/svtools/source/items1/itemprop.cxx b/svl/source/items/itemprop.cxx
index 354e0a1441ba..3add3f466495 100644
--- a/svtools/source/items1/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/itemprop.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <hash_map>
 /*************************************************************************
@@ -43,7 +43,7 @@ using namespace com::sun::star;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
-using namespace ::rtl;
+
 /*-- 16.02.2009 10:03:55---------------------------------------------------
 
   -----------------------------------------------------------------------*/
@@ -262,7 +262,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
 /* -----------------------------06.06.01 12:32--------------------------------
 
  ---------------------------------------------------------------------------*/
-void SfxItemPropertySet::getPropertyValue( const OUString &rName,
+void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
             const SfxItemSet& rSet, Any& rAny ) const
                         throw(RuntimeException, UnknownPropertyException)
 {
@@ -275,7 +275,7 @@ void SfxItemPropertySet::getPropertyValue( const OUString &rName,
 /* -----------------------------21.02.00 11:26--------------------------------
 
  ---------------------------------------------------------------------------*/
-Any SfxItemPropertySet::getPropertyValue( const OUString &rName,
+Any SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
             const SfxItemSet& rSet ) const
                         throw(RuntimeException, UnknownPropertyException)
 {
@@ -327,7 +327,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
 /* -----------------------------21.02.00 11:26--------------------------------
 
  ---------------------------------------------------------------------------*/
-void SfxItemPropertySet::setPropertyValue( const OUString &rName,
+void SfxItemPropertySet::setPropertyValue( const rtl::OUString &rName,
                                             const Any& aVal,
                                             SfxItemSet& rSet ) const
                                             throw(RuntimeException,
@@ -360,7 +360,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
     return eRet;
 }
 PropertyState   SfxItemPropertySet::getPropertyState(
-                                const OUString& rName, const SfxItemSet& rSet) const
+    const rtl::OUString& rName, const SfxItemSet& rSet) const
                                     throw(UnknownPropertyException)
 {
     PropertyState eRet = PropertyState_DIRECT_VALUE;
@@ -489,7 +489,7 @@ Sequence< Property > SAL_CALL
 
  ---------------------------------------------------------------------------*/
 Property SAL_CALL
-        SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName )
+SfxExtItemPropertySetInfo::getPropertyByName( const rtl::OUString& rPropertyName )
             throw(UnknownPropertyException, RuntimeException)
 {
     return aExtMap.getPropertyByName( rPropertyName );
@@ -498,7 +498,7 @@ Property SAL_CALL
 
  ---------------------------------------------------------------------------*/
 sal_Bool SAL_CALL
-        SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName )
+SfxExtItemPropertySetInfo::hasPropertyByName( const rtl::OUString& rPropertyName )
             throw(RuntimeException)
 {
     return aExtMap.hasPropertyByName( rPropertyName );
diff --git a/svtools/source/items1/itemset.cxx b/svl/source/items/itemset.cxx
index fee00dca854a..45516660ee21 100644
--- a/svtools/source/items1/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <string.h>
 
@@ -43,12 +43,12 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
 
-#include <svtools/svstdarr.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
 #include "whiter.hxx"
-#include <svtools/nranges.hxx>
+#include <svl/nranges.hxx>
 #include "whassert.hxx"
 
 #include <tools/stream.hxx>
diff --git a/svtools/source/items1/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index c848e377b257..04e2edb70026 100644
--- a/svtools/source/items1/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #define _LCKBITEM_CXX
-#include <svtools/lckbitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/cachestr.hxx>
diff --git a/svtools/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 480fb844ccc7..511ca2bba57c 100644
--- a/svtools/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/stream.hxx>
 
 #ifndef GCC
 #endif
 
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svtools/source/items1/makefile.mk b/svl/source/items/makefile.mk
index 9a7d13ff7d0f..d779e16e24d1 100644
--- a/svtools/source/items1/makefile.mk
+++ b/svl/source/items/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.13 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -30,8 +30,8 @@
 #*************************************************************************
 
 PRJ=..$/..
-PRJNAME=svtools
-TARGET=items1
+PRJNAME=svl
+TARGET=items
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -42,32 +42,40 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files --------------------------------------------------------
 
 SLOFILES=\
-    $(SLO)$/bintitem.obj	\
+    $(SLO)$/aeitem.obj	\
     $(SLO)$/cenumitm.obj	\
     $(SLO)$/cintitem.obj	\
     $(SLO)$/cntwall.obj	\
-    $(SLO)$/cstitem.obj	\
     $(SLO)$/ctypeitm.obj	\
     $(SLO)$/custritm.obj	\
-    $(SLO)$/dateitem.obj	\
-    $(SLO)$/dtritem.obj	\
-    $(SLO)$/frqitem.obj	\
+    $(SLO)$/dateitem.obj \
+    $(SLO)$/eitem.obj	\
+    $(SLO)$/flagitem.obj	\
+    $(SLO)$/globalnameitem.obj	\
     $(SLO)$/ilstitem.obj    \
+    $(SLO)$/imageitm.obj    \
+    $(SLO)$/intitem.obj	\
     $(SLO)$/itemiter.obj	\
     $(SLO)$/itempool.obj	\
     $(SLO)$/itemprop.obj	\
     $(SLO)$/itemset.obj	\
     $(SLO)$/lckbitem.obj	\
+    $(SLO)$/macitem.obj	\
+    $(SLO)$/poolcach.obj	\
     $(SLO)$/poolio.obj	\
-    $(SLO)$/stylepool.obj	\
     $(SLO)$/poolitem.obj	\
+    $(SLO)$/ptitem.obj	\
+    $(SLO)$/rectitem.obj	\
+    $(SLO)$/rngitem.obj	\
     $(SLO)$/sfontitm.obj	\
     $(SLO)$/sitem.obj	    \
     $(SLO)$/slstitm.obj	\
-    $(SLO)$/tfrmitem.obj	\
-    $(SLO)$/tresitem.obj	\
-    $(SLO)$/whiter.obj \
-    $(SLO)$/visitem.obj
+    $(SLO)$/stritem.obj	\
+    $(SLO)$/style.obj	\
+    $(SLO)$/stylepool.obj	\
+    $(SLO)$/szitem.obj \
+    $(SLO)$/visitem.obj \
+    $(SLO)$/whiter.obj 
 
 SRS1NAME=$(TARGET)
 SRC1FILES=\
diff --git a/svtools/source/items1/nranges.cxx b/svl/source/items/nranges.cxx
index e12c7428d513..789da8dc5ff9 100644
--- a/svtools/source/items1/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 // compiled via include from itemset.cxx only!
 
diff --git a/svtools/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 2c758a7e25fa..e64325213ff4 100644
--- a/svtools/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -29,15 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <limits.h>
 
 #ifndef GCC
 #endif
 
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include "poolcach.hxx"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svtools/source/items1/poolio.cxx b/svl/source/items/poolio.cxx
index f2eb94ef7f67..4383ac99d2ed 100644
--- a/svtools/source/items1/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <string.h>
 #include <stdio.h>
@@ -38,11 +38,11 @@
 #endif
 
 #include <tools/solar.h>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include "whassert.hxx"
-#include <svtools/brdcst.hxx>
-#include <svtools/filerec.hxx>
-#include <svtools/svtdata.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/filerec.hxx>
+#include <svl/svldata.hxx>
 #include "poolio.hxx"
 
 // STATIC DATA -----------------------------------------------------------
@@ -67,7 +67,7 @@ void SfxItemPool::SetStoringPool( const SfxItemPool *pStoringPool )
 */
 
 {
-    ImpSvtData::GetSvtData().pStoringPool = pStoringPool;
+    ImpSvlData::GetSvlData().pStoringPool = pStoringPool;
 }
 
 //-------------------------------------------------------------------------
@@ -84,7 +84,7 @@ const SfxItemPool* SfxItemPool::GetStoringPool()
 */
 
 {
-    return ImpSvtData::GetSvtData().pStoringPool;
+    return ImpSvlData::GetSvlData().pStoringPool;
 }
 
 //-------------------------------------------------------------------------
@@ -169,7 +169,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
 
     // jeder Pool ist als ganzes ein Record
     SfxMiniRecordWriter aPoolRec( &rStream, SFX_ITEMPOOL_REC );
-    ImpSvtData::GetSvtData().pStoringPool = this;
+    ImpSvlData::GetSvlData().pStoringPool = this;
 
     // Einzel-Header (Version des Inhalts und Name)
     {
@@ -309,7 +309,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
     }
 
     // weitere Pools rausschreiben
-    ImpSvtData::GetSvtData().pStoringPool = 0;
+    ImpSvlData::GetSvlData().pStoringPool = 0;
     aPoolRec.Close();
     if ( !rStream.GetError() && pSecondary )
         pSecondary->Store( rStream );
diff --git a/svtools/source/items1/poolitem.cxx b/svl/source/items/poolitem.cxx
index ef160b4a8b4c..4957c5c16945 100644
--- a/svtools/source/items1/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/stream.hxx>
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svtools/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index ac1e94fd1727..30fef0227397 100644
--- a/svtools/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <tools/stream.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "memberid.hrc"
 
 using namespace ::com::sun::star;
diff --git a/svtools/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index f9faeeeaa824..26c4876d8c2c 100644
--- a/svtools/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/rectitem.hxx>
+#include <svl/rectitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <tools/stream.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "memberid.hrc"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svtools/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 0c62de7229f4..b6340d662112 100644
--- a/svtools/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/stream.hxx>
 
 #ifndef NUMTYPE
@@ -37,13 +37,13 @@
 #define NUMTYPE USHORT
 #define SfxXRangeItem SfxRangeItem
 #define SfxXRangesItem SfxUShortRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #include "rngitem_inc.cxx"
 
 #define NUMTYPE sal_uInt32
 #define SfxXRangeItem SfxULongRangeItem
 #define SfxXRangesItem SfxULongRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #include "rngitem_inc.cxx"
 
 #else
diff --git a/svtools/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index d8cc7ed185ae..d8cc7ed185ae 100755
--- a/svtools/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.cxx
diff --git a/svtools/source/items1/sfontitm.cxx b/svl/source/items/sfontitm.cxx
index ee7119c95e1c..9ec06bc5a105 100644
--- a/svtools/source/items1/sfontitm.cxx
+++ b/svl/source/items/sfontitm.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
-#include <svtools/sfontitm.hxx>
+#include <svl/sfontitm.hxx>
 
 //============================================================================
 //
diff --git a/svtools/source/items1/sitem.cxx b/svl/source/items/sitem.cxx
index 2a917e93bb79..52f0931c9eae 100644
--- a/svtools/source/items1/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 // INCLUDE ---------------------------------------------------------------
 
 #ifndef GCC
@@ -38,8 +38,8 @@
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
 
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svtools/source/items1/slstitm.cxx b/svl/source/items/slstitm.cxx
index 87163d41e033..d0dd801bb6f9 100644
--- a/svtools/source/items1/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/slstitm.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/stream.hxx>
diff --git a/svtools/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index 37968dc3ee1d..5f6b692106a3 100644
--- a/svtools/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/stritem.hxx>
+#include "precompiled_svl.hxx"
+#include <svl/stritem.hxx>
 
 //============================================================================
 //
diff --git a/svtools/source/items/style.cxx b/svl/source/items/style.cxx
index ad11f1527ce7..756a2f7edc21 100644
--- a/svtools/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #ifndef GCC
 #endif
@@ -43,17 +43,16 @@
 #include <tools/tenccvt.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/intlwrapper.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <poolio.hxx>
-#include <svtools/filerec.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/style.hxx>
-#include <svtools/svstdarr.hxx>
-#include <vcl/svapp.hxx>
-
+#include <svl/filerec.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/style.hxx>
+#include <svl/svstdarr.hxx>
+#include <unotools/syslocale.hxx>
 #include <algorithm>
 
 #define STYLESTREAM             "SfxStyleSheets"
@@ -393,7 +392,7 @@ XubString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric )
     const SfxPoolItem* pItem = aIter.FirstItem();
 
     IntlWrapper aIntlWrapper(comphelper::getProcessServiceFactory(),
-            Application::GetSettings().GetLanguage());
+            SvtSysLocale().GetLanguage());
     while ( pItem )
     {
         XubString aItemPresentation;
@@ -702,11 +701,11 @@ SfxStyleSheetBase* SfxStyleSheetBasePool::Create( const SfxStyleSheetBase& r )
 
 SfxStyleSheetBase& SfxStyleSheetBasePool::Make( const XubString& rName, SfxStyleFamily eFam, USHORT mask, USHORT nPos)
 {
-    DBG_ASSERT( eFam != SFX_STYLE_FAMILY_ALL, "svtools::SfxStyleSheetBasePool::Make(), FamilyAll is not a allowed Familie" );
+    DBG_ASSERT( eFam != SFX_STYLE_FAMILY_ALL, "svl::SfxStyleSheetBasePool::Make(), FamilyAll is not a allowed Familie" );
 
     SfxStyleSheetIterator aIter(this, eFam, mask);
     rtl::Reference< SfxStyleSheetBase > xStyle( aIter.Find( rName ) );
-    DBG_ASSERT( !xStyle.is(), "svtools::SfxStyleSheetBasePool::Make(), StyleSheet already exists" );
+    DBG_ASSERT( !xStyle.is(), "svl::SfxStyleSheetBasePool::Make(), StyleSheet already exists" );
     SfxStyleSheetIterator& rIter = GetIterator_Impl();
 
     if( !xStyle.is() )
@@ -820,15 +819,15 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
 
 void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
 {
-    DBG_ASSERT( p, "svtools::SfxStyleSheetBasePool::Insert(), no stylesheet?" );
+    DBG_ASSERT( p, "svl::SfxStyleSheetBasePool::Insert(), no stylesheet?" );
 
     SfxStyleSheetIterator aIter(this, p->GetFamily(), p->GetMask());
     SfxStyleSheetBase* pOld = aIter.Find( p->GetName() );
-    DBG_ASSERT( !pOld, "svtools::SfxStyleSheetBasePool::Insert(), StyleSheet already inserted" );
+    DBG_ASSERT( !pOld, "svl::SfxStyleSheetBasePool::Insert(), StyleSheet already inserted" );
     if( p->GetParent().Len() )
     {
         pOld = aIter.Find( p->GetParent() );
-        DBG_ASSERT( pOld, "svtools::SfxStyleSheetBasePool::Insert(), Parent not found!" );
+        DBG_ASSERT( pOld, "svl::SfxStyleSheetBasePool::Insert(), Parent not found!" );
     }
     aStyles.push_back( rtl::Reference< SfxStyleSheetBase >( p ) );
     Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) );
diff --git a/svtools/source/items1/stylepool.cxx b/svl/source/items/stylepool.cxx
index 5f31500be73c..6d214b6b94dd 100644
--- a/svtools/source/items1/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -27,6 +27,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svl.hxx"
 
 #ifdef _MSC_VER
 #pragma hdrstop
@@ -36,8 +38,8 @@
 #include <map>
 
 #include "stylepool.hxx"
-#include <svtools/itemiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/itempool.hxx>
 
 
 using namespace boost;
diff --git a/svtools/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index ec3ff83dd2ec..a7667a25a97c 100644
--- a/svtools/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -29,15 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/szitem.hxx>
+#include <svl/szitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <tools/stream.hxx>
 #include <tools/gen.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "memberid.hrc"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svtools/source/items1/visitem.cxx b/svl/source/items/visitem.cxx
index 112b223a8be0..e4ff302541fe 100644
--- a/svtools/source/items1/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/visitem.hxx>
+#include "precompiled_svl.hxx"
+#include <svl/visitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
 
diff --git a/svtools/source/items1/whassert.hxx b/svl/source/items/whassert.hxx
index fe9a834816c2..fe9a834816c2 100644
--- a/svtools/source/items1/whassert.hxx
+++ b/svl/source/items/whassert.hxx
diff --git a/svtools/source/items1/whiter.cxx b/svl/source/items/whiter.cxx
index 461daf7ac012..b5e53e0bc278 100644
--- a/svtools/source/items1/whiter.cxx
+++ b/svl/source/items/whiter.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 // INCLUDE ---------------------------------------------------------------
 #ifndef GCC
 #endif
 
 #include "whiter.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 DBG_NAME(SfxWhichIter)
 
diff --git a/svtools/source/memtools/makefile.mk b/svl/source/memtools/makefile.mk
index 4592bceff8cc..8f59391a25ee 100644
--- a/svtools/source/memtools/makefile.mk
+++ b/svl/source/memtools/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=svarray
 
 # --- Settings -----------------------------------------------------
diff --git a/svtools/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index fe682e5f535d..e2fa809c1b52 100644
--- a/svtools/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #define _SVARRAY_CXX
 
@@ -59,7 +59,7 @@
 #define _SVSTDARR_XUB_STRLEN
 #define _SVSTDARR_XUB_STRLENSORT
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 
diff --git a/svtools/source/misc1/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx
index 53c447bde830..a1125306eb7b 100644
--- a/svtools/source/misc1/PasswordHelper.cxx
+++ b/svl/source/misc/PasswordHelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 
 #ifndef GCC
diff --git a/svtools/source/misc1/adrparse.cxx b/svl/source/misc/adrparse.cxx
index 37c25d6c669f..b45650846df5 100644
--- a/svtools/source/misc1/adrparse.cxx
+++ b/svl/source/misc/adrparse.cxx
@@ -29,16 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/inetmime.hxx>
 #include <adrparse.hxx>
 
-namespace unnamed_svtools_adrparse {}
-using namespace unnamed_svtools_adrparse;
+namespace unnamed_svl_adrparse {}
+using namespace unnamed_svl_adrparse;
     // unnamed namespaces don't work well yet
 
 //============================================================================
-namespace unnamed_svtools_adrparse {
+namespace unnamed_svl_adrparse {
 
 enum ElementType { ELEMENT_START, ELEMENT_DELIM, ELEMENT_ITEM, ELEMENT_END };
 
diff --git a/svtools/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 990f1ba58d73..b0c4148749e7 100644
--- a/svtools/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -30,7 +30,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <stdio.h>
 
@@ -56,9 +56,9 @@
 
 #include <ucbhelper/content.hxx>
 
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
-#include <svtools/documentlockfile.hxx>
+#include <svl/documentlockfile.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svtools/source/misc1/filenotation.cxx b/svl/source/misc/filenotation.cxx
index f5e5ae934e3d..d50645c97439 100644
--- a/svtools/source/misc1/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include "filenotation.hxx"
 #include <osl/file.h>
 #include <osl/diagnose.h>
diff --git a/svtools/source/misc1/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index 7f95bdaaa0bc..9ec7ead0a4be 100644
--- a/svtools/source/misc1/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "folderrestriction.hxx"
 #include "osl/process.h"
diff --git a/svtools/source/misc1/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 82480fc83473..43619e879a91 100644
--- a/svtools/source/misc1/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/string.hxx>
diff --git a/svtools/source/misc1/inethist.cxx b/svl/source/misc/inethist.cxx
index 5a1a3719d7ca..290312c0efd8 100644
--- a/svtools/source/misc1/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/inethist.hxx>
+#include "precompiled_svl.hxx"
+#include <svl/inethist.hxx>
 
 #ifndef INCLUDED_ALGORITHM
 #include <algorithm>
diff --git a/svtools/source/misc1/inettype.cxx b/svl/source/misc/inettype.cxx
index ce62d7f3b2fc..47183be1d7b2 100644
--- a/svtools/source/misc1/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -29,27 +29,27 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/table.hxx>
 #include <tools/wldcrd.hxx>
-#include <svtools/inettype.hxx>
-#include <svtools/svtdata.hxx>
+#include <svl/inettype.hxx>
+#include <svl/svldata.hxx>
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #ifndef _SVSTDARR_STRINGSSORT_DECL
 #define _SVSTDARR_STRINGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #undef _SVSTDARR_STRINGSSORT
 #endif
 
-namespace unnamed_svtools_inettype {}
-using namespace unnamed_svtools_inettype;
+namespace unnamed_svl_inettype {}
+using namespace unnamed_svl_inettype;
     // unnamed namespaces don't work well yet
 
 //============================================================================
-namespace unnamed_svtools_inettype {
+namespace unnamed_svl_inettype {
 
 //============================================================================
 struct MediaTypeEntry
@@ -804,7 +804,7 @@ INetContentType Registration::GetContentType4Extension(UniString const &
 //
 //============================================================================
 
-namespace unnamed_svtools_inettype {
+namespace unnamed_svl_inettype {
 
 MediaTypeEntry const * seekEntry(UniString const & rTypeName,
                                  MediaTypeEntry const * pMap, sal_Size nSize)
diff --git a/svtools/source/misc1/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index e00540af1ab1..df7c28d22b1d 100644
--- a/svtools/source/misc1/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <lngmisc.hxx>
 #include <tools/solar.h>
 #include <tools/string.hxx>
diff --git a/svtools/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index ef2cf89d8572..f13ed574a87f 100644
--- a/svtools/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -30,7 +30,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <stdio.h>
 
@@ -57,9 +57,9 @@
 
 #include <ucbhelper/content.hxx>
 
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
-#include <svtools/lockfilecommon.hxx>
+#include <svl/lockfilecommon.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svtools/source/misc1/makefile.mk b/svl/source/misc/makefile.mk
index dd143ea4e972..adc659a7b60b 100644
--- a/svtools/source/misc1/makefile.mk
+++ b/svl/source/misc/makefile.mk
@@ -30,8 +30,8 @@
 #*************************************************************************
 
 PRJ=..$/..
-PRJNAME=svtools
-TARGET=misc1
+PRJNAME=svl
+TARGET=misc
 
 # --- Settings -----------------------------------------------------
 
@@ -41,10 +41,16 @@ TARGET=misc1
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=\
-    $(SLO)$/fstathelper.obj \
+    $(SLO)$/documentlockfile.obj \
     $(SLO)$/folderrestriction.obj \
+    $(SLO)$/fstathelper.obj \
+    $(SLO)$/lockfilecommon.obj \
+    $(SLO)$/ownlist.obj \
+    $(SLO)$/restrictedpaths.obj \
+    $(SLO)$/sharecontrolfile.obj \
     $(SLO)$/strmadpt.obj \
-    $(SLO)$/svtdata.obj
+    $(SLO)$/svldata.obj \
+    $(SLO)$/urihelper.obj 
 
 SLOFILES=\
     $(EXCEPTIONSFILES) \
@@ -52,7 +58,6 @@ SLOFILES=\
     $(SLO)$/filenotation.obj \
     $(SLO)$/inethist.obj \
     $(SLO)$/inettype.obj \
-    $(SLO)$/iniadrtk.obj \
     $(SLO)$/lngmisc.obj \
     $(SLO)$/PasswordHelper.obj
 
diff --git a/svtools/source/misc1/mediatyp.src b/svl/source/misc/mediatyp.src
index c7acdf8efc45..63033af29d03 100644
--- a/svtools/source/misc1/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -35,7 +35,7 @@
 //============================================================================
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 String STR_SVT_MIMETYPE_APP_OCTSTREAM
diff --git a/svtools/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 346b4ff7251e..def341d57b7c 100644
--- a/svtools/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <ctype.h>
 #include <stdio.h>
 #include <com/sun/star/beans/PropertyValues.hpp>
 
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svtools/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index 354e32126680..9eda454604b1 100644
--- a/svtools/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/restrictedpaths.hxx>
+#include "precompiled_svl.hxx"
+#include <svl/restrictedpaths.hxx>
 
 #include <algorithm>
 #include <osl/process.h>
 #include <tools/urlobj.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 namespace svt
 {
diff --git a/svtools/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index dbea89f54bcc..9249fa3f33de 100644
--- a/svtools/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <stdio.h>
 
@@ -57,9 +57,9 @@
 #include <unotools/bootstrap.hxx>
 #include <unotools/streamwrap.hxx>
 
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/sharecontrolfile.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svtools/source/misc1/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 4c4835609b7b..9803f2bcc32f 100644
--- a/svtools/source/misc1/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <functional> // needed under Solaris when including <algorithm>...
 
diff --git a/svtools/source/misc1/svtdata.cxx b/svl/source/misc/svldata.cxx
index 51247a628c0e..0ba8075069cd 100644
--- a/svtools/source/misc1/svtdata.cxx
+++ b/svl/source/misc/svldata.cxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svtdata.cxx,v $
+ * $RCSfile: svldata.cxx,v $
  * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
@@ -29,20 +29,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <map>
 #include <tools/resmgr.hxx>
 #include <tools/shl.hxx>
 #include <vos/process.hxx>
-#include <svtools/svtdata.hxx>
+#include <svl/svldata.hxx>
 
-namespace unnamed_svtools_svtdata {}
-using namespace unnamed_svtools_svtdata;
+namespace unnamed_svl_svldata {}
+using namespace unnamed_svl_svldata;
     // unnamed namespaces don't work well yet
 
 //============================================================================
-namespace unnamed_svtools_svtdata {
+namespace unnamed_svl_svldata {
 
 typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap;
 
@@ -50,13 +50,14 @@ typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap;
 
 //============================================================================
 //
-//  ImpSvtData
+//  ImpSvlData
 //
 //============================================================================
 
-ImpSvtData::~ImpSvtData()
+static ImpSvlData* pSvlData = 0;
+
+ImpSvlData::~ImpSvlData()
 {
-    delete pResMgr;
     for (SimpleResMgrMap::iterator t
              = static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->begin();
          t != static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->end(); ++t)
@@ -65,17 +66,7 @@ ImpSvtData::~ImpSvtData()
 }
 
 //============================================================================
-ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale)
-{
-    if (!pResMgr)
-    {
-        pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svt), aLocale );
-    }
-    return pResMgr;
-}
-
-//============================================================================
-SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale)
+SimpleResMgr* ImpSvlData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale)
 {
     if (!m_pThreadsafeRMs)
         m_pThreadsafeRMs = new SimpleResMgrMap;
@@ -92,22 +83,12 @@ SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLoc
     return rResMgr;
 }
 
-ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
-{
-    if (!pPatchResMgr)
-    {
-        pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
-    }
-    return pPatchResMgr;
-}
-
 //============================================================================
 // static
-ImpSvtData & ImpSvtData::GetSvtData()
+ImpSvlData & ImpSvlData::GetSvlData()
 {
-    void ** pAppData = GetAppData(SHL_SVT);
-    if (!*pAppData)
-        *pAppData= new ImpSvtData;
-    return *static_cast<ImpSvtData *>(*pAppData);
+    if (!pSvlData)
+        pSvlData= new ImpSvlData;
+    return *pSvlData;
 }
 
diff --git a/svtools/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 1ddb4c6dd6f9..5473bf1c995d 100644
--- a/svtools/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <urihelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
@@ -67,8 +67,8 @@
 #include <unotools/charclass.hxx>
 #include "rtl/instance.hxx"
 
-namespace unnamed_svtools_urihelper {}
-using namespace unnamed_svtools_urihelper;
+namespace unnamed_svl_urihelper {}
+using namespace unnamed_svl_urihelper;
     // unnamed namespaces don't work well yet...
 
 namespace css = com::sun::star;
@@ -80,7 +80,7 @@ using namespace com::sun::star;
 //
 //============================================================================
 
-namespace unnamed_svtools_urihelper {
+namespace unnamed_svl_urihelper {
 
 inline UniString toUniString(ByteString const & rString)
 {
@@ -425,7 +425,7 @@ rtl::OUString URIHelper::simpleNormalizedMakeRelative(
 //
 //============================================================================
 
-namespace unnamed_svtools_urihelper {
+namespace unnamed_svl_urihelper {
 
 inline xub_StrLen nextChar(UniString const & rStr, xub_StrLen nPos)
 {
diff --git a/svtools/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index 3a698c725c5c..08562fe9fece 100644
--- a/svtools/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.cxx
@@ -29,20 +29,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #ifndef GCC
 #endif
 #include <tools/debug.hxx>
 
-#include <svtools/hint.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/hint.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/lstner.hxx>
 
 SV_DECL_PTRARR( SfxListenerArr_Impl, SfxListener*, 0, 2 )
 
 #define _SFX_BRDCST_CXX
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 //====================================================================
 DBG_NAME(SfxBroadcaster)
diff --git a/svtools/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index e363f545c719..ede14e4171b2 100644
--- a/svtools/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #ifndef GCC
 #endif
@@ -38,7 +38,7 @@
 #include "listener.hxx"
 #include "listeneriter.hxx"
 #include "broadcast.hxx"
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 
 //====================================================================
diff --git a/svtools/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx
index 32a76a7df9c1..1df3abb22776 100644
--- a/svtools/source/notify/cancel.cxx
+++ b/svl/source/notify/cancel.cxx
@@ -29,15 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #define _SFX_CANCEL_CXX
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 
 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 
-#include <svtools/smplhint.hxx>
-#include <svtools/cnclhint.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/cnclhint.hxx>
 #include <rtl/instance.hxx>
 
 namespace { struct lclMutex : public rtl::Static< ::vos::OMutex, lclMutex >{}; }
diff --git a/svtools/source/notify/hint.cxx b/svl/source/notify/hint.cxx
index 9ae3bf8f8b21..36bcfb9990d9 100644
--- a/svtools/source/notify/hint.cxx
+++ b/svl/source/notify/hint.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 
 //====================================================================
 
diff --git a/svtools/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx
index 67d484219ac6..5138fb2a9ad9 100644
--- a/svtools/source/notify/isethint.cxx
+++ b/svl/source/notify/isethint.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #ifndef GCC
 #endif
 
-#include <svtools/isethint.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/isethint.hxx>
+#include <svl/itemset.hxx>
 
 //====================================================================
 
diff --git a/svtools/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 0ce072b44dfb..7d9a223e1a73 100644
--- a/svtools/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
diff --git a/svtools/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx
index 25f1f1da1901..bb1569c128c5 100644
--- a/svtools/source/notify/listenerbase.cxx
+++ b/svl/source/notify/listenerbase.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
diff --git a/svtools/source/notify/listenerbase.hxx b/svl/source/notify/listenerbase.hxx
index e73f9dfc37c5..e73f9dfc37c5 100644
--- a/svtools/source/notify/listenerbase.hxx
+++ b/svl/source/notify/listenerbase.hxx
diff --git a/svtools/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx
index 08fcb5b7e9ac..1f92eadfedbc 100644
--- a/svtools/source/notify/listeneriter.cxx
+++ b/svl/source/notify/listeneriter.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 #include <tools/debug.hxx>
diff --git a/svtools/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index d7345d7ed3db..4be2020967b5 100644
--- a/svtools/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
@@ -37,13 +37,13 @@
 #include <tools/debug.hxx>
 #endif
 
-#include <svtools/hint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/hint.hxx>
+#include <svl/brdcst.hxx>
 
 SV_DECL_PTRARR( SfxBroadcasterArr_Impl, SfxBroadcaster*, 0, 2 )
 
 #define _SFX_LSTNER_CXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 //====================================================================
 DBG_NAME(SfxListener)
diff --git a/svtools/source/notify/makefile.mk b/svl/source/notify/makefile.mk
index 8e4c4b211258..0d26860d02b5 100644
--- a/svtools/source/notify/makefile.mk
+++ b/svl/source/notify/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=notify
 
 # --- Settings -----------------------------------------------------
diff --git a/svtools/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx
index 6fddffc23e56..454710a1b79f 100644
--- a/svtools/source/notify/smplhint.cxx
+++ b/svl/source/notify/smplhint.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 //====================================================================
 
diff --git a/svtools/source/numbers/makefile.mk b/svl/source/numbers/makefile.mk
index 46cd3985df1a..db4b30070ce8 100644
--- a/svtools/source/numbers/makefile.mk
+++ b/svl/source/numbers/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=numbers
 LIBTARGET=NO
 
@@ -41,7 +41,7 @@ PROJECTPCHSOURCE=
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/svtools/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx
index d7cf20f6059f..2bc5121e18fd 100644
--- a/svtools/source/numbers/nbdll.cxx
+++ b/svl/source/numbers/nbdll.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #ifdef WIN
 #include <svwin.h>
diff --git a/svtools/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index d65a2fd696ce..23f627834955 100644
--- a/svtools/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -29,11 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
-#include <vcl/svapp.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <i18npool/mslangid.hxx>
@@ -45,9 +44,9 @@
 
 #include "numfmuno.hxx"
 #include "numuno.hxx"
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svl/itemprop.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svtools/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 4148069fb37e..4148069fb37e 100644
--- a/svtools/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
diff --git a/svtools/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index 7e79aad624f3..99ff33433de3 100644
--- a/svtools/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 #include <tools/debug.hxx>
diff --git a/svtools/source/numbers/numhead.hxx b/svl/source/numbers/numhead.hxx
index de23b3cbccf4..de23b3cbccf4 100644
--- a/svtools/source/numbers/numhead.hxx
+++ b/svl/source/numbers/numhead.hxx
diff --git a/svtools/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index f91bf82b4e60..3cc90998e2dc 100644
--- a/svtools/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -29,13 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
 #define _ZFORLIST_DECLARE_TABLE
 
-#include <vcl/svapp.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <vos/mutex.hxx>
@@ -44,7 +43,7 @@
 
 #include "numuno.hxx"
 #include "numfmuno.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svtools/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 1035cd056406..7e4d8560dae7 100644
--- a/svtools/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -29,14 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include "supservs.hxx"
 #include <com/sun/star/lang/Locale.hpp>
 #include <comphelper/sharedmutex.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
 #include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
 #include <tools/stream.hxx>
 #include <strmadpt.hxx>
 #include "instrm.hxx"
diff --git a/svtools/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index df48d6567ecc..7dbbfe27177d 100644
--- a/svtools/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.hxx
@@ -32,7 +32,7 @@
 #define _SVTOOLS_NUMBERS_SUPPLIERSERVICE_HXX_
 
 #include "numuno.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
diff --git a/svtools/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 7aac440e8b58..372ae2b15abf 100644
--- a/svtools/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -44,16 +44,16 @@
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 #include <unotools/digitgroupingiterator.hxx>
 
-#include <svtools/zforlist.hxx>         // NUMBERFORMAT_XXX
+#include <svl/zforlist.hxx>         // NUMBERFORMAT_XXX
 #include "zforscan.hxx"
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 
 #define _ZFORFIND_CXX
 #include "zforfind.hxx"
 #undef _ZFORFIND_CXX
 
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define NF_TEST_CALENDAR 0
 #else
 #define NF_TEST_CALENDAR 0
diff --git a/svtools/inc/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 049925f2034f..049925f2034f 100644
--- a/svtools/inc/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
diff --git a/svtools/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index b76bf3226b50..f03ef3f31140 100644
--- a/svtools/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -29,17 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
 // #include <math.h>
 #include <tools/debug.hxx>
-#ifndef _SOUND_HXX //autogen
-#include <vcl/sound.hxx>
-#endif
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <unotools/charclass.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -48,23 +43,22 @@
 #include <com/sun/star/i18n/KNumberFormatUsage.hpp>
 #include <com/sun/star/i18n/KNumberFormatType.hpp>
 #include <comphelper/processfactory.hxx>
+#include <unotools/misccfg.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #define _ZFORLIST_CXX
 #include <osl/mutex.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #undef _ZFORLIST_CXX
 
 #include "zforscan.hxx"
 #include "zforfind.hxx"
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include "numhead.hxx"
 
-#include <svtools/syslocaleoptions.hxx>
-#include "listener.hxx"
-#include <svtools/smplhint.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include <unotools/digitgroupingiterator.hxx>
 #include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
@@ -107,7 +101,7 @@ static sal_uInt32 __FAR_DATA theIndexTable[NF_INDEX_TABLE_ENTRIES];
     also handles one instance of the SysLocale options
  */
 
-class SvNumberFormatterRegistry_Impl : public SvtListener
+class SvNumberFormatterRegistry_Impl : public utl::ConfigurationListener
 {
     List                    aFormatters;
     SvtSysLocaleOptions     aSysLocaleOptions;
@@ -124,30 +118,26 @@ public:
             sal_uInt32           Count()
                                 { return aFormatters.Count(); }
 
-    virtual void            Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
-
+            virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 };
 
 
 SvNumberFormatterRegistry_Impl::SvNumberFormatterRegistry_Impl()
 {
     eSysLanguage = MsLangId::getRealLanguage( LANGUAGE_SYSTEM );
-    aSysLocaleOptions.AddListener( *this );
+    aSysLocaleOptions.AddListener( this );
 }
 
 
 SvNumberFormatterRegistry_Impl::~SvNumberFormatterRegistry_Impl()
 {
-    aSysLocaleOptions.RemoveListener( *this );
+    aSysLocaleOptions.RemoveListener( this );
 }
 
 
-void SvNumberFormatterRegistry_Impl::Notify( SvtBroadcaster&, const SfxHint& rHint )
+void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 nHint )
 {
-    const SfxSimpleHint* pHint = PTR_CAST( SfxSimpleHint, &rHint );
-    if( pHint )
-    {
-        if ( pHint->GetId() & SYSLOCALEOPTIONS_HINT_LOCALE )
+        if ( nHint & SYSLOCALEOPTIONS_HINT_LOCALE )
         {
             ::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
             for ( SvNumberFormatter* p = (SvNumberFormatter*)aFormatters.First();
@@ -157,7 +147,7 @@ void SvNumberFormatterRegistry_Impl::Notify( SvtBroadcaster&, const SfxHint& rHi
             }
             eSysLanguage = MsLangId::getRealLanguage( LANGUAGE_SYSTEM );
         }
-        if ( pHint->GetId() & SYSLOCALEOPTIONS_HINT_CURRENCY )
+        if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
         {
             ::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
             for ( SvNumberFormatter* p = (SvNumberFormatter*)aFormatters.First();
@@ -166,7 +156,6 @@ void SvNumberFormatterRegistry_Impl::Notify( SvtBroadcaster&, const SfxHint& rHi
                 p->ResetDefaultSystemCurrency();
             }
         }
-    }
 }
 
 
@@ -237,7 +226,7 @@ SvNumberFormatter::~SvNumberFormatter()
 
 void SvNumberFormatter::ImpConstruct( LanguageType eLang )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "er93726", "SvNumberFormatter::ImpConstruct" );
+    RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svl", "er93726", "SvNumberFormatter::ImpConstruct" );
 
     if ( eLang == LANGUAGE_DONTKNOW )
         eLang = UNKNOWN_SUBSTITUTE;
@@ -307,7 +296,7 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge)
         if( !pMutex )
         {
             // #i77768# Due to a static reference in the toolkit lib
-            // we need a mutex that lives longer than the svtools library.
+            // we need a mutex that lives longer than the svl library.
             // Otherwise the dtor would use a destructed mutex!!
             pMutex = new ::osl::Mutex;
         }
@@ -535,7 +524,6 @@ BOOL SvNumberFormatter::PutEntry(String& rString,
             sal_uInt32 nPos = CLOffset + pStdFormat->GetLastInsertKey();
             if (nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET)
             {
-                Sound::Beep();
                 DBG_ERROR("SvNumberFormatter:: Zu viele Formate pro CL");
                 delete p_Entry;
             }
@@ -601,15 +589,14 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString,
     // #62389# empty format string (of Writer) => General standard format
     if (!rString.Len())
         ;   // nothing
-    else if (eLnge == LANGUAGE_SYSTEM && eSysLnge !=
-            Application::GetSettings().GetLanguage())
+    else if (eLnge == LANGUAGE_SYSTEM && eSysLnge != SvtSysLocale().GetLanguage())
     {
         sal_uInt32 nOrig = GetEntryKey( rString, eSysLnge );
         if (nOrig == NUMBERFORMAT_ENTRY_NOT_FOUND)
             nKey = nOrig;   // none avaliable, maybe user-defined
         else
-            nKey = GetFormatForLanguageIfBuiltIn( nOrig,
-                    Application::GetSettings().GetLanguage());
+            nKey = GetFormatForLanguageIfBuiltIn( nOrig, SvtSysLocale().GetLanguage() );
+
         if (nKey == nOrig)
         {
             // Not a builtin format, convert.
@@ -617,7 +604,7 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString,
             // language and wouldn't match eSysLnge anymore, do that on a copy.
             String aTmp( rString);
             rNewInserted = PutandConvertEntrySystem( aTmp, rCheckPos, rType,
-                    nKey, eLnge, Application::GetSettings().GetLanguage());
+                    nKey, eLnge, SvtSysLocale().GetLanguage());
             if (rCheckPos > 0)
             {
                 DBG_ERRORFILE("SvNumberFormatter::GetIndexPuttingAndConverting: bad format code string for current locale");
@@ -685,7 +672,7 @@ void SvNumberFormatter::SetFormatUsed(sal_uInt32 nFIndex)
 
 BOOL SvNumberFormatter::Load( SvStream& rStream )
 {
-    LanguageType eSysLang = Application::GetSettings().GetLanguage();
+    LanguageType eSysLang = SvtSysLocale().GetLanguage();
     SvNumberFormatter* pConverter = NULL;
 
     ImpSvNumMultipleReadHeader aHdr( rStream );
@@ -894,7 +881,7 @@ BOOL SvNumberFormatter::Save( SvStream& rStream ) const
     ImpSvNumMultipleWriteHeader aHdr( rStream );
     // ab 364i wird gespeichert was SYSTEM wirklich war, vorher hart LANGUAGE_SYSTEM
     rStream << (USHORT) SV_NUMBERFORMATTER_VERSION;
-    rStream << (USHORT) Application::GetSettings().GetLanguage() << (USHORT) IniLnge;
+    rStream << (USHORT) SvtSysLocale().GetLanguage() << (USHORT) IniLnge;
     SvNumberFormatTable* pTable = (SvNumberFormatTable*) &aFTable;
     SvNumberformat* pEntry = (SvNumberformat*) pTable->First();
     while (pEntry)
@@ -2900,7 +2887,6 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
                 nNewKey = nPos+1;
                 if (nPos - nCLOffset >= SV_COUNTRY_LANGUAGE_OFFSET)
                 {
-                    Sound::Beep();
                     DBG_ERROR(
                         "SvNumberFormatter:: Zu viele Formate pro CL");
                     delete pNewEntry;
@@ -3005,7 +2991,7 @@ USHORT SvNumberFormatter::ExpandTwoDigitYear( USHORT nYear ) const
 // static
 USHORT SvNumberFormatter::GetYear2000Default()
 {
-    return Application::GetSettings().GetMiscSettings().GetTwoDigitYearStart();
+    return (USHORT) ::utl::MiscCfg().GetYear2000();
 }
 
 
@@ -3106,7 +3092,7 @@ void SvNumberFormatter::SetDefaultSystemCurrency( const String& rAbbrev, Languag
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     if ( eLang == LANGUAGE_SYSTEM )
-        eLang = Application::GetSettings().GetLanguage();
+        eLang = SvtSysLocale().GetLanguage();
     const NfCurrencyTable& rTable = GetTheCurrencyTable();
     USHORT nCount = rTable.Count();
     const NfCurrencyEntryPtr* ppData = rTable.GetData();
@@ -3227,7 +3213,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat()
 // static
 // try to make it inline if possible since this a loop body
 // TRUE: continue; FALSE: break loop, if pFoundEntry==NULL dupe found
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 inline
 #endif
     BOOL SvNumberFormatter::ImpLookupCurrencyEntryLoopBody(
@@ -3547,9 +3533,9 @@ void SvNumberFormatter::ImpInitCurrencyTable()
         return ;
     bInitializing = TRUE;
 
-    RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "er93726", "SvNumberFormatter::ImpInitCurrencyTable" );
+    RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svl", "er93726", "SvNumberFormatter::ImpInitCurrencyTable" );
 
-    LanguageType eSysLang = Application::GetSettings().GetLanguage();
+    LanguageType eSysLang = SvtSysLocale().GetLanguage();
     LocaleDataWrapper* pLocaleData = new LocaleDataWrapper(
         ::comphelper::getProcessServiceFactory(),
         MsLangId::convertLanguageToLocale( eSysLang ) );
diff --git a/svtools/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 0afbf3b4a3f5..52d37b9cd26f 100644
--- a/svtools/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <stdio.h>
 #include <ctype.h>
 #include <float.h>
@@ -49,11 +49,11 @@
 #include <com/sun/star/i18n/AmPmValue.hpp>
 
 #define _ZFORMAT_CXX
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include "zforscan.hxx"
 
 #include "zforfind.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include "numhead.hxx"
 #include <unotools/digitgroupingiterator.hxx>
 #include "nfsymbol.hxx"
diff --git a/svtools/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 77b33226559c..5c0d45a53ed2 100644
--- a/svtools/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifndef GCC
 #endif
 
@@ -41,8 +41,8 @@
 #include <unotools/numberformatcodewrapper.hxx>
 #include <rtl/instance.hxx>
 
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <unotools/digitgroupingiterator.hxx>
 
 #define _ZFORSCAN_CXX
diff --git a/svtools/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index bc19ac5b633f..300715dfeaa5 100644
--- a/svtools/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -34,7 +34,7 @@
 #include <tools/date.hxx>
 #include <i18npool/lang.h>
 #include <tools/color.hxx>
-#include <svtools/nfkeytab.hxx>
+#include <svl/nfkeytab.hxx>
 #include "nfsymbol.hxx"
 
 class SvNumberFormatter;
diff --git a/svtools/source/passwordcontainer/exports.map b/svl/source/passwordcontainer/exports.map
index f4ed78b9e970..f4ed78b9e970 100644
--- a/svtools/source/passwordcontainer/exports.map
+++ b/svl/source/passwordcontainer/exports.map
diff --git a/svtools/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
index 31e1336ad966..3c74246ee3ed 100644
--- a/svtools/source/passwordcontainer/makefile.mk
+++ b/svl/source/passwordcontainer/makefile.mk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 PRJ=..$/..
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=passwordcontainer.uno
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
diff --git a/svtools/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 2349a9f9a3da..4d629958e5bf 100644
--- a/svtools/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "passwordcontainer.hxx"
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include "cppuhelper/factory.hxx"
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -1473,7 +1473,7 @@ Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedS
 
 ::rtl::OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("stardiv.svtools.PasswordContainer");
+    return ::rtl::OUString::createFromAscii("stardiv.svl.PasswordContainer");
 }
 
 //-------------------------------------------------------------------------
@@ -1556,7 +1556,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         Reference< XRegistryKey > xNewKey;
 
         xNewKey = xRegistryKey->createKey(
-            ::rtl::OUString::createFromAscii( "/stardiv.svtools.PasswordContainer/UNO/SERVICES" ));
+            ::rtl::OUString::createFromAscii( "/stardiv.svl.PasswordContainer/UNO/SERVICES" ));
         xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.task.PasswordContainer"));
 
         return sal_True;
diff --git a/svtools/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index b8c223040e6d..faf086e369bd 100644
--- a/svtools/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -59,6 +59,11 @@ void SysCredentialsConfigItem::Notify(
     m_pOwner->persistentConfigChanged();
 }
 
+void SysCredentialsConfigItem::Commit()
+{
+    // does nothing
+}
+
 uno::Sequence< rtl::OUString >
 SysCredentialsConfigItem::getSystemCredentialsURLs()
 {
@@ -112,7 +117,7 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs(
 
 namespace
 {
-    // TODO: This code is actually copied from svtools/source/passwordcontainer.cxx
+    // TODO: This code is actually copied from svl/source/passwordcontainer.cxx
     bool removeLastSegment( ::rtl::OUString & aURL )
     {
         sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) );
@@ -134,7 +139,7 @@ namespace
 
     bool findURL( StringSet const & rContainer, rtl::OUString const & aURL, rtl::OUString & aResult )
     {
-        // TODO: This code is actually copied from svtools/source/passwordcontainer.cxx
+        // TODO: This code is actually copied from svl/source/passwordcontainer.cxx
         if( !rContainer.empty() && aURL.getLength() )
         {
             ::rtl::OUString aUrl( aURL );
diff --git a/svtools/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx
index b037e17c348e..68de21049fdc 100644
--- a/svtools/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.hxx
@@ -49,7 +49,7 @@ class SysCredentialsConfigItem : public utl::ConfigItem
         virtual void Notify(
             const com::sun::star::uno::Sequence< rtl::OUString > &
                 seqPropertyNames );
-        //virtual void Commit();
+        virtual void Commit();
 
         com::sun::star::uno::Sequence< rtl::OUString >
         getSystemCredentialsURLs();
diff --git a/svtools/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index e31e53d07522..dd3c9c237f9a 100644
--- a/svtools/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -29,16 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #define UNICODE
 #include <string.h> // memset
 #include "ddeimp.hxx"
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 
 #include <osl/thread.h>
 #include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
+#include <tools/solarmutex.hxx>
 #include <vos/mutex.hxx>
 
 // static DWORD        hDdeInst  = NULL;
@@ -367,9 +367,11 @@ const String& DdeTransaction::GetName() const
 
 void __EXPORT DdeTransaction::Data( const DdeData* p )
 {
-    Application::GetSolarMutex().acquire();
-    aData.Call( (void*)p );
-    Application::GetSolarMutex().release();
+    if ( ::tools::SolarMutex::Acquire() )
+    {
+        aData.Call( (void*)p );
+        ::tools::SolarMutex::Release();
+    }
 }
 
 // --- DdeTransaction::Done() --------------------------------------
diff --git a/svtools/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index 9167c8585b08..8ae22a8cfb20 100644
--- a/svtools/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 // ACHTUNG: es wird angenommen, dass StarView-Clipboard-Foamatnummern
 // und Windows-Formatnummern identisch sind! Ist dies einmal nicht der
@@ -40,7 +40,7 @@
 
 #include <string.h>
 #include "ddeimp.hxx"
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 
 #include <osl/thread.h>
 
diff --git a/svtools/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx
index 696d7b2851d2..b27272a2a910 100644
--- a/svtools/source/svdde/ddedll.cxx
+++ b/svl/source/svdde/ddedll.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #ifdef WIN
 
 
diff --git a/svtools/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index dcdf5b3be33c..dcdf5b3be33c 100644
--- a/svtools/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
diff --git a/svtools/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index 7c2fb82789e6..b5154e1f7530 100644
--- a/svtools/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #define UNICODE
 
 #include <string.h>
 #include "ddeimp.hxx"
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 
 // --- DdeInternal::InfCallback() ----------------------------------
 
diff --git a/svtools/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx
index 4b8011627c7d..9d1351b17f16 100644
--- a/svtools/source/svdde/ddeml1.cxx
+++ b/svl/source/svdde/ddeml1.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 /*
     ToDo / Bugs:
diff --git a/svtools/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx
index 979897136a46..e0cdee2d52d1 100644
--- a/svtools/source/svdde/ddeml2.cxx
+++ b/svl/source/svdde/ddeml2.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #define INCL_DOS
 #include <stdlib.h>
diff --git a/svtools/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx
index bb53743a2915..18da7c07fd3c 100644
--- a/svtools/source/svdde/ddemldeb.cxx
+++ b/svl/source/svdde/ddemldeb.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "ddemlimp.hxx"
 
diff --git a/svtools/source/svdde/ddemldeb.hxx b/svl/source/svdde/ddemldeb.hxx
index 39d3d836882a..39d3d836882a 100644
--- a/svtools/source/svdde/ddemldeb.hxx
+++ b/svl/source/svdde/ddemldeb.hxx
diff --git a/svtools/source/svdde/ddemlimp.hxx b/svl/source/svdde/ddemlimp.hxx
index 47ad53d0b9fe..47ad53d0b9fe 100644
--- a/svtools/source/svdde/ddemlimp.hxx
+++ b/svl/source/svdde/ddemlimp.hxx
diff --git a/svtools/source/svdde/ddemlos2.h b/svl/source/svdde/ddemlos2.h
index fe685e95fecf..fe685e95fecf 100644
--- a/svtools/source/svdde/ddemlos2.h
+++ b/svl/source/svdde/ddemlos2.h
diff --git a/svtools/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 40af3b1cbc27..9cd594a7920d 100644
--- a/svtools/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #define UNICODE
 
 #include "ddeimp.hxx"
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 
 #if defined( WIN ) && defined( MSC )
 #pragma code_seg( "SVDDE_MISC_CODE" )
diff --git a/svtools/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 8c72c1713e90..ec718d4e56ee 100644
--- a/svtools/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #define UNICODE
 #include "ddeimp.hxx"
-#include <svtools/svdde.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svdde.hxx>
+#include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 #include <osl/thread.h>
 
diff --git a/svtools/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx
index b0b023ad3a75..650ec5b1b31f 100644
--- a/svtools/source/svdde/ddewrap.cxx
+++ b/svl/source/svdde/ddewrap.cxx
@@ -30,7 +30,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #define _SVTOOLS_SVDDE_DDEWRAP_CXX_
 
 #if defined _MSC_VER
diff --git a/svtools/source/svdde/ddewrap.hxx b/svl/source/svdde/ddewrap.hxx
index 77d012ccbba5..77d012ccbba5 100644
--- a/svtools/source/svdde/ddewrap.hxx
+++ b/svl/source/svdde/ddewrap.hxx
diff --git a/svtools/source/svdde/makefile.mk b/svl/source/svdde/makefile.mk
index f4c72aff2094..321a4b5ced03 100644
--- a/svtools/source/svdde/makefile.mk
+++ b/svl/source/svdde/makefile.mk
@@ -34,13 +34,13 @@
 
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=svdde
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/svtools/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx
index c87290265e90..826b64adc48d 100644
--- a/svtools/source/svsql/converter.cxx
+++ b/svl/source/svsql/converter.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include "converter.hxx"
 
 INT32 SvDbaseConverter::ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale)
diff --git a/svtools/source/svsql/makefile.mk b/svl/source/svsql/makefile.mk
index 55c400b83ef3..ae3abf24db24 100644
--- a/svtools/source/svsql/makefile.mk
+++ b/svl/source/svsql/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=svsql
 
 # --- Settings -----------------------------------------------------
diff --git a/svtools/source/undo/makefile.mk b/svl/source/undo/makefile.mk
index b277fa3c906f..7c51df3f17fc 100644
--- a/svtools/source/undo/makefile.mk
+++ b/svl/source/undo/makefile.mk
@@ -31,14 +31,14 @@
 
 PRJ=..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=undo
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/svtools/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 2f733d4f03b3..a8442098237e 100644
--- a/svtools/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <com/sun/star/uno/Exception.hpp>
 
 #include <tools/debug.hxx>
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 using ::com::sun::star::uno::Exception;
 
@@ -313,7 +313,7 @@ USHORT SfxUndoManager::GetUndoActionCount() const
 
 XubString SfxUndoManager::GetUndoActionComment( USHORT nNo ) const
 {
-    DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::GetUndoActionComment(), illegal id!" );
+    DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoActionComment(), illegal id!" );
     if( nNo < pActUndoArray->nCurUndoAction )
     {
         return pActUndoArray->aUndoActions[pActUndoArray->nCurUndoAction-1-nNo]->GetComment(); //!
@@ -329,7 +329,7 @@ XubString SfxUndoManager::GetUndoActionComment( USHORT nNo ) const
 
 USHORT SfxUndoManager::GetUndoActionId( USHORT nNo ) const
 {
-    DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::GetUndoActionId(), illegal id!" );
+    DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoActionId(), illegal id!" );
     if( nNo < pActUndoArray->nCurUndoAction )
     {
         return pActUndoArray->aUndoActions[pActUndoArray->nCurUndoAction-1-nNo]->GetId(); //!
@@ -344,7 +344,7 @@ USHORT SfxUndoManager::GetUndoActionId( USHORT nNo ) const
 
 SfxUndoAction* SfxUndoManager::GetUndoAction( USHORT nNo ) const
 {
-    DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::GetUndoAction(), illegal id!" );
+    DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoAction(), illegal id!" );
     if( nNo < pActUndoArray->nCurUndoAction )
     {
         return pActUndoArray->aUndoActions[pActUndoArray->nCurUndoAction-1-nNo]; //!
@@ -360,7 +360,7 @@ SfxUndoAction* SfxUndoManager::GetUndoAction( USHORT nNo ) const
 /** clears the redo stack and removes the top undo action */
 void SfxUndoManager::RemoveLastUndoAction()
 {
-    DBG_ASSERT( pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::RemoveLastUndoAction(), no action to remove?!" );
+    DBG_ASSERT( pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::RemoveLastUndoAction(), no action to remove?!" );
     if( pActUndoArray->nCurUndoAction )
     {
         pActUndoArray->nCurUndoAction--;
@@ -387,7 +387,7 @@ BOOL SfxUndoManager::Undo( USHORT )
 
     try
     {
-        DBG_ASSERT( pActUndoArray == pUndoArray, "svtools::SfxUndoManager::Undo(), LeaveListAction() not yet called!" );
+        DBG_ASSERT( pActUndoArray == pUndoArray, "svl::SfxUndoManager::Undo(), LeaveListAction() not yet called!" );
         if ( pActUndoArray->nCurUndoAction )
         {
             Undo( *pActUndoArray->aUndoActions[ --pActUndoArray->nCurUndoAction ] );
@@ -587,11 +587,11 @@ void SfxUndoManager::LeaveListAction()
 
     if( pActUndoArray == pUndoArray )
     {
-        DBG_ERROR( "svtools::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" );
+        DBG_ERROR( "svl::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" );
         return;
     }
 
-    DBG_ASSERT(pActUndoArray->pFatherUndoArray,"svtools::SfxUndoManager::LeaveListAction(), no father undo array!?");
+    DBG_ASSERT(pActUndoArray->pFatherUndoArray,"svl::SfxUndoManager::LeaveListAction(), no father undo array!?");
 
     SfxUndoArray* pTmp=pActUndoArray;
     pActUndoArray=pActUndoArray->pFatherUndoArray;
diff --git a/svl/source/uno/makefile.mk b/svl/source/uno/makefile.mk
new file mode 100644
index 000000000000..af26b20cd8df
--- /dev/null
+++ b/svl/source/uno/makefile.mk
@@ -0,0 +1,51 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.21 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=svl
+TARGET=unoiface
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/svl.pmk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES= \
+            $(SLO)$/registerservices.obj\
+            $(SLO)$/pathservice.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svtools/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 65d08609483a..78c339773aec 100644
--- a/svtools/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include "sal/types.h"
 #include "rtl/ustring.hxx"
 #include <cppuhelper/implbase2.hxx>
@@ -54,7 +54,7 @@ public:
     virtual OUString SAL_CALL getImplementationName()
         throw(css::uno::RuntimeException)
         {
-            return OUString::createFromAscii("com.sun.star.comp.svtools.PathService");
+            return OUString::createFromAscii("com.sun.star.comp.svl.PathService");
         }
 
     virtual sal_Bool SAL_CALL supportsService (
diff --git a/svtools/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx
index a3e9f39c2dba..39be9e177fea 100644
--- a/svtools/source/uno/registerservices.cxx
+++ b/svl/source/uno/registerservices.cxx
@@ -29,13 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include "sal/types.h"
 #include "rtl/ustring.hxx"
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
+#include <svl/svldllapi.h>
 
 namespace css = com::sun::star;
 using css::uno::Reference;
@@ -49,19 +50,20 @@ using rtl::OUString;
 
 DECLARE_CREATEINSTANCE( SvNumberFormatterServiceObj )
 DECLARE_CREATEINSTANCE( SvNumberFormatsSupplierServiceObject )
+DECLARE_CREATEINSTANCE( PathService )
 
 // -------------------------------------------------------------------------------------
 
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SVL_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment (
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
+SVL_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo (
     void * /* _pServiceManager */, void * _pRegistryKey)
 {
     if (_pRegistryKey)
@@ -82,12 +84,17 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         xNewKey->createKey (
             OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ) );
 
+        xNewKey = xRegistryKey->createKey(
+            OUString::createFromAscii( "/com.sun.star.comp.svl.PathService/UNO/SERVICES" ) );
+        xNewKey->createKey (
+            OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) );
+
         return sal_True;
     }
     return sal_False;
 }
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory (
+SVL_DLLPUBLIC void* SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * _pServiceManager, void * /* _pRegistryKey*/)
 {
     void * pResult = 0;
@@ -122,6 +129,18 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory (
                 SvNumberFormatterServiceObj_CreateInstance,
                 aServiceNames);
         }
+        else if (rtl_str_compare (
+                     pImplementationName, "com.sun.star.comp.svl.PathService") == 0)
+        {
+            Sequence< OUString > aServiceNames(1);
+            aServiceNames.getArray()[0] =
+                OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" );
+            xFactory = ::cppu::createSingleFactory (
+                reinterpret_cast< css::lang::XMultiServiceFactory* >( _pServiceManager ),
+                OUString::createFromAscii( pImplementationName ),
+                PathService_CreateInstance,
+                aServiceNames);
+        }
         if ( xFactory.is() )
         {
             xFactory->acquire();
diff --git a/svtools/unx/inc/convert.hxx b/svl/unx/inc/convert.hxx
index e91ee4ed2791..e91ee4ed2791 100644
--- a/svtools/unx/inc/convert.hxx
+++ b/svl/unx/inc/convert.hxx
diff --git a/svtools/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index 6f627807bfd3..2aec705bc7ef 100644
--- a/svtools/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/svdde.hxx>
+#include "precompiled_svl.hxx"
+#include <svl/svdde.hxx>
 #include <rtl/instance.hxx>
 
 DdeData::DdeData()
diff --git a/svtools/unx/source/svdde/makefile.mk b/svl/unx/source/svdde/makefile.mk
index d0203fd6378b..c6e89eaf2630 100644
--- a/svtools/unx/source/svdde/makefile.mk
+++ b/svl/unx/source/svdde/makefile.mk
@@ -31,13 +31,13 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=svdde
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk
new file mode 100644
index 000000000000..47a37a6e9173
--- /dev/null
+++ b/svl/util/makefile.mk
@@ -0,0 +1,126 @@
+#*************************************************************************
+#*
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.67 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=svl
+TARGET=svl
+RESTARGETSIMPLE=svs
+GEN_HID=TRUE
+# GEN_HID_OTHER=TRUE
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- general section ----------------------------------------------------
+
+.IF "$(GUI)"!="UNX"
+LIB2TARGET= $(LB)$/isvl.lib
+LIB2FILES=	$(LB)$/_isvl.lib
+.ENDIF
+
+LIB1TARGET= $(SLB)$/svl.lib
+LIB1FILES=	\
+        $(SLB)$/config.lib	\
+        $(SLB)$/svdde.lib \
+        $(SLB)$/undo.lib		\
+        $(SLB)$/numbers.lib 	\
+        $(SLB)$/numbers.uno.lib 	\
+        $(SLB)$/filerec.lib \
+        $(SLB)$/filepicker.lib \
+        $(SLB)$/items.lib	\
+        $(SLB)$/misc.lib	\
+        $(SLB)$/notify.lib	\
+                $(SLB)$/unoiface.lib      \
+        $(SLB)$/svarray.lib \
+        $(SLB)$/svsql.lib
+
+# generation of resourcen-lib ----------------------------------------
+
+RESLIB1NAME=	$(RESTARGETSIMPLE)
+RESLIB1SRSFILES=\
+        $(SRS)$/items.srs \
+        $(SRS)$/misc.srs
+
+# build the shared library  --------------------------------------------------
+
+SHL1TARGET= svl$(DLLPOSTFIX)
+SHL1IMPLIB= _isvl
+SHL1USE_EXPORTS=name
+#Do not link with VCL or any other library that links with VCL
+SHL1STDLIBS= \
+        $(UNOTOOLSLIB)		\
+        $(TOOLSLIB) 		\
+        $(I18NISOLANGLIB)   \
+        $(UCBHELPERLIB)		\
+        $(COMPHELPERLIB)	\
+        $(CPPUHELPERLIB)	\
+        $(CPPULIB)			\
+        $(VOSLIB)			\
+                $(SOTLIB)     \
+        $(SALLIB)
+
+.IF "$(GUI)"=="WNT"
+SHL1STDLIBS+= \
+        $(UWINAPILIB) \
+        $(ADVAPI32LIB)	\
+        $(GDI32LIB)
+.ENDIF # WNT
+
+SHL1LIBS=	$(SLB)$/svl.lib
+
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=	$(SHL1TARGET)
+DEF1DEPN=	$(SLB)$/svl.lib
+DEFLIB1NAME=svl
+DEF1DES =SvTools lite
+
+# --- Targets ------------------------------------------------------
+
+.IF "$(GUI)"=="UNX"
+SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
+.ELSE
+SVTTARGETS= $(LB)$/isvl.lib
+.ENDIF
+
+# just a quick fix - has to be cleaned up some day...
+.IF "$(L10N-framework)"==""
+ALL: $(SLB)$/svl.lib \
+    $(MISC)$/$(SHL1TARGET).def \
+    $(SVTTARGETS) \
+    ALLTAR
+.ENDIF          # "$(L10N-framework)"==""
+
+.INCLUDE :	target.mk
+
diff --git a/svtools/util/svl.pmk b/svl/util/svl.pmk
index aec76257e743..aec76257e743 100644
--- a/svtools/util/svl.pmk
+++ b/svl/util/svl.pmk
diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index df20c7e05376..b91dae79bbad 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.cxx
@@ -43,7 +43,7 @@ using namespace std;
 
 #include <vcl/svapp.hxx>
 
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 #include "filedlg.hxx"
 #include "bmpcore.hxx"
 #include "bmp.hrc"
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index 0633eb4c6a09..3eee49ef695d 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.cxx
@@ -45,7 +45,7 @@
 #include <vcl/bmpacc.hxx>
 #include <vcl/pngread.hxx>
 
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 
 #define EXIT_NOERROR        0x00000000
 #define EXIT_INVALIDFILE    0x00000001
diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx
index 1123eb839eff..412faab3107b 100644
--- a/svtools/inc/apearcfg.hxx
+++ b/svtools/inc/apearcfg.hxx
@@ -87,6 +87,7 @@ public:
     ~SvtTabAppearanceCfg( );
 
     virtual void    Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
     USHORT      GetLookNFeel () const { return nLookNFeel; }
     void        SetLookNFeel ( USHORT nSet );
diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/extcolorcfg.hxx
index f8154c86f88f..228ef9823fd2 100644
--- a/svtools/inc/extcolorcfg.hxx
+++ b/svtools/inc/extcolorcfg.hxx
@@ -34,8 +34,8 @@
 #include <rtl/ustring.hxx>
 #include <tools/color.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 
 //-----------------------------------------------------------------------------
 namespace svtools{
diff --git a/svtools/source/dialogs/filedlg2.hrc b/svtools/inc/filedlg2.hrc
index a75e9047eafb..a75e9047eafb 100644
--- a/svtools/source/dialogs/filedlg2.hrc
+++ b/svtools/inc/filedlg2.hrc
diff --git a/svtools/inc/flbytes.hxx b/svtools/inc/flbytes.hxx
deleted file mode 100644
index 86c19191de2a..000000000000
--- a/svtools/inc/flbytes.hxx
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: flbytes.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FLBYTES_HXX
-#define _FLBYTES_HXX
-
-#include <tools/debug.hxx>
-#include <tools/stream.hxx>
-
-//============================================================================
-class SvFillLockBytes : public SvLockBytes
-{
-    SvLockBytesRef xLockBytes;
-    ULONG nFilledSize;
-    BOOL bTerminated;
-    BOOL bSync;
-public:
-    TYPEINFO();
-
-    SvFillLockBytes( SvLockBytes* pLockBytes );
-    virtual ErrCode ReadAt(
-        ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pRead ) const;
-    virtual ErrCode WriteAt(
-        ULONG nPos, const void* pBuffer, ULONG nCount, ULONG* pWritten );
-    virtual ErrCode Flush() const;
-    virtual ErrCode SetSize( ULONG nSize );
-    virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );
-    virtual ErrCode UnlockRegion( ULONG nPos, ULONG nCount, LockType );
-    virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
-    ErrCode FillAppend( const void* pBuffer, ULONG nCount, ULONG *pWritten );
-    ULONG   Tell() const { return nFilledSize; }
-    void    Seek( ULONG nPos ) { nFilledSize = nPos; }
-
-    void Terminate();
-};
-
-SV_DECL_IMPL_REF( SvFillLockBytes )
-
-//============================================================================
-class SvSyncLockBytes: public SvOpenLockBytes
-{
-    SvAsyncLockBytesRef m_xAsyncLockBytes;
-
-public:
-    TYPEINFO();
-
-    /// Create a synchronous wrapper around existing asynchronous lock bytes.
-    ///
-    /// @param pTheAsyncLockBytes  Must not be null.
-    inline SvSyncLockBytes(SvAsyncLockBytes * pTheAsyncLockBytes);
-
-    /// Create a synchronous wrapper around an existing stream.
-    ///
-    /// @descr  This is like first creating asynchronous lock bytes around the
-    /// stream and than creating a synchronous wrapper around the asynchronous
-    /// lock bytes.
-    ///
-    /// @param pStream  Must not be null.
-    ///
-    /// @param bOwner  True if these lock bytes own the stream (delete it on
-    /// destruction).
-    SvSyncLockBytes(SvStream * pStream, BOOL bOwner):
-        m_xAsyncLockBytes(new SvAsyncLockBytes(pStream, bOwner)) {}
-
-    virtual const SvStream * GetStream() const
-    { return m_xAsyncLockBytes->GetStream(); }
-
-    virtual void SetSynchronMode(BOOL bSync = TRUE)
-    { m_xAsyncLockBytes->SetSynchronMode(bSync); }
-
-    virtual BOOL IsSynchronMode() const
-    { return m_xAsyncLockBytes->IsSynchronMode(); }
-
-    virtual ErrCode ReadAt(ULONG nPos, void * pBuffer, ULONG nCount,
-                           ULONG * pRead) const;
-
-    virtual ErrCode WriteAt(ULONG nPos, const void * pBuffer, ULONG nCount,
-                            ULONG * pWritten);
-
-    virtual ErrCode Flush() const { return m_xAsyncLockBytes->Flush(); }
-
-    virtual ErrCode SetSize(ULONG nSize)
-    { return m_xAsyncLockBytes->SetSize(nSize); }
-
-    virtual ErrCode LockRegion(ULONG nPos, ULONG nCount, LockType eType)
-    { return m_xAsyncLockBytes->LockRegion(nPos, nCount, eType); }
-
-    virtual ErrCode UnlockRegion(ULONG nPos, ULONG nCount, LockType eType)
-    { return m_xAsyncLockBytes->UnlockRegion(nPos, nCount, eType); }
-
-    virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag eFlag)
-        const
-    { return m_xAsyncLockBytes->Stat(pStat, eFlag); }
-
-    virtual ErrCode FillAppend(const void * pBuffer, ULONG nCount,
-                               ULONG * pWritten)
-    { return m_xAsyncLockBytes->FillAppend(pBuffer, nCount, pWritten); }
-
-    virtual ULONG Tell() const { return m_xAsyncLockBytes->Tell(); }
-
-    virtual ULONG Seek(ULONG nPos)
-    { return m_xAsyncLockBytes->Seek(nPos); }
-
-    virtual void Terminate() { m_xAsyncLockBytes->Terminate(); }
-};
-
-inline SvSyncLockBytes::SvSyncLockBytes(SvAsyncLockBytes *
-                                         pTheAsyncLockBytes):
-    m_xAsyncLockBytes(pTheAsyncLockBytes)
-{
-    DBG_ASSERT(m_xAsyncLockBytes.Is(),
-               "SvSyncLockBytes::SvSyncLockBytes(): Null");
-}
-
-SV_DECL_IMPL_REF(SvSyncLockBytes);
-
-//============================================================================
-struct SvCompositeLockBytes_Impl;
-class SvCompositeLockBytes : public SvLockBytes
-{
-    SvCompositeLockBytes_Impl* pImpl;
-public:
-    TYPEINFO();
-
-    SvCompositeLockBytes( );
-    ~SvCompositeLockBytes();
-
-    void Append( SvLockBytes* pLockBytes, ULONG nPos, ULONG nOffset );
-    ULONG RelativeOffset( ULONG nPos ) const;
-    void  SetIsPending( BOOL bSet );
-    SvLockBytes*    GetLastLockBytes() const;
-
-    virtual ErrCode ReadAt(
-        ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pRead ) const;
-    virtual ErrCode WriteAt(
-        ULONG nPos, const void* pBuffer, ULONG nCount, ULONG* pWritten );
-    virtual ErrCode Flush() const;
-    virtual ErrCode SetSize( ULONG nSize );
-    virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );
-    virtual ErrCode UnlockRegion( ULONG nPos, ULONG nCount, LockType );
-    virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
-};
-
-SV_DECL_IMPL_REF( SvCompositeLockBytes )
-
-
-#endif
diff --git a/svtools/inc/fontsubstconfig.hxx b/svtools/inc/fontsubstconfig.hxx
index 7bcb20e509fe..7ce7e64362b5 100644
--- a/svtools/inc/fontsubstconfig.hxx
+++ b/svtools/inc/fontsubstconfig.hxx
@@ -53,6 +53,7 @@ public:
     virtual ~SvtFontSubstConfig();
 
     virtual void            Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
     sal_Bool                IsEnabled() const {return bIsEnabled;}
     void                    Enable(sal_Bool bSet)  {bIsEnabled = bSet; SetModified();}
diff --git a/svtools/inc/imgdef.hxx b/svtools/inc/imgdef.hxx
index e5b682d91bfe..2881fe5150bc 100644
--- a/svtools/inc/imgdef.hxx
+++ b/svtools/inc/imgdef.hxx
@@ -38,17 +38,6 @@ enum SfxSymbolsSize
     SFX_SYMBOLS_SIZE_AUTO
 };
 
-enum SfxSymbolsStyle
-{
-    SFX_SYMBOLS_STYLE_AUTO,
-    SFX_SYMBOLS_STYLE_DEFAULT,
-    SFX_SYMBOLS_STYLE_HICONTRAST,
-    SFX_SYMBOLS_STYLE_INDUSTRIAL,
-    SFX_SYMBOLS_STYLE_CRYSTAL,
-    SFX_SYMBOLS_STYLE_TANGO,
-    SFX_SYMBOLS_STYLE_CLASSIC
-};
-
 #define SFX_TOOLBOX_CHANGESYMBOLSET     0x0001
 #define SFX_TOOLBOX_CHANGEOUTSTYLE      0x0002
 #define SFX_TOOLBOX_CHANGEBUTTONTYPE    0x0004
diff --git a/svtools/inc/inidef.hxx b/svtools/inc/inidef.hxx
deleted file mode 100644
index c7744d8be2d0..000000000000
--- a/svtools/inc/inidef.hxx
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: inidef.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SFXINIDEF_HXX
-#define _SFXINIDEF_HXX
-
-#ifndef _INIMGR_HXX
-#include <iniman.hxx>
-#endif
-
-class SfxIniEntry;
-class SfxIniDefaulterList;
-class SfxIniDefaultManager;
-
-#if _SOLAR__PRIVATE
-#include <svtools/svarray.hxx>
-
-class SfxIniDefaulter;
-SV_DECL_PTRARR( SfxIniDefaulterList, SfxIniDefaulter*, 0, 2 );
-#endif
-
-//========================================================================
-
-class SfxIniDefaulter
-
-/*  [Beschreibung]
-
-    Instanzen dieser Klasse k"onnen (f"ur die Laufzeit eines Moduls, z.B.
-    einer DLL-Nutzung oder einer Applikation) angelegt werden, um Defaults
-    f"ur eine Anzahl von ini-Eintr"agen zu liefern. Diese Defaults werden
-    erfragt, wenn ein <SfxIniManager> einen Eintrag nicht in den ini-Files
-    finden kann.
-
-    Defaults verschiedener <SfxIniDefaulter>-Instanzen d"urfen sich nicht
-    unterscheiden, da die Reihenfolge der Abarbeitung nicht definiert ist.
-
-    Die Instanzen brauchen nicht zerst"ort zu werden, au\ser wenn der
-    dazugeh"orige Code entladen wird (load-on-demand DLLs). Sonst geschieht
-    dies automatisch beim Zerst"oren des <SfxIniDefaultManager>.
-*/
-
-{
-    SfxIniDefaultManager*   _pManager;
-
-public:
-                            SfxIniDefaulter( SfxIniDefaultManager *pManager );
-                            ~SfxIniDefaulter();
-
-    virtual BOOL            QueryDefault( String &aValue,
-                                          const SfxIniEntry &rEntry ) = 0;
-};
-
-//========================================================================
-
-class SfxIniDefaultManager
-
-/*  [Beschreibung]
-
-    Genau eine Instanz dieser Klasse mu\s in jeder Application-Subklasse,
-    die diesen Mechanismus nutzen m"ochte, in deren Ctor angelegt werden
-    und sollte in deren Dtor zerst"ort werden.
-*/
-
-{
-    SfxIniDefaulterList*    _pList;
-
-public:
-                            SfxIniDefaultManager();
-                            ~SfxIniDefaultManager();
-
-#if _SOLAR__PRIVATE
-    void                    Insert( SfxIniDefaulter *pDefaulter )
-                            { _pList->C40_INSERT( SfxIniDefaulter, pDefaulter, _pList->Count() ); }
-    void                    Remove( SfxIniDefaulter *pDefaulter )
-                            { _pList->Remove( _pList->C40_GETPOS( SfxIniDefaulter, pDefaulter ) ); }
-    BOOL                    QueryDefault( String &aValue,
-                                          const SfxIniEntry &rEntry );
-#endif
-};
-
-//========================================================================
-
-class SfxIniEntry
-
-/*  [Beschreibung]
-
-    Instanzen dieser Klasse beschreiben einen Eintrag eines Ini-Files,
-    um mit der Klasse <SfxIniDefaulter> erfragt werden zu k"onnen, falls
-    der <SfxIniManager> einen Eintrag nicht in den Ini-Files auffindet.
-*/
-
-{
-friend class SfxIniManager;
-
-    const String&           _aGroup;
-    const String&           _aKey;
-    SfxIniGroup             _eGroup;
-    SfxIniKey               _eKey;
-    USHORT                  _nIndex;
-
-private:
-                            SfxIniEntry( const String&  aGroup,
-                                         const String&  aKey,
-                                         SfxIniGroup    eGroup,
-                                         SfxIniKey      eKey,
-                                         USHORT         nIndex );
-                            SfxIniEntry( const SfxIniEntry & ); // n.i.
-    SfxIniEntry&            operator=( const SfxIniEntry & ); // n.i.
-
-public:
-    const String&           GetGroupName() const { return _aGroup; }
-    SfxIniGroup             GetGroup() const { return _eGroup; }
-    const String&           GetKeyName() const { return _aKey; }
-    SfxIniKey               GetKey() const { return _eKey; }
-    USHORT                  GetIndex() const { return _nIndex; }
-};
-
-#endif
-
diff --git a/svtools/inc/iniprop.hxx b/svtools/inc/iniprop.hxx
deleted file mode 100644
index 8ba56baa287b..000000000000
--- a/svtools/inc/iniprop.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: iniprop.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SFXINIPROP_HXX
-#define _SFXINIPROP_HXX
-
-#include <limits.h>
-#include <tools/rtti.hxx>
-#ifndef _APP_HXX
-#include <vcl/svapp.hxx>
-#endif
-
-class SfxIniManager;
-
-//------------------------------------------------------------------------
-
-class SfxAppIniManagerProperty: public ApplicationProperty
-
-//  fuer Application::Property(), um von ueberall an den AppIniManger zu kommen
-
-{
-    SfxIniManager*      _pIniManager;
-
-public:
-                        TYPEINFO();
-                        SfxAppIniManagerProperty()
-                        :   _pIniManager(0)
-                        {}
-                        ~SfxAppIniManagerProperty();
-
-    SfxIniManager*      GetIniManager() const { return _pIniManager; }
-    void                SetIniManager( SfxIniManager *pIniManager )
-                        { _pIniManager = pIniManager; }
-};
-
-
-#endif
-
diff --git a/svtools/inc/reginfo.hxx b/svtools/inc/reginfo.hxx
deleted file mode 100644
index bb3596797c6e..000000000000
--- a/svtools/inc/reginfo.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: reginfo.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _REGINFO_HXX
-#define _REGINFO_HXX
-
-struct RegInfo_Impl;
-
-#include <tools/string.hxx>
-
-class RegInfo
-{
-
-  public:
-
-                    RegInfo();
-                    ~RegInfo();
-
-    const String&   GetGroup() const { return aCurrentGroup; }
-    void            SetAppGroup( const String& rGroup );
-    void            DeleteAppGroup( const String& rGroup );
-
-    String          ReadKey( const String& rKey ) const;
-    String          ReadKey( const String& rKey, const String& rDefault ) const;
-    void            WriteKey( const String& rKey, const String& rValue );
-    void            DeleteKey( const String& rKey );
-    String          GetKeyName( USHORT nKey ) const;
-    String          ReadKey( USHORT nKey ) const;
-    USHORT          GetKeyCount() const;
-
-  private:
-
-    String          aCurrentGroup;
-    RegInfo_Impl*   pImp;
-
-};
-
-
-#endif
diff --git a/svtools/source/svrtf/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx
index f76399ffd824..f76399ffd824 100644
--- a/svtools/source/svrtf/rtfkeywd.hxx
+++ b/svtools/inc/rtfkeywd.hxx
diff --git a/svtools/source/svrtf/rtfout.hxx b/svtools/inc/rtfout.hxx
index ba20add1d968..ba20add1d968 100644
--- a/svtools/source/svrtf/rtfout.hxx
+++ b/svtools/inc/rtfout.hxx
diff --git a/svtools/source/svrtf/rtftoken.h b/svtools/inc/rtftoken.h
index c7981361ffc9..c7981361ffc9 100644
--- a/svtools/source/svrtf/rtftoken.h
+++ b/svtools/inc/rtftoken.h
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index 85b914354a3a..bde908fb1851 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.hxx
@@ -33,14 +33,14 @@
 #include "svtools/svtdllapi.h"
 #include <unotools/configitem.hxx>
 #include <tools/string.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/options.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/options.hxx>
 
 class SvtAccessibilityOptions_Impl;
 
 class SVT_DLLPUBLIC SvtAccessibilityOptions:
-    public svt::detail::Options, public SfxBroadcaster, private SfxListener
+    public utl::detail::Options, private SfxListener
 {
 private:
     static SvtAccessibilityOptions_Impl* volatile sm_pSingleImplConfig;
diff --git a/svtools/inc/svtools/addxmltostorageoptions.hxx b/svtools/inc/svtools/addxmltostorageoptions.hxx
deleted file mode 100644
index 1704de8b1700..000000000000
--- a/svtools/inc/svtools/addxmltostorageoptions.hxx
+++ /dev/null
@@ -1,162 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: addxmltostorageoptions.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_ADDXMLTOSTORAGEOPTIONS_HXX
-#define INCLUDED_SVTOOLS_ADDXMLTOSTORAGEOPTIONS_HXX
-
-//_________________________________________________________________________________________________________________
-//  includes
-//_________________________________________________________________________________________________________________
-
-#include "svtools/svldllapi.h"
-#include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
-
-//_________________________________________________________________________________________________________________
-//  forward declarations
-//_________________________________________________________________________________________________________________
-
-/*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
-                    You can create the container if it is neccessary. The class which use these mechanism
-                    is faster and smaller then a complete implementation!
-*//*-*************************************************************************************************************/
-
-class SvtAddXMLToStorageOptions_Impl;
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
-/*-************************************************************************************************************//**
-    @short          collect informations about security features
-    @descr          -
-
-    @implements     -
-    @base           -
-
-    @devstatus      ready to use
-*//*-*************************************************************************************************************/
-
-class SVL_DLLPUBLIC SvtAddXMLToStorageOptions: public svt::detail::Options
-{
-    //-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    //-------------------------------------------------------------------------------------------------------------
-
-    public:
-
-        //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
-
-        /*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
-                        We implement these class with a refcount mechanism! Every instance of this class increase it
-                        at create and decrease it at delete time - but all instances use the same data container!
-                        He is implemented as a static member ...
-
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
-
-            @param      -
-            @return     -
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-
-         SvtAddXMLToStorageOptions();
-        virtual ~SvtAddXMLToStorageOptions();
-
-        //---------------------------------------------------------------------------------------------------------
-        //  interface
-        //---------------------------------------------------------------------------------------------------------
-
-        /*-****************************************************************************************************//**
-            @short      interface methods to get value of config key
-            @descr
-
-            @seealso    -
-
-            @param
-            @return     The values which represent current state of internal variable.
-
-            @onerror    No error should occurre!
-        *//*-*****************************************************************************************************/
-
-        sal_Bool IsWriter_Add_XML_to_Storage() const;
-        sal_Bool IsCalc_Add_XML_to_Storage() const;
-        sal_Bool IsImpress_Add_XML_to_Storage() const;
-        sal_Bool IsDraw_Add_XML_to_Storage() const;
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  private methods
-    //-------------------------------------------------------------------------------------------------------------
-
-    private:
-
-        /*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class use his own static mutex to be threadsafe.
-                        We create a static mutex only for one ime and use at different times.
-
-            @seealso    -
-
-            @param      -
-            @return     A reference to a static mutex member.
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  private member
-    //-------------------------------------------------------------------------------------------------------------
-
-    private:
-
-        /*Attention
-
-            Don't initialize these static member in these header!
-            a) Double dfined symbols will be detected ...
-            b) and unresolved externals exist at linking time.
-            Do it in your source only.
-         */
-
-        static SvtAddXMLToStorageOptions_Impl*  m_pDataContainer;   /// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32 m_nRefCount;   /// internal ref count mechanism
-
-};      // class SvtAddXMLToStorageOptions
-
-#endif
diff --git a/svtools/inc/svtools/bintitem.hxx b/svtools/inc/svtools/bintitem.hxx
deleted file mode 100644
index 83119d9f3b18..000000000000
--- a/svtools/inc/svtools/bintitem.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bintitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _BINTITEM_HXX
-#define _BINTITEM_HXX
-
-#include <tools/solar.h>
-#include <tools/rtti.hxx>
-#include <tools/bigint.hxx>
-#include <tools/debug.hxx>
-
-#include <svtools/poolitem.hxx>
-
-class SfxArguments;
-class SvStream;
-
-DBG_NAMEEX(SfxBigIntItem)
-
-class SfxBigIntItem: public SfxPoolItem
-{
-    BigInt aVal;
-
-public:
-    TYPEINFO();
-    SfxBigIntItem();
-    SfxBigIntItem(USHORT nWhich, const BigInt& rValue);
-    SfxBigIntItem(USHORT nWhich, SvStream &);
-    SfxBigIntItem(const SfxBigIntItem&);
-    ~SfxBigIntItem() { DBG_DTOR(SfxBigIntItem, 0); }
-
-    virtual SfxItemPresentation GetPresentation(
-        SfxItemPresentation ePres,
-        SfxMapUnit eCoreMetric,
-        SfxMapUnit ePresMetric,
-        XubString &rText,
-        const IntlWrapper * = 0 ) const;
-
-    virtual int operator==(const SfxPoolItem&) const;
-    using SfxPoolItem::Compare;
-    virtual int Compare(const SfxPoolItem &rWith) const;
-    virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const;
-    virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
-
-    virtual BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
-                             BYTE nMemberId = 0 );
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
-                             BYTE nMemberId = 0 ) const;
-
-    virtual SfxFieldUnit GetUnit() const;    // FUNIT_NONE
-
-    const BigInt& GetValue() const { return aVal; }
-    void SetValue(const BigInt& rNewVal)
-    {
-        DBG_ASSERT(GetRefCount() == 0, "SetValue() with pooled item");
-        aVal = rNewVal;
-    }
-};
-
-#endif /* _BINTITEM_HXX */
-
diff --git a/svtools/inc/svtools/colorcfg.hxx b/svtools/inc/svtools/colorcfg.hxx
index 9a0d570e7cc0..dd3ba4018280 100644
--- a/svtools/inc/svtools/colorcfg.hxx
+++ b/svtools/inc/svtools/colorcfg.hxx
@@ -34,9 +34,9 @@
 #include <rtl/ustring.hxx>
 #include <tools/color.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/options.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/options.hxx>
 
 //-----------------------------------------------------------------------------
 namespace svtools{
@@ -108,7 +108,7 @@ struct ColorConfigValue
 
  ---------------------------------------------------------------------------*/
 class SVT_DLLPUBLIC ColorConfig:
-    public svt::detail::Options, public SfxBroadcaster, public SfxListener
+    public utl::detail::Options
 {
     friend class ColorConfig_Impl;
 private:
@@ -117,12 +117,9 @@ public:
     ColorConfig();
     virtual ~ColorConfig();
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
     // get the configured value - if bSmart is set the default color setting is provided
     // instead of the automatic color
     ColorConfigValue        GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart = sal_True)const;
-
     static Color            GetDefaultColor(ColorConfigEntry eEntry);
 };
 /* -----------------------------22.03.2002 15:31------------------------------
diff --git a/svtools/inc/svtools/cstitem.hxx b/svtools/inc/svtools/cstitem.hxx
deleted file mode 100644
index 654ee9c15a75..000000000000
--- a/svtools/inc/svtools/cstitem.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cstitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CSTITEM_HXX
-#define _CSTITEM_HXX
-
-#include <tools/rtti.hxx>
-
-#include <svtools/poolitem.hxx>
-
-class SvStream;
-
-enum CrawlStatus
-{
-    CSTAT_NEVER_UPD         = 0,        /* noch nie ueberprueft                         */
-    CSTAT_IN_UPD            = 1,        /* Ueberpruefung laeuft                         */
-    CSTAT_UPD_NEWER         = 2,        /* wurde ueberprueft und ist neuer              */
-    CSTAT_UPD_NOT_NEWER     = 3,        /* wurde ueberprueft und ist nicht neuer        */
-    CSTAT_UPD_CANCEL        = 4,        /* Ueberpruefung vom Benutzer abgebrochen       */
-    CSTAT_ERR_GENERAL       = 5,        /* allgemeiner Fehler                           */
-    CSTAT_ERR_NOTEXISTS     = 6,        /* Server existiert nicht                       */
-    CSTAT_ERR_NOTREACHED    = 7,        /* Server nicht ereicht                         */
-    CSTAT_UPD_IMMEDIATELY   = 8,        /* es wird gleich ueberprueftt                  */
-    CSTAT_ERR_OFFLINE       = 9         /* Ueberpruefung nicht m�glich, da Offline        */
-};
-
-DBG_NAMEEX(SfxCrawlStatusItem)
-
-// class SfxDateTimeRangeItem -------------------------------------------------
-
-class SfxCrawlStatusItem : public SfxPoolItem
-{
-private:
-            CrawlStatus     eStatus;
-public:
-            TYPEINFO();
-
-            SfxCrawlStatusItem( const SfxCrawlStatusItem& rCpy );
-            SfxCrawlStatusItem( USHORT nWhich );
-            SfxCrawlStatusItem( USHORT nWhich, CrawlStatus eStat );
-            ~SfxCrawlStatusItem() { DBG_DTOR(SfxCrawlStatusItem, 0); }
-
-    virtual int             operator==( const SfxPoolItem& )            const;
-    using SfxPoolItem::Compare;
-    virtual int             Compare( const SfxPoolItem &rWith )         const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion )    const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion )     const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 )             const;
-
-    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    XubString &rText,
-                                    const IntlWrapper * pIntlWrapper = 0 )
-        const;
-
-    CrawlStatus             GetStatus() const { return eStatus; }
-    void                    SetStatus(CrawlStatus eNew) { eStatus = eNew; }
-
-    virtual BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
-                             BYTE nMemberId = 0 );
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
-                             BYTE nMemberId = 0 ) const;
-};
-
-#endif
-
diff --git a/svtools/inc/svtools/dtritem.hxx b/svtools/inc/svtools/dtritem.hxx
deleted file mode 100644
index 87666a306a43..000000000000
--- a/svtools/inc/svtools/dtritem.hxx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dtritem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DTRITEM_HXX
-#define _DTRITEM_HXX
-
-#include <tools/rtti.hxx>
-#include <tools/datetime.hxx>
-
-#include <svtools/poolitem.hxx>
-
-class SvStream;
-
-DBG_NAMEEX(SfxDateTimeRangeItem)
-
-// class SfxDateTimeRangeItem -------------------------------------------------
-
-class SfxDateTimeRangeItem : public SfxPoolItem
-{
-private:
-    DateTime                aStartDateTime;
-    DateTime                aEndDateTime;
-
-public:
-            TYPEINFO();
-
-            SfxDateTimeRangeItem( const SfxDateTimeRangeItem& rCpy );
-            SfxDateTimeRangeItem( USHORT nWhich );
-            SfxDateTimeRangeItem( USHORT nWhich, const DateTime& rStartDT,
-                                  const DateTime& rEndDT );
-
-            ~SfxDateTimeRangeItem()
-                { DBG_DTOR(SfxDateTimeRangeItem, 0); }
-
-    virtual int             operator==( const SfxPoolItem& )            const;
-    using SfxPoolItem::Compare;
-    virtual int             Compare( const SfxPoolItem &rWith )         const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion )    const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion )     const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 )             const;
-    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    XubString &rText,
-                                    const IntlWrapper * pIntlWrapper = 0 )
-        const;
-
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 );
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 ) const;
-
-    const DateTime&         GetStartDateTime()      const { return aStartDateTime; }
-    const DateTime&         GetEndDateTime()        const { return aEndDateTime; }
-
-    void                    SetStartDateTime( const DateTime& rDT )
-                            { DBG_ASSERT( GetRefCount() == 0, "SetDateTime() with pooled item" );
-                              aStartDateTime = rDT; }
-
-    void                    SetEndDateTime( const DateTime& rDT )
-                            { DBG_ASSERT( GetRefCount() == 0, "SetDateTime() with pooled item" );
-                              aEndDateTime = rDT; }
-};
-
-#endif
-
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index e2fe243f8399..27e9376ea1c7 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -33,7 +33,7 @@
 
 #include "svtools/svtdllapi.h"
 #include <vcl/spinfld.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 //#define REGEXP_SUPPORT
 
diff --git a/svtools/inc/svtools/frqitem.hxx b/svtools/inc/svtools/frqitem.hxx
deleted file mode 100644
index 11b2d31a1123..000000000000
--- a/svtools/inc/svtools/frqitem.hxx
+++ /dev/null
@@ -1,178 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: frqitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FRQITEM_HXX
-#define _FRQITEM_HXX
-
-#include <tools/rtti.hxx>
-#include <tools/time.hxx>
-#include <tools/datetime.hxx>
-#include <tools/string.hxx>
-
-#include <svtools/poolitem.hxx>
-
-class SvStream;
-
-DBG_NAMEEX(SfxFrequencyItem)
-
-// class SfxFrequencyItem -------------------------------------------------
-
-///////////////////////////////////////////////////////////////////////////////
-/*
-FRQ_DAILY
-    * jeden X'ten Tag
-    nInterval1 = 1 .. 999
-
-    * jeden Wochentag
-    nInterval1 = USHRT_MAX
-
-FRQ_WEEKLY
-    + wiederhole jede X'te Woche
-    nInterval1 = 1 .. 99
-
-    + an SU, MO, TU, WE, TH, FR, SA
-    nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY | WD_WEDNESDAY |
-                 WD_THURSDAY | WD_FRIDAY | WD_SATURDAY
-
-FRQ_MONTHLY_DAILY
-    * jeden X'ten Tag von jedem X'ten Monat
-    nInterval1 = 1 .. 31
-    nInterval2 = 1 .. 6
-
-FRQ_MONTHLY_LOGIC
-    * jeden ersten, zweiten, dritten, vierten oder letzten Wochentag jeden X'ten Monats
-    nInterval1 = 0 .. 4
-    nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY | WD_WEDNESDAY |
-                 WD_THURSDAY | WD_FRIDAY | WD_SATURDAY
-    nInterval3 = 1 .. 6
-
-===============================================================================
-
-FRQ_TIME_AT
-    * Update um Uhrzeit
-    nTime1 = 00:00:00 - 24:00:00
-
-FRQ_TIME_REPEAT
-    * Wiederhole alle X Stunden
-    nTInterval1 = 1 .. 8
-        + zwischen Uhrzeit 1 und 2
-        nTime1 = 00:00:00 - 24:00:00
-        nTime2 = 00:00:00 - 24:00:00
-
-*/
-///////////////////////////////////////////////////////////////////////////////
-
-enum FrequencyMode
-{
-    FRQ_DAILY               = 1,
-    FRQ_WEEKLY              = 2,
-    FRQ_MONTHLY_DAILY       = 3,
-    FRQ_MONTHLY_LOGIC       = 4
-};
-
-enum FrequencyTimeMode
-{
-    FRQ_TIME_AT             = 1,
-    FRQ_TIME_REPEAT         = 2,
-    FRQ_TIME_REPEAT_RANGE   = 3
-};
-
-#define WD_SUNDAY       0x0001
-#define WD_MONDAY       0x0002
-#define WD_TUESDAY      0x0004
-#define WD_WEDNESDAY    0x0008
-#define WD_THURSDAY     0x0010
-#define WD_FRIDAY       0x0020
-#define WD_SATURDAY     0x0040
-
-class SfxFrequencyItem : public SfxPoolItem
-{
-private:
-            FrequencyMode       eFrqMode;
-            FrequencyTimeMode   eFrqTimeMode;
-
-            USHORT              nDInterval1;
-            USHORT              nDInterval2;
-            USHORT              nDInterval3;
-
-            USHORT              nTInterval1;
-            Time                aTime1;
-            Time                aTime2;
-
-            BOOL                bMissingDate;
-            DateTime            aMissingDate;
-
-            Time                _CalcTime( BOOL bForToday ) const;
-public:
-            TYPEINFO();
-
-            SfxFrequencyItem( const SfxFrequencyItem& rCpy );
-            SfxFrequencyItem( USHORT nWhich );
-            SfxFrequencyItem( USHORT nWhich, FrequencyMode eMode, FrequencyTimeMode eTMode,
-                              USHORT nDI1, USHORT nDI2, USHORT nDI3, USHORT nTI1,
-                              const Time& rT1, const Time& rT2 );
-            ~SfxFrequencyItem() { DBG_DTOR(SfxFrequencyItem, 0); }
-
-    virtual int             operator==( const SfxPoolItem& )            const;
-    using SfxPoolItem::Compare;
-    virtual int             Compare( const SfxPoolItem &rWith )         const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion )    const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion )     const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 )             const;
-    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-                                SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString &rText,
-                                const IntlWrapper * = 0 ) const;
-
-    DateTime                CalcNextTick( const DateTime& rNow, BOOL bFirst = FALSE );
-
-    BOOL                    HasMissingDate() const              { return bMissingDate; }
-    DateTime                GetMissingDate() const              { return aMissingDate; }
-
-    FrequencyMode           GetFrequencyMode() const            { return eFrqMode; }
-    FrequencyTimeMode       GetFrequencyTimeMode() const        { return eFrqTimeMode; }
-    USHORT                  GetDInterval_1() const              { return nDInterval1; }
-    USHORT                  GetDInterval_2() const              { return nDInterval2; }
-    USHORT                  GetDInterval_3() const              { return nDInterval3; }
-    USHORT                  GetTInterval_1() const              { return nTInterval1; }
-    const Time&             GetTime_1() const                   { return aTime1; }
-    const Time&             GetTime_2() const                   { return aTime2; }
-
-    void                    SetFrequencyMode(FrequencyMode eNew)    { eFrqMode = eNew; }
-    void                    SetFrequencyTimeMode(FrequencyTimeMode eNew){ eFrqTimeMode = eNew; }
-    void                    SetDInterval_1(USHORT nNew)             { nDInterval1 = nNew; }
-    void                    SetDInterval_2(USHORT nNew)             { nDInterval2 = nNew; }
-    void                    SetDInterval_3(USHORT nNew)             { nDInterval3 = nNew; }
-    void                    SetTInterval_1(USHORT nNew)             { nTInterval1 = nNew; }
-    void                    SetTime_1(const Time& rNew)             { aTime1 = rNew; }
-    void                    SetTime_2(const Time& rNew)             { aTime2 = rNew; }
-};
-
-#endif
-
diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc
index efbb0d2628d9..937898f37af1 100644
--- a/svtools/inc/svtools/helpid.hrc
+++ b/svtools/inc/svtools/helpid.hrc
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 
diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx
index 7c8c322ec916..7a9a06b8bc5f 100644
--- a/svtools/inc/svtools/helpopt.hxx
+++ b/svtools/inc/svtools/helpopt.hxx
@@ -37,13 +37,13 @@
 #define INCLUDED_LIST
 #endif
 #include <tools/string.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 typedef std::list< sal_Int32 > IdList;
 
 class SvtHelpOptions_Impl;
 
-class SVT_DLLPUBLIC SvtHelpOptions: public svt::detail::Options
+class SVT_DLLPUBLIC SvtHelpOptions: public utl::detail::Options
 {
     SvtHelpOptions_Impl*    pImp;
 
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx
index 1f0b91c3c353..13df12b64ea9 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/svtools/inc/svtools/htmlout.hxx
@@ -34,7 +34,7 @@
 #include "svtools/svtdllapi.h"
 #include <tools/solar.h>
 #include <rtl/textenc.h>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 class Color;
 class ImageMap;
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx
index 3671bf50878c..b8da0e5c3ee8 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/svtools/inc/svtools/imapobj.hxx
@@ -33,7 +33,7 @@
 
 #include "svtools/svtdllapi.h"
 #include <tools/string.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 class Point;
 class Rectangle;
diff --git a/svtools/inc/svtools/insdlg.hxx b/svtools/inc/svtools/insdlg.hxx
index 191c3db68397..9721d55761f0 100644
--- a/svtools/inc/svtools/insdlg.hxx
+++ b/svtools/inc/svtools/insdlg.hxx
@@ -38,7 +38,7 @@
 #include <sot/formats.hxx>
 
 #ifndef _OWNCONT_HXX
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 #endif
 #include <svtools/transfer.hxx>
 
diff --git a/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx
index 1d93d9068e1c..2bc5588519c2 100644
--- a/svtools/inc/svtools/menuoptions.hxx
+++ b/svtools/inc/svtools/menuoptions.hxx
@@ -34,10 +34,10 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "svtools/svtdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -67,7 +67,7 @@ class SvtMenuOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtMenuOptions: public svt::detail::Options
+class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -98,8 +98,8 @@ class SVL_DLLPUBLIC SvtMenuOptions: public svt::detail::Options
          SvtMenuOptions();
         virtual ~SvtMenuOptions();
 
-        void AddListener( const Link& rLink );
-        void RemoveListener( const Link& rLink );
+        void AddListenerLink( const Link& rLink );
+        void RemoveListenerLink( const Link& rLink );
         //---------------------------------------------------------------------------------------------------------
         //  interface
         //---------------------------------------------------------------------------------------------------------
@@ -148,7 +148,7 @@ class SVL_DLLPUBLIC SvtMenuOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 1b81bb8a5fc9..556dd7f0cc7e 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -39,7 +39,7 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -71,7 +71,7 @@ class Link;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVT_DLLPUBLIC SvtMiscOptions: public svt::detail::Options
+class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -102,8 +102,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public svt::detail::Options
          SvtMiscOptions();
         virtual ~SvtMiscOptions();
 
-        void AddListener( const Link& rLink );
-        void RemoveListener( const Link& rLink );
+        void AddListenerLink( const Link& rLink );
+        void RemoveListenerLink( const Link& rLink );
 
         //---------------------------------------------------------------------------------------------------------
         //  interface
diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx
index 120cccfa4232..18ce9c65e897 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/svtools/inc/svtools/optionsdrawinglayer.hxx
@@ -35,7 +35,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "svtools/svtdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
@@ -68,7 +68,7 @@ class SvtOptionsDrawinglayer_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtOptionsDrawinglayer
+class SVT_DLLPUBLIC SvtOptionsDrawinglayer
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -217,7 +217,7 @@ class SVL_DLLPUBLIC SvtOptionsDrawinglayer
 
             @onerror    -
         *//*-*****************************************************************************************************/
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx
index f5de6aea358d..e1eb53c6e052 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/svtools/inc/svtools/parhtml.hxx
@@ -34,7 +34,7 @@
 #include "svtools/svtdllapi.h"
 #include <tools/solar.h>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <svtools/svparser.hxx>
 
 
diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx
index 94e81e798bdf..1882b127ae90 100644
--- a/svtools/inc/svtools/parrtf.hxx
+++ b/svtools/inc/svtools/parrtf.hxx
@@ -33,7 +33,7 @@
 
 #include "svtools/svtdllapi.h"
 #include <svtools/svparser.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 struct RtfParserState_Impl
 {
diff --git a/svtools/inc/svtools/printoptions.hxx b/svtools/inc/svtools/printoptions.hxx
index b00c27f94130..15147b21b62e 100644
--- a/svtools/inc/svtools/printoptions.hxx
+++ b/svtools/inc/svtools/printoptions.hxx
@@ -35,7 +35,7 @@
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 class SvtPrintOptions_Impl;
 
@@ -45,7 +45,7 @@ class SvtPrintOptions_Impl;
 
 class PrinterOptions;
 
-class SVT_DLLPUBLIC SvtBasePrintOptions: public svt::detail::Options
+class SVT_DLLPUBLIC SvtBasePrintOptions: public utl::detail::Options
 {
 protected:
 
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index 7371c2feee05..a7f385941fc6 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -52,7 +52,7 @@
 #include <vcl/mnemonicengine.hxx>
 #include <tools/gen.hxx>
 #include <svtools/treelist.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <svtools/transfer.hxx>
 
 class Application;
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index c929faad3d13..b1cc8136ef68 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -32,34 +32,22 @@
 #define _SVTOOLS_SVTDATA_HXX
 
 #include <tools/resid.hxx>
-#include <tools/simplerm.hxx>
+#include <com/sun/star/lang/Locale.hpp>
 
 class ResMgr;
 class SfxItemDesruptorList_Impl;
-class SfxItemPool;
-class Twain;
 
 //============================================================================
 class ImpSvtData
 {
 public:
-    Twain * pTwain;
-    const SfxItemPool * pStoringPool;
     SfxItemDesruptorList_Impl * pItemDesruptList;
-
     ResMgr *        pResMgr;
     ResMgr *        pPatchResMgr;
 
-    void*           m_pThreadsafeRMs;
-        // one SimpleResMgr for each language for which a resource was requested
-        // (When using the 'non-simple' resmgr, the first request for any language wins, any
-        // further request for any other language supply the resmgr of the first call.
-        // For the simple resmgr we have a mgr for each language ever requested).
-
 private:
     ImpSvtData():
-        pTwain(0), pStoringPool(0), pItemDesruptList(0), pResMgr(0),
-        pPatchResMgr(NULL), m_pThreadsafeRMs(NULL)
+        pItemDesruptList(0), pResMgr(0), pPatchResMgr(0)
     {}
 
     ~ImpSvtData();
@@ -67,13 +55,9 @@ private:
 public:
     ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale);
     ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL!
-
     ResMgr * GetPatchResMgr();
     ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale);
 
-
-    SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale);
-
     static ImpSvtData & GetSvtData();
 };
 
@@ -100,18 +84,5 @@ public:
      // VCL dependant, only available in SVT, not in SVL!
 };
 
-//============================================================================
-class SvtSimpleResId
-{
-    String  m_sValue;
-
-public:
-    SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvtData::GetSvtData().GetSimpleRM(aLocale)->ReadString(nId)) { };
-
-    operator String () const { return m_sValue; }
-};
-
-
-
 #endif //  _SVTOOLS_SVTDATA_HXX
 
diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx
index e2b575c7e085..c9680821affc 100644
--- a/svtools/inc/svtools/syntaxhighlight.hxx
+++ b/svtools/inc/svtools/syntaxhighlight.hxx
@@ -40,7 +40,7 @@
 #include <tools/stream.hxx>
 #include <tools/shl.hxx>
 
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <svtools/svtdllapi.h>
 
 
@@ -60,7 +60,7 @@
 #include <tools/string.hxx>
 #include <tools/gen.hxx>
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 
 // Token-Typen TT_...
@@ -137,7 +137,7 @@ class SimpleTokenizer_Impl
 
     String getTokStr( /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // TEST: Token ausgeben
     String getFullTokenStr( /*out*/TokenTypes eType,
         /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos );
diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx
index 5b44b1364492..bd119b63c095 100644
--- a/svtools/inc/svtools/textdata.hxx
+++ b/svtools/inc/svtools/textdata.hxx
@@ -32,8 +32,8 @@
 #define _TEXTDATA_HXX
 
 #include "svtools/svtdllapi.h"
-#include <svtools/brdcst.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/string.hxx>
 
 #define TEXTUNDO_START              100
diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index c1d7746d73c6..e1d64aa42ecd 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.hxx
@@ -54,7 +54,7 @@ class Timer;
 
 class TextLine;
 class TETextPortion;
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <tools/link.hxx>
 #include <vcl/font.hxx>
 #include <tools/string.hxx>
diff --git a/svtools/inc/svtools/tfrmitem.hxx b/svtools/inc/svtools/tfrmitem.hxx
deleted file mode 100644
index 93e245a731a2..000000000000
--- a/svtools/inc/svtools/tfrmitem.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: tfrmitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _TFRMITEM_HXX
-#define _TFRMITEM_HXX
-
-#include <tools/rtti.hxx>
-
-#include <svtools/poolitem.hxx>
-
-class SvStream;
-
-enum SfxOpenMode
-{
-    SfxOpenSelect       = 0,     // selected in view
-    SfxOpenOpen         = 1,     // doubleclicked or <enter>
-    SfxOpenAddTask      = 2,     // doubleclicked or <enter> with Ctrl-Modifier
-    SfxOpenDontKnow     = 3,
-    SfxOpenReserved1    = 4,
-    SfxOpenReserved2    = 5,
-    SfxOpenModeLast     = 5
-};
-
-DBG_NAMEEX(SfxTargetFrameItem)
-
-// class SfxTargetFrameItem -------------------------------------------------
-
-class SfxTargetFrameItem : public SfxPoolItem
-{
-private:
-            String          _aFrames[ (USHORT)SfxOpenModeLast+1 ];
-public:
-            TYPEINFO();
-
-            SfxTargetFrameItem( const SfxTargetFrameItem& rCpy );
-            SfxTargetFrameItem( USHORT nWhich );
-            SfxTargetFrameItem(
-                USHORT nWhich,
-                const String& rOpenSelectFrame,
-                const String& rOpenOpenFrame,
-                const String& rOpenAddTaskFrame );
-            ~SfxTargetFrameItem();
-
-    virtual int             operator==( const SfxPoolItem& ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion ) const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion ) const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 ) const;
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 );
-    /*
-        Framebezeichner im Sfx:
-        _browser : Beamerview
-        _document : Desktopview
-        _blank : new task
-        "" : do nothing
-    */
-    String                  GetTargetFrame( SfxOpenMode eMode ) const;
-};
-
-#endif
-
diff --git a/svtools/inc/svtools/tresitem.hxx b/svtools/inc/svtools/tresitem.hxx
deleted file mode 100644
index 6282d3a7d4ff..000000000000
--- a/svtools/inc/svtools/tresitem.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: tresitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVTOOLS_TRESITEM_HXX
-#define SVTOOLS_TRESITEM_HXX
-
-#include <com/sun/star/ucb/TransferResult.hpp>
-#include <svtools/poolitem.hxx>
-
-//============================================================================
-class CntTransferResultItem: public SfxPoolItem
-{
-    com::sun::star::ucb::TransferResult m_aResult;
-
-public:
-    TYPEINFO();
-
-    CntTransferResultItem(USHORT which = 0): SfxPoolItem(which) {}
-
-    CntTransferResultItem(USHORT which,
-                          com::sun::star::ucb::TransferResult const &
-                              rTheResult):
-        SfxPoolItem(which), m_aResult(rTheResult) {}
-
-    virtual int operator ==(SfxPoolItem const & rItem) const;
-
-    virtual BOOL QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
-
-    virtual BOOL PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
-
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
-
-    com::sun::star::ucb::TransferResult const & GetValue() const
-    { return m_aResult; }
-};
-
-#endif // SVTOOLS_TRESITEM_HXX
-
diff --git a/svtools/inc/svtuno.hxx b/svtools/inc/svtuno.hxx
deleted file mode 100644
index 378251488707..000000000000
--- a/svtools/inc/svtuno.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: svtuno.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_SVTUNO_HXX
-#define _SVTOOLS_SVTUNO_HXX
-
-// Macro to define const unicode a'la "..."
-// It's better then "OUString::createFromAscii(...)" !!!
-#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-#define DEFINE_CONST_OUSTRING(CONSTASCII)       OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-
-// defines ---------------------------------------------------------------
-#define UNOANY                          ::com::sun::star::uno::Any
-#define UNOEXCEPTION                    ::com::sun::star::uno::Exception
-#define UNOMUTEX                        ::osl::Mutex
-#define UNOMUTEXGUARD                   ::osl::MutexGuard
-#define UNOOIMPLEMENTATIONID            ::cppu::OImplementationId
-#define UNOOTYPECOLLECTION              ::cppu::OTypeCollection
-#define UNOOUSTRING                     ::rtl::OUString
-#define UNOPROPERTYVALUE                ::com::sun::star::beans::PropertyValue
-#define UNOSTRINGPAIR                   ::com::sun::star::beans::StringPair
-#define UNOREFERENCE                    ::com::sun::star::uno::Reference
-#define UNORUNTIMEEXCEPTION             ::com::sun::star::uno::RuntimeException
-#define UNOINVALIDREGISTRYEXCEPTION     ::com::sun::star::registry::InvalidRegistryException
-#define UNOSEQUENCE                     ::com::sun::star::uno::Sequence
-#define UNOTYPE                         ::com::sun::star::uno::Type
-#define UNOURL                          ::com::sun::star::util::URL
-#define UNOXINTERFACE                   ::com::sun::star::uno::XInterface
-#define UNOXMULTISERVICEFACTORY         ::com::sun::star::lang::XMultiServiceFactory
-#define UNOXSINGLESERVICEFACTORY        ::com::sun::star::lang::XSingleServiceFactory
-#define UNOXTYPEPROVIDER                ::com::sun::star::lang::XTypeProvider
-#define UNOILLEGALARGUMENTEXCEPTION     ::com::sun::star::lang::IllegalArgumentException
-
-// -----------------------------------------------------------------------
-
-#endif
diff --git a/svtools/inc/twain.hxx b/svtools/inc/twain.hxx
deleted file mode 100644
index 786a8e65a624..000000000000
--- a/svtools/inc/twain.hxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: twain.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TWAIN_HXX
-#define _TWAIN_HXX
-
-// please add new platforms if TWAIN is available
-#if defined WIN || defined WNT || defined UNX
-#define TWAIN_AVAILABLE 1
-#else
-#undef  TWAIN_AVAILABLE
-#endif
-
-// include following only, if define is not set
-#ifndef _TWAIN_HXX_CHECK
-
-#include <vcl/bitmap.hxx>
-
-// -----------
-// - Defines -
-// -----------
-
-#define TWAIN_ERR_NO_ERROR                  0
-#define TWAIN_ERR_MODULE_NOT_LOADED         2
-#define TWAIN_ERR_DSMENTRY_NOT_FOUND        4
-#define TWAIN_ERR_SOURCE_MANAGER_NOT_OPENED 6
-#define TWAIN_ERR_SOURCE_SELECTION_DIALOG   8
-
-// ---------
-// - Twain -
-// ---------
-
-struct TwainImp;
-namespace com { namespace sun { namespace star { namespace lang { struct EventObject; } } } }
-
-class Twain
-{
-friend class TwainEventListener;
-
-private:
-
-    TwainImp*           mpImp;
-
-    Bitmap              maBitmap;
-    Link                maUpdateLink;
-    USHORT              mnErrorCode;
-    BOOL                mbScanning;
-
-                        Twain();
-                        Twain( const Twain& rTwain );
-    const Twain&        operator=( const Twain& rTwain ) { return *this; }
-
-protected:
-
-    void                Disposing( const com::sun::star::lang::EventObject& rEventObject );
-
-public:
-
-                        Twain( const Link& rUpdateLink );
-                        ~Twain();
-
-    BOOL                SelectSource();
-    BOOL                PerformTransfer();
-
-    Bitmap              GetBitmap();
-
-    BOOL                IsScanning() const { return mbScanning; }
-    USHORT              GetErrorCode() const { return mnErrorCode; }
-};
-
-#endif // _TWAIN_HXX_CHECK
-#endif // _TWAIN_HXX
diff --git a/svtools/inc/xmlcnimp.hxx b/svtools/inc/xmlcnimp.hxx
deleted file mode 100644
index 8fb212fe70bd..000000000000
--- a/svtools/inc/xmlcnimp.hxx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: xmlcnimp.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_XMLCNIMP_HXX
-#define _SVTOOLS_XMLCNIMP_HXX
-
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/svarray.hxx>
-
-#ifndef _SVTOOLS_NMSPMAP_HXX
-#include <xmloff/nmspmap.hxx>
-#endif
-
-namespace rtl { class OUString; }
-
-typedef ::rtl::OUString *OUStringPtr;
-SV_DECL_PTRARR_DEL( OUStringsDtor2_Impl, OUStringPtr, 5, 5 )
-
-class SvXMLAttrContainerItem_Impl
-{
-    SvXMLNamespaceMap   aNamespaceMap;
-    SvUShorts           aPrefixPoss;
-    OUStringsDtor2_Impl aLNames;
-    OUStringsDtor2_Impl aValues;
-
-    inline sal_uInt16 GetPrefixPos( sal_uInt16 i ) const;
-public:
-
-    SvXMLAttrContainerItem_Impl( const SvXMLAttrContainerItem_Impl& rImpl );
-    SvXMLAttrContainerItem_Impl();
-
-    int  operator ==( const SvXMLAttrContainerItem_Impl& rCmp ) const;
-
-    BOOL AddAttr( const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix, const ::rtl::OUString& rNamespace,
-                    const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix,
-                  const ::rtl::OUString& rLName,
-                  const ::rtl::OUString& rValue );
-
-    sal_uInt16 GetAttrCount() const { return aLNames.Count(); }
-    inline ::rtl::OUString GetAttrNamespace( sal_uInt16 i ) const;
-    inline ::rtl::OUString GetAttrPrefix( sal_uInt16 i ) const;
-    inline const ::rtl::OUString& GetAttrLName( sal_uInt16 i ) const;
-    inline const ::rtl::OUString& GetAttrValue( sal_uInt16 i ) const;
-
-    sal_uInt16 GetFirstNamespaceIndex() const { return aNamespaceMap.GetFirstIndex(); }
-    sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const { return aNamespaceMap.GetNextIndex( nIdx ); }
-    inline const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const;
-    inline const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const;
-
-    BOOL SetAt( sal_uInt16 i,
-                const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
-                const ::rtl::OUString& rPrefix, const ::rtl::OUString& rNamespace,
-                const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
-                const ::rtl::OUString& rPrefix,
-                const ::rtl::OUString& rLName,
-                const ::rtl::OUString& rValue );
-
-    void Remove( sal_uInt16 i );
-};
-
-inline sal_uInt16 SvXMLAttrContainerItem_Impl::GetPrefixPos( sal_uInt16 i ) const
-{
-//  DBG_ASSERT( i >= 0 && i < aPrefixPoss.Count(),
-//              "SvXMLAttrContainerItem_Impl::GetPrefixPos: illegal index" );
-    return aPrefixPoss[i];
-}
-
-inline ::rtl::OUString SvXMLAttrContainerItem_Impl::GetAttrNamespace( sal_uInt16 i ) const
-{
-    ::rtl::OUString sRet;
-    sal_uInt16 nPos = GetPrefixPos( i );
-    if( USHRT_MAX != nPos )
-        sRet = aNamespaceMap.GetNameByIndex( nPos );
-    return sRet;
-}
-
-inline ::rtl::OUString SvXMLAttrContainerItem_Impl::GetAttrPrefix( sal_uInt16 i ) const
-{
-    ::rtl::OUString sRet;
-    sal_uInt16 nPos = GetPrefixPos( i );
-    if( USHRT_MAX != nPos )
-        sRet = aNamespaceMap.GetPrefixByIndex( nPos );
-    return sRet;
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetAttrLName(sal_uInt16 i) const
-{
-    DBG_ASSERT( i >= 0 && i < aLNames.Count(),
-                "SvXMLAttrContainerItem_Impl::GetLName: illegal index" );
-    return *aLNames[i];
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetAttrValue(sal_uInt16 i) const
-{
-    DBG_ASSERT( i >= 0 && i < aValues.Count(),
-                "SvXMLAttrContainerItem_Impl::GetValue: illegal index" );
-    return *aValues[i];
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetNamespace(
-                                                            sal_uInt16 i ) const
-{
-    return aNamespaceMap.GetNameByIndex( i );
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetPrefix( sal_uInt16 i ) const
-{
-    return aNamespaceMap.GetPrefixByIndex( i );
-}
-
-#endif
-
diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index a60199740561..5a67b9414181 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -1,55 +1,28 @@
-st	svtools	:	l10n offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL
-st	svtools						usr1	-	all	st_mkout NULL
-st	svtools\inc					nmake	-	all	st_inc NULL
-st	svtools\inc\sane				get	-	all	st_incsa NULL
-st	svtools\prj					get	-	all	st_prj NULL
-st	svtools\res					get	-	all	st_res NULL
-st	svtools\win\inc					get	-	all	st_winc NULL
-st	svtools\win\res					get	-	all	st_wres NULL
-st	svtools\os2\inc					get	-	all	st_oinc NULL
-st	svtools\mac\inc					get	-	all	st_minc NULL
-st	svtools\unx\inc					get	-	all	st_uinc NULL
-st	svtools\bmpmaker				nmake	-	all	st_bmp st_inc NULL
-st	svtools\source\memtools				nmake	-	all	st_mem st_inc NULL
-st	svtools\source\numbers				nmake	-	all	st_num st_inc NULL
-st	svtools\source\notify				nmake	-	all	st_not st_inc NULL
-st	svtools\source\config				nmake	-	all	st_conf st_inc NULL
-st	svtools\unx\source\svdde			nmake	-	u	st_usdde st_inc NULL
-st	svtools\unx\source\svdde			nmake	-	p	st_psdde st_inc NULL
-st	svtools\mac\source\svdde			nmake	-	m	st_msdde st_inc NULL
-st	svtools\mac\source\misc				nmake	-	m	st_msc st_inc NULL
-st	svtools\source\control				nmake	-	all	st_ctl st_inc NULL
-st	svtools\source\filerec				nmake	-	all	st_file st_inc NULL
-st	svtools\source\filter.vcl\filter		nmake	-	all	st_vfilt st_inc NULL
-st	svtools\source\filter.vcl\wmf			nmake	-	all	st_vwmf st_inc NULL
-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	:	l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL
+st	svtools								usr1	-	all	st_mkout NULL
+st	svtools\inc							nmake	-	all	st_inc NULL
+st	svtools\bmpmaker					nmake	-	all	st_bmp st_inc NULL
 st	svtools\source\brwbox				nmake	-	all	st__brw st_bmp st_inc NULL
-st	svtools\source\urlobj				nmake	-	all	st__url st_inc NULL
-st	svtools\source\misc				nmake	-	all	st__misc st_bmp st_inc NULL
-st	svtools\source\misc1			nmake	-	all	st__misc1 st_inc NULL
+st	svtools\source\config				nmake	-	all	st_conf st_inc NULL
 st	svtools\source\contnr				nmake	-	all	st__ctr st_inc NULL
-st	svtools\source\svdde				nmake	-	all	st__dde st_inc NULL
-st	svtools\source\items				nmake	-	all	st__item st_inc NULL
-st	svtools\source\items1				nmake	-	all	st__item1 st_inc NULL
-st	svtools\source\undo				nmake	-	all	st_undo st_inc NULL
-st	svtools\source\plugapp				nmake	-	all	st_papp st_inc NULL
+st	svtools\source\control				nmake	-	all	st_ctl st_inc NULL
 st	svtools\source\dialogs				nmake	-	all	st_dial st_inc NULL
-st	svtools\source\edit				nmake	-	all	st_edit 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\svrtf				nmake	-	all	st_rtf st_inc NULL
-st	svtools\source\svsql				nmake	-	all	st_sql st_inc NULL
+st	svtools\source\edit					nmake	-	all	st_edit st_inc NULL
+st	svtools\source\filter.vcl\filter	nmake	-	all	st_vfilt st_inc NULL
+st	svtools\source\filter.vcl\wmf		nmake	-	all	st_vwmf st_inc NULL
+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\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
 st	svtools\source\svhtml				nmake	-	all	st_html st_inc NULL
-st  svtools\source\syslocale                nmake   -   all st_sysloc st_inc NULL
-st	svtools\source\filepicker               nmake	-	all	st_filepick st_inc NULL
-st  svtools\util                            nmake   -   all st_util st__brw st__ctr st__dde st__item st__item1 st__misc st__misc1 st__url  st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_psdde.p st_msdde.m st_msc.m st_undo st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_sysloc st_filepick st_not st_conf st_mem st_num st_svtjava NULL
-st	svtools\source\fsstor				nmake	-	all	st_fsstor st_inc NULL
+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\source\hatchwindow			nmake	-	all	st_hatchwin st_inc NULL
-st	svtools\source\passwordcontainer	nmake	-	all	st_passcont st_inc NULL
 st	svtools\source\productregistration	nmake	-	all	st_prodreg st_util st_inc NULL
-st	svtools\uno							nmake	-	all	st_svtuno st_util st_inc NULL
-st	svtools\source\java				nmake	-	all	st_svtjava  st_inc NULL
 st  svtools\workben\unodialog           nmake   -   all st_workben_udlg st_util NULL
diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index 9a8a60262990..0a3ccd8a9819 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -5,11 +5,8 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
 ..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs
 ..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid
-..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib
 ..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib
 ..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib
-..\%__SRC%\bin\dllver.exe %_DEST%\bin%_EXT%\dllver.exe
-..\%__SRC%\bin\dllver %_DEST%\bin%_EXT%\dllver
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
 ..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.*
@@ -25,309 +22,12 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
 
-..\inc\svtools\svldllapi.h %_DEST%\inc%_EXT%\svtools\svldllapi.h
-..\inc\svtools\svtdllapi.h %_DEST%\inc%_EXT%\svtools\svtdllapi.h
-
-..\inc\svtools\globalnameitem.hxx %_DEST%\inc%_EXT%\svtools\globalnameitem.hxx
-..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\svtools\imagemgr.hxx
-..\inc\imagemgr.hrc %_DEST%\inc%_EXT%\svtools\imagemgr.hrc
-..\inc\testtool.hxx %_DEST%\inc%_EXT%\svtools\testtool.hxx
-..\inc\flbytes.hxx %_DEST%\inc%_EXT%\svtools\flbytes.hxx
-..\inc\adrparse.hxx %_DEST%\inc%_EXT%\svtools\adrparse.hxx
-..\inc\svtools\aeitem.hxx %_DEST%\inc%_EXT%\svtools\aeitem.hxx
-..\inc\svtools\brdcst.hxx %_DEST%\inc%_EXT%\svtools\brdcst.hxx
-..\inc\broadcast.hxx %_DEST%\inc%_EXT%\svtools\broadcast.hxx
-..\inc\svtools\brwbox.hxx %_DEST%\inc%_EXT%\svtools\brwbox.hxx
-..\inc\calendar.hxx %_DEST%\inc%_EXT%\svtools\calendar.hxx
-..\inc\svtools\cancel.hxx %_DEST%\inc%_EXT%\svtools\cancel.hxx
-..\inc\cntnrsrt.hxx %_DEST%\inc%_EXT%\svtools\cntnrsrt.hxx
-..\inc\svtools\colrdlg.hxx %_DEST%\inc%_EXT%\svtools\colrdlg.hxx
-..\inc\svtools\colctrl.hxx %_DEST%\inc%_EXT%\svtools\colctrl.hxx
-..\inc\ctrlbox.hxx %_DEST%\inc%_EXT%\svtools\ctrlbox.hxx
-..\inc\ctrltool.hxx %_DEST%\inc%_EXT%\svtools\ctrltool.hxx
-..\inc\collatorres.hxx %_DEST%\inc%_EXT%\svtools\collatorres.hxx
-..\inc\indexentryres.hxx %_DEST%\inc%_EXT%\svtools\indexentryres.hxx
-..\inc\cntwids.hrc %_DEST%\inc%_EXT%\svtools\cntwids.hrc
-..\inc\svtools\dateitem.hxx %_DEST%\inc%_EXT%\svtools\dateitem.hxx
-..\inc\svtools\dtritem.hxx %_DEST%\inc%_EXT%\svtools\dtritem.hxx
-..\inc\svtools\frqitem.hxx %_DEST%\inc%_EXT%\svtools\frqitem.hxx
-..\inc\svtools\cstitem.hxx %_DEST%\inc%_EXT%\svtools\cstitem.hxx
-..\inc\svtools\tfrmitem.hxx %_DEST%\inc%_EXT%\svtools\tfrmitem.hxx
-..\inc\svtools\cntwall.hxx %_DEST%\inc%_EXT%\svtools\cntwall.hxx
-..\inc\svtools\langtab.hxx %_DEST%\inc%_EXT%\svtools\langtab.hxx
-..\inc\itemdel.hxx %_DEST%\inc%_EXT%\svtools\itemdel.hxx
-..\inc\wallitem.hxx %_DEST%\inc%_EXT%\svtools\wallitem.hxx
-..\inc\svtools\sfontitm.hxx %_DEST%\inc%_EXT%\svtools\sfontitm.hxx
-..\inc\svtools\bintitem.hxx %_DEST%\inc%_EXT%\svtools\bintitem.hxx
-..\inc\stylepool.hxx %_DEST%\inc%_EXT%\svtools\stylepool.hxx
-..\inc\dialogcontrolling.hxx %_DEST%\inc%_EXT%\svtools\dialogcontrolling.hxx
-..\inc\svtools\eitem.hxx %_DEST%\inc%_EXT%\svtools\eitem.hxx
-..\inc\eventcfg.hxx %_DEST%\inc%_EXT%\svtools\eventcfg.hxx
-..\inc\filedlg.hxx %_DEST%\inc%_EXT%\svtools\filedlg.hxx
-..\inc\svtools\filerec.hxx %_DEST%\inc%_EXT%\svtools\filerec.hxx
-..\inc\svtools\flagitem.hxx %_DEST%\inc%_EXT%\svtools\flagitem.hxx
-..\inc\svtools\fltcall.hxx %_DEST%\inc%_EXT%\svtools\fltcall.hxx
-..\inc\svtools\wmf.hxx %_DEST%\inc%_EXT%\svtools\wmf.hxx
-..\inc\fltdefs.hxx %_DEST%\inc%_EXT%\svtools\fltdefs.hxx
-..\inc\svtools\filter.hxx %_DEST%\inc%_EXT%\svtools\filter.hxx
-..\inc\svtools\FilterConfigItem.hxx %_DEST%\inc%_EXT%\svtools\FilterConfigItem.hxx
-..\inc\svtools\fmtfield.hxx %_DEST%\inc%_EXT%\svtools\fmtfield.hxx
-..\inc\svtools\hint.hxx %_DEST%\inc%_EXT%\svtools\hint.hxx
-..\inc\svtools\accessibletableprovider.hxx %_DEST%\inc%_EXT%\svtools\accessibletableprovider.hxx
-..\inc\svtools\AccessibleBrowseBoxObjType.hxx %_DEST%\inc%_EXT%\svtools\AccessibleBrowseBoxObjType.hxx
-..\inc\svtools\accessiblefactory.hxx %_DEST%\inc%_EXT%\svtools\accessiblefactory.hxx
-..\inc\svtools\accessibletable.hxx %_DEST%\inc%_EXT%\svtools\accessibletable.hxx
-..\inc\svtools\textwindowpeer.hxx %_DEST%\inc%_EXT%\svtools\textwindowpeer.hxx
-..\inc\imgdef.hxx %_DEST%\inc%_EXT%\svtools\imgdef.hxx
-..\inc\inetdef.hxx %_DEST%\inc%_EXT%\svtools\inetdef.hxx
-..\inc\svtools\inethist.hxx %_DEST%\inc%_EXT%\svtools\inethist.hxx
-..\inc\inetmsg.hxx %_DEST%\inc%_EXT%\svtools\inetmsg.hxx
-..\inc\inetstrm.hxx %_DEST%\inc%_EXT%\svtools\inetstrm.hxx
-..\inc\svtools\intitem.hxx %_DEST%\inc%_EXT%\svtools\intitem.hxx
-..\inc\svtools\visitem.hxx %_DEST%\inc%_EXT%\svtools\visitem.hxx
-..\inc\svtools\imageitm.hxx %_DEST%\inc%_EXT%\svtools\imageitm.hxx
-..\inc\svtools\isethint.hxx %_DEST%\inc%_EXT%\svtools\isethint.hxx
-..\inc\svtools\itemiter.hxx %_DEST%\inc%_EXT%\svtools\itemiter.hxx
-..\inc\svtools\itempool.hxx %_DEST%\inc%_EXT%\svtools\itempool.hxx
-..\inc\svtools\itemset.hxx %_DEST%\inc%_EXT%\svtools\itemset.hxx
-..\inc\svtools\lckbitem.hxx %_DEST%\inc%_EXT%\svtools\lckbitem.hxx
-..\inc\listener.hxx %_DEST%\inc%_EXT%\svtools\listener.hxx
-..\inc\listeneriter.hxx %_DEST%\inc%_EXT%\svtools\listeneriter.hxx
-..\inc\svtools\lstner.hxx %_DEST%\inc%_EXT%\svtools\lstner.hxx
-..\inc\svtools\macitem.hxx %_DEST%\inc%_EXT%\svtools\macitem.hxx
-..\inc\memberid.hrc %_DEST%\inc%_EXT%\svtools\memberid.hrc
-..\inc\svtools\nranges.hxx %_DEST%\inc%_EXT%\svtools\nranges.hxx
-..\inc\svtools\ownlist.hxx %_DEST%\inc%_EXT%\svtools\ownlist.hxx
-..\inc\prgsbar.hxx %_DEST%\inc%_EXT%\svtools\prgsbar.hxx
-..\inc\svtools\prnsetup.hxx %_DEST%\inc%_EXT%\svtools\prnsetup.hxx
-..\inc\poolcach.hxx %_DEST%\inc%_EXT%\svtools\poolcach.hxx
-..\inc\svtools\poolitem.hxx %_DEST%\inc%_EXT%\svtools\poolitem.hxx
-..\inc\svtools\printdlg.hxx %_DEST%\inc%_EXT%\svtools\printdlg.hxx
-..\inc\svtools\ptitem.hxx %_DEST%\inc%_EXT%\svtools\ptitem.hxx
-..\inc\svtools\szitem.hxx %_DEST%\inc%_EXT%\svtools\szitem.hxx
-..\inc\svtools\rectitem.hxx %_DEST%\inc%_EXT%\svtools\rectitem.hxx
-..\inc\svtools\rngitem.hxx %_DEST%\inc%_EXT%\svtools\rngitem.hxx
-..\inc\ruler.hxx %_DEST%\inc%_EXT%\svtools\ruler.hxx
-..\inc\scrwin.hxx %_DEST%\inc%_EXT%\svtools\scrwin.hxx
-..\inc\svtools\sharecontrolfile.hxx %_DEST%\inc%_EXT%\svtools\sharecontrolfile.hxx
-..\inc\svtools\documentlockfile.hxx %_DEST%\inc%_EXT%\svtools\documentlockfile.hxx
-..\inc\svtools\lockfilecommon.hxx %_DEST%\inc%_EXT%\svtools\lockfilecommon.hxx
-..\inc\svtools\slstitm.hxx %_DEST%\inc%_EXT%\svtools\slstitm.hxx
-..\inc\svtools\ilstitem.hxx %_DEST%\inc%_EXT%\svtools\ilstitem.hxx
-..\inc\svtools\smplhint.hxx %_DEST%\inc%_EXT%\svtools\smplhint.hxx
-..\inc\svtools\cnclhint.hxx %_DEST%\inc%_EXT%\svtools\cnclhint.hxx
-..\inc\svtools\inettype.hxx %_DEST%\inc%_EXT%\svtools\inettype.hxx
-..\inc\svtools\brwhead.hxx %_DEST%\inc%_EXT%\svtools\brwhead.hxx
-..\inc\svtools\solar.hrc %_DEST%\inc%_EXT%\svtools\solar.hrc
-..\inc\scriptedtext.hxx %_DEST%\inc%_EXT%\svtools\scriptedtext.hxx
-..\inc\svtools\stdctrl.hxx %_DEST%\inc%_EXT%\svtools\stdctrl.hxx
-..\inc\svtools\stritem.hxx %_DEST%\inc%_EXT%\svtools\stritem.hxx
-..\inc\svtools\style.hrc %_DEST%\inc%_EXT%\svtools\style.hrc
-..\inc\svtools\style.hxx %_DEST%\inc%_EXT%\svtools\style.hxx
-..\inc\svtools\svarray.hxx %_DEST%\inc%_EXT%\svtools\svarray.hxx
-..\inc\svtools\svdde.hxx %_DEST%\inc%_EXT%\svtools\svdde.hxx
-..\inc\svtools\svtdata.hxx %_DEST%\inc%_EXT%\svtools\svtdata.hxx
-..\inc\tabbar.hxx %_DEST%\inc%_EXT%\svtools\tabbar.hxx
-..\inc\taskbar.hxx %_DEST%\inc%_EXT%\svtools\taskbar.hxx
-..\inc\svtools\undo.hxx %_DEST%\inc%_EXT%\svtools\undo.hxx
-..\inc\whiter.hxx %_DEST%\inc%_EXT%\svtools\whiter.hxx
-..\inc\svtools\valueset.hxx %_DEST%\inc%_EXT%\svtools\valueset.hxx
-..\inc\stdmenu.hxx %_DEST%\inc%_EXT%\svtools\stdmenu.hxx
-..\inc\svtools\headbar.hxx %_DEST%\inc%_EXT%\svtools\headbar.hxx
-..\inc\svtools\svicnvw.hxx %_DEST%\inc%_EXT%\svtools\svicnvw.hxx
-..\inc\svtools\svlbitm.hxx %_DEST%\inc%_EXT%\svtools\svlbitm.hxx
-..\inc\svtools\svlbox.hxx %_DEST%\inc%_EXT%\svtools\svlbox.hxx
-..\inc\svtools\svtabbx.hxx %_DEST%\inc%_EXT%\svtools\svtabbx.hxx
-..\inc\svtools\svtreebx.hxx %_DEST%\inc%_EXT%\svtools\svtreebx.hxx
-..\inc\tooltiplbox.hxx %_DEST%\inc%_EXT%\svtools\tooltiplbox.hxx
-..\inc\svtools\treelist.hxx %_DEST%\inc%_EXT%\svtools\treelist.hxx
-..\inc\svtools\xtextedt.hxx %_DEST%\inc%_EXT%\svtools\xtextedt.hxx
-..\inc\svtools\texteng.hxx %_DEST%\inc%_EXT%\svtools\texteng.hxx
-..\inc\svtools\textview.hxx %_DEST%\inc%_EXT%\svtools\textview.hxx
-..\inc\svtools\textdata.hxx %_DEST%\inc%_EXT%\svtools\textdata.hxx
-..\inc\txtattr.hxx %_DEST%\inc%_EXT%\svtools\txtattr.hxx
-..\inc\sychconv.hxx %_DEST%\inc%_EXT%\svtools\sychconv.hxx
-..\inc\svtools\ttprops.hxx %_DEST%\inc%_EXT%\svtools\ttprops.hxx
-..\inc\svtools\transfer.hxx %_DEST%\inc%_EXT%\svtools\transfer.hxx
-..\inc\svtools\embedtransfer.hxx %_DEST%\inc%_EXT%\svtools\embedtransfer.hxx
-..\inc\svtools\embedhlp.hxx %_DEST%\inc%_EXT%\svtools\embedhlp.hxx
-..\inc\cliplistener.hxx %_DEST%\inc%_EXT%\svtools\cliplistener.hxx
-..\inc\txtcmp.hxx %_DEST%\inc%_EXT%\svtools\txtcmp.hxx
-..\inc\urlbmk.hxx %_DEST%\inc%_EXT%\svtools\urlbmk.hxx
-..\inc\inetimg.hxx %_DEST%\inc%_EXT%\svtools\inetimg.hxx
-..\inc\svtools\svmedit.hxx %_DEST%\inc%_EXT%\svtools\svmedit.hxx
-..\inc\svtools\editsyntaxhighlighter.hxx %_DEST%\inc%_EXT%\svtools\editsyntaxhighlighter.hxx
-..\inc\svtools\syntaxhighlight.hxx %_DEST%\inc%_EXT%\svtools\syntaxhighlight.hxx
-..\inc\svtools\svmedit2.hxx %_DEST%\inc%_EXT%\svtools\svmedit2.hxx
-..\inc\svtools\svstdarr.hxx %_DEST%\inc%_EXT%\svtools\svstdarr.hxx
-..\inc\svtools\metitem.hxx %_DEST%\inc%_EXT%\svtools\metitem.hxx
-..\inc\svtools\nfversi.hxx %_DEST%\inc%_EXT%\svtools\nfversi.hxx
-..\inc\svtools\nfkeytab.hxx %_DEST%\inc%_EXT%\svtools\nfkeytab.hxx
-..\inc\nfsymbol.hxx %_DEST%\inc%_EXT%\svtools\nfsymbol.hxx
-..\inc\svtools\wizdlg.hxx %_DEST%\inc%_EXT%\svtools\wizdlg.hxx
-..\inc\svtools\zforlist.hxx %_DEST%\inc%_EXT%\svtools\zforlist.hxx
-..\inc\svtools\zformat.hxx %_DEST%\inc%_EXT%\svtools\zformat.hxx
-..\inc\numuno.hxx %_DEST%\inc%_EXT%\svtools\numuno.hxx
-..\inc\svtools\ondemand.hxx %_DEST%\inc%_EXT%\svtools\ondemand.hxx
-..\inc\svtools\loginerr.hxx %_DEST%\inc%_EXT%\svtools\loginerr.hxx
-..\inc\svtools\logindlg.hxx %_DEST%\inc%_EXT%\svtools\logindlg.hxx
-..\inc\svtools\httpcook.hxx %_DEST%\inc%_EXT%\svtools\httpcook.hxx
-..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx
-..\inc\svtools\itemprop.hxx %_DEST%\inc%_EXT%\svtools\itemprop.hxx
-..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx
-..\inc\svtools\genericunodialog.hxx %_DEST%\inc%_EXT%\svtools\genericunodialog.hxx
-..\inc\svtools\editbrowsebox.hxx %_DEST%\inc%_EXT%\svtools\editbrowsebox.hxx
-..\inc\svtools\editimplementation.hxx %_DEST%\inc%_EXT%\svtools\editimplementation.hxx
-..\inc\templatefoldercache.hxx %_DEST%\inc%_EXT%\svtools\templatefoldercache.hxx
-..\inc\folderrestriction.hxx %_DEST%\inc%_EXT%\svtools\folderrestriction.hxx
-..\inc\filenotation.hxx %_DEST%\inc%_EXT%\svtools\filenotation.hxx
-..\inc\svtools\urlcontrol.hxx %_DEST%\inc%_EXT%\svtools\urlcontrol.hxx
-..\inc\svtools\fileurlbox.hxx %_DEST%\inc%_EXT%\svtools\fileurlbox.hxx
-..\inc\svtools\toolboxcontroller.hxx %_DEST%\inc%_EXT%\svtools\toolboxcontroller.hxx
-..\inc\framestatuslistener.hxx %_DEST%\inc%_EXT%\svtools\framestatuslistener.hxx
-..\inc\statusbarcontroller.hxx %_DEST%\inc%_EXT%\svtools\statusbarcontroller.hxx
-..\inc\svtools\generictoolboxcontroller.hxx %_DEST%\inc%_EXT%\svtools\generictoolboxcontroller.hxx
-..\inc\svtools\restrictedpaths.hxx %_DEST%\inc%_EXT%\svtools\restrictedpaths.hxx
-
-..\inc\svtools\imap.hxx %_DEST%\inc%_EXT%\svtools\imap.hxx
-..\inc\svtools\imapobj.hxx %_DEST%\inc%_EXT%\svtools\imapobj.hxx
-..\inc\svtools\imaprect.hxx %_DEST%\inc%_EXT%\svtools\imaprect.hxx
-..\inc\svtools\imapcirc.hxx %_DEST%\inc%_EXT%\svtools\imapcirc.hxx
-..\inc\svtools\imappoly.hxx %_DEST%\inc%_EXT%\svtools\imappoly.hxx
-
-..\inc\svtools\parhtml.hxx %_DEST%\inc%_EXT%\svtools\parhtml.hxx
-..\inc\htmltokn.h %_DEST%\inc%_EXT%\svtools\htmltokn.h
-..\inc\htmlkywd.hxx %_DEST%\inc%_EXT%\svtools\htmlkywd.hxx
-..\inc\svtools\svparser.hxx %_DEST%\inc%_EXT%\svtools\svparser.hxx
-..\inc\svtools\htmlout.hxx %_DEST%\inc%_EXT%\svtools\htmlout.hxx
-..\source\svrtf\rtfout.hxx %_DEST%\inc%_EXT%\svtools\rtfout.hxx
-..\inc\svtools\parrtf.hxx %_DEST%\inc%_EXT%\svtools\parrtf.hxx
-..\source\svrtf\rtftoken.h %_DEST%\inc%_EXT%\svtools\rtftoken.h
-..\source\svrtf\rtfkeywd.hxx %_DEST%\inc%_EXT%\svtools\rtfkeywd.hxx
-
-..\inc\svtools\ctypeitm.hxx %_DEST%\inc%_EXT%\svtools\ctypeitm.hxx
-
-..\inc\strmadpt.hxx %_DEST%\inc%_EXT%\svtools\strmadpt.hxx
-..\inc\instrm.hxx %_DEST%\inc%_EXT%\svtools\instrm.hxx
-..\inc\outstrm.hxx %_DEST%\inc%_EXT%\svtools\outstrm.hxx
-
-..\inc\expander.hxx %_DEST%\inc%_EXT%\svtools\expander.hxx
-..\source\svsql\converter.hxx %_DEST%\inc%_EXT%\svtools\converter.hxx
-
-..\inc\filectrl.hxx %_DEST%\inc%_EXT%\svtools\filectrl.hxx
-..\inc\svtools\cenumitm.hxx %_DEST%\inc%_EXT%\svtools\cenumitm.hxx
-..\inc\svtools\cintitem.hxx %_DEST%\inc%_EXT%\svtools\cintitem.hxx
-..\inc\svtools\custritm.hxx %_DEST%\inc%_EXT%\svtools\custritm.hxx
-
-..\inc\sfxecode.hxx %_DEST%\inc%_EXT%\svtools\sfxecode.hxx
-..\inc\svtools\ehdl.hxx %_DEST%\inc%_EXT%\svtools\ehdl.hxx
-..\inc\svtools\svtools.hrc %_DEST%\inc%_EXT%\svtools\svtools.hrc
-..\source\dialogs\filedlg2.hrc %_DEST%\inc%_EXT%\svtools\filedlg2.hrc
-
-..\inc\xmlement.hxx %_DEST%\inc%_EXT%\svtools\xmlement.hxx
-..\inc\svtools\tresitem.hxx %_DEST%\inc%_EXT%\svtools\tresitem.hxx
-..\inc\urihelper.hxx %_DEST%\inc%_EXT%\svtools\urihelper.hxx
-..\inc\reginfo.hxx %_DEST%\inc%_EXT%\svtools\reginfo.hxx
-..\inc\cacheoptions.hxx %_DEST%\inc%_EXT%\svtools\cacheoptions.hxx
-..\inc\svtools\cjkoptions.hxx %_DEST%\inc%_EXT%\svtools\cjkoptions.hxx
-..\inc\javaoptions.hxx %_DEST%\inc%_EXT%\svtools\javaoptions.hxx
-..\inc\svtools\accelcfg.hxx %_DEST%\inc%_EXT%\svtools\accelcfg.hxx
-..\inc\svtools\pathoptions.hxx %_DEST%\inc%_EXT%\svtools\pathoptions.hxx
-..\inc\svtools\useroptions.hxx %_DEST%\inc%_EXT%\svtools\useroptions.hxx
-..\inc\fstathelper.hxx %_DEST%\inc%_EXT%\svtools\fstathelper.hxx
-..\inc\svtools\saveopt.hxx %_DEST%\inc%_EXT%\svtools\saveopt.hxx
-..\inc\svtools\undoopt.hxx %_DEST%\inc%_EXT%\svtools\undoopt.hxx
-..\inc\svtools\helpopt.hxx %_DEST%\inc%_EXT%\svtools\helpopt.hxx
-..\inc\svtools\optionsdlg.hxx %_DEST%\inc%_EXT%\svtools\optionsdlg.hxx
-..\inc\svtools\moduleoptions.hxx %_DEST%\inc%_EXT%\svtools\moduleoptions.hxx
-..\inc\svtools\securityoptions.hxx %_DEST%\inc%_EXT%\svtools\securityoptions.hxx
-..\inc\svtools\extendedsecurityoptions.hxx %_DEST%\inc%_EXT%\svtools\extendedsecurityoptions.hxx
-..\inc\svtools\miscopt.hxx %_DEST%\inc%_EXT%\svtools\miscopt.hxx
-..\inc\svtools\localisationoptions.hxx %_DEST%\inc%_EXT%\svtools\localisationoptions.hxx
-..\inc\svtools\workingsetoptions.hxx %_DEST%\inc%_EXT%\svtools\workingsetoptions.hxx
-..\inc\svtools\viewoptions.hxx %_DEST%\inc%_EXT%\svtools\viewoptions.hxx
-..\inc\svtools\internaloptions.hxx %_DEST%\inc%_EXT%\svtools\internaloptions.hxx
-..\inc\svtools\startoptions.hxx %_DEST%\inc%_EXT%\svtools\startoptions.hxx
-..\inc\svtools\historyoptions.hxx %_DEST%\inc%_EXT%\svtools\historyoptions.hxx
-..\inc\svtools\inetoptions.hxx %_DEST%\inc%_EXT%\svtools\inetoptions.hxx
-..\inc\svtools\menuoptions.hxx %_DEST%\inc%_EXT%\svtools\menuoptions.hxx
-..\inc\svtools\options3d.hxx %_DEST%\inc%_EXT%\svtools\options3d.hxx
-..\inc\svtools\optionsdrawinglayer.hxx %_DEST%\inc%_EXT%\svtools\optionsdrawinglayer.hxx
-..\inc\svtools\fontoptions.hxx %_DEST%\inc%_EXT%\svtools\fontoptions.hxx
-..\inc\svtools\addxmltostorageoptions.hxx %_DEST%\inc%_EXT%\svtools\addxmltostorageoptions.hxx
-..\inc\svtools\defaultoptions.hxx %_DEST%\inc%_EXT%\svtools\defaultoptions.hxx
-..\inc\svtools\printwarningoptions.hxx %_DEST%\inc%_EXT%\svtools\printwarningoptions.hxx
-..\inc\svtools\printoptions.hxx %_DEST%\inc%_EXT%\svtools\printoptions.hxx
-..\inc\svtools\dynamicmenuoptions.hxx %_DEST%\inc%_EXT%\svtools\dynamicmenuoptions.hxx
-..\inc\svtools\compatibility.hxx %_DEST%\inc%_EXT%\svtools\compatibility.hxx
-..\inc\svtools\syslocaleoptions.hxx %_DEST%\inc%_EXT%\svtools\syslocaleoptions.hxx
-..\inc\localresaccess.hxx %_DEST%\inc%_EXT%\svtools\localresaccess.hxx
-..\inc\svtools\wizardmachine.hxx %_DEST%\inc%_EXT%\svtools\wizardmachine.hxx
-..\inc\svtools\roadmapwizard.hxx %_DEST%\inc%_EXT%\svtools\roadmapwizard.hxx
-..\inc\roadmap.hxx %_DEST%\inc%_EXT%\svtools\roadmap.hxx
-..\inc\svtools\hyperlabel.hxx %_DEST%\inc%_EXT%\svtools\hyperlabel.hxx
-..\inc\svtools\fixedhyper.hxx %_DEST%\inc%_EXT%\svtools\fixedhyper.hxx
-..\inc\helpagentwindow.hxx %_DEST%\inc%_EXT%\svtools\helpagentwindow.hxx
-..\inc\pickerhistory.hxx %_DEST%\inc%_EXT%\svtools\pickerhistory.hxx
-..\inc\pickerhistoryaccess.hxx %_DEST%\inc%_EXT%\svtools\pickerhistoryaccess.hxx
-..\inc\pickerhelper.hxx %_DEST%\inc%_EXT%\svtools\pickerhelper.hxx
-..\inc\regoptions.hxx %_DEST%\inc%_EXT%\svtools\regoptions.hxx
-..\inc\svtools\accessibilityoptions.hxx %_DEST%\inc%_EXT%\svtools\accessibilityoptions.hxx
-..\inc\svtools\cmdoptions.hxx %_DEST%\inc%_EXT%\svtools\cmdoptions.hxx
-..\inc\svtools\ctloptions.hxx %_DEST%\inc%_EXT%\svtools\ctloptions.hxx
-..\inc\svtools\languageoptions.hxx %_DEST%\inc%_EXT%\svtools\languageoptions.hxx
-..\inc\svtools\sourceviewconfig.hxx %_DEST%\inc%_EXT%\svtools\sourceviewconfig.hxx
-..\inc\svtools\colorcfg.hxx %_DEST%\inc%_EXT%\svtools\colorcfg.hxx
-
-..\inc\lngmisc.hxx %_DEST%\inc%_EXT%\svtools\lngmisc.hxx
-..\inc\svtools\lingucfg.hxx %_DEST%\inc%_EXT%\svtools\lingucfg.hxx
-..\inc\linguprops.hxx %_DEST%\inc%_EXT%\svtools\linguprops.hxx
-..\inc\searchopt.hxx %_DEST%\inc%_EXT%\svtools\searchopt.hxx
-
-..\inc\PasswordHelper.hxx %_DEST%\inc%_EXT%\svtools\PasswordHelper.hxx
-
-..\inc\svtools\syslocale.hxx %_DEST%\inc%_EXT%\svtools\syslocale.hxx
-
-..\inc\unoimap.hxx %_DEST%\inc%_EXT%\svtools\unoimap.hxx
-..\inc\unoevent.hxx %_DEST%\inc%_EXT%\svtools\unoevent.hxx
-
-..\inc\svtools\stringtransfer.hxx %_DEST%\inc%_EXT%\svtools\stringtransfer.hxx
-
-..\inc\ivctrl.hxx %_DEST%\inc%_EXT%\svtools\ivctrl.hxx
-..\inc\fileview.hxx %_DEST%\inc%_EXT%\svtools\fileview.hxx
-..\inc\templdlg.hxx %_DEST%\inc%_EXT%\svtools\templdlg.hxx
-..\inc\asynclink.hxx %_DEST%\inc%_EXT%\svtools\asynclink.hxx
-..\inc\svtools\inettbc.hxx %_DEST%\inc%_EXT%\svtools\inettbc.hxx
-..\inc\svtools\urlfilter.hxx %_DEST%\inc%_EXT%\svtools\urlfilter.hxx
-
-..\inc\controldims.hrc %_DEST%\inc%_EXT%\svtools\controldims.hrc
-
-..\inc\svtools\helpid.hrc %_DEST%\inc%_EXT%\svtools\helpid.hrc
-..\inc\svtools\insdlg.hxx %_DEST%\inc%_EXT%\svtools\insdlg.hxx
-..\inc\soerr.hxx %_DEST%\inc%_EXT%\svtools\soerr.hxx
-..\inc\sores.hxx %_DEST%\inc%_EXT%\svtools\sores.hxx
-
-..\inc\textwindowaccessibility.hxx %_DEST%\inc%_EXT%\svtools\textwindowaccessibility.hxx
-
-..\inc\docpasswdrequest.hxx %_DEST%\inc%_EXT%\svtools\docpasswdrequest.hxx
-..\inc\docmspasswdrequest.hxx %_DEST%\inc%_EXT%\svtools\docmspasswdrequest.hxx
-..\inc\fontsubstconfig.hxx %_DEST%\inc%_EXT%\svtools\fontsubstconfig.hxx
-..\inc\apearcfg.hxx %_DEST%\inc%_EXT%\svtools\apearcfg.hxx
-..\inc\fltrcfg.hxx %_DEST%\inc%_EXT%\svtools\fltrcfg.hxx
-..\inc\misccfg.hxx %_DEST%\inc%_EXT%\svtools\misccfg.hxx
-..\inc\acceleratorexecute.hxx %_DEST%\inc%_EXT%\svtools\acceleratorexecute.hxx
-
-..\inc\QueryFolderName.hxx %_DEST%\inc%_EXT%\svtools\QueryFolderName.hxx
-..\inc\DocumentInfoPreview.hxx %_DEST%\inc%_EXT%\svtools\DocumentInfoPreview.hxx
-..\inc\svtools\javacontext.hxx %_DEST%\inc%_EXT%\svtools\javacontext.hxx
-..\inc\svtools\javainteractionhandler.hxx %_DEST%\inc%_EXT%\svtools\javainteractionhandler.hxx
-..\inc\dialogclosedlistener.hxx %_DEST%\inc%_EXT%\svtools\dialogclosedlistener.hxx
-..\inc\svtools\options.hxx %_DEST%\inc%_EXT%\svtools\options.hxx
-..\inc\contextmenuhelper.hxx %_DEST%\inc%_EXT%\svtools\contextmenuhelper.hxx
-..\inc\extcolorcfg.hxx %_DEST%\inc%_EXT%\svtools\extcolorcfg.hxx
-
-..\inc\svtools\chartprettypainter.hxx %_DEST%\inc%_EXT%\svtools\chartprettypainter.hxx
-..\inc\svtools\extensionlistbox.hxx %_DEST%\inc%_EXT%\svtools\extensionlistbox.hxx
+..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
+..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h
+..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
+..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
+..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h
+..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
 
 dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 36a798d666cd..09d1f5c869b9 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -50,7 +50,7 @@
 #include <svtools/svtdata.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #include <algorithm>
diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src
index 39991363c906..c04e1294c0af 100644
--- a/svtools/source/brwbox/editbrowsebox.src
+++ b/svtools/source/brwbox/editbrowsebox.src
@@ -33,7 +33,7 @@
 #endif
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 ImageList RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 6f1e3882d705..4077231c5c84 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -31,11 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
 #include <svtools/accessibilityoptions.hxx>
 #include "configitems/accessibilityoptions_const.hxx"
 
@@ -57,10 +52,10 @@
 #include <unotools/processfactory.hxx>
 #endif
 #ifndef _SVT_LOGHELPER_HXX_
-#include <loghelper.hxx>
+#include <unotools/loghelper.hxx>
 #endif
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
@@ -544,7 +539,7 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions()
 
 void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
-    Broadcast( rHint );
+    NotifyListeners(0);
     if ( rHint.IsA(TYPE(SfxSimpleHint)) )
     {
         if ( ((SfxSimpleHint&)rHint).GetId()  == SFX_HINT_ACCESSIBILITY_CHANGED )
diff --git a/svtools/source/config/addxmltostorageoptions.cxx b/svtools/source/config/addxmltostorageoptions.cxx
deleted file mode 100644
index 92e2369a2a70..000000000000
--- a/svtools/source/config/addxmltostorageoptions.cxx
+++ /dev/null
@@ -1,291 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: addxmltostorageoptions.cxx,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//  includes
-//_________________________________________________________________________________________________________________
-
-#include <svtools/addxmltostorageoptions.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
-#include <tools/string.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <rtl/logfile.hxx>
-#include "itemholder1.hxx"
-
-//_________________________________________________________________________________________________________________
-//  namespaces
-//_________________________________________________________________________________________________________________
-
-using namespace ::utl;
-using namespace ::rtl;
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-
-//*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
-//*****************************************************************************************************************
-SvtAddXMLToStorageOptions_Impl* SvtAddXMLToStorageOptions::m_pDataContainer = 0;
-sal_Int32 SvtAddXMLToStorageOptions::m_nRefCount = 0;
-
-
-//_________________________________________________________________________________________________________________
-//  private declarations!
-//_________________________________________________________________________________________________________________
-
-class SvtAddXMLToStorageOptions_Impl : public ConfigItem
-{
-    //-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    //-------------------------------------------------------------------------------------------------------------
-
-    public:
-
-        //---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
-
-         SvtAddXMLToStorageOptions_Impl();
-
-        //---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
-        //---------------------------------------------------------------------------------------------------------
-
-        //---------------------------------------------------------------------------------------------------------
-        //  public interface
-        //---------------------------------------------------------------------------------------------------------
-
-        /*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
-                        It's not used in the moment - but it's possible for the feature!
-
-            @seealso    -
-
-            @param      -
-            @return     -
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-
-        sal_Bool IsWriter_Add_XML_to_Storage() const    { return bAddXmlToStg_Writer; }
-        sal_Bool IsCalc_Add_XML_to_Storage() const      { return bAddXmlToStg_Calc; }
-        sal_Bool IsImpress_Add_XML_to_Storage() const   { return bAddXmlToStg_Impress; }
-        sal_Bool IsDraw_Add_XML_to_Storage() const      { return bAddXmlToStg_Draw; }
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  private methods
-    //-------------------------------------------------------------------------------------------------------------
-
-    private:
-
-        /*-****************************************************************************************************//**
-            @short      return list of key names of ouer configuration management which represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get needed values from our
-                        configuration management.
-
-            @seealso    -
-
-            @param      -
-            @return     A list of needed configuration keys is returned.
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-
-        static Sequence< OUString > GetPropertyNames();
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  private member
-    //-------------------------------------------------------------------------------------------------------------
-
-    private:
-
-        sal_Bool bAddXmlToStg_Writer,
-                 bAddXmlToStg_Calc,
-                 bAddXmlToStg_Impress,
-                 bAddXmlToStg_Draw;
-};
-
-//_________________________________________________________________________________________________________________
-//  definitions
-//_________________________________________________________________________________________________________________
-
-
-//*****************************************************************************************************************
-//  constructor
-//*****************************************************************************************************************
-SvtAddXMLToStorageOptions_Impl::SvtAddXMLToStorageOptions_Impl()
-    // Init baseclasses first
-    :   ConfigItem( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
-                        "Office.Common/AddXMLToStorage"))),
-    // Init member then.
-    bAddXmlToStg_Writer( FALSE ),
-    bAddXmlToStg_Calc( FALSE ),
-    bAddXmlToStg_Impress( FALSE ),
-    bAddXmlToStg_Draw( FALSE )
-{
-    // Use our static list of configuration keys to get his values.
-    Sequence< OUString > seqNames = GetPropertyNames();
-    Sequence< Any > seqValues = GetProperties( seqNames );
-
-    // Copy values from list in right order to ouer internal member.
-    sal_Int32 nPropertyCount = seqValues.getLength();
-    const Any* pValue = seqValues.getConstArray();
-    for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty, ++pValue )
-        if( pValue->hasValue() )
-
-            switch( nProperty )
-            {
-            case 0:
-                *pValue >>= bAddXmlToStg_Writer;
-                break;
-            case 1:
-                *pValue >>= bAddXmlToStg_Calc;
-                break;
-            case 2:
-                *pValue >>= bAddXmlToStg_Impress;
-                break;
-            case 3:
-                *pValue >>= bAddXmlToStg_Draw;
-                break;
-            }
-}
-
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
-Sequence< OUString > SvtAddXMLToStorageOptions_Impl::GetPropertyNames()
-{
-    // Build static list of configuration key names.
-    static const sal_Char* pProperties[] =
-    {
-        "Writer",
-        "Calc",
-        "Impress",
-        "Draw"
-    };
-
-    const sal_uInt16 nCnt = sizeof(pProperties) / sizeof( pProperties[0] );
-    Sequence<OUString> aNames( nCnt );
-    OUString* pNames = aNames.getArray();
-    for( sal_uInt16 n = 0; n < nCnt; ++n )
-        pNames[ n ] = OUString::createFromAscii( pProperties[ n ] );
-    return aNames;
-}
-
-
-//*****************************************************************************************************************
-//  constructor
-//*****************************************************************************************************************
-SvtAddXMLToStorageOptions::SvtAddXMLToStorageOptions()
-{
-    // Global access, must be guarded (multithreading!).
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    // Increase ouer refcount ...
-    ++m_nRefCount;
-    // ... and initialize ouer data container only if it not already exist!
-    if( !m_pDataContainer )
-    {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtAddXMLToStorageOptions_Impl::ctor()");
-        m_pDataContainer = new SvtAddXMLToStorageOptions_Impl;
-
-        ItemHolder1::holdConfigItem(E_ADDXMLTOSTORAGEOPTIONS);
-   }
-}
-
-//*****************************************************************************************************************
-//  destructor
-//*****************************************************************************************************************
-SvtAddXMLToStorageOptions::~SvtAddXMLToStorageOptions()
-{
-    // Global access, must be guarded (multithreading!)
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    // Decrease ouer refcount.
-    // If last instance was deleted ...
-    // we must destroy ouer static data container!
-    if( !--m_nRefCount )
-        delete m_pDataContainer, m_pDataContainer = 0;
-}
-
-sal_Bool SvtAddXMLToStorageOptions::IsWriter_Add_XML_to_Storage() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->IsWriter_Add_XML_to_Storage();
-}
-sal_Bool SvtAddXMLToStorageOptions::IsCalc_Add_XML_to_Storage() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->IsCalc_Add_XML_to_Storage();
-}
-sal_Bool SvtAddXMLToStorageOptions::IsImpress_Add_XML_to_Storage() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->IsImpress_Add_XML_to_Storage();
-}
-sal_Bool SvtAddXMLToStorageOptions::IsDraw_Add_XML_to_Storage() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->IsDraw_Add_XML_to_Storage();
-}
-
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
-Mutex& SvtAddXMLToStorageOptions::GetOwnStaticMutex()
-{
-    // Initialize static mutex only for one time!
-    static Mutex* pMutex = NULL;
-    // If these method first called (Mutex not already exist!) ...
-    if( pMutex == NULL )
-    {
-        // ... we must create a new one. Protect follow code with the global mutex -
-        // It must be - we create a static variable!
-        MutexGuard aGuard( Mutex::getGlobalMutex() );
-        // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
-        if( pMutex == NULL )
-        {
-            // Create the new mutex and set it for return on static variable.
-            static Mutex aMutex;
-            pMutex = &aMutex;
-        }
-    }
-    // Return new created or already existing mutex object.
-    return *pMutex;
-}
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 35a07a715dd5..0d4865ee563e 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -31,11 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
 #include "apearcfg.hxx"
 #include "com/sun/star/uno/Any.hxx"
 
@@ -176,6 +171,11 @@ void  SvtTabAppearanceCfg::Commit()
     }
     PutProperties(rNames, aValues);
 }
+
+void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
 /*--------------------------------------------------------------------
      Beschreibung:
  --------------------------------------------------------------------*/
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 0c39fde11390..9008d7a27ee1 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -31,11 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
 #include <svtools/colorcfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -46,8 +41,8 @@
 #include <unotools/configitem.hxx>
 #include <unotools/configpathes.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <svtools/poolitem.hxx> //Any2Bool
-#include <svtools/smplhint.hxx>
+#include <svl/poolitem.hxx> //Any2Bool
+#include <svl/smplhint.hxx>
 #include <vos/mutex.hxx>
 
 #include <itemholder2.hxx>
@@ -81,15 +76,12 @@ ColorConfig_Impl*    ColorConfig::m_pImpl = NULL;
 
 /* -----------------------------16.01.01 15:36--------------------------------
  ---------------------------------------------------------------------------*/
-class ColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
+class ColorConfig_Impl : public utl::ConfigItem
 {
     ColorConfigValue    m_aConfigValues[ColorConfigEntryCount];
     sal_Bool            m_bEditMode;
     rtl::OUString       m_sIsVisible;
     rtl::OUString       m_sLoadedScheme;
-    sal_Bool            m_bIsBroadcastEnabled;
-    static sal_Bool     m_bLockBroadcast;
-    static sal_Bool     m_bBroadcastWhenUnlocked;
 
     uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme);
 public:
@@ -118,13 +110,6 @@ public:
     void                            ClearModified(){ConfigItem::ClearModified();}
     void                            SettingsChanged();
 
-    static void                     DisableBroadcast();
-    static void                     EnableBroadcast();
-    static sal_Bool                 IsEnableBroadcast();
-
-    static void                     LockBroadcast();
-    static void                     UnlockBroadcast();
-
     // #100822#
     DECL_LINK( DataChangedEventListener, VclWindowEvent* );
 
@@ -219,13 +204,10 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
 /* -----------------------------22.03.2002 14:37------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Bool ColorConfig_Impl::m_bLockBroadcast = sal_False;
-sal_Bool ColorConfig_Impl::m_bBroadcastWhenUnlocked = sal_False;
 ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
     ConfigItem(C2U("Office.UI/ColorScheme")),
     m_bEditMode(bEditMode),
-    m_sIsVisible(C2U("/IsVisible")),
-    m_bIsBroadcastEnabled(sal_True)
+    m_sIsVisible(C2U("/IsVisible"))
 {
     if(!m_bEditMode)
     {
@@ -249,23 +231,6 @@ ColorConfig_Impl::~ColorConfig_Impl()
     // #100822#
     ::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
 }
-// -----------------------------------------------------------------------------
-void ColorConfig_Impl::DisableBroadcast()
-{
-    if ( ColorConfig::m_pImpl )
-        ColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_False;
-}
-// -----------------------------------------------------------------------------
-void ColorConfig_Impl::EnableBroadcast()
-{
-    if ( ColorConfig::m_pImpl )
-        ColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_True;
-}
-// -----------------------------------------------------------------------------
-sal_Bool ColorConfig_Impl::IsEnableBroadcast()
-{
-    return ColorConfig::m_pImpl ? ColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False;
-}
 /* -----------------------------22.03.2002 14:38------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -308,16 +273,7 @@ void    ColorConfig_Impl::Notify( const uno::Sequence<OUString>& )
 {
     //loading via notification always uses the default setting
     Load(::rtl::OUString());
-
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
-
-    if(m_bLockBroadcast)
-    {
-        m_bBroadcastWhenUnlocked = sal_True;
-        ImplUpdateApplicationSettings();
-    }
-    else
-        Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED));
+    NotifyListeners(0);
 }
 /* -----------------------------22.03.2002 14:38------------------------------
 
@@ -414,34 +370,7 @@ void ColorConfig_Impl::SettingsChanged()
 
     ImplUpdateApplicationSettings();
 
-    Broadcast( SfxSimpleHint( SFX_HINT_COLORS_CHANGED ) );
-}
-/* -----------------11.12.2002 09:21-----------------
- *
- * --------------------------------------------------*/
-void ColorConfig_Impl::LockBroadcast()
-{
-    m_bLockBroadcast = sal_True;
-}
-/* -----------------11.12.2002 09:21-----------------
- *
- * --------------------------------------------------*/
-void ColorConfig_Impl::UnlockBroadcast()
-{
-    if ( m_bBroadcastWhenUnlocked )
-    {
-        m_bBroadcastWhenUnlocked = ColorConfig::m_pImpl != NULL;
-        if ( m_bBroadcastWhenUnlocked )
-        {
-            ColorConfig::m_pImpl->ImplUpdateApplicationSettings();
-            if ( ColorConfig::m_pImpl->IsEnableBroadcast() )
-            {
-                m_bBroadcastWhenUnlocked = sal_False;
-                ColorConfig::m_pImpl->Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED));
-            }
-        }
-    }
-    m_bLockBroadcast = sal_False;
+    NotifyListeners(0);
 }
 /* -----------------------------2002/08/16 12:07 -----------------------------
    #100822#
@@ -500,7 +429,7 @@ ColorConfig::ColorConfig()
         ItemHolder2::holdConfigItem(E_COLORCFG);
     }
     ++nColorRefCount_Impl;
-    StartListening( *m_pImpl);
+    m_pImpl->AddListener(this);
 }
 /* -----------------------------16.01.01 15:36--------------------------------
 
@@ -508,7 +437,7 @@ ColorConfig::ColorConfig()
 ColorConfig::~ColorConfig()
 {
     ::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
-    EndListening( *m_pImpl);
+    m_pImpl->RemoveListener(this);
     if(!--nColorRefCount_Impl)
     {
         delete m_pImpl;
@@ -636,15 +565,6 @@ ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bS
 
     return aRet;
 }
-/* -----------------------------12.04.2002 09:25------------------------------
-
- ---------------------------------------------------------------------------*/
-void ColorConfig::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
-
-    Broadcast( rHint );
-}
 /* -----------------------------25.03.2002 12:01------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -652,14 +572,14 @@ EditableColorConfig::EditableColorConfig() :
     m_pImpl(new ColorConfig_Impl),
     m_bModified(sal_False)
 {
-    m_pImpl->LockBroadcast();
+    m_pImpl->BlockBroadcasts(TRUE);
 }
 /*-- 25.03.2002 12:03:08---------------------------------------------------
 
   -----------------------------------------------------------------------*/
 EditableColorConfig::~EditableColorConfig()
 {
-    m_pImpl->UnlockBroadcast();
+    m_pImpl->BlockBroadcasts(FALSE);
     if(m_bModified)
         m_pImpl->SetModified();
     if(m_pImpl->IsModified())
@@ -757,12 +677,12 @@ void EditableColorConfig::Commit()
 // -----------------------------------------------------------------------------
 void EditableColorConfig::DisableBroadcast()
 {
-    m_pImpl->DisableBroadcast();
+    m_pImpl->BlockBroadcasts(TRUE);
 }
 // -----------------------------------------------------------------------------
 void EditableColorConfig::EnableBroadcast()
 {
-    m_pImpl->EnableBroadcast();
+    m_pImpl->BlockBroadcasts(FALSE);
 }
 // -----------------------------------------------------------------------------
 
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 4610a1571baf..89bf41ac9f58 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -27,11 +27,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
 
 #include "extcolorcfg.hxx"
 #include <com/sun/star/uno/Any.hxx>
@@ -43,8 +40,8 @@
 #include <unotools/configitem.hxx>
 #include <unotools/configpathes.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <svtools/poolitem.hxx> //Any2Bool
-#include <svtools/smplhint.hxx>
+#include <svl/poolitem.hxx> //Any2Bool
+#include <svl/smplhint.hxx>
 #include <vos/mutex.hxx>
 
  /* #100822# ----
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 8fe799dec67a..dc9bfa64e6d4 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -31,13 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
 #include "fontsubstconfig.hxx"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -129,6 +124,10 @@ SvtFontSubstConfig::~SvtFontSubstConfig()
 /*-- 18.01.01 12:08:00---------------------------------------------------
 
   -----------------------------------------------------------------------*/
+void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
 void SvtFontSubstConfig::Commit()
 {
     Sequence<OUString> aNames(1);
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 0ca09c176072..16982a695e11 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -31,11 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
 #include <svtools/helpopt.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 590e0f85ade1..759fabbee686 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -31,11 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
 #include "itemholder2.hxx"
 
 //-----------------------------------------------
@@ -45,18 +40,12 @@
 
 #include <svtools/accessibilityoptions.hxx>
 #include <apearcfg.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svtools/menuoptions.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/ctloptions.hxx>
 #include <fontsubstconfig.hxx>
 #include <svtools/helpopt.hxx>
-#include <svtools/languageoptions.hxx>
-#include <misccfg.hxx>
 #include <svtools/printoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 #include <svtools/miscopt.hxx>
 
 
@@ -178,18 +167,10 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
 // no ref count            rItem.pItem = new SvtTabAppearanceCfg();
             break;
 
-        case E_CJKOPTIONS :
-            rItem.pItem = new SvtCJKOptions();
-            break;
-
         case E_COLORCFG :
             rItem.pItem = new ::svtools::ColorConfig();
             break;
 
-        case E_CTLOPTIONS :
-            rItem.pItem = new SvtCTLOptions();
-            break;
-
         case E_FONTSUBSTCONFIG :
 // no ref count            rItem.pItem = new SvtFontSubstConfig();
             break;
@@ -198,12 +179,8 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
             rItem.pItem = new SvtHelpOptions();
             break;
 
-        case E_LANGUAGEOPTIONS :
-// capsulate CTL and CJL options !            rItem.pItem = new SvtLanguageOptions();
-            break;
-
-        case E_MISCCFG :
-// no ref count            rItem.pItem = new SfxMiscCfg();
+        case E_MENUOPTIONS :
+            rItem.pItem = new SvtMenuOptions();
             break;
 
         case E_PRINTOPTIONS :
@@ -214,17 +191,6 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
             rItem.pItem = new SvtPrintFileOptions();
             break;
 
-        case E_SYSLOCALEOPTIONS :
-            rItem.pItem = new SvtSysLocaleOptions();
-            break;
-
-        case E_UNDOOPTIONS :
-            rItem.pItem = new SvtUndoOptions();
-            break;
-
-        case E_USEROPTIONS :
-            rItem.pItem = new SvtUserOptions();
-            break;
         case E_MISCOPTIONS :
             rItem.pItem = new SvtMiscOptions();
             break;
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index d32eee1fc093..192df8f746c9 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -34,7 +34,7 @@
 //-----------------------------------------------
 // includes
 
-#include "itemholderbase.hxx"
+#include <unotools/itemholderbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 
diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk
index 9c0985329eb3..9de32bd9e43d 100644
--- a/svtools/source/config/makefile.mk
+++ b/svtools/source/config/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -32,80 +32,28 @@ PRJ=..$/..
 
 PRJNAME=svtools
 TARGET=config
-TARGET1=heavyconfig
-LIBTARGET=NO
 
 ENABLE_EXCEPTIONS := TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
+.INCLUDE :  $(PRJ)$/util$/svt.pmk
 
 # --- Files --------------------------------------------------------
 
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-# --- config.lib Files --------------------------------------------------------
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES=  \
-    $(SLO)$/accelcfg.obj				\
-    $(SLO)$/fltrcfg.obj				\
-    $(SLO)$/xmlaccelcfg.obj				\
-    $(SLO)$/moduleoptions.obj           \
-    $(SLO)$/pathoptions.obj             \
-    $(SLO)$/saveopt.obj					\
-    $(SLO)$/lingucfg.obj                \
-    $(SLO)$/javaoptions.obj             \
-    $(SLO)$/securityoptions.obj			\
-    $(SLO)$/localisationoptions.obj		\
-    $(SLO)$/workingsetoptions.obj		\
-    $(SLO)$/viewoptions.obj				\
-    $(SLO)$/internaloptions.obj			\
-    $(SLO)$/startoptions.obj			\
-    $(SLO)$/historyoptions.obj			\
-    $(SLO)$/inetoptions.obj				\
-    $(SLO)$/menuoptions.obj				\
-    $(SLO)$/dynamicmenuoptions.obj		\
-    $(SLO)$/optionsdrawinglayer.obj		\
-    $(SLO)$/fontoptions.obj				\
-    $(SLO)$/addxmltostorageoptions.obj	\
-    $(SLO)$/defaultoptions.obj			\
-    $(SLO)$/searchopt.obj				\
-    $(SLO)$/printwarningoptions.obj		\
-    $(SLO)$/cacheoptions.obj            \
-    $(SLO)$/regoptions.obj				\
-    $(SLO)$/cmdoptions.obj				\
-    $(SLO)$/extendedsecurityoptions.obj \
-    $(SLO)$/sourceviewconfig.obj		\
-    $(SLO)$/compatibility.obj           \
-    $(SLO)$/eventcfg.obj                \
-    $(SLO)$/optionsdlg.obj              \
-    $(SLO)$/itemholder1.obj \
-    $(SLO)$/options.obj
-
-#	$(SLO)$/miscopt.obj					\
-# --- heavyconfig.lib Files --------------------------------------------------------
-LIB2TARGET= $(SLB)$/$(TARGET1).lib
-
-LIB2OBJFILES=  \
-    $(SLO)$/accessibilityoptions.obj	\
-    $(SLO)$/fontsubstconfig.obj				\
-    $(SLO)$/misccfg.obj				\
-    $(SLO)$/apearcfg.obj				\
-    $(SLO)$/helpopt.obj                 \
-    $(SLO)$/printoptions.obj			\
-    $(SLO)$/languageoptions.obj     \
-    $(SLO)$/ctloptions.obj          \
-    $(SLO)$/cjkoptions.obj          \
-    $(SLO)$/colorcfg.obj            \
-    $(SLO)$/extcolorcfg.obj            \
-    $(SLO)$/undoopt.obj                 \
-    $(SLO)$/useroptions.obj      \
-    $(SLO)$/syslocaleoptions.obj \
-    $(SLO)$/itemholder2.obj \
-    $(SLO)$/miscopt.obj
+SLOFILES=  \
+        $(SLO)$/accessibilityoptions.obj	\
+        $(SLO)$/apearcfg.obj				\
+        $(SLO)$/colorcfg.obj            \
+        $(SLO)$/extcolorcfg.obj            \
+        $(SLO)$/fontsubstconfig.obj				\
+        $(SLO)$/helpopt.obj                 \
+        $(SLO)$/itemholder2.obj \
+        $(SLO)$/menuoptions.obj				\
+        $(SLO)$/miscopt.obj             \
+        $(SLO)$/optionsdrawinglayer.obj		\
+        $(SLO)$/printoptions.obj			
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 2d0e8d905ad9..8c00d7165ba5 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -46,7 +46,7 @@
 #include <vcl/svapp.hxx>
 
 #include <rtl/logfile.hxx>
-#include "itemholder1.hxx"
+#include "itemholder2.hxx"
 
 //_________________________________________________________________________________________________________________
 //  namespaces
@@ -111,8 +111,8 @@ class SvtMenuOptions_Impl : public ConfigItem
          SvtMenuOptions_Impl();
         ~SvtMenuOptions_Impl();
 
-        void AddListener( const Link& rLink );
-        void RemoveListener( const Link& rLink );
+        void AddListenerLink( const Link& rLink );
+        void RemoveListenerLink( const Link& rLink );
 
         //---------------------------------------------------------------------------------------------------------
         //  overloaded methods of baseclass
@@ -412,12 +412,12 @@ Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
     return seqPropertyNames;
 }
 
-void SvtMenuOptions_Impl::AddListener( const Link& rLink )
+void SvtMenuOptions_Impl::AddListenerLink( const Link& rLink )
 {
     aList.Insert( new Link( rLink ) );
 }
 
-void SvtMenuOptions_Impl::RemoveListener( const Link& rLink )
+void SvtMenuOptions_Impl::RemoveListenerLink( const Link& rLink )
 {
     for ( USHORT n=0; n<aList.Count(); n++ )
     {
@@ -452,7 +452,7 @@ SvtMenuOptions::SvtMenuOptions()
         RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtMenuOptions_Impl::ctor()");
         m_pDataContainer = new SvtMenuOptions_Impl();
 
-        ItemHolder1::holdConfigItem(E_MENUOPTIONS);
+        ItemHolder2::holdConfigItem(E_MENUOPTIONS);
     }
 }
 
@@ -553,12 +553,12 @@ Mutex& SvtMenuOptions::GetOwnStaticMutex()
     return *pMutex;
 }
 
-void SvtMenuOptions::AddListener( const Link& rLink )
+void SvtMenuOptions::AddListenerLink( const Link& rLink )
 {
-    m_pDataContainer->AddListener( rLink );
+    m_pDataContainer->AddListenerLink( rLink );
 }
 
-void SvtMenuOptions::RemoveListener( const Link& rLink )
+void SvtMenuOptions::RemoveListenerLink( const Link& rLink )
 {
-    m_pDataContainer->RemoveListener( rLink );
+    m_pDataContainer->RemoveListenerLink( rLink );
 }
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 7a6dc4281da6..af6861a5104f 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -33,10 +33,6 @@
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
 
 #include <svtools/miscopt.hxx>
 #include <unotools/configmgr.hxx>
@@ -231,8 +227,8 @@ class SvtMiscOptions_Impl : public ConfigItem
         inline sal_Bool IsUseSystemPrintDialogReadOnly() const
         { return m_bIsUseSystemPrintDialogRO; }
 
-        void AddListener( const Link& rLink );
-        void RemoveListener( const Link& rLink );
+        void AddListenerLink( const Link& rLink );
+        void RemoveListenerLink( const Link& rLink );
         void CallListeners();
 
     //-------------------------------------------------------------------------------------------------------------
@@ -260,42 +256,6 @@ class SvtMiscOptions_Impl : public ConfigItem
         void ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName );
 };
 
-//_________________________________________________________________________________________________________________
-//  definitions
-//_________________________________________________________________________________________________________________
-
-static sal_Int16 implSymbolsStyleFromVCL( ULONG nStyle )
-{
-    switch ( nStyle )
-    {
-        case STYLE_SYMBOLS_AUTO:       return SFX_SYMBOLS_STYLE_AUTO;
-        case STYLE_SYMBOLS_DEFAULT:    return SFX_SYMBOLS_STYLE_DEFAULT;
-        case STYLE_SYMBOLS_HICONTRAST: return SFX_SYMBOLS_STYLE_HICONTRAST;
-        case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
-        case STYLE_SYMBOLS_CRYSTAL:    return SFX_SYMBOLS_STYLE_CRYSTAL;
-        case STYLE_SYMBOLS_TANGO:      return SFX_SYMBOLS_STYLE_TANGO;
-        case STYLE_SYMBOLS_CLASSIC:    return SFX_SYMBOLS_STYLE_CLASSIC;
-    }
-
-    return SFX_SYMBOLS_STYLE_AUTO;
-}
-
-static ULONG implSymbolsStyleToVCL( sal_Int16 nStyle )
-{
-    switch ( nStyle )
-    {
-        case SFX_SYMBOLS_STYLE_AUTO:       return STYLE_SYMBOLS_AUTO;
-        case SFX_SYMBOLS_STYLE_DEFAULT:    return STYLE_SYMBOLS_DEFAULT;
-        case SFX_SYMBOLS_STYLE_HICONTRAST: return STYLE_SYMBOLS_HICONTRAST;
-        case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
-        case SFX_SYMBOLS_STYLE_CRYSTAL:    return STYLE_SYMBOLS_CRYSTAL;
-        case SFX_SYMBOLS_STYLE_TANGO:      return STYLE_SYMBOLS_TANGO;
-        case SFX_SYMBOLS_STYLE_CLASSIC:    return STYLE_SYMBOLS_CLASSIC;
-    }
-
-    return STYLE_SYMBOLS_AUTO;
-}
-
 //*****************************************************************************************************************
 //  constructor
 //*****************************************************************************************************************
@@ -503,12 +463,12 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
     }
 }
 
-void SvtMiscOptions_Impl::AddListener( const Link& rLink )
+void SvtMiscOptions_Impl::AddListenerLink( const Link& rLink )
 {
     aList.Insert( new Link( rLink ) );
 }
 
-void SvtMiscOptions_Impl::RemoveListener( const Link& rLink )
+void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink )
 {
     for ( USHORT n=0; n<aList.Count(); n++ )
     {
@@ -543,7 +503,7 @@ void SvtMiscOptions_Impl::SetSymbolsSize( sal_Int16 nSet )
 
 sal_Int16 SvtMiscOptions_Impl::GetSymbolsStyle() const
 {
-    return implSymbolsStyleFromVCL( Application::GetSettings().GetStyleSettings().GetSymbolsStyle() );
+    return (sal_Int16)Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
 }
 
 ::rtl::OUString SvtMiscOptions_Impl::GetSymbolsStyleName() const
@@ -553,7 +513,7 @@ sal_Int16 SvtMiscOptions_Impl::GetSymbolsStyle() const
 
 sal_Int16 SvtMiscOptions_Impl::GetCurrentSymbolsStyle() const
 {
-    return implSymbolsStyleFromVCL( Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyle() );
+    return (sal_Int16)Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyle();
 }
 
 void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName )
@@ -565,7 +525,7 @@ void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, cons
         StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
 
         if ( bValue )
-            aStyleSettings.SetSymbolsStyle( implSymbolsStyleToVCL( nSet ) );
+            aStyleSettings.SetSymbolsStyle( nSet );
         else
             aStyleSettings.SetSymbolsStyleName( rName );
 
@@ -863,12 +823,12 @@ Mutex & SvtMiscOptions::GetInitMutex()
     return *pMutex;
 }
 
-void SvtMiscOptions::AddListener( const Link& rLink )
+void SvtMiscOptions::AddListenerLink( const Link& rLink )
 {
-    m_pDataContainer->AddListener( rLink );
+    m_pDataContainer->AddListenerLink( rLink );
 }
 
-void SvtMiscOptions::RemoveListener( const Link& rLink )
+void SvtMiscOptions::RemoveListenerLink( const Link& rLink )
 {
-    m_pDataContainer->RemoveListener( rLink );
+    m_pDataContainer->RemoveListenerLink( rLink );
 }
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index abb044c7863e..43490c5ea79e 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -27,6 +27,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
+
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
@@ -191,6 +194,7 @@ public:
 //---------------------------------------------------------------------------------------------------------
 
     virtual void Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
 //---------------------------------------------------------------------------------------------------------
 //  public interface
@@ -735,6 +739,10 @@ void SvtOptionsDrawinglayer_Impl::Commit()
     PutProperties( aSeqNames, aSeqValues );
 }
 
+void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+{
+}
+
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 0f54366c47f6..9627a2ce10d9 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -31,11 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
@@ -73,7 +68,7 @@
 #endif
 
 #ifndef _SVT_LOGHELPER_HXX
-#include <loghelper.hxx>
+#include <unotools/loghelper.hxx>
 #endif
 
 #include <itemholder2.hxx>
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index 4090f7cb8bf5..1ac0038b5131 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -42,7 +42,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/dynamicmenuoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index af379db9b12b..a0e6b353dfb6 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include "contentenumeration.hxx"
-#include <svtools/urlfilter.hxx>
+#include <svl/urlfilter.hxx>
 #include <svtools/inettbc.hxx>
 #include "imagemgr.hxx"
 
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 243856a8e15a..7fddf18ee266 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -37,7 +37,7 @@
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include "fileview.hrc"
 #include "contentenumeration.hxx"
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
@@ -78,8 +78,8 @@
 #include <vcl/sound.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/intlwrapper.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/urlfilter.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/urlfilter.hxx>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index c86db1ce418a..9d1cdb618cda 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -30,7 +30,7 @@
 
  // includes ------------------------------------------------------------------
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include "fileview.hrc"
 #include <svtools/helpid.hrc>
 
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index d4ec597aebfc..d443beb7fff9 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -45,7 +45,7 @@
 #include <limits.h>
 
 #include "ivctrl.hxx"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class IcnCursor_Impl;
 class SvtIconChoiceCtrl;
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
index c26c906eb3f6..f81bc3fdfa9b 100644
--- a/svtools/source/contnr/svcontnr.src
+++ b/svtools/source/contnr/svcontnr.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 Image RID_IMG_TREENODE_COLLAPSED
 {
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index e17b81e548a9..f2674279f4df 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -50,7 +50,7 @@
 #include <svtools/svtdata.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 // #102891# --------------------
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index 37ee096dc6d9..8d7a79701d27 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -46,7 +46,7 @@
 #ifndef _SVLBITM_HXX
 #include <svtools/svlbitm.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 
 
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index e56db398b8fb..77a9a3798d6d 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -48,7 +48,7 @@
 #include <rtl/instance.hxx>
 
 #define _SVSTDARR_ULONGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef _SVEDI_HXX
 #include <svtools/svmedit.hxx>
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 1770810c7a5d..3b4907e7a80d 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -34,7 +34,7 @@
 #include <svtools/headbar.hxx>
 #include <svtools/svtdata.hxx>
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 8312fc432299..06de35ba19aa 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -33,18 +33,18 @@
 #include "templwin.hxx"
 #include "templdlg.hxx"
 #include <svtools/svtdata.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/dynamicmenuoptions.hxx>
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
 #include <svtools/xtextedt.hxx>
-#include <svtools/inettype.hxx>
+#include <svl/inettype.hxx>
 #include "imagemgr.hxx"
 #include <svtools/miscopt.hxx>
 #include "templatefoldercache.hxx"
 #include "imgdef.hxx"
 #include "txtattr.hxx"
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #ifndef _SVTOOLS_TEMPLWIN_HRC
 #include "templwin.hrc"
@@ -52,8 +52,8 @@
 #ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
 #endif
-#include <svtools/pathoptions.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <unotools/ucbhelper.hxx>
 
 #include "unotools/configmgr.hxx"
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index bd3eb4afd5dd..050ba7ab6739 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -38,7 +38,7 @@
 #include "fileview.hxx"
 #include "ivctrl.hxx"
 #include <svtools/svmedit2.hxx>
-#include <svtools/restrictedpaths.hxx>
+#include <svl/restrictedpaths.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index 30149de4da14..f7f42b7e176b 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -33,7 +33,7 @@
 #include "templwin.hrc"
 #include "controldims.hrc"
 #include <svtools/helpid.hrc>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 // Magenta and Grey as mask colors
 #define MASK_COL_MAGENTA    Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index eb4e533b628c..c1491571dd1c 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -38,7 +38,7 @@
 
 #include <svtools/treelist.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // Prueft Integritaet der Liste nach jeder Operation
 //#define CHECK_INTEGRITY
 #endif
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 8ff008eaf7e4..481f6f2ceeae 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -62,7 +62,7 @@
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 
 #define _SV_CALENDAR_CXX
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
 #include <calendar.hxx>
 
diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src
index 44bffd361847..043dd9808663 100644
--- a/svtools/source/control/calendar.src
+++ b/svtools/source/control/calendar.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 String STR_SVT_CALENDAR_DAY
 {
     Text [ en-US ] = "Day" ;
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 692d470b8f5b..c976d7442bc0 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -32,7 +32,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 
 #include <collatorres.hxx>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 097bba0e39f9..b0d20bf7ce30 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -43,7 +43,7 @@
 #include <unotools/charclass.hxx>
 
 #include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <ctrlbox.hxx>
 #include <ctrltool.hxx>
 
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 5cfee79e5f11..05c75577cdbf 100644
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.src
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #ifndef IMAGE_STDBTN_COLOR
 #define IMAGE_STDBTN_COLOR Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 77bb996584bd..1573ed531662 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -45,7 +45,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
 #include <ctrltool.hxx>
 
diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src
index 267a65e98517..ab8005cd9698 100644
--- a/svtools/source/control/ctrltool.src
+++ b/svtools/source/control/ctrltool.src
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 String STR_SVT_STYLE_LIGHT
 {
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 936f8b3e25c5..554f713fd4d6 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svtools.hxx"
 #include <svtools/fileurlbox.hxx>
 #include <osl/file.h>
-#include "filenotation.hxx"
+#include "svl/filenotation.hxx"
 
 //.........................................................................
 namespace svt
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 387c1db34fc1..bbf00329cf93 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <svtools/fmtfield.hxx>
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/lang/Locale.hpp>
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/SearchResult.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #ifndef REGEXP_SUPPORT
 #include <map>
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index 49096144b215..f69e9b34e5ea 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -32,7 +32,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 
 #include <indexentryres.hxx>
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 4a01a03ad759..b4904afee418 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -66,16 +66,16 @@
 #include <vos/mutex.hxx>
 #endif
 #include <vcl/svapp.hxx>
-#include <svtools/historyoptions.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/cancel.hxx>
-#include <svtools/itemset.hxx>
-#include "urihelper.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/historyoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/cancel.hxx>
+#include <svl/itemset.hxx>
+#include "svl/urihelper.hxx"
+#include <unotools/pathoptions.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
@@ -83,7 +83,7 @@
 
 #include "iodlg.hrc"
 #include <asynclink.hxx>
-#include <svtools/urlfilter.hxx>
+#include <svl/urlfilter.hxx>
 
 #include <vector>
 #include <algorithm>
diff --git a/svtools/source/control/makefile.mk b/svtools/source/control/makefile.mk
index 10bb6beb50e4..eecf983ab756 100644
--- a/svtools/source/control/makefile.mk
+++ b/svtools/source/control/makefile.mk
@@ -77,7 +77,6 @@ SLOFILES=\
         $(SLO)$/calendar.obj \
         $(SLO)$/filectrl.obj \
         $(SLO)$/scrwin.obj       \
-        $(SLO)$/reginfo.obj     \
         $(SLO)$/collatorres.obj \
         $(SLO)$/indexentryres.obj \
         $(SLO)$/hyperlabel.obj  \
diff --git a/svtools/source/control/reginfo.cxx b/svtools/source/control/reginfo.cxx
deleted file mode 100644
index 24daba5e6123..000000000000
--- a/svtools/source/control/reginfo.cxx
+++ /dev/null
@@ -1,375 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: reginfo.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#include "reginfo.hxx"
-#include <tools/debug.hxx>
-#include <osl/thread.h>
-
-#define MAXREGVALUE 200
-
-// *****************************************************************************
-#if defined(WIN) || defined(WNT)
-
-#include <tools/svwin.h>
-
-#define DBG_HDL DBG_ASSERT(pImp->bValidGroup, "Keine Gruppe gesetzt"); \
-    if( !pImp->bValidGroup ) return
-
-struct RegInfo_Impl
-{
-    HKEY aGroupHdl;
-    BOOL bValidGroup;
-};
-
-RegInfo::RegInfo()
-{
-    pImp=new RegInfo_Impl;
-    pImp->bValidGroup = FALSE;
-}
-
-RegInfo::~RegInfo()
-{
-    if(pImp->bValidGroup)
-        RegCloseKey( pImp->aGroupHdl );
-    delete pImp;
-}
-
-String RegInfo::GetKeyName( USHORT nKey ) const
-{
-    DBG_HDL String::EmptyString();
-    char aBuffer[MAXREGVALUE];
-    RegEnumKey( pImp->aGroupHdl, nKey, aBuffer, MAXREGVALUE );
-    return String( UniString::CreateFromAscii(aBuffer) );
-}
-
-USHORT RegInfo::GetKeyCount() const
-{
-    DBG_HDL 0;
-#ifdef WNT
-    DWORD nKeys;
-    DWORD Dum1=10, Dum2, Dum3, Dum4, Dum5, Dum6, Dum7;
-    char s[10];
-    FILETIME aDumFileTime;
-    RegQueryInfoKey( pImp->aGroupHdl, s, &Dum1, 0, &nKeys, &Dum2, &Dum3,
-                    &Dum4, &Dum5, &Dum6, &Dum7, &aDumFileTime );
-    return (USHORT) nKeys;
-#else
-    char aBuffer[MAXREGVALUE];
-    USHORT n=0;
-    while(RegEnumKey(
-        pImp->aGroupHdl, n, aBuffer, MAXREGVALUE) == ERROR_SUCCESS)
-        n++;
-    return n;
-#endif
-}
-
-inline String MakeAppGroupString_Impl( const String &rGroup )
-{
-    String aGroup( UniString::CreateFromAscii("SvAppGroups\\") );
-    aGroup+=rGroup;
-    return aGroup;
-}
-
-void RegInfo::SetAppGroup( const String& rGroup )
-{
-    aCurrentGroup = MakeAppGroupString_Impl(rGroup);
-    if( pImp->bValidGroup )
-    {
-        RegCloseKey( pImp->aGroupHdl );
-        pImp->bValidGroup = FALSE;
-    }
-    ByteString aBStr( aCurrentGroup, osl_getThreadTextEncoding() );
-    RegCreateKey( HKEY_CLASSES_ROOT, aBStr.GetBuffer(), &pImp->aGroupHdl );
-    pImp->bValidGroup = TRUE;
-}
-
-void RegInfo::DeleteAppGroup( const String &rGroup )
-{
-    String aOldGroup = aCurrentGroup;
-    SetAppGroup( rGroup );
-    DBG_HDL;
-    USHORT nMax = GetKeyCount();
-    for( USHORT n = nMax; n--; )
-    {
-        String aKey( GetKeyName( n ));
-        DeleteKey( aKey );
-    }
-    RegCloseKey( pImp->aGroupHdl );
-
-    ByteString aBStr( rGroup, osl_getThreadTextEncoding() );
-    RegDeleteKey( HKEY_CLASSES_ROOT, aBStr.GetBuffer() );
-    pImp->bValidGroup = FALSE;
-    if( rGroup != aOldGroup )
-        SetAppGroup( aOldGroup );
-}
-
-BOOL ReadKey_Impl( const String& rKey,
-                  HKEY aHdl, String& rResult )
-{
-    char s[MAXREGVALUE];
-    LONG aLen=MAXREGVALUE;
-
-    ByteString aBStr( rKey, osl_getThreadTextEncoding() );
-    LONG nRes = RegQueryValue( aHdl, aBStr.GetBuffer(), s, &aLen);
-    if(nRes == ERROR_SUCCESS)
-    {
-        rResult = UniString::CreateFromAscii(s);
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
-String  RegInfo::ReadKey( const String& rKey ) const
-{
-    DBG_HDL String::EmptyString();
-    String aRes;
-    if(ReadKey_Impl( rKey, pImp->aGroupHdl, aRes))
-        return aRes;
-    else
-        return String::EmptyString();
-}
-
-String  RegInfo::ReadKey( const String& rKey, const String &rDefault ) const
-{
-    DBG_HDL String::EmptyString();
-    String aRes;
-    if(ReadKey_Impl( rKey, pImp->aGroupHdl, aRes))
-        return aRes;
-    else
-        return rDefault;
-}
-
-void RegInfo::WriteKey( const String& rKey, const String& rValue )
-{
-    DBG_HDL;
-    ByteString aBStr( rKey, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rValue, osl_getThreadTextEncoding() );
-    RegSetValue( pImp->aGroupHdl, aBStr.GetBuffer(), REG_SZ, aBStr1.GetBuffer(), 0);
-}
-
-
-void RegInfo::DeleteKey( const String& rKey )
-{
-    DBG_HDL;
-    ByteString aBStr( rKey, osl_getThreadTextEncoding() );
-    RegDeleteKey( pImp->aGroupHdl, aBStr.GetBuffer() );
-}
-
-// *****************************************************************************
-#elif defined(OS2)
-
-#define INCL_WINSHELLDATA
-#include <svpm.h>
-
-struct RegInfo_Impl
-{
-    char *pKeyList;
-    String aCurrentApp;
-    void BuildKeyList( const String &rGroup );
-};
-
-void RegInfo_Impl::BuildKeyList( const String &rGroup )
-{
-    ByteString aBStr( rGroup, osl_getThreadTextEncoding() );
-    USHORT nLen = 0;
-    do
-    {
-        nLen+=1000;
-        delete[] pKeyList;
-        pKeyList = new char[nLen];
-        *(int *)pKeyList = 0;
-    }
-    while( PrfQueryProfileString(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(),
-        0, 0, pKeyList, nLen) == nLen);
-}
-
-
-RegInfo::RegInfo()
-{
-    pImp=new RegInfo_Impl;
-    pImp->pKeyList = 0;
-}
-
-RegInfo::~RegInfo()
-{
-    delete[] pImp->pKeyList;
-    delete pImp;
-}
-
-inline String MakeAppGroupString_Impl( const String &rGroup )
-{
-    String aGroup(UniString::CreateFromAscii("SvAppGroups:"));
-    aGroup+=rGroup;
-    return aGroup;
-}
-
-String RegInfo::GetKeyName( USHORT nKey ) const
-{
-    if( !pImp->pKeyList )
-        pImp->BuildKeyList(pImp->aCurrentApp);
-
-    const char *pc=pImp->pKeyList;
-    for( USHORT n=0; n<nKey; n++ )
-        while(*pc++);
-
-    return String(UniString::CreateFromAscii(pc));
-}
-
-USHORT RegInfo::GetKeyCount() const
-{
-    if( !pImp->pKeyList )
-        pImp->BuildKeyList( pImp->aCurrentApp);
-
-    const char *pc=pImp->pKeyList;
-    USHORT nRet=0;
-    while(*pc)
-    {
-        while(*pc++);
-        nRet++;
-    }
-    return nRet;
-}
-
-void RegInfo::SetAppGroup( const String& rGroup )
-{
-    delete[] pImp->pKeyList;
-    pImp->pKeyList = 0;
-    aCurrentGroup = rGroup;
-    pImp->aCurrentApp = MakeAppGroupString_Impl( rGroup );
-}
-
-void RegInfo::DeleteAppGroup( const String &rGroup )
-{
-    ByteString aBStr( MakeAppGroupString_Impl( rGroup ), osl_getThreadTextEncoding() );
-    PrfWriteProfileString(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), 0, 0);
-}
-
-
-String  RegInfo::ReadKey( const String& rKey ) const
-{
-    ULONG    ulBufferMax = MAXREGVALUE;
-    char *pBuffer= new char[MAXREGVALUE];
-    ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rKey, osl_getThreadTextEncoding() );
-    *pBuffer=0;
-    PrfQueryProfileData(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)aBStr1.GetBuffer(), pBuffer, &ulBufferMax);
-    String aRet(UniString::CreateFromAscii(pBuffer));
-    delete[] pBuffer;
-    return aRet;
-}
-
-
-String  RegInfo::ReadKey( const String& rKey, const String &rDefault ) const
-{
-    String aResult = ReadKey(rKey);
-    if (!aResult.Len())
-        return rDefault;
-    else
-        return aResult;
-}
-
-
-void RegInfo::WriteKey( const String& rKey, const String& rValue )
-{
-    ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rKey, osl_getThreadTextEncoding() );
-    PrfWriteProfileData(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)aBStr1.GetBuffer(), (PVOID)rValue.GetBuffer(), rValue.Len()*2);
-}
-
-void RegInfo::DeleteKey( const String& rKey )
-{
-    ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rKey, osl_getThreadTextEncoding() );
-    PrfWriteProfileString(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)rKey.GetBuffer(), 0);
-}
-
-// *****************************************************************************
-
-#else
-
-RegInfo::RegInfo()
-{
-}
-
-
-RegInfo::~RegInfo()
-{
-}
-
-String RegInfo::GetKeyName( USHORT ) const
-{
-    return String::EmptyString();
-}
-
-USHORT RegInfo::GetKeyCount() const
-{
-    return 0;
-}
-
-void RegInfo::SetAppGroup( const String& )
-{
-    return ;
-}
-
-void RegInfo::DeleteAppGroup( const String& )
-{
-    return;
-}
-
-String  RegInfo::ReadKey( const String& ) const
-{
-    return String::EmptyString();
-}
-
-String  RegInfo::ReadKey( const String&, const String& ) const
-{
-    return String::EmptyString();
-}
-
-void RegInfo::WriteKey( const String&, const String& )
-{
-    return;
-}
-
-void RegInfo::DeleteKey( const String& )
-{
-    return;
-}
-
-#endif
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 86098af7de4a..82165a711285 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/calendarwrapper.hxx>
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <taskbar.hxx>
 
 // =======================================================================
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index 1252fc17a1d6..899867414e2f 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -31,12 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef SVTOOL_URLCONTROL_HXX
 #include <svtools/urlcontrol.hxx>
-#endif
-#ifndef SVTOOLS_FILENOTATION_HXX_
-#include "filenotation.hxx"
-#endif
+#include "svl/filenotation.hxx"
 
 //.........................................................................
 namespace svt
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 14ede88482a6..aa18a3683916 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -39,7 +39,7 @@
 #include "addresstemplate.hrc"
 #endif
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
@@ -70,7 +70,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include "localresaccess.hxx"
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include "filenotation.hxx"
+#include "svl/filenotation.hxx"
 #endif
 #include <tools/urlobj.hxx>
 
@@ -324,8 +324,20 @@ public:
 
         virtual void    setDatasourceName(const ::rtl::OUString& _rName);
         virtual void    setCommand(const ::rtl::OUString& _rCommand);
+
+        virtual void    Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+        virtual void    Commit();
     };
 
+
+void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+{
+}
+
+void AssignmentPersistentData::Commit()
+{
+}
+
     // -------------------------------------------------------------------
     AssignmentPersistentData::AssignmentPersistentData()
         :ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.DataAccess/AddressBook" )))
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 9c4997cae9d2..63c0e6475597 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #ifndef _SVT_ADDRESSTEMPLATE_HRC_
 #include "addresstemplate.hrc"
diff --git a/svtools/source/dialogs/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx
index 7ac65a77947d..791e373086af 100644
--- a/svtools/source/dialogs/logindlg.cxx
+++ b/svtools/source/dialogs/logindlg.cxx
@@ -38,7 +38,7 @@
 #include "logindlg.hrc"
 #endif
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #include <svtools/svtdata.hxx>
 
diff --git a/svtools/source/dialogs/logindlg.src b/svtools/source/dialogs/logindlg.src
index 897597f383bf..b3ef357bbae4 100644
--- a/svtools/source/dialogs/logindlg.src
+++ b/svtools/source/dialogs/logindlg.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_LOGINDLG_HRC_
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 3a7171090cd2..a006f209af18 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -47,7 +47,7 @@
 #include <svtools/printdlg.hxx>
 #include <svtools/svtdata.hxx>
 #include <filedlg.hxx>
-#include "pickerhelper.hxx"
+#include "svl/pickerhelper.hxx"
 #ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
 #endif
diff --git a/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc
index cae57cefdb0e..2f2f43e3ba10 100644
--- a/svtools/source/dialogs/printdlg.hrc
+++ b/svtools/source/dialogs/printdlg.hrc
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #define FL_PRINTER              1
 #define LB_NAMES                2
diff --git a/svtools/source/dialogs/prnsetup.hrc b/svtools/source/dialogs/prnsetup.hrc
index 33f98f7ed5e0..00623d97084c 100644
--- a/svtools/source/dialogs/prnsetup.hrc
+++ b/svtools/source/dialogs/prnsetup.hrc
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #define FL_PRINTER          1
 #define LB_NAMES                2
diff --git a/svtools/inc/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
index b2698f6a1c8e..59019fc21b90 100644
--- a/svtools/inc/propctrl.hxx
+++ b/svtools/source/dialogs/propctrl.hxx
@@ -34,7 +34,7 @@
 #include "sbx.hxx"
 #include "sbxbase.hxx"
 #include "sbxres.hxx"
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
   */
 
 
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index b0fff49e5e8d..c7473e446986 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svtools.hxx"
 
 #include <svtools/roadmapwizard.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
 #include "roadmap.hxx"
 #include <tools/debug.hxx>
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index c436256a31c4..602c2e3e6f8a 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -36,7 +36,7 @@
 #include <vcl/msgbox.hxx>
 #include <svtools/svtdata.hxx>
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 //.........................................................................
diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src
index d83fdd98824b..2fa50ef20bf6 100644
--- a/svtools/source/dialogs/wizardmachine.src
+++ b/svtools/source/dialogs/wizardmachine.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 String STR_WIZDLG_FINISH
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 135761195e48..8c60a62063df 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -43,11 +43,11 @@
 
 #include <svtools/svmedit.hxx>
 #include <svtools/xtextedt.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/undo.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/undo.hxx>
 #include <svtools/textwindowpeer.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/lstner.hxx>
+#include <svl/smplhint.hxx>
 
 
 // IDs erstmal aus VCL geklaut, muss mal richtig delivert werden...
@@ -1478,7 +1478,7 @@ long MultiLineEdit::PreNotify( NotifyEvent& rNEvt )
 {
     long nDone = 0;
 
-#if (OSL_DEBUG_LEVEL > 1) && !defined( PRODUCT )
+#if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
     if( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         const KeyEvent& rKEvent = *rNEvt.GetKeyEvent();
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index e2e71e86b662..7e2f98d0d37f 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -682,7 +682,7 @@ String SimpleTokenizer_Impl::getTokStr
     return String( pStartPos, (USHORT)( pEndPos - pStartPos ) );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // TEST: Token ausgeben
 String SimpleTokenizer_Impl::getFullTokenStr( /*out*/TokenTypes eType,
     /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos )
diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx
index 51336e75741e..7ee667db2305 100644
--- a/svtools/source/edit/textdat2.hxx
+++ b/svtools/source/edit/textdat2.hxx
@@ -32,7 +32,7 @@
 #ifndef _TEXTDAT2_HXX
 #define _TEXTDAT2_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/list.hxx>
 #include <vcl/seleng.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index 45b03e70ac47..b940bb6f4da7 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -31,7 +31,7 @@
 #ifndef _TEXTDOC_HXX
 #define _TEXTDOC_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <svtools/textdata.hxx>
 #include <txtattr.hxx>
 
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index e7eff8385206..596ca89054e7 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -40,7 +40,7 @@
 #include <textdat2.hxx>
 #include <textundo.hxx>
 #include <textund2.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <vcl/window.hxx>
 
 #include <vcl/edit.hxx>
diff --git a/svtools/source/edit/textundo.hxx b/svtools/source/edit/textundo.hxx
index fe2c53bca45e..7ce7169e1563 100644
--- a/svtools/source/edit/textundo.hxx
+++ b/svtools/source/edit/textundo.hxx
@@ -30,7 +30,7 @@
 #ifndef _TEXTUNDO_HXX
 #define _TEXTUNDO_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 class TextEngine;
 
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index e0697a488287..99b6fc900885 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -36,7 +36,7 @@
 #include <svtools/textdata.hxx>
 #include <textdat2.hxx>
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
@@ -44,7 +44,7 @@
 #include <tools/stream.hxx>
 
 #include <sot/formats.hxx>
-#include <urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 
 #ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_
 #include <com/sun/star/i18n/XBreakIterator.hpp>
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
index 1bc83575ec38..584814dd9e92 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
@@ -37,7 +37,7 @@
 #include "FilterConfigCache.hxx"
 #include <osl/file.hxx>
 #include <osl/module.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 #include "dlgexpor.hxx"
 #include "dlgejpg.hxx"
@@ -49,7 +49,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Any.h>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include "vcl/svapp.hxx"
 
 #if defined WIN || (defined OS2 && !defined ICC)
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc
index 4342a89d1d24..67ac915df367 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.hrc
+++ b/svtools/source/filter.vcl/filter/dlgejpg.hrc
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #define BTN_OK 1
 #define BTN_CANCEL 1
diff --git a/svtools/source/filter.vcl/filter/dlgepng.hrc b/svtools/source/filter.vcl/filter/dlgepng.hrc
index 79d4b189aa5a..d687141abf56 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.hrc
+++ b/svtools/source/filter.vcl/filter/dlgepng.hrc
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #define BTN_OK 1
 #define BTN_CANCEL 1
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hrc b/svtools/source/filter.vcl/filter/dlgexpor.hrc
index 28921b5f178c..cae15d7276d2 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.hrc
+++ b/svtools/source/filter.vcl/filter/dlgexpor.hrc
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #define BTN_OK_PIX 1
 #define BTN_CANCEL_PIX 1
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index 3586ddd02ddd..306307a0bf91 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -54,7 +54,7 @@
 #include "jpeg.hxx"
 #include "xbmread.hxx"
 #include "xpmread.hxx"
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include "strings.hrc"
 #include "sgffilt.hxx"
 #include "osl/module.hxx"
diff --git a/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk
index 2229f8f05546..ecdf48ba5671 100644
--- a/svtools/source/filter.vcl/filter/makefile.mk
+++ b/svtools/source/filter.vcl/filter/makefile.mk
@@ -40,6 +40,8 @@ LIBTARGET=NO
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/svt.pmk
 
+SOLARINC+=-I../../inc
+
 # --- Files --------------------------------------------------------
 
 SRS1NAME=$(TARGET)
diff --git a/svtools/source/filter.vcl/filter/strings.hrc b/svtools/source/filter.vcl/filter/strings.hrc
index 0cfa4e6bf7c4..a3356982609a 100644
--- a/svtools/source/filter.vcl/filter/strings.hrc
+++ b/svtools/source/filter.vcl/filter/strings.hrc
@@ -27,4 +27,4 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
diff --git a/svtools/source/filter.vcl/igif/makefile.mk b/svtools/source/filter.vcl/igif/makefile.mk
index 0562813c00cc..49e2461bd7a8 100644
--- a/svtools/source/filter.vcl/igif/makefile.mk
+++ b/svtools/source/filter.vcl/igif/makefile.mk
@@ -38,6 +38,7 @@ TARGET=igif
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/svt.pmk
+SOLARINC+=-I../../inc
 
 # --- Files --------------------------------------------------------
 
diff --git a/svtools/source/filter.vcl/ixbm/makefile.mk b/svtools/source/filter.vcl/ixbm/makefile.mk
index 9c090e1de04a..41d6f7425474 100644
--- a/svtools/source/filter.vcl/ixbm/makefile.mk
+++ b/svtools/source/filter.vcl/ixbm/makefile.mk
@@ -38,6 +38,7 @@ TARGET=ixbm
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/svt.pmk
+SOLARINC+=-I../../inc
 
 # --- Files --------------------------------------------------------
 
diff --git a/svtools/source/filter.vcl/ixpm/makefile.mk b/svtools/source/filter.vcl/ixpm/makefile.mk
index 2e5cb851ebbf..10792f41ab3a 100644
--- a/svtools/source/filter.vcl/ixpm/makefile.mk
+++ b/svtools/source/filter.vcl/ixpm/makefile.mk
@@ -38,6 +38,7 @@ TARGET=ixpm
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/svt.pmk
+SOLARINC+=-I../../inc
 
 # --- Files --------------------------------------------------------
 
diff --git a/svtools/source/filter.vcl/jpeg/makefile.mk b/svtools/source/filter.vcl/jpeg/makefile.mk
index 86c9c89c8bf0..7a9b5fc509c9 100644
--- a/svtools/source/filter.vcl/jpeg/makefile.mk
+++ b/svtools/source/filter.vcl/jpeg/makefile.mk
@@ -43,6 +43,8 @@ TARGET=jpeg
 CFLAGS+=-DSYSTEM_JPEG
 .ENDIF
 
+SOLARINC+=-I../../inc
+
 # --- Files --------------------------------------------------------
 
 SLOFILES=	$(SLO)$/jpegc.obj \
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index 95c60f1265c1..d25d4e94f97a 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx
@@ -33,7 +33,7 @@
 
 #include <vcl/salbtype.hxx>
 #include "wmfwr.hxx"
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
 #include <tools/tenccvt.hxx>
diff --git a/svtools/source/inc/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx
index 72eaa58bb16d..72eaa58bb16d 100644
--- a/svtools/source/inc/hatchwindowfactory.hxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx
diff --git a/svtools/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc
index 13fb89afd382..13fb89afd382 100644
--- a/svtools/inc/filectrl.hrc
+++ b/svtools/source/inc/filectrl.hrc
diff --git a/svtools/inc/gifread.hxx b/svtools/source/inc/gifread.hxx
index 8a9d299930c9..8a9d299930c9 100644
--- a/svtools/inc/gifread.hxx
+++ b/svtools/source/inc/gifread.hxx
diff --git a/svtools/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx
index 28c9d8db1fcd..28c9d8db1fcd 100644
--- a/svtools/inc/gradwrap.hxx
+++ b/svtools/source/inc/gradwrap.hxx
diff --git a/svtools/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
index 36e3092064cd..9c41e06a2b6c 100644
--- a/svtools/inc/iodlg.hrc
+++ b/svtools/source/inc/iodlg.hrc
@@ -32,7 +32,7 @@
 #define _SVTOOLS_IODLGIMPL_HRC
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 // ModalDialog DLG_SVT_EXPLORERFILE
diff --git a/svtools/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx
index d8de26c31009..d8de26c31009 100644
--- a/svtools/inc/jpeg.hxx
+++ b/svtools/source/inc/jpeg.hxx
diff --git a/svtools/inc/msgrd.hxx b/svtools/source/inc/msgrd.hxx
index 381ae71c7b83..381ae71c7b83 100644
--- a/svtools/inc/msgrd.hxx
+++ b/svtools/source/inc/msgrd.hxx
diff --git a/svtools/inc/msgwr.hxx b/svtools/source/inc/msgwr.hxx
index c347938fd34d..c347938fd34d 100644
--- a/svtools/inc/msgwr.hxx
+++ b/svtools/source/inc/msgwr.hxx
diff --git a/svtools/inc/property.hxx b/svtools/source/inc/property.hxx
index cfdc62dd350c..2a756f177608 100644
--- a/svtools/inc/property.hxx
+++ b/svtools/source/inc/property.hxx
@@ -54,17 +54,17 @@
 #endif
 #include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/scrbar.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #ifndef _SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/svtools/inc/sgfbram.hxx b/svtools/source/inc/sgfbram.hxx
index ca7e90b59cd4..ca7e90b59cd4 100644
--- a/svtools/inc/sgfbram.hxx
+++ b/svtools/source/inc/sgfbram.hxx
diff --git a/svtools/inc/sgffilt.hxx b/svtools/source/inc/sgffilt.hxx
index a93522fcf590..a93522fcf590 100644
--- a/svtools/inc/sgffilt.hxx
+++ b/svtools/source/inc/sgffilt.hxx
diff --git a/svtools/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx
index 58e43e0a00b2..58e43e0a00b2 100644
--- a/svtools/inc/sgvmain.hxx
+++ b/svtools/source/inc/sgvmain.hxx
diff --git a/svtools/inc/sgvspln.hxx b/svtools/source/inc/sgvspln.hxx
index 7e9976eaf25b..7e9976eaf25b 100644
--- a/svtools/inc/sgvspln.hxx
+++ b/svtools/source/inc/sgvspln.hxx
diff --git a/svtools/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 10463fc05906..10463fc05906 100644
--- a/svtools/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
diff --git a/svtools/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 724a92543700..724a92543700 100644
--- a/svtools/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
diff --git a/svtools/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx
index c9623fbb2cda..c9623fbb2cda 100644
--- a/svtools/inc/xbmread.hxx
+++ b/svtools/source/inc/xbmread.hxx
diff --git a/svtools/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx
index f1a76c9bc62f..f1a76c9bc62f 100644
--- a/svtools/inc/xpmread.hxx
+++ b/svtools/source/inc/xpmread.hxx
diff --git a/svtools/source/items1/bintitem.cxx b/svtools/source/items1/bintitem.cxx
deleted file mode 100644
index a3b6c1c2b54d..000000000000
--- a/svtools/source/items1/bintitem.cxx
+++ /dev/null
@@ -1,169 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bintitem.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <com/sun/star/uno/Any.hxx>
-#include <tools/stream.hxx>
-#include <tools/bigint.hxx>
-#include <svtools/bintitem.hxx>
-
-// STATIC DATA
-
-DBG_NAME(SfxBigIntItem)
-
-// RTTI
-TYPEINIT1_AUTOFACTORY(SfxBigIntItem, SfxPoolItem);
-
-// SfxBigIntItem
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem()
-    : SfxPoolItem(0),
-        aVal(0)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-}
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem(USHORT which, const BigInt& rValue)
-    : SfxPoolItem(which),
-        aVal(rValue)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-}
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem(USHORT which, SvStream &rStream)
-    : SfxPoolItem(which)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-    ByteString sTmp;
-    rStream.ReadByteString(sTmp);
-    BigInt aTmp(sTmp);
-    aVal = aTmp;
-}
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem(const SfxBigIntItem& rItem)
-    : SfxPoolItem(rItem),
-        aVal(rItem.aVal)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-}
-
-//============================================================================
-SfxItemPresentation SfxBigIntItem::GetPresentation(
-    SfxItemPresentation /*ePresentation*/,
-    SfxMapUnit          /*eCoreMetric*/,
-    SfxMapUnit          /*ePresentationMetric*/,
-    XubString&           rText,
-    const IntlWrapper * ) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    rText = aVal.GetString();
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-//============================================================================
-int SfxBigIntItem::operator==(const SfxPoolItem& rItem) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    DBG_ASSERT(SfxPoolItem::operator==(rItem), "unequal type");
-    return ((SfxBigIntItem&)rItem).aVal == aVal;
-}
-
-//============================================================================
-int SfxBigIntItem::Compare(const SfxPoolItem& rItem) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    DBG_ASSERT(SfxPoolItem::operator==(rItem), "unequal type");
-
-    if (((const SfxBigIntItem&)rItem ).aVal < aVal )
-        return -1;
-    else if (((const SfxBigIntItem&)rItem ).aVal == aVal)
-        return 0;
-    else
-        return 1;
-}
-
-//============================================================================
-SfxPoolItem* SfxBigIntItem::Clone(SfxItemPool *) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    return new SfxBigIntItem(*this);
-}
-
-//============================================================================
-SfxPoolItem* SfxBigIntItem::Create(SvStream &rStream, USHORT) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    return new SfxBigIntItem(Which(), rStream);
-}
-
-//============================================================================
-SvStream& SfxBigIntItem::Store(SvStream &rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    rStream.WriteByteString( aVal.GetByteString() );
-    return rStream;
-}
-
-//============================================================================
-SfxFieldUnit SfxBigIntItem::GetUnit() const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    return SFX_FUNIT_NONE;
-}
-
-//============================================================================
-// virtual
-BOOL SfxBigIntItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
-{
-    double aValue = 0.0;
-    if ( rVal >>= aValue )
-    {
-        SetValue( aValue );
-        return TRUE;
-    }
-
-    DBG_ERROR( "SfxBigIntItem::PutValue - Wrong type!" );
-    return FALSE;
-}
-
-//============================================================================
-// virtual
-BOOL SfxBigIntItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
-{
-    double aValue = GetValue();
-    rVal <<= aValue;
-    return TRUE;
-}
-
diff --git a/svtools/source/items1/cstitem.cxx b/svtools/source/items1/cstitem.cxx
deleted file mode 100644
index 9755f4bb9944..000000000000
--- a/svtools/source/items1/cstitem.cxx
+++ /dev/null
@@ -1,252 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cstitem.cxx,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <com/sun/star/uno/Any.hxx>
-
-#include <unotools/intlwrapper.hxx>
-
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/datetime.hxx>
-
-#include <svtools/svtdata.hxx>
-#include <svtools/cstitem.hxx>
-
-#include <svtools/svtools.hrc>
-#include <com/sun/star/lang/Locale.hpp>
-
-DBG_NAME( SfxCrawlStatusItem )
-TYPEINIT1( SfxCrawlStatusItem, SfxPoolItem );
-
-// -----------------------------------------------------------------------
-
-SfxCrawlStatusItem::SfxCrawlStatusItem( USHORT which ) :
-    SfxPoolItem( which )
-{
-    DBG_CTOR( SfxCrawlStatusItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxCrawlStatusItem::SfxCrawlStatusItem( USHORT which, CrawlStatus eStat ) :
-    SfxPoolItem( which ),
-    eStatus( eStat )
-{
-    DBG_CTOR( SfxCrawlStatusItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxCrawlStatusItem::SfxCrawlStatusItem( const SfxCrawlStatusItem& rItem ) :
-    SfxPoolItem( rItem ),
-    eStatus( rItem.eStatus )
-{
-    DBG_CTOR( SfxCrawlStatusItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-int SfxCrawlStatusItem::operator==( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxCrawlStatusItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    return ((SfxCrawlStatusItem&)rItem).eStatus == eStatus;
-}
-
-// -----------------------------------------------------------------------
-
-int SfxCrawlStatusItem::Compare( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxCrawlStatusItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    if( ((const SfxCrawlStatusItem&)rItem).eStatus < eStatus )
-        return -1;
-    else if( ((const SfxCrawlStatusItem&)rItem).eStatus == eStatus )
-        return 0;
-    else
-        return 1;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxCrawlStatusItem::Create( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxCrawlStatusItem, 0);
-
-    USHORT _eStatus;
-    rStream >> _eStatus;
-
-    return new SfxCrawlStatusItem( Which(), (CrawlStatus)_eStatus );
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SfxCrawlStatusItem::Store( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS( SfxCrawlStatusItem, 0 );
-
-    USHORT nStatus = (USHORT)eStatus;
-    rStream << (USHORT) nStatus;
-
-    return rStream;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxCrawlStatusItem::Clone( SfxItemPool* ) const
-{
-    DBG_CHKTHIS( SfxCrawlStatusItem, 0 );
-    return new SfxCrawlStatusItem( *this );
-}
-// -----------------------------------------------------------------------
-
-SfxItemPresentation SfxCrawlStatusItem::GetPresentation
-(
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
-    const IntlWrapper *   pIntlWrapper
-)   const
-{
-    DBG_CHKTHIS(SfxCrawlStatusItem, 0);
-    DBG_ASSERT(pIntlWrapper,
-               "SfxCrawlStatusItem::GetPresentation():"
-                " Using default IntlWrapper");
-
-    ::com::sun::star::lang::Locale aLocale;
-
-    switch (eStatus)
-    {
-        case CSTAT_NEVER_UPD:
-            rText = String(SvtResId(STR_CSTAT_NEVER_UPD,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_IN_UPD:
-            rText = String(SvtResId(STR_CSTAT_IN_UPD,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_UPD_NEWER:
-            rText = String(SvtResId(STR_CSTAT_UPD_NEWER,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_UPD_NOT_NEWER:
-            rText = String(SvtResId(STR_CSTAT_UPD_NOT_NEWER,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_UPD_CANCEL:
-            rText = String(SvtResId(STR_CSTAT_UPD_CANCEL,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_ERR_GENERAL:
-            rText = String(SvtResId(STR_CSTAT_ERR_GENERAL,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_ERR_NOTEXISTS:
-            rText = String(SvtResId(STR_CSTAT_ERR_NOTEXISTS,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_ERR_NOTREACHED:
-            rText = String(SvtResId(STR_CSTAT_ERR_NOTREACHED,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_UPD_IMMEDIATELY:
-            rText = String(SvtResId(STR_CSTAT_UPD_IMMEDIATELY,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        case CSTAT_ERR_OFFLINE:
-            rText = String(SvtResId(STR_CSTAT_ERR_OFFLINE,
-                                    pIntlWrapper ?
-                                     pIntlWrapper->getLocale() :
-                                     aLocale));
-            break;
-
-        default:
-            rText.Erase();
-            break;
-    }
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-//----------------------------------------------------------------------------
-// virtual
-BOOL SfxCrawlStatusItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
-{
-    sal_Int16 aValue = sal_Int16();
-    if ( rVal >>= aValue )
-    {
-        SetStatus( static_cast< CrawlStatus >( aValue ) );
-        return TRUE;
-    }
-
-    DBG_ERROR( "SfxCrawlStatusItem::PutValue - Wrong type!" );
-    return FALSE;
-}
-
-//----------------------------------------------------------------------------
-// virtual
-BOOL SfxCrawlStatusItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
-{
-    sal_Int16 aValue = sal::static_int_cast< sal_Int16 >(GetStatus());
-    rVal <<= aValue;
-    return TRUE;
-}
-
diff --git a/svtools/source/items1/cstitem.src b/svtools/source/items1/cstitem.src
deleted file mode 100644
index 8d6e2d0280c0..000000000000
--- a/svtools/source/items1/cstitem.src
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cstitem.src,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <svtools/svtools.hrc>
-String STR_CSTAT_NEVER_UPD
-{
-    Text [ en-US ] = "No update has occurred" ;
-};
-String STR_CSTAT_IN_UPD
-{
-    Text [ en-US ] = "Updating in progress" ;
-};
-String STR_CSTAT_UPD_NEWER
-{
-    Text [ en-US ] = "Changes discovered" ;
-};
-String STR_CSTAT_UPD_NOT_NEWER
-{
-    Text [ en-US ] = "No changes discovered" ;
-};
-String STR_CSTAT_UPD_CANCEL
-{
-    Text [ en-US ] = "Canceled by user" ;
-};
-String STR_CSTAT_UPD_IMMEDIATELY
-{
-    Text [ en-US ] = "Updating immediately" ;
-};
-String STR_CSTAT_ERR_OFFLINE
-{
-    Text [ en-US ] = "failed, you have not been online" ;
-};
-String STR_CSTAT_ERR_GENERAL
-{
-    Text [ en-US ] = "General error" ;
-};
-String STR_CSTAT_ERR_NOTEXISTS
-{
-    Text [ en-US ] = "Server does not exist" ;
-};
-String STR_CSTAT_ERR_NOTREACHED
-{
-    Text [ en-US ] = "Server not available" ;
-};
-String STR_COLUM_DT_AUTO
-{
-    Text [ en-US ] = "automatic" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/items1/dtritem.cxx b/svtools/source/items1/dtritem.cxx
deleted file mode 100644
index fa3a36b762f5..000000000000
--- a/svtools/source/items1/dtritem.cxx
+++ /dev/null
@@ -1,244 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dtritem.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/util/DateTimeRange.hpp>
-
-#include <unotools/intlwrapper.hxx>
-#include <comphelper/processfactory.hxx>
-
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/datetime.hxx>
-#include <rtl/math.hxx>
-
-#include <vcl/svapp.hxx>
-
-#include <svtools/dtritem.hxx>
-
-
-DBG_NAME( SfxDateTimeRangeItem )
-TYPEINIT1( SfxDateTimeRangeItem, SfxPoolItem );
-
-// -----------------------------------------------------------------------
-
-SfxDateTimeRangeItem::SfxDateTimeRangeItem( USHORT which ) :
-    SfxPoolItem( which )
-{
-    DBG_CTOR( SfxDateTimeRangeItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxDateTimeRangeItem::SfxDateTimeRangeItem( USHORT which, const DateTime& rStartDT,
-                                            const DateTime& rEndDT ) :
-    SfxPoolItem( which ),
-    aStartDateTime( rStartDT ),
-    aEndDateTime( rEndDT )
-{
-    DBG_CTOR( SfxDateTimeRangeItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxDateTimeRangeItem::SfxDateTimeRangeItem( const SfxDateTimeRangeItem& rItem ) :
-    SfxPoolItem( rItem ),
-    aStartDateTime( rItem.aStartDateTime ),
-    aEndDateTime( rItem.aEndDateTime )
-{
-    DBG_CTOR( SfxDateTimeRangeItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-int SfxDateTimeRangeItem::operator==( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    return  ((SfxDateTimeRangeItem&)rItem ).aStartDateTime == aStartDateTime &&
-            ((SfxDateTimeRangeItem&)rItem ).aEndDateTime == aEndDateTime;
-}
-
-// -----------------------------------------------------------------------
-
-int SfxDateTimeRangeItem::Compare( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    double fThisRange = aEndDateTime - aStartDateTime;
-    double fRange = ((const SfxDateTimeRangeItem&)rItem).aEndDateTime -
-        ((const SfxDateTimeRangeItem&)rItem).aStartDateTime;
-
-    if ( ::rtl::math::approxEqual( fRange, fThisRange ) )
-        return 0;
-    else if ( fRange < fThisRange )
-        return -1;
-    else
-        return 1;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxDateTimeRangeItem::Create( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxDateTimeRangeItem, 0);
-
-    sal_uInt32 nStartDate, nEndDate;
-    sal_Int32 nStartTime, nEndTime;
-
-    rStream >> nStartDate;
-    rStream >> nStartTime;
-
-    rStream >> nEndDate;
-    rStream >> nEndTime;
-
-    DateTime aStartDT, aEndDT;
-
-    aStartDT.SetDate( nStartDate );
-    aStartDT.SetTime( nStartTime );
-
-    aEndDT.SetDate( nEndDate );
-    aEndDT.SetTime( nEndTime );
-
-    return new SfxDateTimeRangeItem( Which(), aStartDT, aEndDT );
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SfxDateTimeRangeItem::Store( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-
-    rStream << aStartDateTime.GetDate();
-    rStream << aStartDateTime.GetTime();
-
-    rStream << aEndDateTime.GetDate();
-    rStream << aEndDateTime.GetTime();
-
-    return rStream;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxDateTimeRangeItem::Clone( SfxItemPool* ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-
-    return new SfxDateTimeRangeItem( *this );
-}
-// -----------------------------------------------------------------------
-
-SfxItemPresentation SfxDateTimeRangeItem::GetPresentation
-(
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
-    const IntlWrapper *   pIntlWrapper
-)   const
-{
-    DBG_CHKTHIS(SfxDateTimeRangeItem, 0);
-    DateTime aRange(aEndDateTime - (const Time&)aStartDateTime);
-    if (pIntlWrapper)
-    {
-        rText = pIntlWrapper->getLocaleData()->getDate(aRange);
-        rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-        rText += pIntlWrapper->getLocaleData()->getTime(aRange);
-    }
-    else
-    {
-        DBG_WARNING("SfxDateTimeRangeItem::GetPresentation():"
-                     " Using default en_US IntlWrapper");
-        const IntlWrapper aIntlWrapper(
-            ::comphelper::getProcessServiceFactory(), LANGUAGE_ENGLISH_US );
-        rText = aIntlWrapper.getLocaleData()->getDate(aRange);
-        rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-        rText += aIntlWrapper.getLocaleData()->getTime(aRange);
-    }
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-//----------------------------------------------------------------------------
-// virtual
-BOOL SfxDateTimeRangeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
-{
-    com::sun::star::util::DateTimeRange aValue;
-    if ( rVal >>= aValue )
-    {
-        aStartDateTime = DateTime( Date( aValue.StartDay,
-                                           aValue.StartMonth,
-                                           aValue.StartYear ),
-                                     Time( aValue.StartHours,
-                                           aValue.StartMinutes,
-                                           aValue.StartSeconds,
-                                           aValue.StartHundredthSeconds ) );
-        aEndDateTime   = DateTime( Date( aValue.EndDay,
-                                           aValue.EndMonth,
-                                           aValue.EndYear ),
-                                     Time( aValue.EndHours,
-                                           aValue.EndMinutes,
-                                           aValue.EndSeconds,
-                                           aValue.EndHundredthSeconds ) );
-        return TRUE;
-    }
-
-    DBG_ERROR( "SfxDateTimeRangeItem::PutValue - Wrong type!" );
-    return FALSE;
-}
-
-//----------------------------------------------------------------------------
-// virtual
-BOOL SfxDateTimeRangeItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId ) const
-{
-    nMemberId &= ~CONVERT_TWIPS;
-    com::sun::star::util::DateTimeRange aValue( aStartDateTime.Get100Sec(),
-                                                   aStartDateTime.GetSec(),
-                                                      aStartDateTime.GetMin(),
-                                                   aStartDateTime.GetHour(),
-                                                   aStartDateTime.GetDay(),
-                                                   aStartDateTime.GetMonth(),
-                                                   aStartDateTime.GetYear(),
-                                                aEndDateTime.Get100Sec(),
-                                                   aEndDateTime.GetSec(),
-                                                      aEndDateTime.GetMin(),
-                                                   aEndDateTime.GetHour(),
-                                                   aEndDateTime.GetDay(),
-                                                   aEndDateTime.GetMonth(),
-                                                   aEndDateTime.GetYear() );
-    rVal <<= aValue;
-    return TRUE;
-}
-
-
diff --git a/svtools/source/items1/frqitem.cxx b/svtools/source/items1/frqitem.cxx
deleted file mode 100644
index 4068ef8f97f1..000000000000
--- a/svtools/source/items1/frqitem.cxx
+++ /dev/null
@@ -1,580 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: frqitem.cxx,v $
- * $Revision: 1.8.136.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#ifndef GCC
-#endif
-
-#include <unotools/intlwrapper.hxx>
-
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/datetime.hxx>
-
-#include <svtools/frqitem.hxx>
-
-DBG_NAME( SfxFrequencyItem )
-
-TYPEINIT1( SfxFrequencyItem, SfxPoolItem );
-
-#define MAX_GOTO 32000
-
-#define DECL_SAVE_GOTO()                \
-    ULONG nSafetyMeasures = 0;
-
-#define SAVE_GOTO(tag)                  \
-    if(nSafetyMeasures < MAX_GOTO)      \
-    { nSafetyMeasures++; goto tag; }
-
-// -----------------------------------------------------------------------
-
-SfxFrequencyItem::SfxFrequencyItem( USHORT which ) :
-    SfxPoolItem     ( which ),
-    eFrqMode        ( FRQ_DAILY ),
-    eFrqTimeMode    ( FRQ_TIME_AT ),
-    nDInterval1     ( 1 ),
-    nDInterval2     ( 0 ),
-    nDInterval3     ( 0 ),
-    nTInterval1     ( 1 ),
-    aTime1          ( Time( 12, 0, 0 ) ),
-    aTime2          ( Time( 12, 0, 0 ) ),
-    bMissingDate    ( FALSE ),
-    aMissingDate    ( DateTime(0, 0) )
-{
-    DBG_CTOR( SfxFrequencyItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxFrequencyItem::SfxFrequencyItem( USHORT which, FrequencyMode eMode, FrequencyTimeMode eTMode,
-                                    USHORT nDI1, USHORT nDI2, USHORT nDI3, USHORT nTI1,
-                                    const Time& rT1, const Time& rT2 ) :
-    SfxPoolItem     ( which ),
-    eFrqMode        ( eMode ),
-    eFrqTimeMode    ( eTMode ),
-    nDInterval1     ( nDI1 ),
-    nDInterval2     ( nDI2 ),
-    nDInterval3     ( nDI3 ),
-    nTInterval1     ( nTI1 ),
-    aTime1          ( rT1 ),
-    aTime2          ( rT2 ),
-    bMissingDate    ( FALSE )
-{
-    DBG_CTOR( SfxFrequencyItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxFrequencyItem::SfxFrequencyItem( const SfxFrequencyItem& rItem ) :
-    SfxPoolItem     ( rItem ),
-    eFrqMode        ( rItem.eFrqMode ),
-    eFrqTimeMode    ( rItem.eFrqTimeMode ),
-    nDInterval1     ( rItem.nDInterval1 ),
-    nDInterval2     ( rItem.nDInterval2 ),
-    nDInterval3     ( rItem.nDInterval3 ),
-    nTInterval1     ( rItem.nTInterval1 ),
-    aTime1          ( rItem.aTime1 ),
-    aTime2          ( rItem.aTime2 ),
-    bMissingDate    ( rItem.bMissingDate )
-{
-    DBG_CTOR( SfxFrequencyItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-int SfxFrequencyItem::operator==( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    return  ((SfxFrequencyItem&)rItem ).eFrqMode == eFrqMode &&
-            ((SfxFrequencyItem&)rItem ).eFrqTimeMode == eFrqTimeMode &&
-            ((SfxFrequencyItem&)rItem ).nDInterval1 == nDInterval1 &&
-            ((SfxFrequencyItem&)rItem ).nDInterval2 == nDInterval2 &&
-            ((SfxFrequencyItem&)rItem ).nDInterval3 == nDInterval3 &&
-            ((SfxFrequencyItem&)rItem ).nTInterval1 == nTInterval1 &&
-            ((SfxFrequencyItem&)rItem ).aTime1 == aTime1 &&
-            ((SfxFrequencyItem&)rItem ).aTime2 == aTime2;
-}
-
-// -----------------------------------------------------------------------
-
-int SfxFrequencyItem::Compare( const SfxPoolItem&
-#ifdef DBG_UTIL
-rItem
-#endif
-) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-/*  DateTime aThisRange( aEndDateTime - aStartDateTime );
-    DateTime aRange(((const SfxFrequencyItem&)rItem).aEndDateTime -
-                    ((const SfxFrequencyItem&)rItem).aStartDateTime );
-    if( aRange < aThisRange )
-        return -1;
-    else if( aRange == aThisRange )
-        return 0;
-    else
-*/
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxFrequencyItem::Create( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxFrequencyItem, 0);
-
-    USHORT          _eFrqMode;
-    USHORT          _eFrqTimeMode;
-    USHORT          _nDInterval1;
-    USHORT          _nDInterval2;
-    USHORT          _nDInterval3;
-    USHORT          _nTInterval1;
-    long            _nTime1;
-    long            _nTime2;
-
-    rStream >> _eFrqMode;
-    rStream >> _eFrqTimeMode;
-    rStream >> _nDInterval1;
-    rStream >> _nDInterval2;
-    rStream >> _nDInterval3;
-    rStream >> _nTInterval1;
-    rStream >> _nTime1;
-    rStream >> _nTime2;
-
-    return new SfxFrequencyItem( Which(), (FrequencyMode)_eFrqMode,
-        (FrequencyTimeMode) _eFrqTimeMode, _nDInterval1, _nDInterval2, _nDInterval3,
-        _nTInterval1, Time(_nTime1), Time(_nTime2) );
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SfxFrequencyItem::Store( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-
-    USHORT nEMode = (USHORT)eFrqMode;
-    USHORT nETimeMode = (USHORT)eFrqTimeMode;
-
-    rStream << (USHORT) nEMode;
-    rStream << (USHORT) nETimeMode;
-
-    rStream << nDInterval1;
-    rStream << nDInterval2;
-    rStream << nDInterval3;
-
-    rStream << nTInterval1;
-    rStream << aTime1.GetTime();
-    rStream << aTime2.GetTime();
-
-    return rStream;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxFrequencyItem::Clone( SfxItemPool* ) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-    return new SfxFrequencyItem( *this );
-}
-
-// -----------------------------------------------------------------------
-
-SfxItemPresentation SfxFrequencyItem::GetPresentation
-(
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
-    const IntlWrapper *
-)   const
-{
-    DBG_CHKTHIS(SfxFrequencyItem, 0);
-    rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("SNIY"));
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-// -----------------------------------------------------------------------
-
-Time SfxFrequencyItem::_CalcTime( BOOL bForToday ) const
-{
-    Time aNow;
-    Time aTime;
-
-    DECL_SAVE_GOTO();
-
-    switch( eFrqTimeMode )
-    {
-        //////////////////////////////////////////////////////////
-        //  FRQ_TIME_AT
-        //
-        //  Update um Uhrzeit
-        //  nTime1 = 00:00:00 - 24:00:00
-        //
-        case FRQ_TIME_AT :
-            aTime = aTime1;
-            break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_TIME_REPEAT
-        //
-        //  Wiederhole alle X Stunden
-        //  nTInterval1 = 1 .. 8
-        //
-        case FRQ_TIME_REPEAT :
-            aTime = Time( 0, 0 );
-            if( bForToday )
-            {
-
-            RECALC_TIME_REPEAT:
-                if( aNow > aTime )
-                {
-                    aTime += Time( nTInterval1, 0 );
-                    SAVE_GOTO( RECALC_TIME_REPEAT );
-                }
-                break;
-            }
-            break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_TIME_REPEAT_RANGE
-        //
-        //  FRQ_TIME_REPEAT zwischen Uhrzeit 1 und 2
-        //  nTime1 = 00:00:00 - 24:00:00
-        //  nTime2 = 00:00:00 - 24:00:00
-        //
-        case FRQ_TIME_REPEAT_RANGE :
-            aTime = aTime1;
-            if( bForToday )
-            {
-                if( aNow > aTime2 )
-                    return aTime1;
-
-            RECALC_TIME_REPEAT_RANGE:
-                if( aNow > aTime )
-                {
-                    aTime += Time( nTInterval1, 0 );
-                    if( aTime > aTime2 )
-                        return aTime1;
-                    SAVE_GOTO( RECALC_TIME_REPEAT_RANGE );
-                }
-                break;
-            }
-            break;
-    }
-    return aTime;
-}
-
-DateTime SfxFrequencyItem::CalcNextTick( const DateTime& rBase, BOOL bFirst )
-{
-    Date aDateToday;
-    Time aTimeToday;
-    Date aDateBase;
-    Time aTimeBase;
-
-    if( bFirst )
-    {
-        aDateBase = Date( 17, 2, 1969 );
-        aTimeBase = Time( 8, 0, 0 );
-    }
-    else
-    {
-        aDateBase = rBase.GetDate();
-        aTimeBase = rBase.GetTime();
-    }
-
-    Time aNextTime( _CalcTime(FALSE) );
-    Date aNextDate( aDateBase );
-    bMissingDate = FALSE;
-
-    DECL_SAVE_GOTO();
-
-    switch( eFrqMode )
-    {
-        //////////////////////////////////////////////////////////
-        //  FRQ_DAILY
-        //
-        //  jeden X'ten Tag
-        //  nInterval1 = 1 .. 999
-        //
-        //  jeden Wochentag
-        // nInterval1 = USHRT_MAX
-        //
-        case FRQ_DAILY :
-        {
-            if( bFirst )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    aNextTime = _CalcTime( FALSE );
-                    aNextDate = aDateToday + (USHORT)
-                                ((nDInterval1 == USHRT_MAX)? 1 : nDInterval1);
-                }
-                else
-                    aNextDate = aDateToday;
-                break;
-            }
-
-            RECALC_FRQ_DAILY:
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                aNextDate += (USHORT)((nDInterval1 == USHRT_MAX)? 1 : nDInterval1);
-                SAVE_GOTO( RECALC_FRQ_DAILY );
-            }
-
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bMissingDate = TRUE;
-                    aMissingDate.SetDate(aNextDate.GetDate());
-                    aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                    aNextDate += (USHORT)((nDInterval1 == USHRT_MAX)? 1 : nDInterval1);
-                    aNextTime = _CalcTime( FALSE );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_WEEKLY
-        //  wiederhole jede X'te Woche
-        //  nInterval1 = 1 .. 99
-        //
-        //  an SU, MO, TU, WE, TH, FR, SA
-        //  nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY |
-        //               WD_WEDNESDAY | WD_THURSDAY | WD_FRIDAY |
-        //               WD_SATURDAY
-        //
-        case FRQ_WEEKLY :
-        {
-            BOOL bInRecalc = FALSE;
-
-            RECALC_FRQ_WEEKLY:
-            if( !bFirst || bInRecalc )
-                aNextDate += (nDInterval1 - 1) * 7;
-
-            aNextDate -= (USHORT) ((aNextDate.GetDayOfWeek() != SUNDAY) ?
-                         aNextDate.GetDayOfWeek() + 1 : 0);
-
-            if( nDInterval2 & WD_SUNDAY && (aNextDate >= aDateToday) )
-                aNextDate += 0;
-            else if( nDInterval2 & WD_MONDAY && (aNextDate + 1 >= aDateToday) )
-                aNextDate += 1;
-            else if( nDInterval2 & WD_TUESDAY && (aNextDate + 2 >= aDateToday) )
-                aNextDate += 2;
-            else if( nDInterval2 & WD_WEDNESDAY && (aNextDate + 3 >= aDateToday) )
-                aNextDate += 3;
-            else if( nDInterval2 & WD_THURSDAY && (aNextDate + 4 >= aDateToday) )
-                aNextDate += 4;
-            else if( nDInterval2 & WD_FRIDAY && (aNextDate + 5 >= aDateToday) )
-                aNextDate += 5;
-            else if( nDInterval2 & WD_SATURDAY && (aNextDate + 6 >= aDateToday) )
-                aNextDate += 6;
-
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                bInRecalc = TRUE;
-                aNextDate += 7;
-                SAVE_GOTO( RECALC_FRQ_WEEKLY );
-            }
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bInRecalc = TRUE;
-                    aNextDate += 7;
-                    SAVE_GOTO( RECALC_FRQ_WEEKLY );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_MONTHLY_DAILY
-        //
-        //  jeden X'ten Tag von jedem X'ten Monat
-        //  nInterval1 = 1 .. 31
-        //  nInterval2 = 1 .. 6
-        //
-        case FRQ_MONTHLY_DAILY :
-        {
-            BOOL bInRecalc = FALSE;
-            aNextDate.SetDay( nDInterval1 );
-
-            RECALC_FRQ_MONTHLY_DAILY:
-            if( nDInterval2 > 1 || bInRecalc )
-            {
-                long nMonth = aNextDate.GetMonth() - 1;
-                nMonth += nDInterval2;
-                aNextDate.SetYear(
-                    sal::static_int_cast< USHORT >(
-                        aNextDate.GetYear() + nMonth / 12 ) );
-                aNextDate.SetMonth(
-                    sal::static_int_cast< USHORT >( ( nMonth % 12 ) + 1 ) );
-            }
-
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                bInRecalc = TRUE;
-                SAVE_GOTO( RECALC_FRQ_MONTHLY_DAILY );
-            }
-
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bMissingDate = TRUE;
-                    aMissingDate.SetDate(aNextDate.GetDate());
-                    aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                    bInRecalc = TRUE;
-                    SAVE_GOTO( RECALC_FRQ_MONTHLY_DAILY );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_MONTHLY_LOGIC
-        //
-        //  jeden ersten, zweiten, dritten, vierten oder letzten
-        //  Wochentag jeden X'ten Monats
-        //  nInterval1 = 0 .. 4
-        //  nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY |
-        //               WD_WEDNESDAY | WD_THURSDAY | WD_FRIDAY |
-        //               WD_SATURDAY
-        //  nInterval3 = 1 .. 6
-        //
-        case FRQ_MONTHLY_LOGIC :
-        {
-            BOOL bInRecalc = FALSE;
-
-            RECALC_FRQ_MONTHLY_LOGIC:
-            if( nDInterval3 > 1 || bInRecalc )
-            {
-                long nMonth = aNextDate.GetMonth() - 1;
-                nMonth += nDInterval3;
-                aNextDate.SetYear(
-                    sal::static_int_cast< USHORT >(
-                        aNextDate.GetYear() + nMonth / 12 ) );
-                aNextDate.SetMonth(
-                    sal::static_int_cast< USHORT >( ( nMonth % 12 ) + 1 ) );
-            }
-
-            USHORT nDay;
-            if( nDInterval2 & WD_SUNDAY )
-                nDay = 6;
-            else if( nDInterval2 & WD_MONDAY )
-                nDay = 0;
-            else if( nDInterval2 & WD_TUESDAY )
-                nDay = 1;
-            else if( nDInterval2 & WD_WEDNESDAY )
-                nDay = 2;
-            else if( nDInterval2 & WD_THURSDAY )
-                nDay = 3;
-            else if( nDInterval2 & WD_FRIDAY )
-                nDay = 4;
-            else nDay = 5;
-
-            if( nDInterval1 == 4 )
-            {
-                DateTime aDT = aNextDate;
-                aDT.SetDay( 1 );
-                aDT += (long)(aNextDate.GetDaysInMonth() - 1);
-                if( aDT.GetDayOfWeek() != nDay )
-                    for( aDT--; aDT.GetDayOfWeek() != nDay; aDT-- ) ;
-                aNextDate = aDT;
-            }
-            else
-            {
-                DateTime aDT = aNextDate;
-                aDT.SetDay( 1 );
-                aDT += (long)(nDay - USHORT(aDT.GetDayOfWeek()));
-                if( aDT.GetMonth() != aNextDate.GetMonth() )
-                    aDT += 7L;
-                aDT += (long)(nDInterval1 * 7);
-                aNextDate = aDT;
-            }
-
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                bInRecalc = TRUE;
-                SAVE_GOTO( RECALC_FRQ_MONTHLY_LOGIC );
-            }
-
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bMissingDate = TRUE;
-                    aMissingDate.SetDate(aNextDate.GetDate());
-                    aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                    bInRecalc = TRUE;
-                    SAVE_GOTO( RECALC_FRQ_MONTHLY_LOGIC );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-    }
-
-    return DateTime( aNextDate, aNextTime );
-}
-
diff --git a/svtools/source/items1/tfrmitem.cxx b/svtools/source/items1/tfrmitem.cxx
deleted file mode 100644
index a7019ff69947..000000000000
--- a/svtools/source/items1/tfrmitem.cxx
+++ /dev/null
@@ -1,184 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: tfrmitem.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <com/sun/star/uno/Any.hxx>
-
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/string.hxx>
-
-#include <svtools/tfrmitem.hxx>
-
-DBG_NAME( SfxTargetFrameItem )
-TYPEINIT1( SfxTargetFrameItem, SfxPoolItem );
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::SfxTargetFrameItem( USHORT which ) :
-    SfxPoolItem( which )
-{
-    DBG_CTOR( SfxTargetFrameItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::SfxTargetFrameItem( const SfxTargetFrameItem& rItem ) :
-    SfxPoolItem( rItem )
-{
-    DBG_CTOR( SfxTargetFrameItem, 0 );
-    for( USHORT nCur = 0; nCur <= (USHORT)SfxOpenModeLast; nCur++ )
-        _aFrames[nCur] = rItem._aFrames[nCur];
-}
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::SfxTargetFrameItem( USHORT which,
-    const String& rOpenSelectFrame, const String& rOpenOpenFrame,
-    const String& rOpenAddTaskFrame ) : SfxPoolItem( which )
-{
-    DBG_CTOR( SfxTargetFrameItem, 0 );
-    _aFrames[ (USHORT)SfxOpenSelect ]  = rOpenSelectFrame;
-    _aFrames[ (USHORT)SfxOpenOpen ]    = rOpenOpenFrame;
-    _aFrames[ (USHORT)SfxOpenAddTask ] = rOpenAddTaskFrame;
-}
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::~SfxTargetFrameItem()
-{
-    DBG_DTOR(SfxTargetFrameItem, 0);
-}
-
-// -----------------------------------------------------------------------
-
-String SfxTargetFrameItem::GetTargetFrame( SfxOpenMode eMode ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    if( eMode <= SfxOpenModeLast )
-        return _aFrames[ (USHORT)eMode ];
-    String aResult;
-    return aResult;
-}
-
-// -----------------------------------------------------------------------
-
-int SfxTargetFrameItem::operator==( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    for( USHORT nCur = 0; nCur <= (USHORT)SfxOpenModeLast; nCur++ )
-    {
-        if( _aFrames[nCur] != ((const SfxTargetFrameItem&)rItem)._aFrames[nCur] )
-            return 0;
-    }
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxTargetFrameItem::Create( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxTargetFrameItem, 0);
-    SfxTargetFrameItem* pItem = new SfxTargetFrameItem( Which() );
-    USHORT nCount = 0;
-    rStream >> nCount;
-    for(USHORT nCur=0; nCur<= (USHORT)SfxOpenModeLast && nCount; nCur++,nCount--)
-    {
-        readByteString(rStream, pItem->_aFrames[ nCur ]);
-    }
-    // die uebriggebliebenen ueberspringen
-    String aTemp;
-    while( nCount )
-    {
-        readByteString(rStream, aTemp);
-        nCount--;
-    }
-    return pItem;
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SfxTargetFrameItem::Store( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    USHORT nCount = (USHORT)(SfxOpenModeLast+1);
-    rStream << nCount;
-    for( USHORT nCur = 0; nCur <= (USHORT)SfxOpenModeLast; nCur++ )
-    {
-        writeByteString(rStream, _aFrames[ nCur ]);
-    }
-    return rStream;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxTargetFrameItem::Clone( SfxItemPool* ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    return new SfxTargetFrameItem( *this );
-}
-
-// -----------------------------------------------------------------------
-// virtual
-BOOL SfxTargetFrameItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
-{
-    String aVal;
-    for ( int i = 0; i <= SfxOpenModeLast; i++ )
-    {
-        aVal += _aFrames[ i ];
-        aVal += ';' ;
-    }
-
-    rVal <<= rtl::OUString( aVal );
-    return TRUE;
-}
-
-// -----------------------------------------------------------------------
-// virtual
-BOOL SfxTargetFrameItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
-{
-    rtl::OUString aValue;
-    if ( rVal >>= aValue )
-    {
-        const String aVal( aValue );
-
-        for ( USHORT i = 0; i <= SfxOpenModeLast; i++ )
-            _aFrames[ i ] = aVal.GetToken( i );
-
-        return TRUE;
-    }
-
-    DBG_ERROR( "SfxTargetFrameItem::PutValue - Wrong type!" );
-    return FALSE;
-}
-
diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
index 3063bcd994d5..3460df859c2b 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 WarningBox WARNINGBOX_JAVANOTFOUND
 {
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 30f8775a6d5f..a7808c80992b 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -33,7 +33,7 @@
 
 
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <tools/resid.hxx>
 #include <com/sun/star/task/XInteractionContinuation.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src
index bfdfd5a8bcba..2d2ad06a9592 100644
--- a/svtools/source/java/patchjavaerror.src
+++ b/svtools/source/java/patchjavaerror.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 WarningBox WARNINGBOX_JAVANOTFOUND
 {
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 6e89193f1b6b..4084aa47bc80 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -45,7 +45,7 @@
 
 #include <svtools/ehdl.hxx>
 #include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include "sfxecode.hxx"
 
 //=========================================================================
diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src
index ed32172a92e2..5267d13765c3 100644
--- a/svtools/source/misc/ehdl.src
+++ b/svtools/source/misc/ehdl.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #define __RSC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include "sfxecode.hxx"
  // pragma ----------------------------------------------------------------
 
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index edddb7c1ab6d..3554f6955171 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -32,7 +32,7 @@
 
 #include <svtools/embedhlp.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
 
 #include <comphelper/embeddedobjectcontainer.hxx>
@@ -57,6 +57,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include "vcl/svapp.hxx"
 #include <rtl/logfile.hxx>
+#include <vos/mutex.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
index ebd922bfedf7..3ab58ef92dbf 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svtools/source/misc/errtxt.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #define __RSC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include "sfxecode.hxx"
  // pragma ----------------------------------------------------------------
 Resource RID_ERRCTX
diff --git a/svtools/source/misc/flbytes.cxx b/svtools/source/misc/flbytes.cxx
deleted file mode 100644
index acf53d9b3e94..000000000000
--- a/svtools/source/misc/flbytes.cxx
+++ /dev/null
@@ -1,432 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: flbytes.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <vcl/svapp.hxx>
-#include <flbytes.hxx>
-
-#ifndef _SVSTDARR_ULONGS_DECL
-#define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
-#undef _SVSTDARR_ULONGS
-#endif
-
-namespace unnamed_svtools_flbytes {} using namespace unnamed_svtools_flbytes;
-    // unnamed namespaces don't work well yet
-
-//============================================================================
-namespace unnamed_svtools_flbytes {
-
-inline ULONG MyMin( long a, long b )
-{
-    return Max( long( Min(  a ,  b ) ), 0L );
-}
-
-}
-
-//============================================================================
-//
-//  SvFillLockBytes
-//
-//============================================================================
-
-TYPEINIT1(SvFillLockBytes, SvLockBytes);
-
-//============================================================================
-SvFillLockBytes::SvFillLockBytes( SvLockBytes* pLockBytes )
-    : xLockBytes( pLockBytes ),
-      nFilledSize( 0 ),
-      bTerminated( FALSE )
-{
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::ReadAt( ULONG nPos, void* pBuffer, ULONG nCount,
-                             ULONG *pRead ) const
-{
-    if( bTerminated )
-        return xLockBytes->ReadAt( nPos, pBuffer, nCount, pRead );
-    else
-    {
-        ULONG nWanted = nPos + nCount;
-        if( IsSynchronMode() )
-        {
-            while( nWanted > nFilledSize && !bTerminated )
-                Application::Yield();
-            return xLockBytes->ReadAt( nPos, pBuffer, nCount, pRead );
-        }
-        else
-        {
-            ULONG nRead = MyMin( nCount, long( nFilledSize ) - nPos );
-            ULONG nErr = xLockBytes->ReadAt( nPos, pBuffer, nRead, pRead );
-            return ( !nCount || nRead == nCount || nErr ) ?
-                nErr : ERRCODE_IO_PENDING;
-        }
-    }
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::WriteAt( ULONG nPos, const void* pBuffer,
-                                  ULONG nCount, ULONG *pWritten )
-{
-    if( bTerminated )
-        return xLockBytes->WriteAt( nPos, pBuffer, nCount, pWritten );
-    else
-    {
-        ULONG nWanted = nPos + nCount;
-        if( IsSynchronMode() )
-        {
-            while( nWanted > nFilledSize && !bTerminated )
-                Application::Yield();
-            return xLockBytes->WriteAt( nPos, pBuffer, nCount, pWritten );
-        }
-        else
-        {
-            ULONG nRead = MyMin( nCount, long( nFilledSize ) - nPos );
-            ULONG nErr = xLockBytes->WriteAt( nPos, pBuffer, nRead, pWritten );
-            return ( !nCount || nRead == nCount || nErr ) ?
-                nErr : ERRCODE_IO_PENDING;
-        }
-    }
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::Flush() const
-{
-    return xLockBytes->Flush( );
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::SetSize( ULONG nSize )
-{
-    return xLockBytes->SetSize( nSize );
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::LockRegion( ULONG nPos, ULONG nCount, LockType eType)
-{
-    return xLockBytes->LockRegion( nPos, nCount, eType );
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::UnlockRegion(
-    ULONG nPos, ULONG nCount, LockType eType)
-{
-    return xLockBytes->UnlockRegion( nPos, nCount, eType );
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::Stat(
-    SvLockBytesStat* pStat, SvLockBytesStatFlag eFlag) const
-{
-    return xLockBytes->Stat( pStat, eFlag );
-}
-
-//============================================================================
-ErrCode SvFillLockBytes::FillAppend( const void* pBuffer, ULONG nCount, ULONG *pWritten )
-{
-    ErrCode nRet = xLockBytes->WriteAt(
-        nFilledSize, pBuffer, nCount, pWritten );
-    nFilledSize += *pWritten;
-    return nRet;
-}
-
-//============================================================================
-void SvFillLockBytes::Terminate()
-{
-    bTerminated = TRUE;
-}
-
-//============================================================================
-SV_DECL_IMPL_REF_LIST( SvLockBytes, SvLockBytes* )
-
-//============================================================================
-//
-//  SvSyncLockBytes
-//
-//============================================================================
-
-TYPEINIT1(SvSyncLockBytes, SvOpenLockBytes);
-
-//============================================================================
-// virtual
-ErrCode SvSyncLockBytes::ReadAt(ULONG nPos, void * pBuffer, ULONG nCount,
-                                ULONG * pRead) const
-{
-    for (ULONG nReadTotal = 0;;)
-    {
-        ULONG nReadCount = 0;
-        ErrCode nError = m_xAsyncLockBytes->ReadAt(nPos, pBuffer, nCount,
-                                                   &nReadCount);
-        nReadTotal += nReadCount;
-        if (nError != ERRCODE_IO_PENDING || !IsSynchronMode())
-        {
-            if (pRead)
-                *pRead = nReadTotal;
-            return nError;
-        }
-        nPos += nReadCount;
-        pBuffer = static_cast< sal_Char * >(pBuffer) + nReadCount;
-        nCount -= nReadCount;
-        Application::Yield();
-    }
-}
-
-//============================================================================
-// virtual
-ErrCode SvSyncLockBytes::WriteAt(ULONG nPos, const void * pBuffer,
-                                 ULONG nCount, ULONG * pWritten)
-{
-    for (ULONG nWrittenTotal = 0;;)
-    {
-        ULONG nWrittenCount = 0;
-        ErrCode nError = m_xAsyncLockBytes->WriteAt(nPos, pBuffer, nCount,
-                                                    &nWrittenCount);
-        nWrittenTotal += nWrittenCount;
-        if (nError != ERRCODE_IO_PENDING || !IsSynchronMode())
-        {
-            if (pWritten)
-                *pWritten = nWrittenTotal;
-            return nError;
-        }
-        nPos += nWrittenCount;
-        pBuffer = static_cast< sal_Char const * >(pBuffer) + nWrittenCount;
-        nCount -= nWrittenCount;
-        Application::Yield();
-    }
-}
-
-//============================================================================
-//
-//  SvCompositeLockBytes
-//
-//============================================================================
-
-struct SvCompositeLockBytes_Impl
-{
-    SvLockBytesMemberList aLockBytes;
-    SvULongs              aPositions;
-    SvULongs              aOffsets;
-    BOOL                  bPending;
-    ULONG RelativeOffset( ULONG nPos ) const;
-    ErrCode ReadWrite_Impl(
-        ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pProcessed,
-        BOOL bRead );
-    SvCompositeLockBytes_Impl() : bPending( FALSE ){}
-};
-
-//============================================================================
-ULONG SvCompositeLockBytes_Impl::RelativeOffset( ULONG nPos ) const
-{
-    const SvULongs& rPositions = aPositions;
-    const SvULongs& rOffsets = aOffsets;
-
-    USHORT nMinPos = 0;
-    USHORT nListCount = rPositions.Count();
-
-    // Erster Lockbytes, der bearbeitet werden muss
-    while( nMinPos + 1 < nListCount && rPositions[ nMinPos + 1 ] <= nPos )
-        nMinPos ++;
-    ULONG nSectionStart = rPositions[ nMinPos ];
-    if( nSectionStart > nPos )
-        return ULONG_MAX;
-    return rOffsets[ nMinPos ] + nPos - nSectionStart;
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes_Impl::ReadWrite_Impl(
-    ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pProcessed,
-    BOOL bRead )
-{
-    ErrCode nErr = ERRCODE_NONE;
-    SvULongs& rPositions = aPositions;
-    SvULongs& rOffsets = aOffsets;
-    SvLockBytesMemberList& rLockBytes = aLockBytes;
-
-    ULONG nBytes = nCount;
-    USHORT nListCount = rPositions.Count();
-    USHORT nMinPos = 0;
-
-    // Erster Lockbytes, der bearbeitet werden muss
-    while( nMinPos + 1 < nListCount && rPositions[ nMinPos + 1 ] <= nPos )
-        nMinPos ++;
-    ULONG nSectionStart = rPositions[ nMinPos ];
-
-    if( nSectionStart > nPos )
-    {
-        // Es wird aus fuehrendem Leerbereich gearbeitet
-        *pProcessed = 0;
-        return ERRCODE_IO_CANTREAD;
-    }
-
-    ULONG nDone;
-    while( nMinPos < nListCount )
-    {
-        ULONG nToProcess;
-        ULONG nSectionStop;
-        if( nMinPos + 1 < nListCount )
-        {
-            nSectionStop = rPositions[ nMinPos + 1 ];
-            nToProcess = MyMin( long( nSectionStop ) - nPos, nBytes );
-        }
-        else
-        {
-            nToProcess = nBytes;
-            nSectionStop = 0;
-        }
-        ULONG nAbsPos = nPos - nSectionStart + rOffsets[ nMinPos ];
-        SvLockBytes* pLB = rLockBytes.GetObject( nMinPos );
-        if( bRead )
-            nErr = pLB->ReadAt( nAbsPos, pBuffer, nToProcess, &nDone );
-        else
-            nErr = pLB->WriteAt( nAbsPos, pBuffer, nToProcess, &nDone );
-        nBytes -= nDone;
-        if( nErr || nDone < nToProcess || !nBytes )
-        {
-            *pProcessed = nCount - nBytes;
-            // Wenn aus dem letzten LockBytes nichts mehr gelesen wurde und
-            // bPending gesetzt ist, Pending zurueck
-            if( !nDone && nMinPos == nListCount - 1 )
-                return bPending ? ERRCODE_IO_PENDING : nErr;
-            else return nErr;
-        }
-        pBuffer = static_cast< sal_Char * >(pBuffer) + nDone;
-        nPos += nDone;
-        nSectionStart = nSectionStop;
-        nMinPos++;
-    }
-    return nErr;
-}
-
-//============================================================================
-TYPEINIT1(SvCompositeLockBytes, SvLockBytes);
-
-//============================================================================
-SvCompositeLockBytes::SvCompositeLockBytes()
-    : pImpl( new SvCompositeLockBytes_Impl )
-{
-}
-
-//============================================================================
-SvCompositeLockBytes::~SvCompositeLockBytes()
-{
-    delete pImpl;
-}
-
-//============================================================================
-void  SvCompositeLockBytes::SetIsPending( BOOL bSet )
-{
-    pImpl->bPending = bSet;
-}
-
-//============================================================================
-ULONG SvCompositeLockBytes::RelativeOffset( ULONG nPos ) const
-{
-    return  pImpl->RelativeOffset( nPos );
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes::ReadAt(
-    ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pRead ) const
-{
-    return pImpl->ReadWrite_Impl( nPos, pBuffer, nCount, pRead, TRUE );
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes::WriteAt(
-    ULONG nPos, const void* pBuffer, ULONG nCount, ULONG* pWritten )
-{
-    return pImpl->ReadWrite_Impl(
-        nPos, const_cast< void * >(pBuffer), nCount, pWritten, FALSE );
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes::Flush() const
-{
-    SvLockBytesMemberList& rLockBytes = pImpl->aLockBytes;
-    ErrCode nErr = ERRCODE_NONE;
-    for( USHORT nCount = (USHORT)rLockBytes.Count(); !nErr && nCount--; )
-        nErr = rLockBytes.GetObject( nCount )->Flush();
-    return nErr;
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes::SetSize( ULONG )
-{
-    DBG_ERROR( "not implemented" );
-    return ERRCODE_IO_NOTSUPPORTED;
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes::LockRegion( ULONG, ULONG, LockType )
-{
-    DBG_ERROR( "not implemented" );
-    return ERRCODE_IO_NOTSUPPORTED;
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes::UnlockRegion(
-    ULONG, ULONG, LockType )
-{
-    DBG_ERROR( "not implemented" );
-    return ERRCODE_IO_NOTSUPPORTED;
-}
-
-//============================================================================
-ErrCode SvCompositeLockBytes::Stat(
-    SvLockBytesStat* pStat, SvLockBytesStatFlag eFlag) const
-{
-    USHORT nMax = pImpl->aPositions.Count() - 1;
-
-    SvLockBytesStat aStat;
-    ErrCode nErr = pImpl->aLockBytes.GetObject( nMax )->Stat( &aStat, eFlag );
-    pStat->nSize = pImpl->aPositions[ nMax ] + aStat.nSize;
-
-    return nErr;
-}
-
-//============================================================================
-void SvCompositeLockBytes::Append(
-    SvLockBytes* pLockBytes, ULONG nPos, ULONG nOffset )
-{
-    USHORT nCount = pImpl->aOffsets.Count();
-    pImpl->aLockBytes.Insert( pLockBytes, nCount );
-    pImpl->aPositions.Insert( nPos, nCount );
-    pImpl->aOffsets.Insert( nOffset, nCount );
-}
-
-//============================================================================
-SvLockBytes* SvCompositeLockBytes::GetLastLockBytes() const
-{
-    return pImpl->aLockBytes.Count() ?
-        pImpl->aLockBytes.GetObject( pImpl->aLockBytes.Count() - 1 ) : 0;
-}
-
diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src
index 3b9e2a450ec1..181583bc8f6d 100644
--- a/svtools/source/misc/helpagent.src
+++ b/svtools/source/misc/helpagent.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 Bitmap BMP_HELP_AGENT_IMAGE
diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx
index 368c55a94ade..51cd7ebfb740 100644
--- a/svtools/source/misc/helpagentwindow.cxx
+++ b/svtools/source/misc/helpagentwindow.cxx
@@ -39,7 +39,7 @@
 #include <svtools/svtdata.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 314242063711..76752b27354e 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -55,9 +55,10 @@
 #include <rtl/logfile.hxx>
 #include <unotools/configmgr.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include "imagemgr.hrc"
 #include <svtools/svtdata.hxx>
+#include <vos/mutex.hxx>
 
 // globals *******************************************************************
 
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 0aada34305da..e082398beaa1 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -29,7 +29,7 @@
  ************************************************************************/
  // includes ******************************************************************
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include "imagemgr.hrc"
 
  // images ********************************************************************
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 9fb60111094e..df7760f7931b 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -36,7 +36,7 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/window.hxx>
 
-#include "urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/imapcirc.hxx>
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index b1e03a574188..1dd10c36c81a 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -43,7 +43,7 @@
 #endif
 #include <sot/formats.hxx>
 
-#include "urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include <svtools/imap.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/imapobj.hxx>
diff --git a/svtools/source/misc/inidef.cxx b/svtools/source/misc/inidef.cxx
deleted file mode 100644
index bdecd1b833dd..000000000000
--- a/svtools/source/misc/inidef.cxx
+++ /dev/null
@@ -1,269 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: inidef.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-
-#include <tools/string.hxx>
-#include "inetdef.hxx"
-#include "inidef.hxx"
-
-//========================================================================
-
-class SfxStdIniDef_Impl: public SfxIniDefaulter
-{
-public:
-                    SfxStdIniDef_Impl( SfxIniDefaultManager *pDefMgr )
-                    :   SfxIniDefaulter( pDefMgr )
-                    {}
-    virtual BOOL    QueryDefault( String &rValue, const SfxIniEntry &rEntry );
-};
-
-//-------------------------------------------------------------------------
-
-BOOL SfxStdIniDef_Impl::QueryDefault( String &rValue, const SfxIniEntry &rEntry )
-{
-    switch ( rEntry.GetKey() )
-    {
-        case SFX_KEY_BROWSERRESTORE:
-        {
-            rValue = "1";
-            return TRUE;
-        }
-
-        case SFX_KEY_INET_HOME:
-        {
-            if ( System::GetLanguage() == LANGUAGE_GERMAN )
-                rValue = "http://www.stardivision.de";
-            else
-                rValue = "http://www.stardivision.com";
-            return TRUE;
-        }
-
-        case SFX_KEY_INET_MEMCACHE:
-            rValue = "4";
-            return TRUE;
-
-        case SFX_KEY_INET_DISKCACHE:
-            rValue = "2048";
-            return TRUE;
-
-        case SFX_KEY_INET_CACHEEXPIRATION:
-            rValue = "3";
-            return TRUE;
-
-        case SFX_KEY_INET_MAXHTTPCONS:
-            rValue = "4";
-            return TRUE;
-
-        case SFX_KEY_INET_MAXFTPCONS:
-            rValue = "2";
-            return TRUE;
-
-//          case SFX_KEY_INET_JAVAMINHEAP:
-//              rValue = "256";
-//              return TRUE;
-
-//          case SFX_KEY_INET_JAVAMAXHEAP:
-//              rValue = "";
-//              return TRUE;
-
-        case SFX_KEY_INET_USERAGENT:
-            rValue = INET_DEF_CALLERNAME;
-            return TRUE;
-
-        case SFX_KEY_INET_EXE_JAVASCRIPT:
-#ifdef SOLAR_JAVA
-            rValue = "0"; // noch "0", solange es noch soviel Bugs gibt
-#else
-            rValue = "0"; // immer "0"
-#endif
-            return TRUE;
-
-        case SFX_KEY_INET_EXE_PLUGIN:
-            rValue = "1";
-            return TRUE;
-
-/*      case SFX_KEY_INET_JAVA_ENABLE:
-#ifdef SOLAR_JAVA
-            rValue = "1";
-#else
-            rValue = "0";
-#endif
-            return TRUE; */
-
-//          case SFX_KEY_INET_NETACCESS:
-//              rValue = "2";
-//              return TRUE;
-
-        case SFX_KEY_INET_CHANNELS:
-            rValue = "1";
-            return TRUE;
-
-        case SFX_KEY_BASIC_ENABLE:
-            rValue = "1";
-            return TRUE;
-
-        case SFX_KEY_INET_COOKIES:
-            rValue = "1";
-            return TRUE;
-
-        case SFX_KEY_ICONGRID:
-            rValue = "100;70;0";
-            return TRUE;
-
-        case SFX_KEY_METAFILEPRINT:
-            rValue = "1";
-            return TRUE;
-    }
-
-    return SfxIniDefaulter::QueryDefault( rValue, rEntry );
-}
-
-//=========================================================================
-
-SfxIniDefaultManager::SfxIniDefaultManager()
-:   _pList( new SfxIniDefaulterList )
-{
-    new SfxStdIniDef_Impl( this );
-}
-
-//-------------------------------------------------------------------------
-
-SfxIniDefaultManager::~SfxIniDefaultManager()
-{
-    if ( _pList )
-    {
-        for ( USHORT n = _pList->Count(); n--; )
-            delete _pList->GetObject(n);
-        delete _pList;
-    }
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxIniDefaultManager::QueryDefault
-(
-    String&             rValue,     /* out: Default-Wert f"ur 'rEntry'
-                                       (Default ist Leerstring) */
-    const SfxIniEntry&  rEntry      // in:  Beschreibung des Eintrags
-)
-
-/*  [Beschreibung]
-
-    "Uber diese interne Methode besorgt sich der <SfxIniManager> den
-    Default f"ur einen in 'rEntry' beschriebenen Eintrag.
-*/
-
-{
-    for ( USHORT n = _pList->Count(); n--; )
-        if ( _pList->GetObject(n)->QueryDefault( rValue, rEntry ) )
-            return TRUE;
-    return FALSE;
-}
-
-//=========================================================================
-
-SfxIniDefaulter::SfxIniDefaulter( SfxIniDefaultManager *pManager )
-
-/*  [Beschreibung]
-
-    Der Ctor dieser Klasse meldet die neue Instanz automatisch am
-    <SfxiniDefaultManager> 'pManager' an.
-*/
-
-:   _pManager( pManager )
-
-{
-    pManager->Insert( this );
-}
-
-//-------------------------------------------------------------------------
-
-SfxIniDefaulter::~SfxIniDefaulter()
-
-/*  [Beschreibung]
-
-    Der Dtor dieser Klasse meldet die neue Instanz automatisch am
-    <SfxiniDefaultManager> ab, der im Ctor angegeben wurde.
-*/
-
-{
-    _pManager->Remove( this );
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxIniDefaulter::QueryDefault
-(
-    String&             rValue,     /* out: Default-Wert f"ur 'rEntry'
-                                       (Default ist Leerstring) */
-    const SfxIniEntry&  rEntry      // in:  Beschreibung des Eintrags
-)
-
-/*  [Beschreibung]
-
-    Diese virtuelle Methode mu\s "uberladen werden. Sie soll dann in
-    'rValue' einen Default-Wert f"ur den in 'rEntry' beschriebenen
-    ini-Eintrag setzen, falls ihr dieser bekannt ist.
-
-
-    [Returnwert]
-
-    TRUE            In 'rValue' befindet sich der Default-Wert.
-
-    FALSE           F"ur diesen Eintrag ist kein Default-Wert bekannt.
-
-*/
-
-{
-    return FALSE;
-};
-
-//========================================================================
-
-SfxIniEntry::SfxIniEntry
-(
-    const String&   aGroup,
-    const String&   aKey,
-    SfxIniGroup     eGroup,
-    SfxIniKey       eKey,
-    USHORT          nIndex
-)
-:   _aGroup( aGroup ),
-    _aKey( aKey ),
-    _eGroup( eGroup ),
-    _eKey( eKey ),
-    _nIndex( nIndex )
-{
-}
-
-
diff --git a/svtools/source/items/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 4028aa497c22..9db70f852d30 100644
--- a/svtools/source/items/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -37,8 +37,8 @@
 #include <limits.h>
 
 #include <svtools/svtdata.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/svarray.hxx>
+#include <svl/itempool.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 870e6378a216..ef2cedcc50c2 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -42,10 +42,10 @@
 #include <i18npool/lang.h>
 #include <i18npool/mslangid.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
 #include <svtools/langtab.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 4458d4b0f132..0aa90f8e96b9 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
  // include ---------------------------------------------------------------
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #define RSC_RESOURCE_USAGE 1
 #include <i18npool/lang.h>
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
index a23092e120da..77cf8a41a8bd 100644
--- a/svtools/source/misc/makefile.mk
+++ b/svtools/source/misc/makefile.mk
@@ -46,11 +46,9 @@ ENABLE_EXCEPTIONS := TRUE
 
 SRS1NAME=misc
 SRC1FILES=\
-    config.src	\
-    iniman.src 	\
     ehdl.src \
-    imagemgr.src      \
     helpagent.src \
+    imagemgr.src      \
     langtab.src 
 
 SRS2NAME=ehdl
@@ -59,33 +57,28 @@ SRC2FILES=\
 
 SLOFILES=\
     $(SLO)$/acceleratorexecute.obj  \
+    $(SLO)$/chartprettypainter.obj \
     $(SLO)$/cliplistener.obj        \
+    $(SLO)$/dialogclosedlistener.obj\
+    $(SLO)$/dialogcontrolling.obj   \
+    $(SLO)$/ehdl.obj                \
     $(SLO)$/embedhlp.obj            \
     $(SLO)$/embedtransfer.obj       \
+    $(SLO)$/helpagentwindow.obj     \
     $(SLO)$/imagemgr.obj            \
     $(SLO)$/imageresourceaccess.obj \
-    $(SLO)$/templatefoldercache.obj \
-    $(SLO)$/transfer.obj            \
-    $(SLO)$/transfer2.obj           \
-    $(SLO)$/stringtransfer.obj      \
-    $(SLO)$/urihelper.obj           \
-    $(SLO)$/svtaccessiblefactory.obj \
-    $(SLO)$/ehdl.obj                \
-    $(SLO)$/flbytes.obj             \
-    $(SLO)$/helpagentwindow.obj     \
     $(SLO)$/imap.obj                \
     $(SLO)$/imap2.obj               \
     $(SLO)$/imap3.obj               \
-    $(SLO)$/ownlist.obj             \
-    $(SLO)$/vcldata.obj             \
-    $(SLO)$/restrictedpaths.obj     \
-    $(SLO)$/dialogclosedlistener.obj\
-    $(SLO)$/dialogcontrolling.obj   \
-    $(SLO)$/chartprettypainter.obj \
-    $(SLO)$/lockfilecommon.obj     \
-    $(SLO)$/sharecontrolfile.obj   \
-    $(SLO)$/documentlockfile.obj   \
-    $(SLO)$/langtab.obj
+    $(SLO)$/itemdel.obj				\
+    $(SLO)$/langtab.obj				\
+    $(SLO)$/stringtransfer.obj      \
+    $(SLO)$/svtaccessiblefactory.obj \
+    $(SLO)$/svtdata.obj             \
+    $(SLO)$/templatefoldercache.obj \
+    $(SLO)$/transfer.obj            \
+    $(SLO)$/transfer2.obj           \
+    $(SLO)$/wallitem.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/svtools/source/items1/tresitem.cxx b/svtools/source/misc/svtdata.cxx
index 6e70c82a4d03..2bc1977e9197 100644
--- a/svtools/source/items1/tresitem.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tresitem.cxx,v $
- * $Revision: 1.6 $
+ * $RCSfile: svtdata.cxx,v $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,49 +30,66 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include <svtools/tresitem.hxx>
 
-using namespace com::sun::star;
+#include <map>
+#include <tools/resmgr.hxx>
+#include <tools/shl.hxx>
+#include <vos/process.hxx>
+#include <svtools/svtdata.hxx>
+#include <vcl/svapp.hxx>
 
 //============================================================================
 //
-//  CntTransferResultItem
+//  ImpSvtData
 //
 //============================================================================
 
-TYPEINIT1_AUTOFACTORY(CntTransferResultItem, SfxPoolItem)
+ImpSvtData::~ImpSvtData()
+{
+    delete pResMgr;
+}
 
 //============================================================================
-// virtual
-int CntTransferResultItem::operator ==(SfxPoolItem const & rItem) const
+ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale)
 {
-    if (CntTransferResultItem * pResultItem = PTR_CAST(CntTransferResultItem,
-                                                       &rItem))
-        return m_aResult.Source == pResultItem->m_aResult.Source
-               && m_aResult.Target == pResultItem->m_aResult.Target
-               && m_aResult.Result == pResultItem->m_aResult.Result;
-    return false;
+    if (!pResMgr)
+    {
+        pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svt), aLocale );
+    }
+    return pResMgr;
 }
 
-//============================================================================
-// virtual
-BOOL CntTransferResultItem::QueryValue(uno::Any & rVal, BYTE) const
+ResMgr * ImpSvtData::GetResMgr()
 {
-    rVal <<= m_aResult;
-    return true;
+    return GetResMgr(Application::GetSettings().GetUILocale());
 }
 
-//============================================================================
-// virtual
-BOOL CntTransferResultItem::PutValue(uno::Any const & rVal, BYTE)
+ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
+{
+    if (!pPatchResMgr)
+    {
+        pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
+    }
+    return pPatchResMgr;
+}
+
+ResMgr * ImpSvtData::GetPatchResMgr()
+{
+    return GetPatchResMgr(Application::GetSettings().GetUILocale());
+}
+
+SvpResId::SvpResId( USHORT nId ) :
+    ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() )
 {
-    return rVal >>= m_aResult;
 }
 
 //============================================================================
-// virtual
-SfxPoolItem * CntTransferResultItem::Clone(SfxItemPool *) const
+// static
+ImpSvtData & ImpSvtData::GetSvtData()
 {
-    return new CntTransferResultItem(*this);
+    void ** pAppData = GetAppData(SHL_SVT);
+    if (!*pAppData)
+        *pAppData= new ImpSvtData;
+    return *static_cast<ImpSvtData *>(*pAppData);
 }
 
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 93ed9a7f5c90..348a9638399b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -45,7 +45,7 @@
 #include <vos/refernce.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "comphelper/processfactory.hxx"
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 0bcd00af40aa..4a814637e1af 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -76,7 +76,7 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
-#include "urlbmk.hxx"
+#include "svl/urlbmk.hxx"
 #include "inetimg.hxx"
 #include <svtools/wmf.hxx>
 #include <svtools/imap.hxx>
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 8dcbbf9d93dc..027dbc31572d 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -50,7 +50,7 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
 #endif
 
-#include "urlbmk.hxx"
+#include "svl/urlbmk.hxx"
 #include "inetimg.hxx"
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>
diff --git a/svtools/source/items/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 32797f69a48c..6ceb414db003 100644
--- a/svtools/source/items/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -52,7 +52,7 @@
 #include <vcl/cvtgrf.hxx>
 
 #include "wallitem.hxx"
-#include <svtools/cntwall.hxx>
+#include <svl/cntwall.hxx>
 
 // -----------------------------------------------------------------------
 
diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src
index 599675a6c494..78b63c2fb819 100644
--- a/svtools/source/plugapp/testtool.src
+++ b/svtools/source/plugapp/testtool.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 #include "testtool.hrc"
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 
 #define Control_Control 5
diff --git a/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk
index bc964e142232..1892f1600dd8 100644
--- a/svtools/source/productregistration/makefile.mk
+++ b/svtools/source/productregistration/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -57,6 +57,7 @@ SHL1STDLIBS=\
     $(TKLIB) \
     $(VCLLIB) \
     $(SVLLIB) \
+        $(UNOTOOLSLIB) \
     $(TOOLSLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index b3d90a73b231..f5fc03337cd6 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.cxx
@@ -32,10 +32,10 @@
 #include "precompiled_svtools.hxx"
 
 #include "productregistration.hxx"
-#include "regoptions.hxx"
+#include "unotools/regoptions.hxx"
 #include "registrationdlg.hxx"
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #include "cppuhelper/factory.hxx"
 #include <cppuhelper/implbase1.hxx>
@@ -308,18 +308,18 @@ namespace svt
             sal_Bool bDeactivateJob = sal_True;
 
             // our config options
-            RegOptions aRegOptions;
+            utl::RegOptions aRegOptions;
             // check them for the permissions for the dialog
-            RegOptions::DialogPermission ePermission( aRegOptions.getDialogPermission() );
+            utl::RegOptions::DialogPermission ePermission( aRegOptions.getDialogPermission() );
 
-            if ( RegOptions::dpDisabled != ePermission )
+            if ( utl::RegOptions::dpDisabled != ePermission )
             {   // the dialog is _not_ disabled
 
                 // for this session, I'm no interested in the dialog registration anymore
                 aRegOptions.markSessionDone( );
 
-                if  (   ( RegOptions::dpNotThisSession == ePermission )     // first trigger session not reached
-                    ||  ( RegOptions::dpRemindLater == ePermission )        // or at a later reminder date
+                if  (   ( utl::RegOptions::dpNotThisSession == ePermission )     // first trigger session not reached
+                    ||  ( utl::RegOptions::dpRemindLater == ePermission )        // or at a later reminder date
                     )
                 {   // the dialog should be executed during one of the next sessions
                     bDeactivateJob = sal_False;
@@ -327,7 +327,7 @@ namespace svt
                 else
                 {
                     // if we're here, the dialog should be executed during this session
-                    OSL_ENSURE( RegOptions::dpThisSession == ePermission, "OProductRegistration::execute: invalid permissions!" );
+                    OSL_ENSURE( utl::RegOptions::dpThisSession == ePermission, "OProductRegistration::execute: invalid permissions!" );
 
                     {
                         // this is some kind of HACK.
@@ -412,7 +412,7 @@ namespace svt
             OSL_ENSURE( xSystemShell.is(), "OProductRegistration::doOnlineRegistration: invalid SystemExecute component!" );
 
             // access the configuration to retrieve the URL we shall use for registration
-            RegOptions aOptions;
+            utl::RegOptions aOptions;
             OUString sRegistrationURL( aOptions.getRegistrationURL( ) );
             OSL_ENSURE( sRegistrationURL.getLength(), "OProductRegistration::doOnlineRegistration: invalid URL found!" );
 
@@ -436,7 +436,7 @@ namespace svt
             aRegistrationError.Execute();
 
             // try again later
-            RegOptions aRegOptions;
+            utl::RegOptions aRegOptions;
             aRegOptions.activateReminder( 7 );
         }
     }
diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx
index 83018cfa804b..d3969828cb1f 100644
--- a/svtools/source/productregistration/registrationdlg.cxx
+++ b/svtools/source/productregistration/registrationdlg.cxx
@@ -35,7 +35,7 @@
 #if 0 /* @@@ */
 #include <svtools/svtdata.hxx>
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #endif /* @@@ */
 
diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src
index 86024ef765cd..f9462a420061 100644
--- a/svtools/source/productregistration/registrationdlg.src
+++ b/svtools/source/productregistration/registrationdlg.src
@@ -32,7 +32,7 @@
 #include "registrationdlg.hrc"
 #endif
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 #ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 5b584a37059d..5bb26367075e 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -32,11 +32,11 @@
 #include "precompiled_svtools.hxx"
 
 #include <tools/urlobj.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/zformat.hxx>
+#include <svl/macitem.hxx>
 #include <tools/cachestr.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #include <svtools/htmlout.hxx>
 #include "htmlkywd.hxx"
@@ -44,7 +44,7 @@
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
-#include "urihelper.hxx"
+#include "svl/urihelper.hxx"
 
 #ifndef RTL_CONSTASCII_STRINGPARAM
 #define RTL_CONSTASCII_STRINGPARAM( c ) c, sizeof(c)-1
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index 11f48e7fdf5d..9103161afb51 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.cxx
@@ -36,7 +36,7 @@
 #include <tools/urlobj.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include <svtools/parhtml.hxx>
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 215133c8efb4..b4eb6c05cffd 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -40,12 +40,12 @@
 #include <rtl/strbuf.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include <tools/tenccvt.hxx>
 #include <tools/datetime.hxx>
-#include <svtools/inettype.hxx>
+#include <svl/inettype.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index c7444dd5cbcb..2af7af71adac 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -37,7 +37,7 @@
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <rtl/textcvt.h>
 #include <rtl/tencinfo.h>
 
@@ -66,7 +66,7 @@ struct SvParser_Impl
     rtl_TextToUnicodeConverter hConv;
     rtl_TextToUnicodeContext   hContext;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SvFileStream aOut;
 #endif
 
@@ -100,7 +100,7 @@ SvParser::SvParser( SvStream& rIn, BYTE nStackSize )
     pTokenStack = new TokenStackType[ nTokenStackSize ];
     pTokenStackPos = pTokenStack;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
     // wenn die Datei schon existiert, dann Anhaengen:
     if( !pImplData )
@@ -119,7 +119,7 @@ SvParser::SvParser( SvStream& rIn, BYTE nStackSize )
 
 SvParser::~SvParser()
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( pImplData->aOut.IsOpen() )
         pImplData->aOut << "\n\n >>>>>>>>>>>>>>> Dump Ende <<<<<<<<<<<<<<<\n";
     pImplData->aOut.Close();
@@ -417,7 +417,7 @@ sal_Unicode SvParser::GetNextChar()
             return sal_Unicode(EOF);
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( pImplData->aOut.IsOpen() )
         pImplData->aOut << ByteString::ConvertFromUnicode( c,
                                                 RTL_TEXTENCODING_MS_1251 );
diff --git a/svtools/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index b2aff7ae711d..b2aff7ae711d 100644
--- a/svtools/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
index 8af6b2ae7467..82e509f1ce08 100644
--- a/svtools/source/uno/makefile.mk
+++ b/svtools/source/uno/makefile.mk
@@ -46,19 +46,20 @@ SRS1NAME=	uno
 SRC1FILES=  unoifac2.src
 
 SLOFILES= \
-            $(SLO)$/unoiface.obj \
-            $(SLO)$/unoevent.obj \
-            $(SLO)$/unoimap.obj \
-            $(SLO)$/toolboxcontroller.obj \
+            $(SLO)$/addrtempuno.obj \
+            $(SLO)$/contextmenuhelper.obj \
             $(SLO)$/framestatuslistener.obj \
-            $(SLO)$/statusbarcontroller.obj \
-            $(SLO)$/genericunodialog.obj \
             $(SLO)$/generictoolboxcontroller.obj \
+            $(SLO)$/genericunodialog.obj \
+            $(SLO)$/miscservices.obj\
+            $(SLO)$/statusbarcontroller.obj \
+            $(SLO)$/toolboxcontroller.obj \
             $(SLO)$/treecontrolpeer.obj \
             $(SLO)$/unocontroltablemodel.obj \
-            $(SLO)$/svtxgridcontrol.obj \
-            $(SLO)$/registerservices.obj\
-            $(SLO)$/contextmenuhelper.obj
+            $(SLO)$/unoevent.obj \
+            $(SLO)$/unoiface.obj \
+            $(SLO)$/unoimap.obj \
+            $(SLO)$/svtxgridcontrol.obj 
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index e5c5aac3c35d..0f7b79720179 100644
--- a/svtools/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -92,11 +92,6 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         xNewKey->createKey (
             OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) );
 
-        xNewKey = xRegistryKey->createKey(
-            OUString::createFromAscii( "/com.sun.star.comp.svtools.PathService/UNO/SERVICES" ) );
-        xNewKey->createKey (
-            OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) );
-
         return sal_True;
     }
     return sal_False;
@@ -135,18 +130,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
                 SvFilterOptionsDialog_CreateInstance,
                 aServiceNames);
         }
-        else if (rtl_str_compare (
-                     pImplementationName, "com.sun.star.comp.svtools.PathService") == 0)
-        {
-            Sequence< OUString > aServiceNames(1);
-            aServiceNames.getArray()[0] =
-                OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" );
-            xFactory = ::cppu::createSingleFactory (
-                reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ),
-                OUString::createFromAscii( pImplementationName ),
-                PathService_CreateInstance,
-                aServiceNames);
-        }
         if ( xFactory.is() )
         {
             xFactory->acquire();
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 19d40c17ce5c..6fc8b0017ad8 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -40,7 +40,7 @@
 #include <tools/rtti.hxx>
 #include <tools/solar.h>
 #include "unoevent.hxx"
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svtools/source/uno/unoifac2.hrc b/svtools/source/uno/unoifac2.hrc
index 4e8cf0303da5..4f46edffdc51 100644
--- a/svtools/source/uno/unoifac2.hrc
+++ b/svtools/source/uno/unoifac2.hrc
@@ -33,7 +33,7 @@
 
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //! Um den �berblick �ber alle benutzten HelpID's zu behalten sind diese
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index a4e003b69682..a1ff1ad2ac3e 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -48,7 +48,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/property.hxx>
 #include <svtools/fmtfield.hxx>
-#include <numuno.hxx>
+#include <svl/numuno.hxx>
 #include <calendar.hxx>
 #include <prgsbar.hxx>
 
diff --git a/svtools/uno/exports.map b/svtools/uno/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/svtools/uno/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svtools/uno/makefile.mk b/svtools/uno/makefile.mk
deleted file mode 100644
index 8f61c7100508..000000000000
--- a/svtools/uno/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=svtools
-TARGET=svtmisc.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/addrtempuno.obj \
-    $(SLO)$/miscservices.obj \
-    $(SLO)$/pathservice.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1OBJS= \
-    $(SLO)$/svtdata.obj \
-    $(SLOFILES)
-
-SHL1LIBS=	\
-    $(SLB)$/filter.uno.lib
-
-SHL1STDLIBS=\
-    $(SVTOOLLIB) \
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(SVLLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(COMPHELPERLIB) \
-    $(VOSLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
index 80596d23e866..51ea7a9fef31 100644
--- a/svtools/util/makefile.mk
+++ b/svtools/util/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #*
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,6 @@ PRJNAME=svtools
 TARGET=svtool
 RESTARGET=svt
 RESTARGETPATCH=svp
-RESTARGETSIMPLE=svs
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
 ENABLE_EXCEPTIONS=TRUE
@@ -49,54 +48,33 @@ USE_LDUMP2=TRUE
 # --- general section ----------------------------------------------------
 
 .IF "$(GUI)"!="UNX"
-LIB3TARGET= $(LB)$/svtool.lib
-LIB3FILES=	$(LB)$/_svt.lib
+LIB2TARGET= $(LB)$/svtool.lib
+LIB2FILES=	$(LB)$/_svt.lib
 .ENDIF
 
-.IF "$(GUI)"!="UNX"
-LIB4TARGET= $(LB)$/isvl.lib
-LIB4FILES=	$(LB)$/_isvl.lib
-.ENDIF
-
-LIB7TARGET= $(SLB)$/svt.lib
-LIB7FILES=	\
-        $(SLB)$/misc.lib		\
-        $(SLB)$/items.lib		\
+LIB1TARGET= $(SLB)$/svt.lib
+LIB1FILES=	\
         $(SLB)$/browse.lib		\
+        $(SLB)$/config.lib	\
+        $(SLB)$/svcontnr.lib	\
         $(SLB)$/ctrl.lib		\
         $(SLB)$/dialogs.lib 	\
         $(SLB)$/edit.lib		\
-        $(SLB)$/unoiface.lib	\
         $(SLB)$/filter.lib		\
+        $(SLB)$/filter.uno.lib	\
         $(SLB)$/igif.lib		\
         $(SLB)$/jpeg.lib		\
         $(SLB)$/ixpm.lib		\
         $(SLB)$/ixbm.lib		\
-        $(SLB)$/numbers.lib 	\
-        $(SLB)$/numbers.uno.lib 	\
         $(SLB)$/wmf.lib 		\
-        $(SLB)$/undo.lib		\
-        $(SLB)$/urlobj.lib		\
+        $(SLB)$/java.lib		\
+        $(SLB)$/misc.lib		\
         $(SLB)$/plugapp.lib 	\
-        $(SLB)$/svcontnr.lib	\
-        $(SLB)$/syslocale.lib   \
-        $(SLB)$/svdde.lib \
         $(SLB)$/svhtml.lib     \
         $(SLB)$/svrtf.lib	\
-        $(SLB)$/heavyconfig.lib 	\
         $(SLB)$/table.lib 	\
-        $(SLB)$/java.lib	
-
-LIB8TARGET= $(SLB)$/svl.lib
-LIB8FILES=	\
-        $(SLB)$/config.lib	\
-        $(SLB)$/filerec.lib \
-        $(SLB)$/filepicker.lib \
-        $(SLB)$/items1.lib	\
-        $(SLB)$/misc1.lib	\
-        $(SLB)$/notify.lib	\
-        $(SLB)$/svarray.lib \
-        $(SLB)$/svsql.lib
+        $(SLB)$/unoiface.lib	\
+        $(SLB)$/urlobj.lib	
 
 # generation of resourcen-lib ----------------------------------------
 
@@ -113,12 +91,6 @@ RESLIB1SRSFILES= \
         $(SRS)$/browse.srs		\
         $(SRS)$/javaerror.srs
 
-RESLIB2NAME=	$(RESTARGETSIMPLE)
-RESLIB2SRSFILES=\
-        $(SRS)$/items1.srs \
-        $(SRS)$/misc1.srs
-
-
 RESLIB3NAME= $(RESTARGETPATCH)
 RESLIB3SRSFILES= \
         $(SRS)$/patchjavaerror.srs
@@ -169,55 +141,16 @@ SHL1STDLIBS+= \
         $(OLEAUT32LIB)
 .ENDIF # WNT
 
-SHL1OBJS= \
-    $(SLO)$/svtdata.obj
-
 SHL1LIBS= \
     $(SLB)$/svt.lib
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1DEPN=$(SHL2TARGETN)
 
 DEF1NAME=	$(SHL1TARGET)
-DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt
 DEFLIB1NAME =svt
 DEF1DES 	=SvTools
 
 
-# --- svtools lite --------------------------------------------------
-
-SHL2TARGET= svl$(DLLPOSTFIX)
-SHL2IMPLIB= _isvl
-SHL2USE_EXPORTS=name
-#Do not link with VCL or any other library that links with VCL
-SHL2STDLIBS= \
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB) 		\
-        $(I18NISOLANGLIB)   \
-        $(UCBHELPERLIB)		\
-        $(COMPHELPERLIB)	\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(VOSLIB)			\
-        $(VCLLIB)			\
-        $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL2STDLIBS+= \
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB)	\
-        $(GDI32LIB)
-.ENDIF # WNT
-
-SHL2LIBS=	$(SLB)$/svl.lib
-
-SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
-
-DEF2NAME=	$(SHL2TARGET)
-DEF2DEPN=	$(MISC)$/$(SHL2TARGET).flt $(SLB)$/svl.lib
-DEFLIB2NAME=svl
-DEF2DES =SvTools lite
-
 # --- g2g application --------------------------------------------------
 
 APP2TARGET	=	g2g
@@ -241,19 +174,14 @@ APP2STDLIBS+=	$(VCLLIB)		\
 # --- Targets ------------------------------------------------------
 
 .IF "$(GUI)"=="UNX"
-SVTTARGETS= $(LB)$/lib$(SHL2TARGET)$(DLLPOST) $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
+SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
 .ELSE
-SVTTARGETS= $(LB)$/isvl.lib \
-            $(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST)
+SVTTARGETS= $(BIN)$/$(SHL1TARGET)$(DLLPOST)
 .ENDIF
 
 # just a quick fix - has to be cleaned up some day...
 .IF "$(L10N-framework)"==""
-ALL: $(SLB)$/svl.lib \
-    $(SLB)$/svt.lib \
-    $(MISC)$/$(SHL2TARGET).flt \
-    $(MISC)$/$(SHL1TARGET).flt \
-    $(MISC)$/$(SHL2TARGET).def \
+ALL: $(SLB)$/svt.lib \
     $(MISC)$/$(SHL1TARGET).def \
     $(SVTTARGETS) \
     ALLTAR
@@ -261,15 +189,4 @@ ALL: $(SLB)$/svl.lib \
 
 .INCLUDE :	target.mk
 
-# --- Svtools-Control-Filter-Datei ---
-
-$(MISC)$/$(SHL1TARGET).flt: svt.flt
-    @echo ------------------------------
-    @echo Making: $@
-    $(TYPE) svt.flt >$@
-
-$(MISC)$/$(SHL2TARGET).flt: svl.flt
-    @echo ------------------------------
-    @echo Making: $@
-    $(TYPE) svl.flt >$@
 
diff --git a/svtools/util/svl.flt b/svtools/util/svl.flt
deleted file mode 100644
index be7de3bce8c5..000000000000
--- a/svtools/util/svl.flt
+++ /dev/null
@@ -1,85 +0,0 @@
-AUTO_CODE
-BrowserDataWin
-BrowserColumn
-ButtonFrame
-CreateLoader
-DdeString
-DlgSource
-DlgExport
-EditWindow
-FileEntry
-GIFLZWDecompressor
-GIFReader
-PNGReader
-ImpDetect
-ImpDraw
-ImpGet
-ImpPut
-ImpSvNum
-JPEGReader
-WMFReader
-EnhWMFReader
-WMFWriter
-LinkStub
-MultiTextLineInfo
-Regexpr
-RemoteControlServer
-RemoteControlService
-RetStream
-SCmdStream
-SbxArrayRef
-SbxBasicFormater
-SbxRes
-SbxVariableRef
-SfxListUndoAction
-SfxPointerEntry
-SfxUINT32s
-SfxULongRangeItem
-SfxULongRanges
-SfxULongRangesItem
-SgfFontLst
-SgfFontOne
-StatementCommand
-StatementControl
-StatementFlow
-StatementList
-StatementSlot
-SVDDE_MISC_CODE
-SvInterfaceClient
-SvImp
-SvStringLockBytes
-svtools
-SVTOOLS_FILTER
-SVTOOLS_CODE
-SVTOOLS_FILTER4
-SVTOOLS_FILTER_CODE
-ValueSetItem
-WMFRecord
-WriteRecord
-XPMReader
-XBMReader
-_grow
-_ImplINetHistoryLoadTimer
-_ImplINetHistoryStoreTimer
-sRTF_
-sHTML_
-SdbSqlScanner
-Sdbyy_scan
-SqlInternalNode
-unnamed
-WEP
-LIBMAIN
-LibMain
-??_7
-??_8
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-0Imp
-Impl@@
-Imp@@
-__CT
-_STL
diff --git a/svtools/util/svt.flt b/svtools/util/svt.flt
deleted file mode 100644
index f021d41b1dca..000000000000
--- a/svtools/util/svt.flt
+++ /dev/null
@@ -1,81 +0,0 @@
-AUTO_CODE
-BrowserDataWin
-BrowserColumn
-ButtonFrame
-CreateLoader
-DdeString
-DlgSource
-DlgExport
-EditWindow
-FileEntry
-GIFLZWDecompressor
-GIFReader
-PNGReader
-ImpDetect
-ImpDraw
-ImpGet
-ImpPut
-ImpSv
-JPEGReader
-WMFReader
-EnhWMFReader
-WMFWriter
-LinkStub
-MultiTextLineInfo
-Regexpr
-RemoteControlServer
-RemoteControlService
-RetStream
-SCmdStream
-SbxArrayRef
-SbxBasicFormater
-SbxRes
-SbxVariableRef
-SfxListUndoAction
-SfxPointerEntry
-SfxUINT32s
-SfxULongRangeItem
-SfxULongRanges
-SfxULongRangesItem
-SgfFontLst
-SgfFontOne
-StatementCommand
-StatementControl
-StatementFlow
-StatementList
-StatementSlot
-SVDDE_MISC_CODE
-SvInterfaceClient
-SvImp
-SvStringLockBytes
-SVTOOLS_FILTER
-SVTOOLS_CODE
-SVTOOLS_FILTER4
-SVTOOLS_FILTER_CODE
-ValueSetItem
-WMFRecord
-WriteRecord
-XPMReader
-XBMReader
-_grow
-_ImplINetHistoryLoadTimer
-_ImplINetHistoryStoreTimer
-sRTF_
-sHTML_
-unnamed
-svtools\
-WEP
-LIBMAIN
-LibMain
-??_7
-??_8
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-0Imp
-Impl@@
-Imp@@
-__CT
diff --git a/svtools/workben/unodialog/udlg_global.hrc b/svtools/workben/unodialog/udlg_global.hrc
index 71a67cd2b7e8..bde0e5e86ce2 100644
--- a/svtools/workben/unodialog/udlg_global.hrc
+++ b/svtools/workben/unodialog/udlg_global.hrc
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_UDLG_GLOBAL_HRC
 #define SVTOOLS_UDLG_GLOBAL_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 //=====================================================================
 //= bases
diff --git a/svx/inc/bolnitem.hxx b/svx/inc/bolnitem.hxx
index bfb55d676866..22040d790c71 100644
--- a/svx/inc/bolnitem.hxx
+++ b/svx/inc/bolnitem.hxx
@@ -34,7 +34,7 @@
 
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/bulitem.hxx b/svx/inc/bulitem.hxx
index b0adc0d4dd9f..cae4fbcc24ef 100644
--- a/svx/inc/bulitem.hxx
+++ b/svx/inc/bulitem.hxx
@@ -66,7 +66,7 @@
 #define VALID_STYLE         0x0040
 #define VALID_PREVTEXT      0x0080
 #define VALID_FOLLOWTEXT    0x0100
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/font.hxx>
 #include <goodies/grfmgr.hxx>
 
diff --git a/svx/inc/charhiddenitem.hxx b/svx/inc/charhiddenitem.hxx
index ea36786a503b..c11abea5145d 100644
--- a/svx/inc/charhiddenitem.hxx
+++ b/svx/inc/charhiddenitem.hxx
@@ -32,8 +32,8 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 // class SvxCharHiddenItem -------------------------------------------------
diff --git a/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx
index a15824e0790c..ffaa10c71360 100644
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/chrtitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 //------------------------------------------------------------------------
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx
index f17ecfbc6983..3e76dc7a5fe1 100644
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/clipboardctl.hxx
@@ -33,7 +33,7 @@
 
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/ctrlitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx
index cdb62e84fb66..b304c0796bfc 100644
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/clipfmtitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 // class SvxClipboardFmtItem ----------------------------------------------
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx
index 866db4a6c3fd..9cf995814674 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/dlgutil.hxx
@@ -34,8 +34,8 @@
 #ifndef _FIELD_HXX
 #include <vcl/field.hxx>
 #endif
-#include <svtools/poolitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 // macro -----------------------------------------------------------------
diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx
index 5e5e10725bf6..f9bb93b47136 100644
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/drawitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/editund2.hxx b/svx/inc/editund2.hxx
index bb693183136d..65c83dd4f0e8 100644
--- a/svx/inc/editund2.hxx
+++ b/svx/inc/editund2.hxx
@@ -32,7 +32,7 @@
 #define _EDITUND2_HXX
 
 #include "svx/svxdllapi.h"
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 class ImpEditEngine;
 
diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx
index 35e63fb55a1c..b707cae39f98 100644
--- a/svx/inc/extrusioncontrols.hxx
+++ b/svx/inc/extrusioncontrols.hxx
@@ -31,7 +31,7 @@
 #define _SVX_EXTRUSION_CONTROLS_HXX
 
 #include <svtools/valueset.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svtools/svtreebx.hxx>
 #ifndef _SV_BUTTON_HXX
diff --git a/svx/inc/flstitem.hxx b/svx/inc/flstitem.hxx
index 72b1001a3c39..f41970cc79da 100644
--- a/svx/inc/flstitem.hxx
+++ b/svx/inc/flstitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index b5089d663c72..5c3acad950e6 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -31,10 +31,9 @@
 #define _SVX_FMHELP_HRC
 
 // include     -----------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
-
 #define HID_DLG_DBMSG                           ( HID_FORMS_START +   1)
 #define HID_FORM_NAVIGATOR                      ( HID_FORMS_START +   2)
 #define HID_FORM_NAVIGATOR_WIN                  ( HID_FORMS_START +   3)
@@ -45,7 +44,7 @@
 #define HID_FM_DLG_SEARCH                       ( HID_FORMS_START +   8)
 #define HID_SEARCH_TEXT                         ( HID_FORMS_START +   9)
 #define HID_SEARCH_ALLFIELDS                    ( HID_FORMS_START +  10)
-#define HID_SEARCH_SINGLEFIELD                  ( HID_FORMS_START +  11)
+//#define HID_SEARCH_SINGLEFIELD                  ( HID_FORMS_START +  11)
 #define HID_SEARCH_FIELDSELECTION               ( HID_FORMS_START +  12)
 #define HID_SEARCH_POSITION                     ( HID_FORMS_START +  13)
 #define HID_SEARCH_FORMATTER                    ( HID_FORMS_START +  14)
@@ -75,9 +74,9 @@
 #define HID_XFORMS_NAMESPACEITEM_DLG            ( HID_FORMS_START +  38)
 #define HID_XFORMS_NAMESPACEITEM_LIST           ( HID_FORMS_START +  39)
 #define HID_XFORMS_MANAGENAMESPACE_DLG          ( HID_FORMS_START +  40)
-#define HID_TP_XFORMS_INSTANCE                  ( HID_FORMS_START +  41)
-#define HID_TP_XFORMS_SUBMISSION                ( HID_FORMS_START +  42)
-#define HID_TP_XFORMS_BINDING                   ( HID_FORMS_START +  43)
+//#define HID_TP_XFORMS_INSTANCE                  ( HID_FORMS_START +  41)
+//#define HID_TP_XFORMS_SUBMISSION                ( HID_FORMS_START +  42)
+//#define HID_TP_XFORMS_BINDING                   ( HID_FORMS_START +  43)
 #define HID_MN_XFORMS_MODELS_ADD                ( HID_FORMS_START +  44)
 #define HID_MN_XFORMS_MODELS_EDIT               ( HID_FORMS_START +  45)
 #define HID_MN_XFORMS_MODELS_REMOVE             ( HID_FORMS_START +  46)
@@ -103,7 +102,6 @@
     // if you add a new define here, please adjust the overflow check
     // at the end of the file!!
 
-
 // -----------------------------------------------------------------------
 // "Uberlaufpr"ufung -----------------------------------------------------
 // -----------------------------------------------------------------------
diff --git a/svx/inc/fontitem.hxx b/svx/inc/fontitem.hxx
index da0ee972954b..c6d0087382a5 100644
--- a/svx/inc/fontitem.hxx
+++ b/svx/inc/fontitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/string.hxx>
 #ifndef _FONT_HXX //autogen
 #include <vcl/font.hxx>
diff --git a/svx/inc/fwdtitem.hxx b/svx/inc/fwdtitem.hxx
index 14cf9559210f..8a02474f525c 100644
--- a/svx/inc/fwdtitem.hxx
+++ b/svx/inc/fwdtitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 
 // class SvxFontWidthItem -----------------------------------------------
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 5eac53593608..119146fe62e7 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -37,7 +37,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/toolbox.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/miscopt.hxx>
 #include "galbrws.hxx"
 
diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx
index d2cdbcd68847..2a986ea60ba8 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/galctrl.hxx
@@ -41,12 +41,12 @@
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/sound.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/brwbox.hxx>
 #include <goodies/grfmgr.hxx>
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "svx/svxdllapi.h"
 
 // ------------
@@ -95,6 +95,7 @@ public:
                         ~GalleryPreview();
 
     void                SetGraphic( const Graphic& rGraphic ) { aGraphicObj.SetGraphic( rGraphic ); }
+    bool                SetGraphic( const INetURLObject& );
     void                PreviewMedia( const INetURLObject& rURL );
 };
 
diff --git a/svx/inc/galdlg.hxx b/svx/inc/galdlg.hxx
deleted file mode 100644
index fb07dcadba6b..000000000000
--- a/svx/inc/galdlg.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: galdlg.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_GALDLG_HXX_
-#define _SVX_GALDLG_HXX_
-
-
-#include <vos/thread.hxx>
-#include <bootstrp/sstring.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/sound.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/transfer.hxx>
-#include <goodies/grfmgr.hxx>
-#include <sfx2/tabdlg.hxx>
-#include "galctrl.hxx"
-#include "galmisc.hxx"
-
-// ------------
-// - Forwards -
-// ------------
-
-class GalleryTheme;
-
-// ----------------
-// - ExchangeData -
-// ----------------
-
-struct ExchangeData
-{
-    GalleryTheme*   pTheme;
-    String          aEditedTitle;
-    Date            aThemeChangeDate;
-    Time            aThemeChangeTime;
-};
-
-
-#endif // _SVX_GALDLG_HXX_
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 88b632061f0c..556399b2a5f3 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -36,27 +36,10 @@
 // - Defines -
 // -----------
 
-// Gallery-TabDialoge/-TabPages
-#define RID_SVXTABDLG_GALLERY                   (RID_SVX_GALLERY_START)
-#define RID_SVXTABPAGE_GALLERY_GENERAL          (RID_SVX_GALLERY_START + 1)
-
-#define RID_SVXTABDLG_GALLERYTHEME              (RID_SVX_GALLERY_START + 2)
-#define RID_SVXTABPAGE_GALLERYTHEME_GENERAL     (RID_SVX_GALLERY_START + 3)
-#define RID_SVXTABPAGE_GALLERYTHEME_FILES       (RID_SVX_GALLERY_START + 4)
-
 // Dialoge
 #define RID_SVXDLG_GALLERYBROWSER               (RID_SVX_GALLERY_START + 5)
-#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS      (RID_SVX_GALLERY_START + 6)
-#define RID_SVXDLG_GALLERY_TAKE_PROGRESS        (RID_SVX_GALLERY_START + 7)
-#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS   (RID_SVX_GALLERY_START + 8)
-#define RID_SVXDLG_GALLERY_THEMEID              (RID_SVX_GALLERY_START + 9)
 
 // Gallery-Strings
-#define RID_SVXSTR_GALLERY_ACTUALIZE            (RID_SVX_GALLERY_START + 10)
-#define RID_SVXSTR_GALLERY_FOPENERROR           (RID_SVX_GALLERY_START + 11)
-#define RID_SVXSTR_GALLERY_NOFILES              (RID_SVX_GALLERY_START + 12)
-#define RID_SVXSTR_GALLERY_NOTHEME              (RID_SVX_GALLERY_START + 13)
-#define RID_SVXSTR_GALLERY_DELETEOBJ            (RID_SVX_GALLERY_START + 14)
 #define RID_SVXSTR_EXTFORMAT1_SYS               (RID_SVX_GALLERY_START + 15)
 #define RID_SVXSTR_EXTFORMAT1_UI                (RID_SVX_GALLERY_START + 16)
 #define RID_SVXSTR_EXTFORMAT2_SYS               (RID_SVX_GALLERY_START + 17)
@@ -67,42 +50,38 @@
 #define RID_SVXSTR_EXTFORMAT4_UI                (RID_SVX_GALLERY_START + 22)
 #define RID_SVXSTR_EXTFORMAT5_SYS               (RID_SVX_GALLERY_START + 23)
 #define RID_SVXSTR_EXTFORMAT5_UI                (RID_SVX_GALLERY_START + 24)
+#define RID_SVXSTR_GALLERY_FOPENERROR           (RID_SVX_GALLERY_START + 11)
+#define RID_SVXSTR_GALLERY_NOTHEME              (RID_SVX_GALLERY_START + 13)
+#define RID_SVXSTR_GALLERY_DELETEOBJ            (RID_SVX_GALLERY_START + 14)
 #define RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS   (RID_SVX_GALLERY_START + 25)
 #define RID_SVXSTR_GALLERY_FILTER               (RID_SVX_GALLERY_START + 26)
 #define RID_SVXSTR_GALLERY_LENGTH               (RID_SVX_GALLERY_START + 27)
 #define RID_SVXSTR_GALLERY_SIZE                 (RID_SVX_GALLERY_START + 28)
 #define RID_SVXSTR_GALLERY_DELETEDD             (RID_SVX_GALLERY_START + 29)
-#define RID_SVXSTR_GALLERY_SEARCH               (RID_SVX_GALLERY_START + 30)
 #define RID_SVXSTR_GALLERY_SGIERROR             (RID_SVX_GALLERY_START + 31)
 #define RID_SVXSTR_GALLERY_NEWTHEME             (RID_SVX_GALLERY_START + 32)
 #define RID_SVXSTR_GALLERY_BROWSER              (RID_SVX_GALLERY_START + 33)
 #define RID_SVXSTR_GALLERY_THEMEERR             (RID_SVX_GALLERY_START + 34)
+#define RID_SVXSTR_GALLERY_IMPORTTHEME          (RID_SVX_GALLERY_START + 41)
+#define RID_SVXSTR_GALLERY_CREATETHEME          (RID_SVX_GALLERY_START + 42)
+#define RID_SVXSTR_GALLERY_DIALOGID             (RID_SVX_GALLERY_START + 80)
+#define RID_SVXSTR_GALLERY_DELETETHEME          (RID_SVX_GALLERY_START + 83)
+#define RID_SVXSTR_GALLERY_TITLE                (RID_SVX_GALLERY_START + 84)
+#define RID_SVXSTR_GALLERY_PATH                 (RID_SVX_GALLERY_START + 85)
+#define RID_SVXSTR_GALLERY_ICONVIEW             (RID_SVX_GALLERY_START + 86)
+#define RID_SVXSTR_GALLERY_LISTVIEW             (RID_SVX_GALLERY_START + 87)
 
 // Controls fuer Gallery
-#define RID_SVXDLG_GALLERY_CBX                  (RID_SVX_GALLERY_START + 35)
 #define RID_SVXMN_GALLERY1                      (RID_SVX_GALLERY_START + 36)
 #define RID_SVXMN_GALLERY2                      (RID_SVX_GALLERY_START + 37)
 
-// zus. Strings
-#define RID_SVXSTR_GALLERYPROPS_THEME           (RID_SVX_GALLERY_START + 38)
-#define RID_SVXSTR_GALLERYPROPS_OBJECT          (RID_SVX_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME        (RID_SVX_GALLERY_START + 40)
-#define RID_SVXSTR_GALLERY_IMPORTTHEME          (RID_SVX_GALLERY_START + 41)
-#define RID_SVXSTR_GALLERY_CREATETHEME          (RID_SVX_GALLERY_START + 42)
-#define RID_SVXSTR_GALLERY_READONLY             (RID_SVX_GALLERY_START + 43)
-#define RID_SVXSTR_GALLERY_ALLFILES             (RID_SVX_GALLERY_START + 44)
-
 // Images
 #define RID_SVXBMP_GALLERY                      (RID_SVX_GALLERY_START + 46)
 #define RID_SVXBMP_THEME                        (RID_SVX_GALLERY_START + 47)
 #define RID_SVXBMP_THEME_NORMAL                 (RID_SVX_GALLERY_START + 48)
-#define RID_SVXBMP_THEME_NORMAL_BIG             (RID_SVX_GALLERY_START + 49)
 #define RID_SVXBMP_THEME_IMPORTED               (RID_SVX_GALLERY_START + 50)
-#define RID_SVXBMP_THEME_IMPORTED_BIG           (RID_SVX_GALLERY_START + 51)
 #define RID_SVXBMP_THEME_READONLY               (RID_SVX_GALLERY_START + 52)
-#define RID_SVXBMP_THEME_READONLY_BIG           (RID_SVX_GALLERY_START + 53)
 #define RID_SVXBMP_THEME_DEFAULT                (RID_SVX_GALLERY_START + 54)
-#define RID_SVXBMP_THEME_DEFAULT_BIG            (RID_SVX_GALLERY_START + 55)
 #define RID_SVXIMG_GALLERY_VIEW_ICON            (RID_SVX_GALLERY_START + 56)
 #define RID_SVXIMG_GALLERY_VIEW_LIST            (RID_SVX_GALLERY_START + 57)
 #define RID_SVXIMG_GALLERY_VIEW_ICON_HC         (RID_SVX_GALLERY_START + 58)
@@ -119,16 +98,6 @@
 #define RID_SVXBMP_GALLERY_SOUND_7              (RID_SVX_GALLERY_START + 68)
 #define RID_SVXBMP_GALLERY_MEDIA                (RID_SVX_GALLERY_START + 71)
 
-// weitere IDs
-#define RID_SVXSTR_GALLERY_DIALOGID             (RID_SVX_GALLERY_START + 80)
-#define RID_SVXSTR_GALLERY_ID_EXISTS            (RID_SVX_GALLERY_START + 81)
-#define RID_SVXDLG_GALLERY_TITLE                (RID_SVX_GALLERY_START + 82)
-#define RID_SVXSTR_GALLERY_DELETETHEME          (RID_SVX_GALLERY_START + 83)
-#define RID_SVXSTR_GALLERY_TITLE                (RID_SVX_GALLERY_START + 84)
-#define RID_SVXSTR_GALLERY_PATH                 (RID_SVX_GALLERY_START + 85)
-#define RID_SVXSTR_GALLERY_ICONVIEW             (RID_SVX_GALLERY_START + 86)
-#define RID_SVXSTR_GALLERY_LISTVIEW             (RID_SVX_GALLERY_START + 87)
-
 // lokale Defines
 #define BTN_OK 1
 #define BTN_CANCEL 1
@@ -194,8 +163,6 @@
 #define BTN_THEME 2
 #define BTN_RECOVER 3
 #define BTN_CLOSEBROWSER 7
-#define BTN_MADDIN1 8
-#define BTN_MADDIN2 9
 #define LBX_THEME2 1
 #define FL_THEME2 1
 #define BTN_NEWTHEME2 1
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index a33a1b5cbd81..e2a5bee41dd6 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -33,6 +33,7 @@
 
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
+#include "svx/galmisc.hxx"
 
 // -----------
 // - Defines -
@@ -50,21 +51,6 @@
 #define SGA_FORMAT_SVDRAW               0x00010000L
 #define SGA_FORMAT_ALL                  0xFFFFFFFFL
 
-// --------------
-// - SgaObjKind -
-// --------------
-
-enum SgaObjKind
-{
-    SGA_OBJ_NONE = 0,   // Abstraktes Objekt
-    SGA_OBJ_BMP = 1,    // Bitmap-Objekt
-    SGA_OBJ_SOUND = 2,  // Sound-Objekt
-    SGA_OBJ_VIDEO = 3,  // Video-Objekt
-    SGA_OBJ_ANIM = 4,   // Animations-Objekt
-    SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt
-    SGA_OBJ_INET = 6    // Grafik aus dem Internet
-};
-
 // ----------------
 // - GalSoundType -
 // ----------------
diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index 15a1c6fbb1e2..96834327a203 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/galtheme.hxx
@@ -38,17 +38,21 @@
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/salctype.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/transfer.hxx>
 #include <sot/storage.hxx>
-#include "galobj.hxx"
-#include "galmisc.hxx"
-#include "gallery1.hxx"
+#include <svx/svdmodel.hxx>
+//#include <svx/galobj.hxx>
+#include <svx/galmisc.hxx>
+//#include <svx/gallery1.hxx>
 
 // -----------------
 // - GalleryObject -
 // -----------------
+// --------------
+// - SgaObjKind -
+// --------------
 
 struct GalleryObject
 {
@@ -60,6 +64,11 @@ struct GalleryObject
 
 DECLARE_LIST( GalleryObjectList, GalleryObject* )
 
+class GalleryThemeEntry;
+class SgaObject;
+class FmFormModel;
+class ListBox;
+
 // -----------------
 // - GalDragParams -
 // -----------------
@@ -116,7 +125,7 @@ private:
     ULONG                       ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); }
     INetURLObject               ImplGetURL( const GalleryObject* pObject ) const;
     INetURLObject               ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN );
-    void                        ImplSetModified( BOOL bModified ) { pThm->SetModified( bModified ); }
+    void                        ImplSetModified( BOOL bModified );
     void                        ImplBroadcast( ULONG nUpdatePos );
 
                                 GalleryTheme();
@@ -136,20 +145,20 @@ public:
     SVX_DLLPUBLIC BOOL                      RemoveObject( ULONG nPos );
     BOOL                        ChangeObjectPos( ULONG nOldPos, ULONG nNewPos );
 
-    const String&               GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); }
-    const String&               GetRealName() const { return pThm->GetThemeName(); }
+    SVX_DLLPUBLIC const String& GetName() const;
+    const String&               GetRealName() const;
     const String&               GetImportName() const { return aImportName; }
     void                        SetImportName(const String& rImportName) { aImportName = rImportName; }
 
     const String&               GetDestDir() const { return m_aDestDir; }
     void                        SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; }
 
-    const INetURLObject&        GetThmURL() const { return pThm->GetThmURL(); }
-    const INetURLObject&        GetSdgURL() const { return pThm->GetSdgURL(); }
-    const INetURLObject&        GetSdvURL() const { return pThm->GetSdvURL(); }
+    const INetURLObject&        GetThmURL() const;
+    SVX_DLLPUBLIC const INetURLObject&      GetSdgURL() const;
+    const INetURLObject&        GetSdvURL() const;
 
-    UINT32                      GetId() const { return pThm->GetId(); }
-    void                        SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
+    SVX_DLLPUBLIC UINT32        GetId() const;
+    void                        SetId( UINT32 nNewId, BOOL bResetThemeName );
 
     void                        SetDragging( BOOL bSet ) { bDragging = bSet; }
     BOOL                        IsDragging() const { return bDragging; }
@@ -164,12 +173,12 @@ public:
     void                        SetDragPos( ULONG nPos ) { nDragPos = nPos; }
     ULONG                       GetDragPos() const { return nDragPos; }
 
-    BOOL                        IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
+    BOOL                        IsThemeNameFromResource() const;
 
-    BOOL                        IsImported() const { return pThm->IsImported(); }
-    BOOL                        IsReadOnly() const { return pThm->IsReadOnly(); }
-    BOOL                        IsDefault() const { return pThm->IsDefault(); }
-    BOOL                        IsModified() const { return pThm->IsModified(); }
+    SVX_DLLPUBLIC BOOL          IsImported() const;
+    SVX_DLLPUBLIC BOOL          IsReadOnly() const;
+    SVX_DLLPUBLIC BOOL          IsDefault() const;
+    BOOL                        IsModified() const;
 
     SVX_DLLPUBLIC void                      Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
     void                        AbortActualize() { bAbortActualize = TRUE; }
@@ -216,6 +225,7 @@ public:
 
     SvStream&                   WriteData( SvStream& rOut ) const;
     SvStream&                   ReadData( SvStream& rIn );
+    static SVX_DLLPUBLIC void   InsertAllThemes( ListBox& rListBox );
 };
 
 SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme );
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/grafctrl.hxx
index b0a27462fb04..ea5a7236f6fe 100644
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/grafctrl.hxx
@@ -31,8 +31,8 @@
 #ifndef _SVX_GRAFCTRL_HXX
 #define _SVX_GRAFCTRL_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/lstner.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 3cac79c92f80..bc36634e24c3 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -31,794 +31,258 @@
 #define _SVX_HELPID_HRC
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
-// Help-Ids --------------------------------------------------------------
-
-#define HID_GALLERY_BROWSER                     (HID_SVX_START +   0)
-#define HID_GALLERY_THEME                       (HID_SVX_START +   1)
-#define HID_GALLERY_NEW_THEME                   (HID_SVX_START +   2)
-#define HID_GALLERY_RENAME_THEME                (HID_SVX_START +   3)
-#define HID_GALLERY_SEARCH                      (HID_SVX_START +   4)
-#define HID_GALLERY_APPLY                       (HID_SVX_START +   5)
-#define HID_GALLERY_ACTUALIZE                   (HID_SVX_START +   6)
-#define HID_GALLERY_WINDOW                      (HID_SVX_START +   7)
-#define HID_GALLERY_RENAME                      (HID_SVX_START +   8)
-#define HID_GALLERY_PROPERTIES                  (HID_SVX_START +   9)
-
-#define HID_TRANS_POSITION                      (HID_SVX_START +  10)
-#define HID_TRANS_SIZE                          (HID_SVX_START +  11)
-#define HID_TRANS_ANGLE                         (HID_SVX_START +  12)
-#define HID_TRANS_SLANT                         (HID_SVX_START +  13)
-
-#define HID_TABULATOR                           (HID_SVX_START +  14)
-#define HID_BORDER                              (HID_SVX_START +  15)
-#define HID_BACKGROUND                          (HID_SVX_START +  16)
-#define HID_ALIGNMENT                           (HID_SVX_START +  17)
-#define HID_NUMBERFORMAT                        (HID_SVX_START +  18)
-#define HID_CAPTION                             (HID_SVX_START +  19)
-
-#define HID_FORMAT_PAGE                         (HID_SVX_START +  20)
-#define HID_FORMAT_HEADER                       (HID_SVX_START +  21)
-#define HID_FORMAT_FOOTER                       (HID_SVX_START +  22)
-#define HID_FORMAT_CHAR_STD                     (HID_SVX_START +  23)
-#define HID_FORMAT_CHAR_EXT                     (HID_SVX_START +  24)
-#define HID_FORMAT_PARAGRAPH_STD                (HID_SVX_START +  25)
-#define HID_FORMAT_PARAGRAPH_EXT                (HID_SVX_START +  26)
-#define HID_FORMAT_PARAGRAPH_ALIGN              (HID_SVX_START +  27)
-
-#define HID_AREA_AREA                           (HID_SVX_START +  30)
-#define HID_AREA_HATCH                          (HID_SVX_START +  31)
-#define HID_AREA_BITMAP                         (HID_SVX_START +  32)
-#define HID_AREA_GRADIENT                       (HID_SVX_START +  33)
-#define HID_LINE_LINE                           (HID_SVX_START +  34)
-#define HID_LINE_DEF                            (HID_SVX_START +  35)
-#define HID_LINE_ENDDEF                         (HID_SVX_START +  36)
-#define HID_AREA_SHADOW                         (HID_SVX_START +  37)
-#define HID_AREA_TRANSPARENCE                   (HID_SVX_START +  38)
-
-#define HID_OPTIONS_COLOR                       (HID_SVX_START +  40)
-#define HID_OPTIONS_SAVE                        (HID_SVX_START +  41)
-#define HID_OPTIONS_PATH                        (HID_SVX_START +  42)
-#define HID_OPTIONS_GENERAL                     (HID_SVX_START +  43)
-#define HID_OPTIONS_LINGU                       (HID_SVX_START +  44)
-#define HID_OPTIONS_SPELL                       (HID_SVX_START +  45)
-#define HID_OPTIONS_DICT_NEW                    (HID_SVX_START +  46)
-#define HID_OPTIONS_DICT_EDIT                   (HID_SVX_START +  47)
-#define HID_OPTIONS_GRID                        (HID_SVX_START +  48)
-#define HID_OPTIONS_INET                        (HID_SVX_START +  49)
-
-#define HID_DLG_NAME                            (HID_SVX_START +  50)
-#define HID_DLG_MESSBOX                         (HID_SVX_START +  51)
-#define HID_SEARCHATTR                          (HID_SVX_START +  52)
-#define HID_HYPHENATE                           (HID_SVX_START +  53)
-#define HID_SPELLCHECK                          (HID_SVX_START +  54)
-#define HID_SEARCHSIMILARITY                    (HID_SVX_START +  55)
-#define HID_PASSWORD                            (HID_SVX_START +  56)
-#define HID_MULTIPATH                           (HID_SVX_START +  57)
-
-#define HID_GALLERY_PROPERTIES_GENERAL          (HID_SVX_START +  58)
-
-// #i68101#
-#define HID_DLG_OBJECT_NAME                     (HID_SVX_START +  59)
-#define HID_DLG_OBJECT_TITLE_DESC               (HID_SVX_START +  60)
-
-//#define HID_BASICIDE_OBJECTS                  (HID_SVX_START +  59)
-//#define HID_MACRO_OPTIONS                     (HID_SVX_START +  60)
-//#define HID_BASICIDE_BRKPNTS                  (HID_SVX_START +  61)
-//#define HID_BASICIDE_MODULS                   (HID_SVX_START +  62)
-//#define HID_BASICIDE_LIBS_TP                  (HID_SVX_START +  63)
-//#define HID_BASICIDE_LIBS_DLG                 (HID_SVX_START +  64)
-//#define HID_BASICIDE_CONTROLS                 (HID_SVX_START +  65)
-//#define HID_BASICIDE_MACROS                   (HID_SVX_START +  66)
-//#define HID_BASICIDE_LIBS                     (HID_SVX_START +  67)
-//#define HID_BASICIDE_ORG_TC                   (HID_SVX_START +  68)
-
-#define HID_POPUP_COLOR                         (HID_SVX_START +  70)
-#define HID_POPUP_BRUSH                         (HID_SVX_START +  71)
-#define HID_POPUP_FRAME                         (HID_SVX_START +  72)
-#define HID_POPUP_LINE                          (HID_SVX_START +  73)
-
-#define HID_OPTIONS_MAIL                        (HID_SVX_START +  74)
-#define HID_THES_LANGUAGE                       (HID_SVX_START +  75)
-
-#define HID_OPTIONS_PROXY                       (HID_SVX_START +  76)
-#define HID_OPTIONS_CACHE                       (HID_SVX_START +  77)
-#define HID_OPTIONS_TYPE                        (HID_SVX_START +  78)
-#define HID_OPTIONS_SEARCH                      (HID_SVX_START +  79)
-
-//#define HID_BASICIDE_MODULES_TREE             (HID_SVX_START +  80)
-//#define HID_BASICIDE_LIBS_TREE                (HID_SVX_START +  81)
-//#define HID_BASICIDE_LIBSDLG_TREE             (HID_SVX_START +  82)
-//#define HID_BASICIDE_OBJECTCAT                (HID_SVX_START +  83)
-
-#define HID_PAGE_LIGHT3D                        (HID_SVX_START +  84)
-#define HID_PAGE_MEASURE                        (HID_SVX_START +  85)
-#define HID_PAGE_TEXTATTR                       (HID_SVX_START +  86)
-#define HID_PAGE_3DATTR                         (HID_SVX_START +  87)
-#define HID_CTRL_COLOR                          (HID_SVX_START +  88)
-#define HID_PAGE_CONNECTION                     (HID_SVX_START +  89)
-#define HID_PAGE_CONNECTION_CTL_PREVIEW         (HID_SVX_START +  90)
-#define HID_PAGE_DISTRIBUTE                     (HID_SVX_START +  91)
-
-#define HID_WIN_FONTWORK_ALIGN                  (HID_SVX_START +  92)
-#define HID_WIN_FONTWORK_CHARSPACE              (HID_SVX_START +  93)
-#define HID_CTL_FONTWORK_FAVORITES              (HID_SVX_START +  94)
-
-#define HID_BACKGROUND_CTL_BGDCOLORSET          (HID_SVX_START + 100)
-#define HID_BACKGROUND_CTL_PATTERNSET           (HID_SVX_START + 101)
-#define HID_BACKGROUND_CTL_PATCOLORSET          (HID_SVX_START + 102)
-#define HID_BACKGROUND_CTL_POSITION             (HID_SVX_START + 103)
-#define HID_BMPMASK_CTL_QCOL_1                  (HID_SVX_START + 104)
-#define HID_BMPMASK_CTL_PIPETTE                 (HID_SVX_START + 105)
-#define HID_BORDER_CTL_PRESETS                  (HID_SVX_START + 106)
-#define HID_BORDER_CTL_SHADOWS                  (HID_SVX_START + 107)
-#define HID_CHARMAP_CTL_SHOWSET                 (HID_SVX_START + 108)
-#define HID_CHARMAP_CTL_SHOWTEXT                (HID_SVX_START + 109)
-#define HID_CHARMAP_CTL_SHOWCHAR                (HID_SVX_START + 110)
-#define HID_FONTWORK_CTL_FORMS                  (HID_SVX_START + 111)
-#define HID_LIGHT3D_CTL_LIGHT                   (HID_SVX_START + 112)
-#define HID_MEASURE_CTL_POSITION                (HID_SVX_START + 113)
-#define HID_MEASURE_CTL_PREVIEW                 (HID_SVX_START + 114)
-#define HID_SEARCHATTR_CTL_ATTR                 (HID_SVX_START + 115)
-#define HID_TEXTATTR_CTL_POSITION               (HID_SVX_START + 116)
-#define HID_3DATTR_CTL_DISTANCE                 (HID_SVX_START + 117)
-#define HID_3DATTR_CTL_FOCALLENGTH              (HID_SVX_START + 118)
-#define HID_COLOR_CTL_COLORS                    (HID_SVX_START + 119)
-#define HID_OPTPATH_CTL_PATH                    (HID_SVX_START + 120)
-#define HID_OPTLINGU_CTL_DICTS                  (HID_SVX_START + 121)
-#define HID_OPTINET2_CTL_TYPES                  (HID_SVX_START + 122)
-#define HID_OPTIONS_DICT_DELETE                 (HID_SVX_START + 123)
-
-#define HID_TPCOLOR_RGB_1                       (HID_SVX_START + 124)
-#define HID_TPCOLOR_RGB_2                       (HID_SVX_START + 125)
-#define HID_TPCOLOR_RGB_3                       (HID_SVX_START + 126)
-#define HID_TPCOLOR_CMYK_1                      (HID_SVX_START + 127)
-#define HID_TPCOLOR_CMYK_2                      (HID_SVX_START + 128)
-#define HID_TPCOLOR_CMYK_3                      (HID_SVX_START + 129)
-
-#define HID_BMPMASK_TBI_PIPETTE                 (HID_SVX_START + 130)
-//#define HID_BASICIDE_PROP_BROWSER             (HID_SVX_START + 131)
-#define HID_STYLE_LISTBOX                       (HID_SVX_START + 132)
-
-#define HID_FONTWORK_TBI_STYLE_OFF              (HID_SVX_START + 133)
-#define HID_FONTWORK_TBI_STYLE_ROTATE           (HID_SVX_START + 134)
-#define HID_FONTWORK_TBI_STYLE_UPRIGHT          (HID_SVX_START + 135)
-#define HID_FONTWORK_TBI_STYLE_SLANTX           (HID_SVX_START + 136)
-#define HID_FONTWORK_TBI_STYLE_SLANTY           (HID_SVX_START + 137)
-#define HID_FONTWORK_TBI_ADJUST_MIRROR          (HID_SVX_START + 138)
-#define HID_FONTWORK_TBI_ADJUST_LEFT            (HID_SVX_START + 139)
-#define HID_FONTWORK_TBI_ADJUST_CENTER          (HID_SVX_START + 140)
-#define HID_FONTWORK_TBI_ADJUST_RIGHT           (HID_SVX_START + 141)
-#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE        (HID_SVX_START + 142)
-#define HID_FONTWORK_TBI_SHOWFORM               (HID_SVX_START + 143)
-#define HID_FONTWORK_TBI_OUTLINE                (HID_SVX_START + 144)
-#define HID_FONTWORK_TBI_SHADOW_OFF             (HID_SVX_START + 145)
-#define HID_FONTWORK_TBI_SHADOW_NORMAL          (HID_SVX_START + 146)
-#define HID_FONTWORK_TBI_SHADOW_SLANT           (HID_SVX_START + 147)
-
-#define HID_NUMBERFORMAT_TBI_ADD                (HID_SVX_START + 148)
-#define HID_NUMBERFORMAT_TBI_REMOVE             (HID_SVX_START + 149)
-
-#define HID_CONTDLG_APPLY                       (HID_SVX_START + 150)
-#define HID_CONTDLG_WORKPLACE                   (HID_SVX_START + 151)
-#define HID_CONTDLG_SELECT                      (HID_SVX_START + 152)
-#define HID_CONTDLG_RECT                        (HID_SVX_START + 153)
-#define HID_CONTDLG_CIRCLE                      (HID_SVX_START + 154)
-#define HID_CONTDLG_POLY                        (HID_SVX_START + 155)
-#define HID_CONTDLG_FREEPOLY                    (HID_SVX_START + 156)
-#define HID_CONTDLG_POLYEDIT                    (HID_SVX_START + 157)
-#define HID_CONTDLG_POLYMOVE                    (HID_SVX_START + 158)
-#define HID_CONTDLG_POLYINSERT                  (HID_SVX_START + 159)
-#define HID_CONTDLG_POLYDELETE                  (HID_SVX_START + 160)
-#define HID_CONTDLG_UNDO                        (HID_SVX_START + 161)
-#define HID_CONTDLG_REDO                        (HID_SVX_START + 162)
-#define HID_CONTDLG_AUTOCONTOUR                 (HID_SVX_START + 163)
-#define HID_CONTDLG_PIPETTE                     (HID_SVX_START + 164)
-
-//#define HID_BASICIDE_PROP_BROWSER_LBOX        (HID_SVX_START + 165)
-#define HID_DRAWTOOL_TBX                        (HID_SVX_START + 166)
-#define HID_ALIGN_TBX                           (HID_SVX_START + 167)
-
-#define HID_IMAPDLG_APPLY                       (HID_SVX_START + 168)
-#define HID_IMAPDLG_OPEN                        (HID_SVX_START + 169)
-#define HID_IMAPDLG_SAVEAS                      (HID_SVX_START + 170)
-#define HID_IMAPDLG_SELECT                      (HID_SVX_START + 171)
-#define HID_IMAPDLG_RECT                        (HID_SVX_START + 172)
-#define HID_IMAPDLG_CIRCLE                      (HID_SVX_START + 173)
-#define HID_IMAPDLG_POLY                        (HID_SVX_START + 174)
-#define HID_IMAPDLG_FREEPOLY                    (HID_SVX_START + 175)
-#define HID_IMAPDLG_POLYEDIT                    (HID_SVX_START + 176)
-#define HID_IMAPDLG_POLYMOVE                    (HID_SVX_START + 177)
-#define HID_IMAPDLG_POLYINSERT                  (HID_SVX_START + 178)
-#define HID_IMAPDLG_POLYDELETE                  (HID_SVX_START + 179)
-#define HID_IMAPDLG_UNDO                        (HID_SVX_START + 180)
-#define HID_IMAPDLG_REDO                        (HID_SVX_START + 181)
-#define HID_IMAPDLG_ACTIVE                      (HID_SVX_START + 182)
-#define HID_IMAPDLG_MACRO                       (HID_SVX_START + 183)
-#define HID_IMAPDLG_PROPERTY                    (HID_SVX_START + 184)
-
-#define HID_SVXTBX_ALIGNMENT                    (HID_SVX_START + 185)
-#define HID_SVXTBX_DRAW                         (HID_SVX_START + 186)
-
-#define HID_GALLERY_MN_ADDMENU                  (HID_SVX_START + 187)
-#define HID_GALLERY_MN_ADD                      (HID_SVX_START + 188)
-#define HID_GALLERY_MN_ADD_LINK                 (HID_SVX_START + 189)
-#define HID_GALLERY_MN_BACKGROUND               (HID_SVX_START + 190)
-#define HID_GALLERY_MN_PREVIEW                  (HID_SVX_START + 191)
-#define HID_GALLERY_MN_DELETE                   (HID_SVX_START + 192)
-#define HID_GALLERY_TITLE                       (HID_SVX_START + 193)
-#define HID_GALLERY_TITLE_EDIT                  (HID_SVX_START + 194)
-
-//#define HID_BASICIDE_OBJCAT_SHOW              (HID_SVX_START + 195)
-//#define HID_BASICIDE_OBJCAT_PROPS             (HID_SVX_START + 196)
-//#define HID_BASICIDE_OBJCAT_HELP              (HID_SVX_START + 197)
-
-#define HID_IMPGRF_BTN_STANDARD                 (HID_SVX_START + 198)
-#define HID_IMPGRF_BTN_INTERNET                 (HID_SVX_START + 199)
-#define HID_IMPGRF_BTN_PROPERTIES               (HID_SVX_START + 200)
-#define HID_IMPGRF_BTN_FILTER                   (HID_SVX_START + 201)
-#define HID_IMPGRF_CB_LINK                      (HID_SVX_START + 202)
-#define HID_IMPGRF_CB_PREVIEW                   (HID_SVX_START + 203)
-
-//#define HID_BASICIDE_BRKDLG                   (HID_SVX_START + 204)
-//#define HID_BASICIDE_ACTIV                    (HID_SVX_START + 205)
-//#define HID_BASICIDE_BRKPROPS                 (HID_SVX_START + 206)
-//#define HID_BASICIDE_REMOVEWATCH              (HID_SVX_START + 207)
-//#define HID_BASICIDE_GOTOALL                  (HID_SVX_START + 208)
-
-#define HID_SVX_OPT_EXT_LINGU                   (HID_SVX_START + 209)
-#define HID_CACHE_EXTRA_DLG                     (HID_SVX_START + 210)
-
-#define HID_CONTDLG_TOOLBOX                     (HID_SVX_START + 211)
-#define HID_CONTDLG_GRAPHWND                    (HID_SVX_START + 212)
-
-#define HID_IMAPDLG_TOOLBOX                     (HID_SVX_START + 213)
-#define HID_IMAPDLG_GRAPHWND                    (HID_SVX_START + 214)
-
-#define HID_OPTLINGU_TOOLBOX                    (HID_SVX_START + 215)
-
-#define HID_OPTLDAP_SERVERLIST                  (HID_SVX_START + 216)
-#define HID_OPTLDAP_EDITSERVER                  (HID_SVX_START + 217)
-
-#define HID_SPELLDLG_EXTRAS_AUDIT               (HID_SVX_START + 218)
-#define HID_SPELLDLG_EXTRAS_AUTOCORR            (HID_SVX_START + 219)
-#define HID_SPELLDLG_EXTRAS_THESAURUS           (HID_SVX_START + 220)
-#define HID_SPELLDLG_EXTRAS_OPTIONS             (HID_SVX_START + 221)
-
-#define HID_TPSHADOW_CTRL                       (HID_SVX_START + 222)
-#define HID_TPHATCH_CTRL                        (HID_SVX_START + 223)
-#define HID_TPPOSITION_CTRL                     (HID_SVX_START + 224)
-#define HID_TPSIZE_CTRL                         (HID_SVX_START + 225)
-#define HID_TPROTATION_CTRL1                    (HID_SVX_START + 226)
-#define HID_TPROTATION_CTRL2                    (HID_SVX_START + 227)
-
-#define HID_OPTIONS_SSLSITE                     (HID_SVX_START + 228)
-#define HID_OPTIONS_SSLPERSONAL                 (HID_SVX_START + 229)
-#define HID_OPTIONS_COOKIES                     (HID_SVX_START + 230)
-#define HID_OPTINET2_CTL_COOKIES                (HID_SVX_START + 231)
-#define HID_OPTIONS_CHANNELS                    (HID_SVX_START + 232)
-#define HID_OPTINET2_CTL_CHANNELS               (HID_SVX_START + 233)
-
-#define HID_CAPTION_CTL_TYPE                    (HID_SVX_START + 234)
-
-#define HID_NUMBERFORMAT_TBI_INFO               (HID_SVX_START + 235)
-#define HID_NUMBERFORMAT_LB_FORMAT              (HID_SVX_START + 236)
-
-#define HID_ALIGNMENT_CTR_DIAL                  (HID_SVX_START + 237)
-#define HID_ALIGNMENT_CTR_BORDER_LOCK           (HID_SVX_START + 238)
-
-#define HID_REDLINING_FILTER_PAGE               (HID_SVX_START + 239)
-#define HID_REDLINING_FILTER_CB_DATE            (HID_SVX_START + 240)
-#define HID_REDLINING_FILTER_LB_DATE            (HID_SVX_START + 241)
-#define HID_REDLINING_FILTER_DF_DATE            (HID_SVX_START + 242)
-#define HID_REDLINING_FILTER_TF_DATE            (HID_SVX_START + 243)
-#define HID_REDLINING_FILTER_IB_CLOCK           (HID_SVX_START + 244)
-#define HID_REDLINING_FILTER_DF_DATE2           (HID_SVX_START + 245)
-#define HID_REDLINING_FILTER_TF_DATE2           (HID_SVX_START + 246)
-#define HID_REDLINING_FILTER_IB_CLOCK2          (HID_SVX_START + 247)
-#define HID_REDLINING_FILTER_CB_AUTOR           (HID_SVX_START + 248)
-#define HID_REDLINING_FILTER_LB_AUTOR           (HID_SVX_START + 249)
-#define HID_REDLINING_FILTER_CB_RANGE           (HID_SVX_START + 250)
-#define HID_REDLINING_FILTER_ED_RANGE           (HID_SVX_START + 251)
-#define HID_REDLINING_FILTER_LB_ACTION          (HID_SVX_START + 252)
-#define HID_REDLINING_FILTER_BTN_REF            (HID_SVX_START + 253)
-
-#define HID_REDLINING_VIEW_PAGE                 (HID_SVX_START + 254)
-#define HID_REDLINING_VIEW_DG_VIEW              (HID_SVX_START + 255)
-#define HID_REDLINING_VIEW_PB_ACCEPT            (HID_SVX_START + 256)
-#define HID_REDLINING_VIEW_PB_ACCEPTALL         (HID_SVX_START + 257)
-#define HID_REDLINING_VIEW_PB_REJECT            (HID_SVX_START + 258)
-#define HID_REDLINING_VIEW_PB_REJECTALL         (HID_SVX_START + 259)
-
-#define HID_MNU_ZOOM_200                        (HID_SVX_START + 260)
-#define HID_MNU_ZOOM_150                        (HID_SVX_START + 261)
-#define HID_MNU_ZOOM_100                        (HID_SVX_START + 262)
-#define HID_MNU_ZOOM_75                         (HID_SVX_START + 263)
-#define HID_MNU_ZOOM_50                         (HID_SVX_START + 264)
-#define HID_MNU_ZOOM_OPTIMAL                    (HID_SVX_START + 265)
-#define HID_MNU_ZOOM_PAGE_WIDTH                 (HID_SVX_START + 266)
-#define HID_MNU_ZOOM_WHOLE_PAGE                 (HID_SVX_START + 267)
-
-#define HID_MNU_FUNC_AVG                        (HID_SVX_START + 268)
-#define HID_MNU_FUNC_COUNT2                     (HID_SVX_START + 269)
-#define HID_MNU_FUNC_COUNT                      (HID_SVX_START + 270)
-#define HID_MNU_FUNC_MAX                        (HID_SVX_START + 271)
-#define HID_MNU_FUNC_MIN                        (HID_SVX_START + 272)
-#define HID_MNU_FUNC_SUM                        (HID_SVX_START + 273)
-#define HID_MNU_FUNC_NONE                       (HID_SVX_START + 274)
-#define HID_REDLINING_FILTER_CB_ACTION          (HID_SVX_START + 275)
-
-#define HID_REDLINING_DLG                       (HID_SVX_START + 276)
-#define HID_REDLINING_EDIT                      (HID_SVX_START + 277)
-#define HID_REDLINING_PREV                      (HID_SVX_START + 278)
-#define HID_REDLINING_NEXT                      (HID_SVX_START + 279)
-#define HID_REDLINING_TABCONTROL                (HID_SVX_START + 280)
-
-#define HID_VALUESET_SINGLENUM                  (HID_SVX_START + 281)
-#define HID_VALUESET_BULLET                     (HID_SVX_START + 282)
-#define HID_VALUESET_NUM                        (HID_SVX_START + 283)
-#define HID_VALUESET_NUMBMP                     (HID_SVX_START + 284)
-#define HID_SVXPAGE_PICK_NUM                    (HID_SVX_START + 285)
-#define HID_SVXPAGE_PICK_SINGLE_NUM             (HID_SVX_START + 286)
-#define HID_SVXPAGE_PICK_BMP                    (HID_SVX_START + 287)
-#define HID_SVXPAGE_PICK_BULLET                 (HID_SVX_START + 288)
-#define HID_SVXPAGE_NUM_OPTIONS                 (HID_SVX_START + 289)
-#define HID_SVXPAGE_NUM_POSITION                (HID_SVX_START + 290)
-
-//#define HID_BASICIDE_MODULWINDOW              (HID_SVX_START + 291)
-//#define HID_BASICIDE_DIALOGWINDOW             (HID_SVX_START + 292)
-
-#define HID_REDLINING_FILTER_CB_COMMENT         (HID_SVX_START + 293)
-#define HID_REDLINING_FILTER_ED_COMMENT         (HID_SVX_START + 294)
-#define HID_REDLINING_VIEW_PB_UNDO              (HID_SVX_START + 295)
+#include <svx/exthelpid.hrc>
 
-#define HID_OPTIONS_EXTERN_BROWSER              (HID_SVX_START + 296)
-
-#define HID_EDITENG_SPELLER_START               (HID_SVX_START + 297)
-#define HID_EDITENG_SPELLER_ADDWORD             (HID_SVX_START + 298)
-#define HID_EDITENG_SPELLER_IGNORE              (HID_SVX_START + 299)
-#define HID_EDITENG_SPELLER_AUTOCORRECT         (HID_SVX_START + 300)
-
-#define HID_OPTPATH_HEADERBAR                   (HID_SVX_START + 301)
-#define HID_OPTCOOKIES_HEADERBAR                (HID_SVX_START + 302)
-
-#define HID_TPPAGE_FULLSIZE                     (HID_SVX_START + 303)
-
-#define HID_POPUP_LINEEND                       (HID_SVX_START + 304)
-#define HID_POPUP_LINEEND_CTRL                  (HID_SVX_START + 305)
-
-#define HID_SPELLDLG_SETWORD                    (HID_SVX_START + 306)
-
-#define HID_HYPERLINK_INTERNET                  (HID_SVX_START + 315)
-#define HID_HYPERLINK_MAIL                      (HID_SVX_START + 316)
-#define HID_HYPERLINK_DOCUMENT                  (HID_SVX_START + 317)
-#define HID_HYPERLINK_NEWDOCUMENT               (HID_SVX_START + 318)
-#define HID_HYPERLINK_MARKWND                   (HID_SVX_START + 319)
-
-#define HID_ICCDIALOG_RESET_BTN                 (HID_SVX_START + 320)
-#define HID_ICCDIALOG_CHOICECTRL                (HID_SVX_START + 321)
-
-#define HID_HYPERDLG_INET_PATH                  (HID_SVX_START + 322)
-#define HID_HYPERDLG_MAIL_PATH                  (HID_SVX_START + 323)
-#define HID_HYPERDLG_DOC_PATH                   (HID_SVX_START + 324)
-#define HID_ICCDIALOG_OK_BTN                    (HID_SVX_START + 325)
-#define HID_ICCDIALOG_CANCEL_BTN                (HID_SVX_START + 326)
-
-#define HID_HYPERLINK_MARKWND_APPLY             (HID_SVX_START + 327)
-#define HID_HYPERLINK_MARKWND_CLOSE             (HID_SVX_START + 328)
-#define HID_HYPERLINK_MARKWND_TREE              (HID_SVX_START + 329)
-
-#define HID_AUTOCORR_HELP_START                 (HID_SVX_START + 331)
-#define HID_AUTOCORR_HELP_END                   (HID_SVX_START + 370)
-
-#define HID_SVXPAGE_GRFCROP                     (HID_SVX_START + 375)
-
-// #i58240# set HelpIDs for scrollbars and switcher
-#define HID_CTRL3D_HSCROLL                      (HID_SVX_START + 376)
-#define HID_CTRL3D_VSCROLL                      (HID_SVX_START + 377)
-#define HID_CTRL3D_SWITCHER                     (HID_SVX_START + 378)
-
-#define HID_GRFFILTER                           (HID_SVX_START + 380)
-#define HID_GRFFILTER_INVERT                    (HID_SVX_START + 381)
-#define HID_GRFFILTER_SMOOTH                    (HID_SVX_START + 382)
-#define HID_GRFFILTER_SHARPEN                   (HID_SVX_START + 383)
-#define HID_GRFFILTER_REMOVENOISE               (HID_SVX_START + 384)
-#define HID_GRFFILTER_SOBEL                     (HID_SVX_START + 385)
-#define HID_GRFFILTER_MOSAIC                    (HID_SVX_START + 386)
-#define HID_GRFFILTER_EMBOSS                    (HID_SVX_START + 387)
-#define HID_GRFFILTER_POSTER                    (HID_SVX_START + 388)
-#define HID_GRFFILTER_POPART                    (HID_SVX_START + 389)
-#define HID_GRFFILTER_SEPIA                     (HID_SVX_START + 390)
-#define HID_GRFFILTER_SOLARIZE                  (HID_SVX_START + 391)
-
-#define HID_SVXPAGE_CHAR_NAME                   (HID_SVX_START + 392)
-#define HID_SVXPAGE_CHAR_EFFECTS                (HID_SVX_START + 393)
-#define HID_SVXPAGE_CHAR_POSITION               (HID_SVX_START + 394)
-#define HID_SVXPAGE_CHAR_TWOLINES               (HID_SVX_START + 395)
-#define HID_SVXPAGE_CHAR_EFFECTS_CTRL           (HID_SVX_START + 396)
-
-#define HID_LNGDLG_NUM_PREBREAK                 (HID_SVX_START + 400)
-
-#define HID_EDIT_MODULES                        (HID_SVX_START + 401)
-#define HID_CLB_EDIT_MODULES_DICS               (HID_SVX_START + 402)
-#define HID_CLB_EDIT_MODULES_MODULES            (HID_SVX_START + 403)
-#define HID_CLB_LINGU_MODULES                   (HID_SVX_START + 404)
-#define HID_CLB_LINGU_OPTIONS                   (HID_SVX_START + 405)
-
-#define HID_SVXPAGE_PARA_ASIAN                  (HID_SVX_START + 406)
-
-#define HID_GRFFILTER_EMBOSS_LIGHT              (HID_SVX_START + 408)
-
-#define HID_GALLERY_NEWTHEME                    (HID_SVX_START + 410)
-#define HID_GALLERY_THEMELIST                   (HID_SVX_START + 411)
-
-#define HID_SVX_PROPBRW                         (HID_SVX_START + 412)
-#define HID_SVXDLG_PROPBRW                      (HID_SVX_START + 413)
-#define HID_SVX_DLG_LABELCONTROL                (HID_SVX_START + 414)
-
-#define HID_OPTIONS_ASIAN_LAYOUT                (HID_SVX_START + 415)
-#define HID_SVXTBX_FORM                         (HID_SVX_START + 416)
-
-#define HID_WARN_NAME_DUPLICATE                 (HID_SVX_START + 417)
-#define HID_POPUP_COLOR_CTRL                    (HID_SVX_START + 418)
-
-#define HID_RUBY_DIALOG                         (HID_SVX_START + 419)
-
-#define HID_SVXPAGE_JSEARCH_OPTIONS             (HID_SVX_START + 420)
-
-#define HID_SVXTBX_UNDO_REDO_CTRL               (HID_SVX_START + 421)
-
-#define HID_GALLERY_MN_COPYCLIPBOARD            (HID_SVX_START + 422)
-#define HID_GALLERY_MN_PASTECLIPBOARD           (HID_SVX_START + 423)
-#define HID_GALLERY_PREVIEW                     (HID_SVX_START + 424)
-#define HID_GALLERY_ICONVIEW                    (HID_SVX_START + 425)
-#define HID_GALLERY_LISTVIEW                    (HID_SVX_START + 426)
-#define HID_SVXDLG_FILTER_WARNING               (HID_SVX_START + 427)
-
-#define HID_TRANS_POSITION_SIZE                 (HID_SVX_START + 428)
-#define HID_OPTIONS_COLORCONFIG                 (HID_SVX_START + 429)
-#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME     (HID_SVX_START + 430)
-#define HID_OPTIONS_ACCESSIBILITYCONFIG         (HID_SVX_START + 431)
-
-//no new entries here!! HID_SVX_EXT0_START == 39868
-
-#define HID_FILL_ATTR_LISTBOX                   (HID_SVX_EXT0_START + 1)
-#define HID_FILL_TYPE_LISTBOX                   (HID_SVX_EXT0_START + 2)
-#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN   (HID_SVX_EXT0_START + 3)
-#define HID_OPTIONS_SSO                         (HID_SVX_EXT0_START + 4)
-#define HID_EDITENG_SPELLER_WORDLANGUAGE        (HID_SVX_EXT0_START + 5)
-#define HID_EDITENG_SPELLER_PARALANGUAGE        (HID_SVX_EXT0_START + 6)
-#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME     (HID_SVX_EXT0_START + 7)
-#define HID_OPTIONS_PATHS_SELECTFOLDER          (HID_SVX_EXT0_START + 8)
-#define HID_GALLERY_NEWTHEME_FINDFILES          (HID_SVX_EXT0_START + 9)
-#define HID_GALLERY_NEWTHEME_ADDFILES           (HID_SVX_EXT0_START + 10)
-#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE      (HID_SVX_EXT0_START + 11)
-#define HID_OPTIONS_CTL                         (HID_SVX_EXT0_START + 12)
-#define HID_REDLINING_VIEW_DG_VIEW_TABLE        (HID_SVX_EXT0_START + 13)
-#define HID_REDLINING_VIEW_DG_VIEW_HEADER       (HID_SVX_EXT0_START + 14)
-#define HID_DIALOG_HANGULHANJA                  (HID_SVX_EXT0_START + 15)
-#define HID_SPLDLG_BUTTON_CLOSE                 (HID_SVX_EXT0_START + 16)
-#define HID_SPLDLG_BUTTON_IGNORE                (HID_SVX_EXT0_START + 17)
-#define HID_SPLDLG_BUTTON_IGNOREALL             (HID_SVX_EXT0_START + 18)
-#define HID_SPLDLG_BUTTON_CHANGE                (HID_SVX_EXT0_START + 19)
-#define HID_SPLDLG_BUTTON_CHANGEALL             (HID_SVX_EXT0_START + 20)
-#define HID_HANGULDLG_BUTTON_CLOSE              (HID_SVX_EXT0_START + 21)
-#define HID_HANGULDLG_BUTTON_IGNORE             (HID_SVX_EXT0_START + 22)
-#define HID_HANGULDLG_BUTTON_IGNOREALL          (HID_SVX_EXT0_START + 23)
-#define HID_HANGULDLG_BUTTON_CHANGE             (HID_SVX_EXT0_START + 24)
-#define HID_HANGULDLG_BUTTON_CHANGEALL          (HID_SVX_EXT0_START + 25)
-#define HID_SPLDLG_EDIT_NEWWORD                 (HID_SVX_EXT0_START + 26)
-#define HID_HANGULDLG_EDIT_NEWWORD              (HID_SVX_EXT0_START + 27)
-#define HID_DLG_SECURITY_OPTIONS                (HID_SVX_EXT0_START + 28)
-#define HID_DLG_WEBCONNECTION_INFO              (HID_SVX_EXT0_START + 29)
-#define HID_SPLDLG_BUTTON_EXPLAIN               (HID_SVX_EXT0_START + 30)
-#define HID_SPLDLG_CHECKBOX_CHECKGRAMMAR        (HID_SVX_EXT0_START + 31)
-
-#define HID_AUTOCORR_DLG                (HID_OFA_START +  0)
-#define HID_OFAPAGE_AUTOCORR_OPTIONS    (HID_OFA_START +  1)
-#define HID_OFAPAGE_AUTOCORR_REPLACE    (HID_OFA_START +  2)
-#define HID_OFAPAGE_AUTOCORR_EXCEPT     (HID_OFA_START +  3)
-#define HID_OFACTL_AUTOCORR_REPLACE     (HID_OFA_START +  4)
-#define HID_OFAWIN_MAIL_HEADER          (HID_OFA_START +  5)
-#define HID_OFAWIN_MAIL_ATTACH          (HID_OFA_START +  6)
-#define HID_OFACTL_MAIL_ATTACH          (HID_OFA_START +  7)
-#define HID_OFA_TP_MISC                 (HID_OFA_START +  8)
-#define HID_OFA_HYPERLINK               (HID_OFA_START + 10)
-#define HID_OFA_DLGTABNEW               (HID_OFA_START + 11)
-#define HID_OFA_HYPERLINK_DLG           (HID_OFA_START + 12)
-#define HID_OFA_MAILHEAD_ROLE_LB        (HID_OFA_START + 13)
-#define HID_OFA_MAILHEAD_RCPT_ED        (HID_OFA_START + 14)
-#define HID_OFA_MAILHEAD_RCPT_LB        (HID_OFA_START + 15)
-#define HID_OFA_MAILHEAD_SUBJECT_ED     (HID_OFA_START + 16)
-#define HID_OFA_MAILHEAD_RECEIPT_CB     (HID_OFA_START + 17)
-#define HID_OFA_MAILHEAD_PRIORITY_LB    (HID_OFA_START + 18)
-#define HID_OFA_MAILHEAD_HEAD_WIN       (HID_OFA_START + 19)
-#define HID_OFA_MAILATTACH_ATTACH_LB    (HID_OFA_START + 20)
-#define HID_OFA_MAILATTACH_ASCII_CB     (HID_OFA_START + 21)
-#define HID_OFA_MAILATTACH_HTML_CB      (HID_OFA_START + 22)
-#define HID_OFA_MAILATTACH_RTF_CB       (HID_OFA_START + 23)
-#define HID_OFA_MAILATTACH_OFFICE_CB    (HID_OFA_START + 24)
-#define HID_OFA_HYPERLINK_TARGET        (HID_OFA_START + 25)
-#define HID_OFA_HYPERLINK_SEARCH        (HID_OFA_START + 26)
-#define HID_OFA_MAILTOOLBOX             (HID_OFA_START + 27)
-#define HID_OFAPAGE_AUTOCORR_QUOTE      (HID_OFA_START + 28)
-#define HID_OFA_TP_VIEW                 (HID_OFA_START + 29)
-#define HID_OFA_MAILMENU_OPEN           (HID_OFA_START + 30)
-#define HID_OFA_MAILMENU_DELETE         (HID_OFA_START + 31)
-#define HID_OFA_MAILMENU_RENAME         (HID_OFA_START + 32)
-#define HID_OFA_MAILMENU_SAVEAS         (HID_OFA_START + 33)
-#define HID_OFA_MAILMENU_ADDADDRESS     (HID_OFA_START + 34)
-#define HID_OFA_MAILMENU_COPYLINK       (HID_OFA_START + 35)
-#define HID_OFA_MAILMENU_SIG1           (HID_OFA_START + 36)
-#define HID_OFA_MAILMENU_SIG2           (HID_OFA_START + 37)
-#define HID_OFA_MAILMENU_SIG3           (HID_OFA_START + 38)
-#define HID_OFA_MAILMENU_SIG4           (HID_OFA_START + 39)
-#define HID_OFA_MAILHEAD_PROTOCOL_LB    (HID_OFA_START + 42)
-#define HID_OFA_MAILATTACH_RECEIPT_CB   (HID_OFA_START + 43)
-#define HID_OFA_MAILATTACH_PRIORITY_LB  (HID_OFA_START + 44)
-#define HID_OFA_MAILATTACH_TABBAR       (HID_OFA_START + 45)
-#define HID_OFAPAGE_AUTOCORR_CLB        (HID_OFA_START + 46)
-#define HID_OFAPAGE_AUTOFORMAT_CLB      (HID_OFA_START + 47)
-#define HID_OFAPAGE_AUTOFMT_OPTIONS     (HID_OFA_START + 48)
-#define HID_OFA_DLGFORMNEW              (HID_OFA_START + 49)
-#define HID_OFA_TP_APPEARANCE           (HID_OFA_START + 50)
-#define HID_OFA_HYPERLINK_NAME          (HID_OFA_START + 51)
-#define HID_OFA_HYPERLINK_URL_TXT       (HID_OFA_START + 52)
-#define HID_OFA_HYPERLINK_URL           (HID_OFA_START + 53)
-#define HID_OFA_MAILMENU_FILE           (HID_OFA_START + 54)
-#define HID_OFA_FONT_SUBSTITUTION       (HID_OFA_START + 55)
-#define HID_OFA_FONT_SUBST_CLB          (HID_OFA_START + 56)
-#define HID_OFA_SUBST_APPLY             (HID_OFA_START + 57)
-#define HID_OFA_SUBST_DELETE            (HID_OFA_START + 58)
-#define HID_OFADLG_REGISTRATION         (HID_OFA_START + 59)
-#define HID_OFA_TP_DESKTOP              (HID_OFA_START + 60)
-#define HID_REGISTRATION_REGISTER       (HID_OFA_START + 61)
-#define HID_REGISTRATION_ENABLE_KEY     (HID_OFA_START + 62)
-#define HID_AUTOCORR_LANGUAGE           (HID_OFA_START + 63)
-#define HID_OFA_MAILHEAD_RCPT_CB        (HID_OFA_START + 64)
-#define HID_OFA_SENDMENU_PLAIN          (HID_OFA_START + 65)
-#define HID_OFA_SENDMENU_ENCRYPT        (HID_OFA_START + 66)
-#define HID_OFA_SENDMENU_SIGN           (HID_OFA_START + 67)
-#define HID_OFA_SENDMENU_SIGNANDENCRYPT (HID_OFA_START + 68)
-#define HID_OFADLG_OPTIONS_TREE         (HID_OFA_START + 69)
-#define HID_OFADLG_TREELISTBOX          (HID_OFA_START + 70)
-#define HID_OFADLG_TREE_GENERAL         (HID_OFA_START + 71)
-#define HID_OFADLG_TREE_INTERNET        (HID_OFA_START + 72)
-#define HID_OFADLG_TREE_BROWSER         (HID_OFA_START + 73)
-#define HID_OFADLG_TREE_TEXT            (HID_OFA_START + 74)
-#define HID_OFADLG_TREE_HTML            (HID_OFA_START + 75)
-#define HID_OFADLG_TREE_CALC            (HID_OFA_START + 76)
-#define HID_OFADLG_TREE_PRESENTATION    (HID_OFA_START + 77)
-#define HID_OFADLG_TREE_DRAWING         (HID_OFA_START + 78)
-#define HID_OFADLG_TREE_IMAGE           (HID_OFA_START + 79)
-#define HID_OFADLG_TREE_FORMULA         (HID_OFA_START + 80)
-#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS    (HID_OFA_START + 113)
-#define HID_OFADLG_TREE_CHART               (HID_OFA_START + 115)
-#define HID_OFADLG_TREE_BASE                (HID_OFA_START + 116)
-#define HID_OFADLG_TREE_FILTER              (HID_OFA_START + 117)
-#define HID_OFAPAGE_MSFLTR2_CLB             (HID_OFA_START + 118)
-#define HID_OFA_TP_LANGUAGES                (HID_OFA_START + 119)
-#define HID_OFADLG_TREE_LANGUAGE            (HID_OFA_START + 120)
-#define HID_OFA_CONNPOOL_DRIVERLIST         (HID_OFA_START + 121)
-#define UID_OFA_CONNPOOL_DRIVERLIST_BACK    (HID_OFA_START + 122)
-// #define HID_OFA_TP_HELPERPROG               (HID_OFA_START + 123)
-#define HID_OFA_TP_MEMORY                   (HID_OFA_START + 124)
-#define HID_DBPATH_CTL_PATH                 (HID_OFA_START + 125)
-#define HID_DBPATH_HEADERBAR                (HID_OFA_START + 126)
-#define HID_OFAPAGE_SMARTTAG_OPTIONS        (HID_OFA_START + 127)
-
-#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST      (HID_SVX_EXT0_START + 28)
-
-#define HID_COLORPAGE_LISTBOX_START                 (HID_SVX_EXT0_START + 29)
-#define HID_COLORPAGE_DOCCOLOR_LB                   (HID_SVX_EXT0_START + 29)
-#define HID_COLORPAGE_DOCBOUNDARIES_LB              (HID_SVX_EXT0_START + 30)
-#define HID_COLORPAGE_APPBACKGROUND_LB              (HID_SVX_EXT0_START + 31)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_LB           (HID_SVX_EXT0_START + 32)
-#define HID_COLORPAGE_TABLEBOUNDARIES_LB            (HID_SVX_EXT0_START + 33)
-#define HID_COLORPAGE_FONTCOLOR_LB                  (HID_SVX_EXT0_START + 34)
-#define HID_COLORPAGE_LINKS_LB                      (HID_SVX_EXT0_START + 35)
-#define HID_COLORPAGE_LINKSVISITED_LB               (HID_SVX_EXT0_START + 36)
-#define HID_COLORPAGE_ANCHOR_LB                     (HID_SVX_EXT0_START + 37)
-#define HID_COLORPAGE_SPELL_LB                      (HID_SVX_EXT0_START + 38)
-#define HID_COLORPAGE_WRITERTEXTGRID_LB             (HID_SVX_EXT0_START + 39)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB        (HID_SVX_EXT0_START + 40)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_LB          (HID_SVX_EXT0_START + 41)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB         (HID_SVX_EXT0_START + 42)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB       (HID_SVX_EXT0_START + 43)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB      (HID_SVX_EXT0_START + 44)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB    (HID_SVX_EXT0_START + 45)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_LB           (HID_SVX_EXT0_START + 46)
-#define HID_COLORPAGE_HTMLSGML_LB                   (HID_SVX_EXT0_START + 47)
-#define HID_COLORPAGE_HTMLCOMMENT_LB                (HID_SVX_EXT0_START + 48)
-#define HID_COLORPAGE_HTMLKEYWORD_LB                (HID_SVX_EXT0_START + 49)
-#define HID_COLORPAGE_HTMLUNKNOWN_LB                (HID_SVX_EXT0_START + 50)
-#define HID_COLORPAGE_CALCGRID_LB                   (HID_SVX_EXT0_START + 51)
-#define HID_COLORPAGE_CALCPAGEBREAK_LB              (HID_SVX_EXT0_START + 52)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB        (HID_SVX_EXT0_START + 53)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB     (HID_SVX_EXT0_START + 54)
-#define HID_COLORPAGE_CALCDETECTIVE_LB              (HID_SVX_EXT0_START + 55)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_LB         (HID_SVX_EXT0_START + 56)
-#define HID_COLORPAGE_CALCREFERENCE_LB              (HID_SVX_EXT0_START + 57)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB        (HID_SVX_EXT0_START + 58)
-#define HID_COLORPAGE_DRAWGRID_LB                   (HID_SVX_EXT0_START + 59)
-#define HID_COLORPAGE_DRAWDRAWING_LB                (HID_SVX_EXT0_START + 60)
-#define HID_COLORPAGE_DRAWFILL_LB                   (HID_SVX_EXT0_START + 61)
-#define HID_COLORPAGE_BASICIDENTIFIER_LB            (HID_SVX_EXT0_START + 62)
-#define HID_COLORPAGE_BASICCOMMENT_LB               (HID_SVX_EXT0_START + 63)
-#define HID_COLORPAGE_BASICNUMBER_LB                (HID_SVX_EXT0_START + 64)
-#define HID_COLORPAGE_BASICSTRING_LB                (HID_SVX_EXT0_START + 65)
-#define HID_COLORPAGE_BASICOPERATOR_LB              (HID_SVX_EXT0_START + 66)
-#define HID_COLORPAGE_BASICKEYWORD_LB               (HID_SVX_EXT0_START + 67)
-#define HID_COLORPAGE_BASICERROR_LB                 (HID_SVX_EXT0_START + 68)
-
-#define HID_COLORPAGE_CHECKBOX_START                (HID_SVX_EXT0_START + 69)
-#define HID_COLORPAGE_DOCCOLOR_CB                   (HID_SVX_EXT0_START + 69)
-#define HID_COLORPAGE_DOCBOUNDARIES_CB              (HID_SVX_EXT0_START + 70)
-#define HID_COLORPAGE_APPBACKGROUND_CB              (HID_SVX_EXT0_START + 71)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_CB           (HID_SVX_EXT0_START + 72)
-#define HID_COLORPAGE_TABLEBOUNDARIES_CB            (HID_SVX_EXT0_START + 73)
-#define HID_COLORPAGE_FONTCOLOR_CB                  (HID_SVX_EXT0_START + 74)
-#define HID_COLORPAGE_LINKS_CB                      (HID_SVX_EXT0_START + 75)
-#define HID_COLORPAGE_LINKSVISITED_CB               (HID_SVX_EXT0_START + 76)
-#define HID_COLORPAGE_ANCHOR_CB                     (HID_SVX_EXT0_START + 77)
-#define HID_COLORPAGE_SPELL_CB                      (HID_SVX_EXT0_START + 78)
-#define HID_COLORPAGE_WRITERTEXTGRID_CB             (HID_SVX_EXT0_START + 79)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB        (HID_SVX_EXT0_START + 80)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_CB          (HID_SVX_EXT0_START + 81)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB         (HID_SVX_EXT0_START + 82)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB       (HID_SVX_EXT0_START + 83)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB      (HID_SVX_EXT0_START + 84)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB    (HID_SVX_EXT0_START + 85)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_CB           (HID_SVX_EXT0_START + 86)
-#define HID_COLORPAGE_HTMLSGML_CB                   (HID_SVX_EXT0_START + 87)
-#define HID_COLORPAGE_HTMLCOMMENT_CB                (HID_SVX_EXT0_START + 88)
-#define HID_COLORPAGE_HTMLKEYWORD_CB                (HID_SVX_EXT0_START + 89)
-#define HID_COLORPAGE_HTMLUNKNOWN_CB                (HID_SVX_EXT0_START + 90)
-#define HID_COLORPAGE_CALCGRID_CB                   (HID_SVX_EXT0_START + 91)
-#define HID_COLORPAGE_CALCPAGEBREAK_CB              (HID_SVX_EXT0_START + 92)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB        (HID_SVX_EXT0_START + 93)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB     (HID_SVX_EXT0_START + 94)
-#define HID_COLORPAGE_CALCDETECTIVE_CB              (HID_SVX_EXT0_START + 95)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_CB         (HID_SVX_EXT0_START + 96)
-#define HID_COLORPAGE_CALCREFERENCE_CB              (HID_SVX_EXT0_START + 97)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB        (HID_SVX_EXT0_START + 98)
-#define HID_COLORPAGE_DRAWGRID_CB                   (HID_SVX_EXT0_START + 99)
-#define HID_COLORPAGE_DRAWDRAWING_CB                (HID_SVX_EXT0_START + 100)
-#define HID_COLORPAGE_DRAWFILL_CB                   (HID_SVX_EXT0_START + 101)
-#define HID_COLORPAGE_BASICIDENTIFIER_CB            (HID_SVX_EXT0_START + 102)
-#define HID_COLORPAGE_BASICCOMMENT_CB               (HID_SVX_EXT0_START + 103)
-#define HID_COLORPAGE_BASICNUMBER_CB                (HID_SVX_EXT0_START + 104)
-#define HID_COLORPAGE_BASICSTRING_CB                (HID_SVX_EXT0_START + 105)
-#define HID_COLORPAGE_BASICOPERATOR_CB              (HID_SVX_EXT0_START + 106)
-#define HID_COLORPAGE_BASICKEYWORD_CB               (HID_SVX_EXT0_START + 107)
-#define HID_COLORPAGE_BASICERROR_CB                 (HID_SVX_EXT0_START + 108)
-#define HID_SVXPAGE_SWPOSSIZE                       (HID_SVX_EXT0_START + 109)
-
-#define HID_POPUP_EXTRUSION_DEPTH                   (HID_SVX_EXT0_START + 110)
-#define HID_POPUP_EXTRUSION_LIGHTING                (HID_SVX_EXT0_START + 111)
-#define HID_POPUP_EXTRUSION_SURFACE                 (HID_SVX_EXT0_START + 112)
-#define HID_MENU_EXTRUSION_DIRECTION                (HID_SVX_EXT0_START + 113)
-#define HID_VALUESET_EXTRUSION_DIRECTION            (HID_SVX_EXT0_START + 114)
-#define HID_MENU_EXTRUSION_DEPTH                    (HID_SVX_EXT0_START + 115)
-#define HID_MENU_EXTRUSION_LIGHTING                 (HID_SVX_EXT0_START + 116)
-#define HID_VALUESET_EXTRUSION_LIGHTING             (HID_SVX_EXT0_START + 117)
-#define HID_MENU_EXTRUSION_SURFACE                  (HID_SVX_EXT0_START + 118)
-#define HID_SCRIPTORG_DIALOG                        (HID_SVX_EXT0_START + 119)
-#define HID_POPUP_EXTRUSION_DIRECTION               (HID_SVX_EXT0_START + 120)
-#define HID_GALLERY_EDIT_MSNAME                     (HID_SVX_EXT0_START + 121)
-
-// Hangul Hanja extensions
-#define HID_HANGULHANJA_OPT_DLG                     (HID_SVX_EXT0_START + 122)
-#define HID_HANGULHANJA_NEWDICT_DLG                 (HID_SVX_EXT0_START + 123)
-#define HID_HANGULHANJA_EDIT_DLG                    (HID_SVX_EXT0_START + 124)
-#define HID_HANGULDLG_BUTTON_OPTIONS                (HID_SVX_EXT0_START + 125)
-#define HID_HANGULHANJA_OPT_DICTS_LB                (HID_SVX_EXT0_START + 126)
-#define HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES          (HID_SVX_EXT0_START + 127)
-#define HID_OPTIONS_JAVA                            (HID_SVX_EXT0_START + 128)
-#define HID_OPTIONS_JAVA_LIST                       (HID_SVX_EXT0_START + 129)
-#define HID_OPTIONS_JAVA_PARAMETER                  (HID_SVX_EXT0_START + 130)
-#define HID_OPTIONS_JAVA_CLASSPATH                  (HID_SVX_EXT0_START + 131)
-
-// listbox for event config
-#define HID_SVX_MACRO_LB_EVENT                      (HID_SVX_EXT0_START + 132)
-#define HID_SVX_CONFIG_EVENT                        (HID_SVX_EXT0_START + 133)
-#define HID_CONFIG_EVENT_OFFICE_BASED               (HID_SVX_EXT0_START + 134)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED             (HID_SVX_EXT0_START + 135)
-
-#define HID_SELECTOR_CATEGORIES                     (HID_SVX_EXT0_START + 136)
-#define HID_SELECTOR_COMMANDS                       (HID_SVX_EXT0_START + 137)
-#define HID_SELECTOR_DIALOG                         (HID_SVX_EXT0_START + 138)
-#define HID_SVX_CONFIG_MENU                         (HID_SVX_EXT0_START + 139)
-#define HID_SVX_CONFIG_MENU_CONTENTS                (HID_SVX_EXT0_START + 140)
-#define HID_SVX_CONFIG_TOOLBAR                      (HID_SVX_EXT0_START + 141)
-#define HID_SVX_CONFIG_TOOLBAR_CONTENTS             (HID_SVX_EXT0_START + 142)
-#define HID_SCRIPTSBOX                              (HID_SVX_EXT0_START + 143)
-#define HID_SVX_RUN_MACRO                           (HID_SVX_EXT0_START + 144)
-#define HID_SVX_BASIC_MACRO_ORGANIZER               (HID_SVX_EXT0_START + 145)
-#define HID_SVX_BASIC_DIALOG_ORGANIZER              (HID_SVX_EXT0_START + 146)
-#define HID_SVX_COMMON_MACRO_ORGANIZER              (HID_SVX_EXT0_START + 147)
-#define HID_XMLSEC_CALL                             (HID_SVX_EXT0_START + 148)
-
-// chinese simplified traditional dialogs
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED     (HID_SVX_EXT0_START + 149)
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL    (HID_SVX_EXT0_START + 150)
-#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS                 (HID_SVX_EXT0_START + 151)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED      (HID_SVX_EXT0_START + 152)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL     (HID_SVX_EXT0_START + 153)
-#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE                       (HID_SVX_EXT0_START + 154)
-#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER                        (HID_SVX_EXT0_START + 155)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED                 (HID_SVX_EXT0_START + 156)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL                (HID_SVX_EXT0_START + 157)
-
-#define HID_POPUP_FONTWORK_ALIGN                    (HID_SVX_EXT0_START + 158)
-#define HID_POPUP_FONTWORK_CHARSPACE                (HID_SVX_EXT0_START + 159)
-
-// pb: duplicate (see: HID_SVX_EXT0_START + 127)
-// #define HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES          (HID_SVX_EXT0_START + 160)
-
-#define HID_SVX_TABDLG_DOCRECOVERY                  (HID_SVX_EXT0_START + 161)
-#define HID_SVX_TP_DOCRECOVERY_SAVE                 (HID_SVX_EXT0_START + 162)
-#define HID_SVX_MDLG_DOCRECOVERY_PROGR              (HID_SVX_EXT0_START + 163)
-#define HID_SVX_TP_DOCRECOVERY_RECOVER              (HID_SVX_EXT0_START + 164)
-#define HID_SVX_MDLG_DOCRECOVERY_BROKEN             (HID_SVX_EXT0_START + 165)
-#define HID_SVX_TP_ERR_REP_WELCOME                  (HID_SVX_EXT0_START + 166)
-#define HID_SVX_TP_ERR_REP_SEND                     (HID_SVX_EXT0_START + 167)
-#define HID_SVX_MDLG_ERR_REP_OPTIONS                (HID_SVX_EXT0_START + 168)
-#define HID_SVX_MDLG_ERR_REP_PREVIEW                (HID_SVX_EXT0_START + 169)
-
-#define HID_HANGULDLG_SUGGESTIONS                   (HID_SVX_EXT0_START + 170)
-#define HID_HANGULDLG_SUGGESTIONS_GRID              (HID_SVX_EXT0_START + 171)
-#define HID_HANGULDLG_SUGGESTIONS_LIST              (HID_SVX_EXT0_START + 172)
-
-#define HID_SVX_MODIFY_TOOLBAR_ITEM                 (HID_SVX_EXT0_START + 173)
-#define HID_SVX_SAVE_IN                             (HID_SVX_EXT0_START + 174)
-#define HID_SVX_CONFIG_MENU_ORGANIZER               (HID_SVX_EXT0_START + 175)
-#define HID_SVX_CONFIG_ICON_SELECTOR                (HID_SVX_EXT0_START + 176)
-#define HID_SVX_CONFIG_NAME_SUBMENU                 (HID_SVX_EXT0_START + 177)
-#define HID_SVX_CONFIG_RENAME_MENU                  (HID_SVX_EXT0_START + 178)
-#define HID_SVX_CONFIG_RENAME_MENU_ITEM             (HID_SVX_EXT0_START + 179)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR               (HID_SVX_EXT0_START + 180)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM          (HID_SVX_EXT0_START + 181)
-#define HID_SVX_NEW_TOOLBAR                         (HID_SVX_EXT0_START + 182)
-#define HID_SVX_MODIFY_TOOLBAR                      (HID_SVX_EXT0_START + 183)
-#define HID_SVX_NEW_TOOLBAR_ITEM                    (HID_SVX_EXT0_START + 184)
-#define HID_SVX_CONFIG_MENU_LISTBOX                 (HID_SVX_EXT0_START + 185)
-#define HID_SVX_OPTIONS_ONLINEUPDATE                (HID_SVX_EXT0_START + 186)
-#define HID_OPTIONS_CHART_DEFCOLORS                 (HID_SVX_EXT0_START + 187)
-#define HID_OPTIONS_MULTIPATH_LIST                  (HID_SVX_EXT0_START + 188)
-
-#define HID_COLORPAGE_DBREPORTHEADER_CB             (HID_SVX_EXT0_START + 189)
-#define HID_COLORPAGE_DBREPORTFOOTER_CB             (HID_SVX_EXT0_START + 190)
-#define HID_COLORPAGE_DBPAGEHEADER_CB               (HID_SVX_EXT0_START + 191)
-#define HID_COLORPAGE_DBPAGEFOOTER_CB               (HID_SVX_EXT0_START + 192)
-#define HID_COLORPAGE_DBGROUPHEADER_CB              (HID_SVX_EXT0_START + 193)
-#define HID_COLORPAGE_DBGROUPFOOTER_CB              (HID_SVX_EXT0_START + 194)
-#define HID_COLORPAGE_DBCOLUMNHEADER_CB             (HID_SVX_EXT0_START + 195)
-#define HID_COLORPAGE_DBCOLUMNFOOTER_CB             (HID_SVX_EXT0_START + 196)
-#define HID_COLORPAGE_DBDETAIL_CB                   (HID_SVX_EXT0_START + 197)
-#define HID_COLORPAGE_DBREPORTHEADER_LB             (HID_SVX_EXT0_START + 198)
-#define HID_COLORPAGE_DBREPORTFOOTER_LB             (HID_SVX_EXT0_START + 199)
-#define HID_COLORPAGE_DBPAGEHEADER_LB               (HID_SVX_EXT0_START + 200)
-#define HID_COLORPAGE_DBPAGEFOOTER_LB               (HID_SVX_EXT0_START + 201)
-#define HID_COLORPAGE_DBGROUPHEADER_LB              (HID_SVX_EXT0_START + 202)
-#define HID_COLORPAGE_DBGROUPFOOTER_LB              (HID_SVX_EXT0_START + 203)
-#define HID_COLORPAGE_DBCOLUMNHEADER_LB             (HID_SVX_EXT0_START + 204)
-#define HID_COLORPAGE_DBCOLUMNFOOTER_LB             (HID_SVX_EXT0_START + 205)
-#define HID_COLORPAGE_DBDETAIL_LB                   (HID_SVX_EXT0_START + 206)
-
-#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_SVX_EXT0_START + 207)
-#define HID_SPLDLG_BUTTON_IGNORERULE                (HID_SVX_EXT0_START + 208)
-
-#define HID_CONFIG_ACCEL                            (HID_SVX_EXT0_START + 209)
-#define HID_ACCELCONFIG_LISTBOX                     (HID_SVX_EXT0_START + 210)
-#define HID_CONFIGGROUP_ACC_LISTBOX                 (HID_SVX_EXT0_START + 211)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX              (HID_SVX_EXT0_START + 212)
-#define HID_MACRO_LB_EVENT                          (HID_SVX_EXT0_START + 213)
-#define HID_MACRO_GROUP                             (HID_SVX_EXT0_START + 214)
-#define HID_MACRO_MACROS                            (HID_SVX_EXT0_START + 215)
-#define HID_MACROCHECKDIALOG                        (HID_SVX_EXT0_START + 216)
-#define HID_MACRO_HEADERTABLISTBOX                  (HID_SVX_EXT0_START + 217)
+// Help-Ids --------------------------------------------------------------
+#define HID_ALIGN_TBX                                               (HID_SVX_START +   1)
+#define HID_AUTOCORR_HELP_END                                       (HID_SVX_START +   2)
+#define HID_AUTOCORR_HELP_START                                     (HID_SVX_START +   3)
+#define HID_BMPMASK_CTL_PIPETTE                                     (HID_SVX_START +   4)
+#define HID_BMPMASK_CTL_QCOL_1                                      (HID_SVX_START +   5)
+#define HID_BMPMASK_TBI_PIPETTE                                     (HID_SVX_START +   6)
+#define HID_COLOR_CTL_COLORS                                        (HID_SVX_START +   7)
+#define HID_CONTDLG_APPLY                                           (HID_SVX_START +   8)
+#define HID_CONTDLG_AUTOCONTOUR                                     (HID_SVX_START +   9)
+#define HID_CONTDLG_CIRCLE                                          (HID_SVX_START +  10)
+#define HID_CONTDLG_FREEPOLY                                        (HID_SVX_START +  11)
+#define HID_CONTDLG_GRAPHWND                                        (HID_SVX_START +  12)
+#define HID_CONTDLG_PIPETTE                                         (HID_SVX_START +  13)
+#define HID_CONTDLG_POLY                                            (HID_SVX_START +  14)
+#define HID_CONTDLG_POLYDELETE                                      (HID_SVX_START +  15)
+#define HID_CONTDLG_POLYEDIT                                        (HID_SVX_START +  16)
+#define HID_CONTDLG_POLYINSERT                                      (HID_SVX_START +  17)
+#define HID_CONTDLG_POLYMOVE                                        (HID_SVX_START +  18)
+#define HID_CONTDLG_RECT                                            (HID_SVX_START +  19)
+#define HID_CONTDLG_REDO                                            (HID_SVX_START +  20)
+#define HID_CONTDLG_SELECT                                          (HID_SVX_START +  21)
+#define HID_CONTDLG_TOOLBOX                                         (HID_SVX_START +  22)
+#define HID_CONTDLG_UNDO                                            (HID_SVX_START +  23)
+#define HID_CONTDLG_WORKPLACE                                       (HID_SVX_START +  24)
+#define HID_CTL_FONTWORK_FAVORITES                                  (HID_SVX_START +  25)
+#define HID_CTRL3D_HSCROLL                                          (HID_SVX_START +  26)
+#define HID_CTRL3D_SWITCHER                                         (HID_SVX_START +  27)
+#define HID_CTRL3D_VSCROLL                                          (HID_SVX_START +  28)
+#define HID_CTRL_COLOR                                              (HID_SVX_START +  29)
+#define HID_DRAWTOOL_TBX                                            (HID_SVX_START +  30)
+#define HID_EDITENG_SPELLER_ADDWORD                                 (HID_SVX_START +  31)
+#define HID_EDITENG_SPELLER_AUTOCORRECT                             (HID_SVX_START +  32)
+#define HID_EDITENG_SPELLER_IGNORE                                  (HID_SVX_START +  33)
+#define HID_EDITENG_SPELLER_PARALANGUAGE                            (HID_SVX_START +  34)
+#define HID_EDITENG_SPELLER_START                                   (HID_SVX_START +  35)
+#define HID_EDITENG_SPELLER_WORDLANGUAGE                            (HID_SVX_START +  36)
+#define HID_FILL_ATTR_LISTBOX                                       (HID_SVX_START +  37)
+#define HID_FILL_TYPE_LISTBOX                                       (HID_SVX_START +  38)
+#define HID_FONTWORK_CTL_FORMS                                      (HID_SVX_START +  39)
+#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE                            (HID_SVX_START +  40)
+#define HID_FONTWORK_TBI_ADJUST_CENTER                              (HID_SVX_START +  41)
+#define HID_FONTWORK_TBI_ADJUST_LEFT                                (HID_SVX_START +  42)
+#define HID_FONTWORK_TBI_ADJUST_MIRROR                              (HID_SVX_START +  43)
+#define HID_FONTWORK_TBI_ADJUST_RIGHT                               (HID_SVX_START +  44)
+#define HID_FONTWORK_TBI_OUTLINE                                    (HID_SVX_START +  45)
+#define HID_FONTWORK_TBI_SHADOW_NORMAL                              (HID_SVX_START +  46)
+#define HID_FONTWORK_TBI_SHADOW_OFF                                 (HID_SVX_START +  47)
+#define HID_FONTWORK_TBI_SHADOW_SLANT                               (HID_SVX_START +  48)
+#define HID_FONTWORK_TBI_SHOWFORM                                   (HID_SVX_START +  49)
+#define HID_FONTWORK_TBI_STYLE_OFF                                  (HID_SVX_START +  50)
+#define HID_FONTWORK_TBI_STYLE_ROTATE                               (HID_SVX_START +  51)
+#define HID_FONTWORK_TBI_STYLE_SLANTX                               (HID_SVX_START +  52)
+#define HID_FONTWORK_TBI_STYLE_SLANTY                               (HID_SVX_START +  53)
+#define HID_FONTWORK_TBI_STYLE_UPRIGHT                              (HID_SVX_START +  54)
+#define HID_FORMAT_FOOTER                                           (HID_SVX_START +  55)
+#define HID_FORMAT_HEADER                                           (HID_SVX_START +  56)
+// free
+#define HID_GALLERY_ICONVIEW                                        (HID_SVX_START +  58)
+#define HID_GALLERY_LISTVIEW                                        (HID_SVX_START +  59)
+#define HID_GALLERY_MN_ADD                                          (HID_SVX_START +  60)
+#define HID_GALLERY_MN_ADDMENU                                      (HID_SVX_START +  61)
+#define HID_GALLERY_MN_ADD_LINK                                     (HID_SVX_START +  62)
+#define HID_GALLERY_MN_BACKGROUND                                   (HID_SVX_START +  63)
+#define HID_GALLERY_MN_COPYCLIPBOARD                                (HID_SVX_START +  64)
+#define HID_GALLERY_MN_DELETE                                       (HID_SVX_START +  65)
+#define HID_GALLERY_MN_PASTECLIPBOARD                               (HID_SVX_START +  66)
+#define HID_GALLERY_MN_PREVIEW                                      (HID_SVX_START +  67)
+#define HID_GALLERY_NEWTHEME                                        (HID_SVX_START +  68)
+#define HID_GALLERY_PREVIEW                                         (HID_SVX_START +  69)
+#define HID_GALLERY_PROPERTIES                                      (HID_SVX_START +  70)
+#define HID_GALLERY_RENAME                                          (HID_SVX_START +  71)
+#define HID_GALLERY_THEMELIST                                       (HID_SVX_START +  72)
+// free
+#define HID_GALLERY_WINDOW                                          (HID_SVX_START +  74)
+#define HID_GRFFILTER                                               (HID_SVX_START +  75)
+#define HID_GRFFILTER_EMBOSS                                        (HID_SVX_START +  76)
+#define HID_GRFFILTER_INVERT                                        (HID_SVX_START +  77)
+#define HID_GRFFILTER_MOSAIC                                        (HID_SVX_START +  78)
+#define HID_GRFFILTER_POPART                                        (HID_SVX_START +  79)
+#define HID_GRFFILTER_POSTER                                        (HID_SVX_START +  80)
+#define HID_GRFFILTER_REMOVENOISE                                   (HID_SVX_START +  81)
+#define HID_GRFFILTER_SEPIA                                         (HID_SVX_START +  82)
+#define HID_GRFFILTER_SHARPEN                                       (HID_SVX_START +  83)
+#define HID_GRFFILTER_SMOOTH                                        (HID_SVX_START +  84)
+#define HID_GRFFILTER_SOBEL                                         (HID_SVX_START +  85)
+#define HID_GRFFILTER_SOLARIZE                                      (HID_SVX_START +  86)
+#define HID_HYPHENATE                                               (HID_SVX_START +  87)
+#define HID_IMAPDLG_ACTIVE                                          (HID_SVX_START +  88)
+#define HID_IMAPDLG_APPLY                                           (HID_SVX_START +  89)
+#define HID_IMAPDLG_CIRCLE                                          (HID_SVX_START +  90)
+#define HID_IMAPDLG_FREEPOLY                                        (HID_SVX_START +  91)
+#define HID_IMAPDLG_GRAPHWND                                        (HID_SVX_START +  92)
+#define HID_IMAPDLG_MACRO                                           (HID_SVX_START +  93)
+#define HID_IMAPDLG_OPEN                                            (HID_SVX_START +  94)
+#define HID_IMAPDLG_POLY                                            (HID_SVX_START +  95)
+#define HID_IMAPDLG_POLYDELETE                                      (HID_SVX_START +  96)
+#define HID_IMAPDLG_POLYEDIT                                        (HID_SVX_START +  97)
+#define HID_IMAPDLG_POLYINSERT                                      (HID_SVX_START +  98)
+#define HID_IMAPDLG_POLYMOVE                                        (HID_SVX_START +  99)
+#define HID_IMAPDLG_PROPERTY                                        (HID_SVX_START + 100)
+#define HID_IMAPDLG_RECT                                            (HID_SVX_START + 101)
+#define HID_IMAPDLG_REDO                                            (HID_SVX_START + 102)
+#define HID_IMAPDLG_SAVEAS                                          (HID_SVX_START + 103)
+#define HID_IMAPDLG_SELECT                                          (HID_SVX_START + 104)
+#define HID_IMAPDLG_TOOLBOX                                         (HID_SVX_START + 105)
+#define HID_IMAPDLG_UNDO                                            (HID_SVX_START + 106)
+#define HID_MENU_EXTRUSION_DEPTH                                    (HID_SVX_START + 107)
+#define HID_MENU_EXTRUSION_DIRECTION                                (HID_SVX_START + 108)
+#define HID_MENU_EXTRUSION_LIGHTING                                 (HID_SVX_START + 109)
+#define HID_MENU_EXTRUSION_SURFACE                                  (HID_SVX_START + 110)
+#define HID_MNU_FUNC_AVG                                            (HID_SVX_START + 111)
+#define HID_MNU_FUNC_COUNT                                          (HID_SVX_START + 112)
+#define HID_MNU_FUNC_COUNT2                                         (HID_SVX_START + 113)
+#define HID_MNU_FUNC_MAX                                            (HID_SVX_START + 114)
+#define HID_MNU_FUNC_MIN                                            (HID_SVX_START + 115)
+#define HID_MNU_FUNC_NONE                                           (HID_SVX_START + 116)
+#define HID_MNU_FUNC_SUM                                            (HID_SVX_START + 117)
+#define HID_MNU_ZOOM_100                                            (HID_SVX_START + 118)
+#define HID_MNU_ZOOM_150                                            (HID_SVX_START + 119)
+#define HID_MNU_ZOOM_200                                            (HID_SVX_START + 120)
+#define HID_MNU_ZOOM_50                                             (HID_SVX_START + 121)
+#define HID_MNU_ZOOM_75                                             (HID_SVX_START + 122)
+#define HID_MNU_ZOOM_OPTIMAL                                        (HID_SVX_START + 123)
+#define HID_MNU_ZOOM_PAGE_WIDTH                                     (HID_SVX_START + 124)
+#define HID_MNU_ZOOM_WHOLE_PAGE                                     (HID_SVX_START + 125)
+#define HID_OPTIONS_GRID                                            (HID_SVX_START + 126)
+#define HID_PASSWORD                                                (HID_SVX_START + 127)
+#define HID_POPUP_COLOR                                             (HID_SVX_START + 128)
+#define HID_POPUP_COLOR_CTRL                                        (HID_SVX_START + 129)
+#define HID_POPUP_EXTRUSION_DEPTH                                   (HID_SVX_START + 130)
+#define HID_POPUP_EXTRUSION_DIRECTION                               (HID_SVX_START + 131)
+#define HID_POPUP_EXTRUSION_LIGHTING                                (HID_SVX_START + 132)
+#define HID_POPUP_EXTRUSION_SURFACE                                 (HID_SVX_START + 133)
+#define HID_POPUP_FONTWORK_ALIGN                                    (HID_SVX_START + 134)
+#define HID_POPUP_FONTWORK_CHARSPACE                                (HID_SVX_START + 135)
+#define HID_POPUP_FRAME                                             (HID_SVX_START + 136)
+#define HID_POPUP_LINE                                              (HID_SVX_START + 137)
+#define HID_POPUP_LINEEND                                           (HID_SVX_START + 138)
+#define HID_POPUP_LINEEND_CTRL                                      (HID_SVX_START + 139)
+#define HID_REDLINING_FILTER_BTN_REF                                (HID_SVX_START + 140)
+#define HID_REDLINING_FILTER_CB_ACTION                              (HID_SVX_START + 141)
+#define HID_REDLINING_FILTER_CB_AUTOR                               (HID_SVX_START + 142)
+#define HID_REDLINING_FILTER_CB_COMMENT                             (HID_SVX_START + 143)
+#define HID_REDLINING_FILTER_CB_DATE                                (HID_SVX_START + 144)
+#define HID_REDLINING_FILTER_CB_RANGE                               (HID_SVX_START + 145)
+#define HID_REDLINING_FILTER_DF_DATE                                (HID_SVX_START + 146)
+#define HID_REDLINING_FILTER_DF_DATE2                               (HID_SVX_START + 147)
+#define HID_REDLINING_FILTER_ED_COMMENT                             (HID_SVX_START + 148)
+#define HID_REDLINING_FILTER_ED_RANGE                               (HID_SVX_START + 149)
+#define HID_REDLINING_FILTER_IB_CLOCK                               (HID_SVX_START + 150)
+#define HID_REDLINING_FILTER_IB_CLOCK2                              (HID_SVX_START + 151)
+#define HID_REDLINING_FILTER_LB_ACTION                              (HID_SVX_START + 152)
+#define HID_REDLINING_FILTER_LB_AUTOR                               (HID_SVX_START + 153)
+#define HID_REDLINING_FILTER_LB_DATE                                (HID_SVX_START + 154)
+#define HID_REDLINING_FILTER_PAGE                                   (HID_SVX_START + 155)
+#define HID_REDLINING_FILTER_TF_DATE                                (HID_SVX_START + 156)
+#define HID_REDLINING_FILTER_TF_DATE2                               (HID_SVX_START + 157)
+#define HID_REDLINING_TABCONTROL                                    (HID_SVX_START + 158)
+#define HID_REDLINING_VIEW_DG_VIEW                                  (HID_SVX_START + 159)
+#define HID_REDLINING_VIEW_DG_VIEW_HEADER                           (HID_SVX_START + 160)
+#define HID_REDLINING_VIEW_DG_VIEW_TABLE                            (HID_SVX_START + 161)
+#define HID_REDLINING_VIEW_PAGE                                     (HID_SVX_START + 162)
+#define HID_REDLINING_VIEW_PB_ACCEPT                                (HID_SVX_START + 163)
+#define HID_REDLINING_VIEW_PB_ACCEPTALL                             (HID_SVX_START + 164)
+#define HID_REDLINING_VIEW_PB_REJECT                                (HID_SVX_START + 165)
+#define HID_REDLINING_VIEW_PB_REJECTALL                             (HID_SVX_START + 166)
+#define HID_REDLINING_VIEW_PB_UNDO                                  (HID_SVX_START + 167)
+#define HID_RUBY_DIALOG                                             (HID_SVX_START + 168)
+#define HID_STYLE_LISTBOX                                           (HID_SVX_START + 169)
+#define HID_SVXTBX_ALIGNMENT                                        (HID_SVX_START + 170)
+#define HID_SVXTBX_DRAW                                             (HID_SVX_START + 171)
+#define HID_SVXTBX_UNDO_REDO_CTRL                                   (HID_SVX_START + 172)
+#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE                       (HID_SVX_START + 173)
+#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER                        (HID_SVX_START + 174)
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED                 (HID_SVX_START + 175)
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL                (HID_SVX_START + 176)
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED      (HID_SVX_START + 177)
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL     (HID_SVX_START + 178)
+#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS                 (HID_SVX_START + 179)
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED     (HID_SVX_START + 180)
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL    (HID_SVX_START + 181)
+#define HID_SVX_MDLG_DOCRECOVERY_BROKEN                             (HID_SVX_START + 182)
+#define HID_SVX_MDLG_DOCRECOVERY_PROGR                              (HID_SVX_START + 183)
+#define HID_SVX_MDLG_ERR_REP_OPTIONS                                (HID_SVX_START + 184)
+#define HID_SVX_MDLG_ERR_REP_PREVIEW                                (HID_SVX_START + 185)
+#define HID_SVX_TABDLG_DOCRECOVERY                                  (HID_SVX_START + 186)
+#define HID_SVX_TP_DOCRECOVERY_RECOVER                              (HID_SVX_START + 187)
+#define HID_SVX_TP_DOCRECOVERY_SAVE                                 (HID_SVX_START + 188)
+#define HID_SVX_TP_ERR_REP_SEND                                     (HID_SVX_START + 189)
+#define HID_SVX_TP_ERR_REP_WELCOME                                  (HID_SVX_START + 190)
+#define HID_THES_LANGUAGE                                           (HID_SVX_START + 191)
+#define HID_VALUESET_EXTRUSION_DIRECTION                            (HID_SVX_START + 192)
+#define HID_VALUESET_EXTRUSION_LIGHTING                             (HID_SVX_START + 193)
+#define HID_WIN_FONTWORK_ALIGN                                      (HID_SVX_START + 194)
+#define HID_WIN_FONTWORK_CHARSPACE                                  (HID_SVX_START + 195)
+#define HID_XMLSEC_CALL                                             (HID_SVX_START + 196)
+#define HID_OFA_HYPERLINK_DLG                                       (HID_SVX_START + 197)
+#define HID_OFA_HYPERLINK_NAME                                      (HID_SVX_START + 198)
+#define HID_OFA_HYPERLINK_SEARCH                                    (HID_SVX_START + 199)
+#define HID_OFA_HYPERLINK_TARGET                                    (HID_SVX_START + 200)
+#define HID_OFA_HYPERLINK_URL                                       (HID_SVX_START + 201)
+#define HID_OFA_HYPERLINK_URL_TXT                                   (HID_SVX_START + 202)
+#define HID_AUTOCORR_DLG                                            (HID_SVX_START + 203)
+#define HID_SVXCTL_MAIL_ATTACH                                      (HID_SVX_START + 204)
+#define HID_SVXDLG_REGISTRATION                                     (HID_SVX_START + 205)
+#define HID_SVXDLG_TREE_BASE                                        (HID_SVX_START + 206)
+#define HID_SVXDLG_TREE_CHART                                       (HID_SVX_START + 207)
+#define HID_SVXDLG_TREE_FILTER                                      (HID_SVX_START + 208)
+#define HID_SVXDLG_TREE_LANGUAGE                                    (HID_SVX_START + 209)
+#define HID_SVXWIN_MAIL_ATTACH                                      (HID_SVX_START + 210)
+#define HID_SVXWIN_MAIL_HEADER                                      (HID_SVX_START + 211)
+#define HID_SVX_DLGFORMNEW                                          (HID_SVX_START + 212)
+#define HID_SVX_DLGTABNEW                                           (HID_SVX_START + 213)
+#define HID_SVX_HYPERLINK                                           (HID_SVX_START + 214)
+#define HID_SVX_MAILATTACH_ASCII_CB                                 (HID_SVX_START + 215)
+#define HID_SVX_MAILATTACH_HTML_CB                                  (HID_SVX_START + 216)
+#define HID_SVX_MAILATTACH_OFFICE_CB                                (HID_SVX_START + 217)
+#define HID_SVX_MAILATTACH_PRIORITY_LB                              (HID_SVX_START + 218)
+#define HID_SVX_MAILATTACH_RECEIPT_CB                               (HID_SVX_START + 219)
+#define HID_SVX_MAILATTACH_RTF_CB                                   (HID_SVX_START + 220)
+#define HID_SVX_MAILHEAD_HEAD_WIN                                   (HID_SVX_START + 221)
+#define HID_SVX_MAILHEAD_PRIORITY_LB                                (HID_SVX_START + 222)
+#define HID_SVX_MAILHEAD_PROTOCOL_LB                                (HID_SVX_START + 223)
+#define HID_SVX_MAILHEAD_RCPT_CB                                    (HID_SVX_START + 224)
+#define HID_SVX_MAILHEAD_RCPT_ED                                    (HID_SVX_START + 225)
+#define HID_SVX_MAILHEAD_RCPT_LB                                    (HID_SVX_START + 226)
+#define HID_SVX_MAILHEAD_RECEIPT_CB                                 (HID_SVX_START + 227)
+#define HID_SVX_MAILHEAD_ROLE_LB                                    (HID_SVX_START + 228)
+#define HID_SVX_MAILHEAD_SUBJECT_ED                                 (HID_SVX_START + 229)
+#define HID_SVX_MAILMENU_ADDADDRESS                                 (HID_SVX_START + 230)
+#define HID_SVX_MAILMENU_COPYLINK                                   (HID_SVX_START + 231)
+#define HID_SVX_MAILMENU_DELETE                                     (HID_SVX_START + 232)
+#define HID_SVX_MAILMENU_FILE                                       (HID_SVX_START + 233)
+#define HID_SVX_MAILMENU_OPEN                                       (HID_SVX_START + 234)
+#define HID_SVX_MAILMENU_RENAME                                     (HID_SVX_START + 235)
+#define HID_SVX_MAILMENU_SAVEAS                                     (HID_SVX_START + 236)
+#define HID_SVX_MAILMENU_SIG1                                       (HID_SVX_START + 237)
+#define HID_SVX_MAILMENU_SIG2                                       (HID_SVX_START + 238)
+#define HID_SVX_MAILMENU_SIG3                                       (HID_SVX_START + 239)
+#define HID_SVX_MAILMENU_SIG4                                       (HID_SVX_START + 240)
+#define HID_SVX_MAILTOOLBOX                                         (HID_SVX_START + 241)
+#define HID_SVX_SENDMENU_ENCRYPT                                    (HID_SVX_START + 242)
+#define HID_SVX_SENDMENU_PLAIN                                      (HID_SVX_START + 243)
+#define HID_SVX_SENDMENU_SIGN                                       (HID_SVX_START + 244)
+#define HID_SVX_SENDMENU_SIGNANDENCRYPT                             (HID_SVX_START + 245)
+#define HID_SVX_TP_APPEARANCE                                       (HID_SVX_START + 246)
+#define HID_SVX_TP_DESKTOP                                          (HID_SVX_START + 247)
 
 // please adjust ACT_SVX_HID_END2 below if you add entries here!
 
@@ -826,15 +290,10 @@
 // Overrun check ---------------------------------------------------------
 // -----------------------------------------------------------------------
 
-#define ACT_SVX_HID_END     HID_OPTIONS_ACCESSIBILITYCONFIG
+#define ACT_SVX_HID_END     (HID_SVX_START+247)
 #if ACT_SVX_HID_END > HID_SVX_END
 #error Resource-Ueberlauf in #line, #file
 #endif
 
-#define ACT_SVX_HID_END2    (HID_SVX_EXT0_START + 215)
-#if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
-#error resource overrun in #line, #file
-#endif
-
 #endif
 
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx
index 6c8422e60d0e..a820be6562f1 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/hlnkitem.hxx
@@ -31,9 +31,9 @@
 #define _SVX_HLNKITEM_HXX
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include "svx/svxdllapi.h"
 
 #define HYPERDLG_EVENT_MOUSEOVER_OBJECT     0x0001
diff --git a/svx/inc/htmlcfg.hxx b/svx/inc/htmlcfg.hxx
index 2e3175898377..5fa8bdb6071a 100644
--- a/svx/inc/htmlcfg.hxx
+++ b/svx/inc/htmlcfg.hxx
@@ -61,7 +61,8 @@ public:
                     SvxHtmlOptions();
                     ~SvxHtmlOptions();
 
-    virtual void            Commit();
+    virtual void    Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
     USHORT      GetFontSize(USHORT nPos) const;
     void        SetFontSize(USHORT nPos, USHORT nSize);
diff --git a/svx/inc/linectrl.hxx b/svx/inc/linectrl.hxx
index d8d5df55c97c..82c042e08d1f 100644
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/linectrl.hxx
@@ -32,7 +32,7 @@
 
 
 #include <svtools/valueset.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/nlbkitem.hxx b/svx/inc/nlbkitem.hxx
index 3e586731345a..db3298c3d5b1 100644
--- a/svx/inc/nlbkitem.hxx
+++ b/svx/inc/nlbkitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 // class SvxNoLinebreakItem ----------------------------------------------
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/ofaitem.hxx
index 9a57dbb2989c..7701cb82206b 100644
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/ofaitem.hxx
@@ -32,7 +32,7 @@
 
 // include ----------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 // class OfaPtrItem ------------------------------------------------------
diff --git a/svx/inc/opaqitem.hxx b/svx/inc/opaqitem.hxx
index c5306c0e0a61..07a5cbb4fd36 100644
--- a/svx/inc/opaqitem.hxx
+++ b/svx/inc/opaqitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 class SvXMLUnitConverter;
diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index 31e5ac10f59b..e91530f33cd5 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <sfx2/tabdlg.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/svx/inc/optitems.hxx b/svx/inc/optitems.hxx
index e48367556925..6e951c0100f4 100644
--- a/svx/inc/optitems.hxx
+++ b/svx/inc/optitems.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 8e9bc4d17930..4c05d1922247 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -753,29 +753,29 @@
 #include <vector>
 #include "svtools/FilterConfigItem.hxx"
 #include "svtools/accessibilityoptions.hxx"
-#include "svtools/adrparse.hxx"
+#include "svl/adrparse.hxx"
 #include "svtools/apearcfg.hxx"
-#include "svtools/brdcst.hxx"
-#include "svtools/cacheoptions.hxx"
-#include "svtools/cancel.hxx"
-#include "svtools/cjkoptions.hxx"
-#include "svtools/cmdoptions.hxx"
-#include "svtools/cntwall.hxx"
+#include "svl/brdcst.hxx"
+#include "unotools/cacheoptions.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntwall.hxx"
 #include "svtools/colorcfg.hxx"
-#include "svtools/ctloptions.hxx"
-#include "svtools/defaultoptions.hxx"
-#include "svtools/dynamicmenuoptions.hxx"
+#include "svl/ctloptions.hxx"
+#include "unotools/defaultoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
-#include "svtools/eventcfg.hxx"
-#include "svtools/extendedsecurityoptions.hxx"
-#include "svtools/filenotation.hxx"
-#include "svtools/flagitem.hxx"
-#include "svtools/fltrcfg.hxx"
-#include "svtools/fontoptions.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "unotools/fontoptions.hxx"
 #include "svtools/fontsubstconfig.hxx"
 #include "svtools/helpopt.hxx"
-#include "svtools/hint.hxx"
+#include "svl/hint.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/htmltokn.h"
 #include "svtools/imagemgr.hxx"
@@ -784,70 +784,70 @@
 #include "svtools/imappoly.hxx"
 #include "svtools/imaprect.hxx"
 #include "svtools/inetimg.hxx"
-#include "svtools/inetoptions.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/isethint.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/javaoptions.hxx"
-#include "svtools/languageoptions.hxx"
-#include "svtools/lingucfg.hxx"
-#include "svtools/linguprops.hxx"
-#include "svtools/lngmisc.hxx"
+#include "unotools/inetoptions.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/javaoptions.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lngmisc.hxx"
 #include "svtools/localresaccess.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/macitem.hxx"
+#include "svl/lstner.hxx"
+#include "svl/macitem.hxx"
 #include "svtools/menuoptions.hxx"
-#include "svtools/metitem.hxx"
-#include "svtools/misccfg.hxx"
+#include "svl/metitem.hxx"
+#include "unotools/misccfg.hxx"
 #include "svtools/miscopt.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/optionsdlg.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "unotools/optionsdlg.hxx"
 #include "svtools/parhtml.hxx"
 #include "svtools/parrtf.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/pickerhelper.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/printwarningoptions.hxx"
-#include "svtools/ptitem.hxx"
-#include "svtools/rectitem.hxx"
-#include "svtools/rngitem.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "svl/rngitem.hxx"
 #include "svtools/rtfkeywd.hxx"
 #include "svtools/rtfout.hxx"
 #include "svtools/rtftoken.h"
-#include "svtools/saveopt.hxx"
-#include "svtools/searchopt.hxx"
-#include "svtools/securityoptions.hxx"
-#include "svtools/sfontitm.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
+#include "svl/sfontitm.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
-#include "svtools/sourceviewconfig.hxx"
-#include "svtools/startoptions.hxx"
+#include "unotools/sourceviewconfig.hxx"
+#include "unotools/startoptions.hxx"
 #include "svtools/stdmenu.hxx"
 #include "svtools/stringtransfer.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svstdarr.hxx"
-#include "svtools/syslocaleoptions.hxx"
-#include "svtools/szitem.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
 #include "svtools/textdata.hxx"
 #include "svtools/transfer.hxx"
 #include "svtools/txtcmp.hxx"
-#include "svtools/undo.hxx"
-#include "svtools/undoopt.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
 #include "svtools/unoevent.hxx"
 #include "svtools/unoimap.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
-#include "svtools/useroptions.hxx"
-#include "svtools/viewoptions.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
 #include "sys/stat.h"
 #include "sys/types.h"
 #include "toolkit/awt/vclxdevice.hxx"
@@ -927,7 +927,7 @@
 #include "vcl/dndhelp.hxx"
 #include "vcl/fldunit.hxx"
 #include "vcl/fntstyle.hxx"
-#include "vcl/fontcvt.hxx"
+#include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
diff --git a/svx/inc/pgrditem.hxx b/svx/inc/pgrditem.hxx
index 719995362f13..e1c886829d17 100644
--- a/svx/inc/pgrditem.hxx
+++ b/svx/inc/pgrditem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 // class SvxParaGridItem -------------------------------------------------
diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx
index 87908ebebd78..425f3f84bf76 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/postattr.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include "svx/svxdllapi.h"
 
 // class SvxPostItAuthorItem ---------------------------------------------
diff --git a/svx/inc/prntitem.hxx b/svx/inc/prntitem.hxx
index da56c7d0a3f4..f9b91e12a2a7 100644
--- a/svx/inc/prntitem.hxx
+++ b/svx/inc/prntitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/protitem.hxx b/svx/inc/protitem.hxx
index c3707b9b3558..bb6646f9445a 100644
--- a/svx/inc/protitem.hxx
+++ b/svx/inc/protitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 class SvXMLUnitConverter;
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx
index a91074f2f79f..f88b8a2b35ef 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/rotmodit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_ROTMODIT_HXX
 #define _SVX_ROTMODIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 //----------------------------------------------------------------------------
diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx
index 8a1b49f4bc55..7d035acef427 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/rulritem.hxx
@@ -34,7 +34,7 @@
 
 
 #include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 // class SvxLongLRSpaceItem ----------------------------------------------
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
index f002113cb565..cd4006e86690 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/srchdlg.hxx
@@ -57,9 +57,9 @@
 #endif
 #include <sfx2/childwin.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/svmedit.hxx>
 #include <sfx2/srchdefs.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
index 411a16d60e31..411a16d60e31 100755
--- a/svx/inc/EnhancedCustomShapeFunctionParser.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index ebb5172c14bc..a3f040d8d594 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/smarttags/XSmartTagAction.hpp>
diff --git a/svx/inc/svx/adjitem.hxx b/svx/inc/svx/adjitem.hxx
index ce8699bd3f3d..b29a356ded63 100644
--- a/svx/inc/svx/adjitem.hxx
+++ b/svx/inc/svx/adjitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
diff --git a/svx/inc/svx/akrnitem.hxx b/svx/inc/svx/akrnitem.hxx
index eaafd8f546a9..cd581ced8cfa 100644
--- a/svx/inc/svx/akrnitem.hxx
+++ b/svx/inc/svx/akrnitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index 379d20afc685..71900afca1ab 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -33,8 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svx/svxids.hrc>
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/blnkitem.hxx b/svx/inc/svx/blnkitem.hxx
index 7aee8797a43b..1c4c3eb3985d 100644
--- a/svx/inc/svx/blnkitem.hxx
+++ b/svx/inc/svx/blnkitem.hxx
@@ -32,8 +32,8 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/borderline.hxx b/svx/inc/svx/borderline.hxx
index 937fe3d2a973..77fae1f676d0 100644
--- a/svx/inc/svx/borderline.hxx
+++ b/svx/inc/svx/borderline.hxx
@@ -32,7 +32,7 @@
 #define SVX_BORDERLINE_HXX
 
 #include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 // Line defaults in twips (former Writer defaults):
diff --git a/svx/inc/svx/boxitem.hxx b/svx/inc/svx/boxitem.hxx
index 06dd343c7c11..4b45eb0377c8 100644
--- a/svx/inc/svx/boxitem.hxx
+++ b/svx/inc/svx/boxitem.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_BOXITEM_HXX
 #define _SVX_BOXITEM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/borderline.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx
index 50bc798af490..f2241fc08d60 100644
--- a/svx/inc/svx/brkitem.hxx
+++ b/svx/inc/svx/brkitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx
index f418a54fbe55..7952ae3ec2ff 100644
--- a/svx/inc/svx/brshitem.hxx
+++ b/svx/inc/svx/brshitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/charreliefitem.hxx b/svx/inc/svx/charreliefitem.hxx
index 719b28dee875..95685902ad9c 100644
--- a/svx/inc/svx/charreliefitem.hxx
+++ b/svx/inc/svx/charreliefitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/fntstyle.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/charrotateitem.hxx b/svx/inc/svx/charrotateitem.hxx
index 20a6618169cd..62bae4b7caa5 100644
--- a/svx/inc/svx/charrotateitem.hxx
+++ b/svx/inc/svx/charrotateitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/charscaleitem.hxx b/svx/inc/svx/charscaleitem.hxx
index 40ce8002dc04..ed957424731c 100644
--- a/svx/inc/svx/charscaleitem.hxx
+++ b/svx/inc/svx/charscaleitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #ifndef _SFXENUMITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/cmapitem.hxx b/svx/inc/svx/cmapitem.hxx
index b2ce3d24aa30..cec4d6e538c6 100644
--- a/svx/inc/svx/cmapitem.hxx
+++ b/svx/inc/svx/cmapitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/cntritem.hxx b/svx/inc/svx/cntritem.hxx
index 577e2843e91a..da5d48bf06ea 100644
--- a/svx/inc/svx/cntritem.hxx
+++ b/svx/inc/svx/cntritem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 56a7e0a410fa..9a908afa4588 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -34,7 +34,7 @@
 #include <sfx2/childwin.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "svx/svxdllapi.h"
 
 class XColorTable;
diff --git a/svx/inc/svx/colritem.hxx b/svx/inc/svx/colritem.hxx
index 97b60b20a5a0..aea4918850d3 100644
--- a/svx/inc/svx/colritem.hxx
+++ b/svx/inc/svx/colritem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/crsditem.hxx b/svx/inc/svx/crsditem.hxx
index c954d0fc15b4..945ae086f36e 100644
--- a/svx/inc/svx/crsditem.hxx
+++ b/svx/inc/svx/crsditem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <vcl/vclenum.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 6e6162ef61f2..c7cddf48e27c 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -40,39 +40,141 @@
 // Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
 #define RID_SVX_FIRSTFREE                   305
 
-// ResId fuer die Hintergrund-TabPage
-#define RID_SVXPAGE_BACKGROUND              (RID_SVX_START +   1)
-
-// ResId fuer die Tabulator-TabPage
-#define RID_SVXPAGE_TABULATOR               (RID_SVX_START +   2)
+// some strings also used in CUI
+#define RID_SVXSTR_PAPERBIN                 (RID_SVX_START + 145)
+#define RID_SVXSTR_PAPERBIN_SETTINGS        (RID_SVX_START + 149)
+#define RID_SVXERRCTX                       (RID_SVX_START + 351)
+#define RID_SVXSTR_COLOR                    (RID_SVX_START + 179)
+#define RID_SVXSTR_TRANSPARENT              (RID_SVX_START + 190)
+#define RID_SVXSTR_AUTOMATIC                (RID_SVX_START + 841)
+#define RID_SVXSTR_INVISIBLE                (RID_SVX_START + 178)
+#define RID_SVXSTR_NONE                     (RID_SVX_START + 183)
+#define RID_SVXSTR_SOLID                    (RID_SVX_START + 160)
+#define RID_SVXSTR_LINEEND                  (RID_SVX_START + 237)
+#define RID_SVXSTR_GRADIENT                 (RID_SVX_START + 161)
+#define RID_SVXSTR_HATCH                    (RID_SVX_START + 180)
+#define RID_SVXSTR_BITMAP                   (RID_SVX_START + 167)
+#define RID_SVXSTR_LINESTYLE                (RID_SVX_START + 173)
+#define RID_SVXSTR_FIELDUNIT_TABLE          (RID_SVX_START + 311)
+#define RID_SVXSTR_COLOR_USER               (RID_SVX_START + 250)
 
-// ResId's fuer die Zeichen-TabPages
-#define RID_SVXPAGE_CHAR_STD                (RID_SVX_START +   3)
-#define RID_SVXPAGE_CHAR_EXT                (RID_SVX_START +   4)
-// new char pages
+// factory IDs of tabpages implemented in CUI
+#define RID_SVXPAGE_CHAR_TWOLINES           (RID_SVX_START + 242)
+#define RID_SVXPAGE_EXT_PARAGRAPH           (RID_SVX_START +   7)
+#define RID_SVXPAGE_GRFCROP                 (RID_SVX_START + 238)
 #define RID_SVXPAGE_CHAR_NAME               (RID_SVX_START + 239)
 #define RID_SVXPAGE_CHAR_EFFECTS            (RID_SVX_START + 240)
 #define RID_SVXPAGE_CHAR_POSITION           (RID_SVX_START + 241)
-#define RID_SVXPAGE_CHAR_TWOLINES           (RID_SVX_START + 242)
-
-// ResId fuer die Umrahmung-TabPage
+#define RID_SVXPAGE_STD_PARAGRAPH           (RID_SVX_START +   6)
+#define RID_SVXPAGE_ALIGN_PARAGRAPH         (RID_SVX_START + 187)
+#define RID_SVXPAGE_PARA_ASIAN              (RID_SVX_START + 245)
+#define RID_SVXPAGE_TABULATOR               (RID_SVX_START +   2)
+#define RID_SFXPAGE_DBREGISTER              (RID_OFA_START + 123)
+#define RID_SVXPAGE_NUMBERFORMAT            (RID_SVX_START +  41)
+#define RID_SVXPAGE_ALIGNMENT               (RID_SVX_START +  90)
 #define RID_SVXPAGE_BORDER                  (RID_SVX_START +   5)
+#define RID_SVXPAGE_BACKGROUND              (RID_SVX_START +   1)
+#define RID_SVXPAGE_PAGE                    (RID_SVX_START +  25)
+#define RID_SVXPAGE_LINE                    (RID_SVX_START +  51)
+#define RID_SVXPAGE_AREA                    (RID_SVX_START +  56)
+#define RID_SVXPAGE_SHADOW                  (RID_SVX_START +  61)
+#define RID_SVXPAGE_TRANSPARENCE            (RID_SVX_START +  54)
+#define RID_SVXPAGE_TEXTATTR                (RID_SVX_START + 153)
+#define RID_SVXPAGE_TEXTANIMATION           (RID_SVX_START + 184)
+#define RID_SVXPAGE_MEASURE                 (RID_SVX_START + 161)
+#define RID_SVXPAGE_CONNECTION              (RID_SVX_START + 191)
+#define RID_SVXPAGE_LINE_DEF                (RID_SVX_START +  52)
+#define RID_SVXPAGE_LINEEND_DEF             (RID_SVX_START +  53)
+#define RID_SVXPAGE_NUM_OPTIONS             (RID_SVX_START + 219)
+#define RID_SVXPAGE_NUM_POSITION            (RID_SVX_START + 220)
+#define RID_SVXPAGE_PICK_SINGLE_NUM         (RID_SVX_START + 215)
+#define RID_SVXPAGE_PICK_BULLET             (RID_SVX_START + 216)
+#define RID_SVXPAGE_PICK_NUM                (RID_SVX_START + 217)
+#define RID_SVXPAGE_PICK_BMP                (RID_SVX_START + 218)
+#define RID_SVXPAGE_CAPTION                 (RID_SVX_START + 150)
+#define RID_SVXPAGE_SWPOSSIZE               (RID_SVX_START + 288)
+#define RID_SVXPAGE_POSITION_SIZE           (RID_SVX_START +  87)
+#define RID_SVXPAGE_EVENTASSIGN             (RID_SVX_START + 303)
+#define RID_SVXPAGE_HATCH                   (RID_SVX_START +  57)
+#define RID_SVXPAGE_BITMAP                  (RID_SVX_START +  58)
+#define RID_SVXPAGE_GRADIENT                (RID_SVX_START +  59)
+#define RID_SVXPAGE_ANGLE                   (RID_SVX_START +  48)
+#define RID_SVXPAGE_SLANT                   (RID_SVX_START +  49)
+#define RID_SVXPAGE_DISTRIBUTE              (RID_SVX_START + 236)
+#define RID_SVXPAGE_IMPROVEMENT             (RID_SVX_START + 302)
+#define RID_SVXPAGE_MACROASSIGN             (RID_SVX_START + 296)
 
-// ResId's fuer die Absatz-TabPages
-#define RID_SVXPAGE_STD_PARAGRAPH           (RID_SVX_START +   6)
-#define RID_SVXPAGE_ALIGN_PARAGRAPH         (RID_SVX_START +   187)
-#define RID_SVXPAGE_EXT_PARAGRAPH           (RID_SVX_START +   7)
+
+// why extra defines for pages that already exist?
+#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE           (RID_SVX_START + 998)
+#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT           (RID_SVX_START + 999)
+
+// ID of tabpages implemented in SVX, but used in CUI
+#define RID_SVXPAGE_GRID                    (RID_SVX_START + 152)
+
+// factory IDs of dialogs implemented in CUI
+#define RID_SVX_GRFFILTER_DLG_SEPIA         (RID_SVX_START + 334)
+#define RID_SVX_GRFFILTER_DLG_POSTER        (RID_SVX_START + 335)
+#define RID_SVX_GRFFILTER_DLG_MOSAIC        (RID_SVX_START + 332)
+#define RID_SVX_GRFFILTER_DLG_SOLARIZE      (RID_SVX_START + 333)
+#define RID_SVX_GRFFILTER_DLG_EMBOSS        (RID_SVX_START + 336)
+#define RID_SVXDLG_SEARCHFORMAT             (RID_SVX_START +  21)
+#define RID_SVXDLG_CHARMAP                  ( RID_SVX_START +  10 )
+#define RID_SVXDLG_POSTIT                   ( RID_SVX_START +   8 )
+
+// only needed for layout:
+#define RID_SVXDLG_ZOOM                     ( RID_SVX_START +  0 )
+
+// IDs of options pages of applications
+#define RID_SW_TP_MAILCONFIG            (RID_OFA_START + 102)
+#define RID_SW_TP_STD_FONT_CJK          (RID_OFA_START + 247)
+#define RID_SW_TP_STD_FONT_CTL          (RID_OFA_START + 251)
+#define RID_SW_TP_OPTLOAD_PAGE          (RID_OFA_START + 214)
+#define RID_SW_TP_CONTENT_OPT           (RID_OFA_START + 206)
+#define RID_SW_TP_OPTSHDWCRSR           (RID_OFA_START + 211)
+#define RID_SW_TP_STD_FONT              (RID_OFA_START + 208)
+#define RID_SW_TP_OPTPRINT_PAGE         (RID_OFA_START + 209)
+#define RID_SW_TP_OPTTABLE_PAGE         (RID_OFA_START + 210)
+#define RID_SW_TP_REDLINE_OPT           (RID_OFA_START + 212)
+#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
+#define RID_SW_TP_HTML_CONTENT_OPT      (RID_OFA_START + 240)
+#define RID_SW_TP_HTML_OPTPRINT_PAGE    (RID_OFA_START + 242)
+#define RID_SW_TP_HTML_OPTTABLE_PAGE    (RID_OFA_START + 243)
+#define RID_SW_TP_HTML_OPTGRID_PAGE     (RID_OFA_START + 244)
+#define RID_SW_TP_HTML_OPTSHDWCRSR      (RID_OFA_START + 246)
+#define RID_SW_TP_BACKGROUND            (RID_OFA_START + 217)
+#define RID_SW_TP_OPTCAPTION_PAGE       (RID_OFA_START + 256)
+#define SID_SC_TP_LAYOUT                (RID_OFA_START + 218)
+#define SID_SC_TP_CONTENT               (RID_OFA_START + 219)
+#define SID_SC_TP_INPUT                 (RID_OFA_START + 220)
+#define SID_SC_TP_GRID                  (RID_OFA_START + 221)
+#define SID_SC_TP_USERLISTS             (RID_OFA_START + 222)
+#define SID_SC_TP_CALC                  (RID_OFA_START + 223)
+#define SID_SC_TP_CHANGES               (RID_OFA_START + 224)
+#define RID_SC_TP_PRINT                 (RID_OFA_START + 248)
+#define SID_SI_TP_PRINT                 (RID_OFA_START + 236)
+#define SID_SI_TP_CONTENTS              (RID_OFA_START + 232)
+#define SID_SI_TP_SNAP                  (RID_OFA_START + 234)
+#define SID_SI_TP_MISC                  (RID_OFA_START + 237)
+#define SID_SD_TP_PRINT                 (RID_OFA_START + 220)
+#define SID_SD_TP_CONTENTS              (RID_OFA_START + 225)
+#define SID_SD_TP_SNAP                  (RID_OFA_START + 227)
+#define SID_SD_TP_MISC                  (RID_OFA_START + 231)
+#define RID_OFA_TP_INTERNATIONAL_SD     (RID_OFA_START + 253)
+#define RID_OFA_TP_INTERNATIONAL_IMPR   (RID_OFA_START + 254)
+#define RID_OFA_TP_INTERNATIONAL        (RID_OFA_START + 252) // calc
+
+//---------------------------------------------------------------------
+// ResId's fuer die Zeichen-TabPages
+#define RID_SVXPAGE_CHAR_STD                (RID_SVX_START +   3)
+#define RID_SVXPAGE_CHAR_EXT                (RID_SVX_START +   4)
 
 // moved ids +8 ... +17 to "ModalDialog" resource ids
 
 // ResId fuer den Suchen/Ersetzen-Dialog
 #define RID_SVXDLG_SEARCH                   (RID_SVX_START +  20)
-#define RID_SVXDLG_SEARCHFORMAT             (RID_SVX_START +  21)
-#define RID_SVXDLG_SEARCHATTR               (RID_SVX_START +  22)
-#define RID_SVXDLG_SEARCHSIMILARITY         (RID_SVX_START +  23)
 
 // ResId fuer die PageDialog
-#define RID_SVXPAGE_PAGE                    (RID_SVX_START +  25)
 #define RID_SVXPAGE_FOOTER                  (RID_SVX_START +  26)
 #define RID_SVXPAGE_HEADER                  (RID_SVX_START +  27)
 #define RID_SVXQBX_DELETE_HEADFOOT          (RID_SVX_START +  28)
@@ -81,7 +183,6 @@
 #define RID_SVXDLG_HYPHENATE                (RID_SVX_START +  30)
 #define RID_SVXDLG_THESAURUS                (RID_SVX_START +  31)
 #define RID_SVXDLG_THES_LANGUAGE            (RID_SVX_START +  38)
-#define RID_SVXDLG_SPELLCHECK               (RID_SVX_START +  32)
 
 // ResIds fuer HM-QueryBoxen und Error-Strings
 #define RID_SVXQB_THESAURUS                 (RID_SVX_START +  33)
@@ -92,49 +193,14 @@
 // + 38 ist vergeben, siehe RID_SVXDLG_THES_LANGUAGE
 #define RID_SVXQB_BW_CONTINUE               (RID_SVX_START +  39)
 
-// ResId fuer den BB-Dialog
-#define RID_SVXDLG_BBDLG                    (RID_SVX_START +  40)
-
-// ResId fuer die Zahlenformate-Page
-#define RID_SVXPAGE_NUMBERFORMAT            (RID_SVX_START +  41)
-
 // ResId's fuer Dialoge aus StarDraw
-#define RID_SVXDLG_TRANSFORM                (RID_SVX_START +  45)
 #define RID_SVXPAGE_POSITION                (RID_SVX_START +  46)
 #define RID_SVXPAGE_SIZE                    (RID_SVX_START +  47)
-#define RID_SVXPAGE_POSITION_SIZE           (RID_SVX_START +  87)
-#define RID_SVXPAGE_SWPOSSIZE               (RID_SVX_START + 288)
 #define RID_SVXSW_FRAMEPOSITIONS            (RID_SVX_START + 289)
 
-#define RID_SVXPAGE_ANGLE                   (RID_SVX_START +  48)
-#define RID_SVXPAGE_SLANT                   (RID_SVX_START +  49)
-
-#define RID_SVXDLG_LINE                     (RID_SVX_START +  50)
-#define RID_SVXPAGE_LINE                    (RID_SVX_START +  51)
-#define RID_SVXPAGE_LINE_DEF                (RID_SVX_START +  52)
-#define RID_SVXPAGE_LINEEND_DEF             (RID_SVX_START +  53)
-
-#define RID_SVXDLG_AREA                     (RID_SVX_START +  55)
-#define RID_SVXPAGE_AREA                    (RID_SVX_START +  56)
-#define RID_SVXPAGE_TRANSPARENCE            (RID_SVX_START +  54)
-#define RID_SVXPAGE_HATCH                   (RID_SVX_START +  57)
-#define RID_SVXPAGE_BITMAP                  (RID_SVX_START +  58)
-#define RID_SVXPAGE_GRADIENT                (RID_SVX_START +  59)
-#define RID_SVXPAGE_COLOR                   (RID_SVX_START +  60)
-#define RID_SVXPAGE_SHADOW                  (RID_SVX_START +  61)
-
-#define RID_SVXDLG_NAME                     (RID_SVX_START +  62)
-#define RID_SVXDLG_MESSBOX                  (RID_SVX_START +  63)
-
-// #i68101#
-#define RID_SVXDLG_OBJECT_NAME              (RID_SVX_START +  64)
-
 #define RID_SVXIL_FRAME                     (RID_SVX_START +  65)
 #define RID_SVXIL_FRAME_HC                  (RID_SVX_START +  66)
 
-// #i68101#
-#define RID_SVXDLG_OBJECT_TITLE_DESC        (RID_SVX_START +  67)
-
 #define RID_SVXDLG_3D                       (RID_SVX_START +  70)
 #define RID_SVXPAGE_LIGHT3D                 (RID_SVX_START +  71)
 #define RID_SVXPAGE_3DATTR                  (RID_SVX_START +  72)
@@ -192,9 +258,6 @@
 #define RID_SVXBMP_SLIDERDECREASE_HC            (RID_SVX_START +  71)
 #define RID_SVXBMP_SLIDERINCREASE_HC            (RID_SVX_START +  72)
 
-// Alignment-TabPage
-#define RID_SVXPAGE_ALIGNMENT               (RID_SVX_START +  90)
-
 // Resource mit Bitmaps fuer die CheckListBox
 #define RID_CHECKLISTBOX_BITMAPS            (RID_SVX_START +  91)
 
@@ -224,8 +287,6 @@
 #define RID_SVXBMP_SHADOW_SIZE              (RID_SVX_START + 113)
 
 #define RID_SVXCTRL_COLOR                   (RID_SVX_START + 117)
-#define RID_SVXBMP_LOCK                     (RID_SVX_START + 118)
-#define RID_SVXBMP_LOCK_HC                  (RID_SVX_START + 119)
 
 // fuer ToolboxControl-Style
 #define RID_SVXTBX_STYLE                    (RID_SVX_START + 120)
@@ -233,39 +294,12 @@
 #define RID_SVXDLG_HYPERLINK                (RID_SVX_START + 140)
 #define RID_SVXDLG_PASSWORD                 (RID_SVX_START + 141)
 
-// Dialog bzw TabPage fuer Labelobjekte
-#define RID_SVXPAGE_CAPTION                 (RID_SVX_START + 150)
-#define RID_SVXDLG_CAPTION                  (RID_SVX_START + 151)
-
-//ResId fuer TabPage Raster
-#define RID_SVXPAGE_GRID                    (RID_SVX_START + 152)
-
-// ResId fuer TextAttribut-Dialog
-#define RID_SVXDLG_TEXT                     (RID_SVX_START + 183)
-#define RID_SVXPAGE_TEXTATTR                (RID_SVX_START + 153)
-#define RID_SVXPAGE_TEXTANIMATION           (RID_SVX_START + 184)
-
 // ResId fuer InternetPage
 #define RID_SVXPAGE_INTERNET                (RID_SVX_START + 154)
 
-// ResId fuer FontSubstitution
-#define RID_SVX_FONT_SUBSTITUTION           (RID_SVX_START + 18)
-
-// insert row&col dialog
-#define DLG_INS_ROW_COL                     (RID_SVX_START + 156)
-
 //InetDlg
-#define RID_SVXPAGE_INET_MAIL               (RID_SVX_START + 155)
-#define RID_SVXPAGE_INET_PROXY              (RID_SVX_START + 157)
 #define RID_SVXPAGE_INET_CACHE              (RID_SVX_START + 158)
 #define RID_SVXPAGE_INET_TYPE               (RID_SVX_START + 159)
-#define RID_SVXPAGE_INET_SEARCH             (RID_SVX_START + 160)
-//added by jmeng begin
-#define RID_SVXPAGE_INET_MOZPLUGIN          (RID_SVX_START + 2161)
-#define GB_MOZPLUGIN    1
-#define CB_MOZPLUGIN_CODE   2
-//added by jmeng end
-#define RID_SVXPAGE_INET_SECURITY           (RID_SVX_START + 200)
 
 #define RID_SVXPAGE_BROWSER_OTHER           (RID_SVX_START + 202)
 #define RID_CACHE_EXTRA_DLG                 (RID_SVX_START + 203)
@@ -279,9 +313,6 @@
 #define RID_SVXPAGE_REGISTER_5              (RID_SVX_START + 198)
 #define RID_SVXPAGE_REGISTER_6              (RID_SVX_START + 199)
 
-// ResId fuer Measure-Dialog
-#define RID_SVXPAGE_MEASURE                 (RID_SVX_START + 161)
-
 // 3D-Entfernung/Perspektive Bitmaps
 #define RID_SVXBMP_3D_DISTANCE_01           (RID_SVX_START + 162)
 #define RID_SVXBMP_3D_DISTANCE_02           (RID_SVX_START + 163)
@@ -309,18 +340,12 @@
 #define RID_SVXTBX_DRAW                     (RID_SVX_START + 189)
 #define RID_SVXTBX_ALIGNMENT                (RID_SVX_START + 190)
 
-#define RID_SVXPAGE_CONNECTION              (RID_SVX_START + 191)
-
 // Ids fuer Autokorrektur
 #define RID_SVX_AUTOCORR                    (RID_SVX_START + 192)
 
 // Auswahl ext. Linguitik
 #define RID_SVX_OPT_EXT_LINGU               (RID_SVX_START + 193)
 
-// Extra Dialog f"ur Option Pfade
-#define RID_SVXDLG_MULTIPATH                (RID_SVX_START + 201)
-#define RID_MULTIPATH_DBL_ERR               (RID_SVX_START + 207)
-
 // TabPage und Dialog f"ur LDAP-Server
 #define RID_SVXPAGE_LDAP                    (RID_SVX_START + 204)
 #define RID_SVXDLG_LDAP                     (RID_SVX_START + 205)
@@ -328,71 +353,26 @@
 // Dialog fuer Funktionen
 #define RID_SVXDLG_CALCFUNC                 (RID_SVX_START + 206)
 
-// Errorbox f"ur Optionen/Pfade
-#define RID_SVXERR_OPT_DOUBLEPATHS          (RID_SVX_START + 208)
-
-// Messboxen f"ur Optionen/Benutzerdaten
-#define RID_SVXQB_CHANGEDATA                (RID_SVX_START + 214)
-
 // QueryBox for Exit Recovery Wizard
 #define RID_SVXQB_EXIT_RECOVERY             (RID_SVX_START + 215)
 
 // ResId fuer den ImportGraphic-Dialog
 #define RID_SVXRES_IMPORTGRAPHIC            (RID_SVX_START + 499)
 
-#define RID_SVXPAGE_PICK_SINGLE_NUM         (RID_SVX_START + 215)
-#define RID_SVXPAGE_PICK_BULLET             (RID_SVX_START + 216)
-#define RID_SVXPAGE_PICK_NUM                (RID_SVX_START + 217)
-#define RID_SVXPAGE_PICK_BMP                (RID_SVX_START + 218)
-#define RID_SVXPAGE_NUM_OPTIONS             (RID_SVX_START + 219)
-#define RID_SVXPAGE_NUM_POSITION            (RID_SVX_START + 220)
-
-
-#define RID_SVXERR_OPT_PROXYPORTS           (RID_SVX_START + 224)
-#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE   (RID_SVX_START + 225)
 
 #define RID_SVXCTRL_RECTBTNS                (RID_SVX_START + 226)
 
 // ResId's f???r Hyperlink-Dialog-Tabpages
-#define RID_SVXDLG_NEWHYPERLINK             (RID_SVX_START + 227)
-#define RID_SVXPAGE_HYPERLINK_INTERNET      (RID_SVX_START + 228)
-#define RID_SVXPAGE_HYPERLINK_MAIL          (RID_SVX_START + 229)
-#define RID_SVXPAGE_HYPERLINK_DOCUMENT      (RID_SVX_START + 230)
-#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT   (RID_SVX_START + 231)
-#define RID_SVXFLOAT_HYPERLINK_MARKWND      (RID_SVX_START + 232)
 
 // ResId's for Starone impl. bitmaps
 #define RID_UNODRAW_OBJECTS                 (RID_SVX_START + 233)
 #define RID_UNODRAW_OLE2                    (RID_SVX_START + 234)
 #define RID_UNODRAW_GRAPHICS                (RID_SVX_START + 235)
 
-// ResId fuer Distribute-Dialog
-#define RID_SVXPAGE_DISTRIBUTE              (RID_SVX_START + 236)
-
-// tabpage for graphic cropping
-#define RID_SVXPAGE_GRFCROP                 (RID_SVX_START + 238)
-
 #define RID_SVXIMG_NOTCHECKED               (RID_SVX_START + 243)
 #define RID_SVXIMG_CHECKED                  (RID_SVX_START + 244)
 
-#define RID_SVXPAGE_PARA_ASIAN              (RID_SVX_START + 245)
-#define RID_SVXPAGE_ASIAN_LAYOUT            (RID_SVX_START + 246)
-
 #define RID_SVXDLG_RUBY                     (RID_SVX_START + 247)
-#define RID_SVXDLG_FILTER_WARNING           (RID_SVX_START + 248)
-
-#define RID_SVXPAGE_COLORCONFIG             (RID_SVX_START + 249)
-#define RID_SVXPAGE_ACCESSIBILITYCONFIG     (RID_SVX_START + 250)
-#define RID_SVXPAGE_SSO                                 (RID_SVX_START + 251)
-#define RID_SVXPAGE_OPTIONS_CTL             (RID_SVX_START + 252)
-#define RID_SVXPAGE_OPTIONS_JAVA            (RID_SVX_START + 253)
-#define RID_SVXDLG_JAVA_PARAMETER           (RID_SVX_START + 254)
-#define RID_SVXDLG_JAVA_CLASSPATH           (RID_SVX_START + 255)
-#define RID_SVXERR_JRE_NOT_RECOGNIZED       (RID_SVX_START + 256)
-#define RID_SVXERR_JRE_FAILED_VERSION       (RID_SVX_START + 257)
-
-#define RID_DLG_SCRIPTORGANIZER             (RID_SVX_START + 258)
-#define RID_DLG_SCRIPTSELECTOR              (RID_SVX_START + 259)
 
 #define RID_SVXBMP_FONTWORK_FORM1_H         (RID_SVX_START + 260)
 #define RID_SVXBMP_FONTWORK_FORM2_H         (RID_SVX_START + 261)
@@ -406,10 +386,6 @@
 #define RID_SVXBMP_FONTWORK_FORM10_H        (RID_SVX_START + 269)
 #define RID_SVXBMP_FONTWORK_FORM11_H        (RID_SVX_START + 270)
 #define RID_SVXBMP_FONTWORK_FORM12_H        (RID_SVX_START + 271)
-#define RID_SVXBMP_HLINETTP_H               (RID_SVX_START + 272)
-#define RID_SVXBMP_HLMAILTP_H               (RID_SVX_START + 273)
-#define RID_SVXBMP_HLDOCTP_H                (RID_SVX_START + 274)
-#define RID_SVXBMP_HLDOCNTP_H               (RID_SVX_START + 275)
 #define RID_SVXIMG_GRAF_RED_H               (RID_SVX_START + 276)
 #define RID_SVXIMG_GRAF_GREEN_H             (RID_SVX_START + 277)
 #define RID_SVXIMG_GRAF_BLUE_H              (RID_SVX_START + 278)
@@ -417,29 +393,11 @@
 #define RID_SVXIMG_GRAF_CONTRAST_H          (RID_SVX_START + 280)
 #define RID_SVXIMG_GRAF_GAMMA_H             (RID_SVX_START + 281)
 #define RID_SVXIMG_GRAF_TRANSPARENCE_H      (RID_SVX_START + 282)
-#define RID_SVXIMG_LOAD_H                   (RID_SVX_START + 283)
-#define RID_SVXIMG_SAVE_H                   (RID_SVX_START + 284)
 #define RID_SVXIMG_CHECKED_H                (RID_SVX_START + 285)
 
 #define RID_SVXDLG_TEXTCONTROL_CHARATTR     (RID_SVX_START + 286)
 #define RID_SVXDLG_TEXTCONTROL_PARAATTR     (RID_SVX_START + 287)
 
-#define RID_DLG_NEWLIB                      (RID_SVX_START + 290)
-
-#define RID_SVXDLG_CUSTOMIZE                (RID_SVX_START + 291)
-#define RID_SVXPAGE_MENUS                   (RID_SVX_START + 292)
-#define RID_SVXPAGE_KEYBOARD                (RID_SVX_START + 293)
-#define RID_SVXPAGE_TOOLBARS                (RID_SVX_START + 294)
-#define RID_SVXPAGE_EVENTS                  (RID_SVX_START + 295)
-#define RID_SVXPAGE_MACROASSIGN             (RID_SVX_START + 296)
-#define RID_SVXDLG_ASSIGNCOMPONENT          (RID_SVX_START + 297)
-#define RID_SVXPAGE_ONLINEUPDATE            (RID_SVX_START + 298)
-#define RID_OPTPAGE_CHART_DEFCOLORS         (RID_SVX_START + 299)
-#define RID_SVXDLG_SECURITY_OPTIONS         (RID_SVX_START + 300)
-#define RID_SVXDLG_WEBCONNECTION_INFO       (RID_SVX_START + 301)
-#define RID_SVXPAGE_IMPROVEMENT             (RID_SVX_START + 302)
-#define RID_SVXPAGE_EVENTASSIGN             (RID_SVX_START + 303)
-#define RID_SVXPAGE_CONFIGGROUPBOX          (RID_SVX_START + 304)
 // !!! please update RID_SVX_FIRSTFREE !!! see line 46
 
 // Strings ------------------------------------------------------------------
@@ -479,7 +437,7 @@
 #define RID_SVXSTR_HMERR_ADDWORD            (RID_SVX_START +  95)
 #define RID_SVXSTR_HMSTATUS_INVALID_LANG    (RID_SVX_START +  96)
 
-// Strings fuers Paperformat
+// paper formats
 #define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 100)
 #define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 101)
 #define RID_SVXSTR_PAPER_A2                 (RID_SVX_START + 102)
@@ -518,50 +476,17 @@
 #define RID_SVXSTR_PAPER_B5_JIS             (RID_SVX_START + 135)
 #define RID_SVXSTR_PAPER_B6_JIS             (RID_SVX_START + 136)
 
-#define RID_SVXSTRARY_PAPERSIZE_STD         (RID_SVX_START + 142)
-#define RID_SVXSTRARY_PAPERSIZE_DRAW        (RID_SVX_START + 143)
 #define RID_SVXSTR_FULLSIZE                 (RID_SVX_START + 144)
-#define RID_SVXSTR_PAPERBIN                 (RID_SVX_START + 145)
 
 // ResIds fuer die verschiedenen Strings des PageDlgs
 #define RID_SVXSTR_CALC_PAGE                (RID_SVX_START + 146)
 #define RID_SVXSTR_DRAW_PAGE                (RID_SVX_START + 147)
-#define RID_SVXSTR_WRITER_PAGE              (RID_SVX_START + 148)
-
-#define RID_SVXSTR_PAPERBIN_SETTINGS        (RID_SVX_START + 149)
 
 // HM_ERR
 #define RID_SVXSTR_HMERR_THESAURUS          (RID_SVX_START + 150)
 #define RID_SVXSTR_HMERR_HYPH               (RID_SVX_START + 151)
 
-// Strings aus den StarDraw-Dialogen
-#define RID_SVXSTR_SOLID                    (RID_SVX_START + 160)
-#define RID_SVXSTR_GRADIENT                 (RID_SVX_START + 161)
-#define RID_SVXSTR_DESC_GRADIENT            (RID_SVX_START + 163)
-#define RID_SVXSTR_DEL_GRADIENT             (RID_SVX_START + 164)
-#define RID_SVXSTR_ASK_DEL_GRADIENT         (RID_SVX_START + 165)
-#define RID_SVXSTR_ASK_CHANGE_GRADIENT      (RID_SVX_START + 166)
-#define RID_SVXSTR_BITMAP                   (RID_SVX_START + 167)
-#define RID_SVXSTR_DESC_NEW_BITMAP          (RID_SVX_START + 168)
-#define RID_SVXSTR_DESC_EXT_BITMAP          (RID_SVX_START + 169)
-#define RID_SVXSTR_DEL_BITMAP               (RID_SVX_START + 170)
-#define RID_SVXSTR_ASK_DEL_BITMAP           (RID_SVX_START + 171)
-#define RID_SVXSTR_ASK_CHANGE_BITMAP        (RID_SVX_START + 172)
-#define RID_SVXSTR_LINESTYLE                (RID_SVX_START + 173)
-#define RID_SVXSTR_DESC_LINESTYLE           (RID_SVX_START + 174)
-#define RID_SVXSTR_DEL_LINESTYLE            (RID_SVX_START + 175)
-#define RID_SVXSTR_ASK_DEL_LINESTYLE        (RID_SVX_START + 176)
-#define RID_SVXSTR_ASK_CHANGE_LINESTYLE     (RID_SVX_START + 177)
-#define RID_SVXSTR_INVISIBLE                (RID_SVX_START + 178)
-#define RID_SVXSTR_COLOR                    (RID_SVX_START + 179)
-#define RID_SVXSTR_HATCH                    (RID_SVX_START + 180)
-#define RID_SVXSTR_CHANGE                   (RID_SVX_START + 181)
-#define RID_SVXSTR_ADD                      (RID_SVX_START + 182)
-#define RID_SVXSTR_NONE                     (RID_SVX_START + 183)
-#define RID_SVXSTR_ASK_CHANGE_LINEEND       (RID_SVX_START + 184)
-
 // Strings der ToolBox-Controls aus tbcontrl.cxx
-#define RID_SVXSTR_TRANSPARENT              (RID_SVX_START + 190)
 #define RID_SVXSTR_FILLPATTERN              (RID_SVX_START + 191)
 #define RID_SVXSTR_FRAME                    (RID_SVX_START + 192)
 #define RID_SVXSTR_FRAME_COLOR              (RID_SVX_START + 194)
@@ -586,36 +511,12 @@
 #define RID_SVXSTR_SELMODE_ER               (RID_SVX_START + 213)
 #define RID_SVXSTR_SELMODE_ERG              (RID_SVX_START + 214)
 
-// Strings fuer ColorTabPage
-#define RID_SVXSTR_DESC_COLOR               (RID_SVX_START + 215)
-#define RID_SVXSTR_DEL_COLOR                (RID_SVX_START + 216)
-#define RID_SVXSTR_ASK_DEL_COLOR            (RID_SVX_START + 217)
-#define RID_SVXSTR_ASK_CHANGE_COLOR         (RID_SVX_START + 218)
-#define RID_SVXSTR_ASK_DEL_LINEEND          (RID_SVX_START + 219)
-
-// "Tabelle"
-#define RID_SVXSTR_TABLE                    (RID_SVX_START + 220)
-
 #define RID_SVXSTR_XMLSEC_SIG_OK            (RID_SVX_START + 222)
 #define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY  (RID_SVX_START + 223)
 #define RID_SVXSTR_XMLSEC_SIG_NOT_OK        (RID_SVX_START + 224)
 #define RID_SVXSTR_XMLSEC_NO_SIG            (RID_SVX_START + 225)
 #define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226)
 
-// Strings von der Hatch-Tabpage
-#define RID_SVXSTR_WRITE_DATA_ERROR         (RID_SVX_START + 229)
-#define RID_SVXSTR_READ_DATA_ERROR          (RID_SVX_START + 230)
-#define RID_SVXSTR_WARN_TABLE_OVERWRITE     (RID_SVX_START + 231)
-#define RID_SVXSTR_DESC_HATCH               (RID_SVX_START + 232)
-#define RID_SVXSTR_DEL_HATCH                (RID_SVX_START + 233)
-#define RID_SVXSTR_ASK_DEL_HATCH            (RID_SVX_START + 234)
-#define RID_SVXSTR_ASK_CHANGE_HATCH         (RID_SVX_START + 235)
-#define RID_SVXSTR_WARN_NAME_DUPLICATE      (RID_SVX_START + 236)
-
-// Strings der Linienenden-TabPage
-#define RID_SVXSTR_LINEEND                  (RID_SVX_START + 237)
-#define RID_SVXSTR_DESC_LINEEND             (RID_SVX_START + 238)
-#define RID_SVXSTR_DEL_LINEEND              (RID_SVX_START + 239)
 // weitere ID bei 219
 
 // String-ResId fuer den ImportGraphic-Dialog
@@ -628,9 +529,6 @@
 #define RID_SVXSTR_RULER_TAB_DECIMAL        (RID_SVX_START + 247)
 #define RID_SVXSTR_RULER_TAB_CENTER         (RID_SVX_START + 248)
 
-// unbekannte Farbe im Zeichen- oder Umrandungs-Dialog
-#define RID_SVXSTR_COLOR_USER               (RID_SVX_START + 250)
-
 // File-/Grafik-Link String, Dialog Name
 #define RID_SVXSTR_FILELINK                 (RID_SVX_START + 255)
 #define RID_SVXSTR_GRAFIKLINK               (RID_SVX_START + 256)
@@ -686,35 +584,22 @@
 #define RID_SVXSTR_NOTCENTERED              (RID_SVX_START + 307)
 
 // String-Arrays
-#define RID_SVXSTR_FIELDUNIT_TABLE          (RID_SVX_START + 311)
 #define RID_SVXSTR_TEXTENCODING_TABLE       (RID_SVX_START + 312)
 
-// Strings fuer die Optionen-TabPages
-#define RID_SVXSTR_OPT_DOUBLE_DICTS         (RID_SVX_START + 320)
-
 // Hyperlink-Dlg
 #define RID_SVXMN_HYPERLINK                 (RID_SVX_START + 321)
 // Hyperlink-QueryBoxen
 #define RID_SVXQB_NOCONNECT                 (RID_SVX_START + 322)
 #define RID_SVXQB_DONTEXIST                 (RID_SVX_START + 323)
 //color configuration
-#define RID_SVXQB_DELETE_COLOR_CONFIG       (RID_SVX_START + 324)
 
 // Graphic filter
 #define RID_SVX_GRFFILTER_START             (RID_SVX_START + 330)
 #define RID_SVXTBX_GRFFILTER                (RID_SVX_START + 331)
-#define RID_SVX_GRFFILTER_DLG_MOSAIC        (RID_SVX_START + 332)
-#define RID_SVX_GRFFILTER_DLG_SOLARIZE      (RID_SVX_START + 333)
-#define RID_SVX_GRFFILTER_DLG_SEPIA         (RID_SVX_START + 334)
-#define RID_SVX_GRFFILTER_DLG_POSTER        (RID_SVX_START + 335)
-#define RID_SVX_GRFFILTER_DLG_EMBOSS        (RID_SVX_START + 336)
-#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB    (RID_SVX_START + 337)
 
 #define RID_SVXERRCODE                      (RID_SVX_START + 350)
-#define RID_SVXERRCTX                       (RID_SVX_START + 351)
 
-// Define - Bereich fuer Gallery
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// gallery
 #define RID_SVX_GALLERY_START               (RID_SVX_START + 360)
 #define RID_SVX_GALLERY_END                 (RID_SVX_START + 410)
 
@@ -747,13 +632,6 @@
 #define RID_SVX_RELOAD_NORMAL               (RID_SVX_START + 480)
 #define RID_SVX_RELOAD_SPECIAL              (RID_SVX_START + 481)
 
-// ResId's fuer SvxMultiFileDialog
-#define RID_SVXSTR_FILE_TITLE               (RID_SVX_START + 482)
-#define RID_SVXSTR_FILE_HEADLINE            (RID_SVX_START + 483)
-#define RID_SVXSTR_ARCHIVE_TITLE            (RID_SVX_START + 484)
-#define RID_SVXSTR_ARCHIVE_HEADLINE         (RID_SVX_START + 485)
-#define RID_SVXSTR_MULTIFILE_DBL_ERR        (RID_SVX_START + 486)
-
 // Defines fuer die 3D-Engine
 #define RID_SVX_3D_UNDO_EXCHANGE_PASTE      (RID_SVX_START + 489)
 #define RID_SVX_3D_CREATE_LATHE             (RID_SVX_START + 490)
@@ -766,22 +644,24 @@
 #define RID_SVX_3D_UNDO_LATHE               (RID_SVX_START + 497)
 #define RID_SVX_3D_UNDO_BREAK_LATHE         (RID_SVX_START + 498)
 #define RID_SVX_3D_UNDO_ATTRIBUTES          (RID_SVX_START + 499)
+
+#define RID_STR_FULLNUMS_START              (RID_SVX_START + 500)//?
+#define RID_STR_FULLNUMS_1                  (RID_STR_FULLNUMS_START )//?
+#define RID_STR_FULLNUMS_2                  (RID_STR_FULLNUMS_START + 1)//?
+#define RID_STR_FULLNUMS_3                  (RID_STR_FULLNUMS_START + 2)//?
+#define RID_STR_FULLNUMS_4                  (RID_STR_FULLNUMS_START + 3)//?
+#define RID_STR_FULLNUMS_5                  (RID_STR_FULLNUMS_START + 4)//?
+#define RID_STR_FULLNUMS_6                  (RID_STR_FULLNUMS_START + 5)//?
+#define RID_STR_FULLNUMS_7                  (RID_STR_FULLNUMS_START + 6)//?
+#define RID_STR_FULLNUMS_8                  (RID_STR_FULLNUMS_START + 7)//?
+#define RID_STR_FULLNUMS_7_HTML             (RID_SVX_START + 510)//?
+
 // RID_SVX_END == (RID_SVX_START + 499) !!!
 // am besten ab 520 frei (RB)
 // seit der Erfindung eigener Resourcen fuer jedes Projekt kann es hier keine
 // Obergrenze geben (abgesehen von USHRT_MAX) (os)
-#define RID_STR_FULLNUMS_START              (RID_SVX_START + 500)
-#define RID_STR_FULLNUMS_1                  (RID_STR_FULLNUMS_START )
-#define RID_STR_FULLNUMS_2                  (RID_STR_FULLNUMS_START + 1)
-#define RID_STR_FULLNUMS_3                  (RID_STR_FULLNUMS_START + 2)
-#define RID_STR_FULLNUMS_4                  (RID_STR_FULLNUMS_START + 3)
-#define RID_STR_FULLNUMS_5                  (RID_STR_FULLNUMS_START + 4)
-#define RID_STR_FULLNUMS_6                  (RID_STR_FULLNUMS_START + 5)
-#define RID_STR_FULLNUMS_7                  (RID_STR_FULLNUMS_START + 6)
-#define RID_STR_FULLNUMS_8                  (RID_STR_FULLNUMS_START + 7)
 #define RID_STR_BULLET_THEME                (RID_SVX_START + 508)
-#define RID_STR_EDIT_GRAPHIC                (RID_SVX_START + 509)
-#define RID_STR_FULLNUMS_7_HTML             (RID_SVX_START + 510)
+
 
 // ResIds for graphics drawmode
 #define RID_SVXSTR_GRAFMODE_STANDARD        (RID_SVX_START + 520)
@@ -811,17 +691,6 @@
 #define RID_SVXSTR_SEABLUE                  (RID_SVX_START + 546)
 #define RID_SVXSTR_COLOR_SUN                (RID_SVX_START + 547)
 
-#define RID_SVXSTR_HYPDLG_APPLYBUT          (RID_SVX_START + 548)
-#define RID_SVXSTR_HYPDLG_CLOSEBUT          (RID_SVX_START + 549)
-#define RID_SVXSTR_HYPDLG_MACROACT1         (RID_SVX_START + 550)
-#define RID_SVXSTR_HYPDLG_MACROACT2         (RID_SVX_START + 551)
-#define RID_SVXSTR_HYPDLG_MACROACT3         (RID_SVX_START + 552)
-#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME   (RID_SVX_START + 553)
-#define RID_SVXBMP_HLINETTP                 (RID_SVX_START + 556)
-#define RID_SVXBMP_HLMAILTP                 (RID_SVX_START + 557)
-#define RID_SVXBMP_HLDOCTP                  (RID_SVX_START + 558)
-#define RID_SVXBMP_HLDOCNTP                 (RID_SVX_START + 559)
-
 // JP: string resource ids for table-autoformat-names, used in SW/SC
 // !!! Urgent: the order of Ids is persistent. New Ids have to append !!!
 #define RID_SVXSTR_TBLAFMT_BEGIN            (RID_SVX_START + 560)
@@ -843,16 +712,6 @@
 #define RID_SVXSTR_TBLAFMT_YELLOW           (RID_SVX_START + 575)
 #define RID_SVXSTR_TBLAFMT_END              (RID_SVX_START + 576)
 
-#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT   (RID_SVX_START + 580)
-#define RID_SVXSTR_HYPERDLG_HLINETTP        (RID_SVX_START + 581)
-#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP   (RID_SVX_START + 582)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP        (RID_SVX_START + 583)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP   (RID_SVX_START + 584)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP         (RID_SVX_START + 585)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP    (RID_SVX_START + 586)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP        (RID_SVX_START + 587)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP   (RID_SVX_START + 588)
-
 // string resources for XLineJoint item
 #define RID_SVXSTR_LINEJOINT_NONE           RID_SVXSTR_NONE
 #define RID_SVXSTR_LINEJOINT_MIDDLE         (RID_SVX_START + 589 )
@@ -1062,9 +921,6 @@
 #define RID_SVXSTR_LEND_START               RID_SVXSTR_LEND0
 #define RID_SVXSTR_LEND_END                 RID_SVXSTR_LEND11
 
-#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES  (RID_SVX_START + 800)
-#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
-
 #define RID_SVXSTR_QRY_PRINT_TITLE          (RID_SVX_START + 802)
 #define RID_SVXSTR_QRY_PRINT_MSG            (RID_SVX_START + 803)
 #define RID_SVXSTR_QRY_PRINT_ALL            (RID_SVX_START + 804)
@@ -1075,10 +931,6 @@
 #define RID_SVXSTR_DIC_ERR_FULL             (RID_SVX_START +  811)
 #define RID_SVXSTR_DIC_ERR_READONLY         (RID_SVX_START +  812)
 
-#define RID_SVXSTR_HYPERDLG_FORM_BUTTON     (RID_SVX_START +  813)
-#define RID_SVXSTR_HYPERDLG_FROM_TEXT       (RID_SVX_START +  814)
-#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE  (RID_SVX_START +  815)
-
 // strings for graphic attributes/undo
 #define RID_SVXSTR_GRAFCROP                 (RID_SVX_START + 820)
 #define RID_SVXSTR_UNDO_GRAFMODE            (RID_SVX_START + 821)
@@ -1091,14 +943,6 @@
 #define RID_SVXSTR_UNDO_GRAFTRANSPARENCY    (RID_SVX_START + 828)
 #define RID_SVXSTR_UNDO_GRAFCROP            (RID_SVXSTR_GRAFCROP)
 
-// weitere ResId fuer die Linguistik-Dialoge
-#define RID_SVXDLG_LNG_ED_NUM_PREBREAK      (RID_SVX_START +  830)
-#define RID_SVXDLG_EDIT_MODULES             (RID_SVX_START +  831)
-
-// Japanese search options TabPage
-#define RID_SVXPAGE_JSEARCH_OPTIONS         (RID_SVX_START +  840)
-#define RID_SVXSTR_AUTOMATIC                (RID_SVX_START +  841)
-
 // listbox control for UNDO and REDO
 #define RID_SVXTBX_UNDO_REDO_CTRL           (RID_SVX_START +  845)
 #define RID_SVXSTR_NUM_UNDO_ACTIONS         (RID_SVX_START +  846)
@@ -1115,9 +959,6 @@
 #define RID_SVXSTR_TRASNGR_END              RID_SVXSTR_TRASNGR0
 
 #define RID_SVXSTR_BORDER_CONTROL           (RID_SVX_START + 852)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE1       (RID_SVX_START + 853)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE2       (RID_SVX_START + 854)
-#define RID_SVXSTR_COLOR_CONFIG_DELETE      (RID_SVX_START + 855)
 
 // Accessibility strings.  The actual string ids are defined in
 // svx/inc/accessibility.hrc, the strings are defined in
@@ -1125,34 +966,6 @@
 #define RID_SVXSTR_ACCESSIBILITY_START      (RID_SVX_START + 860)
 #define RID_SVXSTR_ACCESSIBILITY_END        (RID_SVX_START + 950)
 
-// string resources for svx::FrameDirectionListBox
-#define RID_SVXSTR_FRAMEDIR_LTR             (RID_SVX_START + 960)
-#define RID_SVXSTR_FRAMEDIR_RTL             (RID_SVX_START + 961)
-#define RID_SVXSTR_FRAMEDIR_SUPER           (RID_SVX_START + 962)
-
-#define RID_SVXSTR_PAGEDIR_LTR_HORI         (RID_SVX_START + 965)
-#define RID_SVXSTR_PAGEDIR_RTL_HORI         (RID_SVX_START + 966)
-#define RID_SVXSTR_PAGEDIR_RTL_VERT         (RID_SVX_START + 967)
-#define RID_SVXSTR_PAGEDIR_LTR_VERT         (RID_SVX_START + 968)
-
-#define RID_SVXSTR_TABLE_PRESET_NONE        (RID_SVX_START + 969)
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   (RID_SVX_START + 970)
-#define RID_SVXSTR_TABLE_PRESET_OUTERHORI   (RID_SVX_START + 971)
-#define RID_SVXSTR_TABLE_PRESET_OUTERALL    (RID_SVX_START + 972)
-#define RID_SVXSTR_TABLE_PRESET_OUTERINNER  (RID_SVX_START + 973)
-
-#define RID_SVXSTR_PARA_PRESET_DIAGONAL     (RID_SVX_START + 974)
-#define RID_SVXSTR_PARA_PRESET_ALL          (RID_SVX_START + 975)
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT    (RID_SVX_START + 976)
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM    (RID_SVX_START + 977)
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT     (RID_SVX_START + 978)
-
-#define RID_SVXSTR_SHADOW_STYLE_NONE        (RID_SVX_START + 979)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980)
-#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT    (RID_SVX_START + 981)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT  (RID_SVX_START + 982)
-#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT     (RID_SVX_START + 983)
-
 // 984: free
 #define RID_SVXFLOAT_EXTRUSION_DIRECTION    (RID_SVX_START + 985)
 
@@ -1184,129 +997,6 @@
     RID_SVXFLOAT_FONTWORK_CHARSPACING above. But these IDs describe floating
     windows, and the following IDs are for strings, so this is no conflict. */
 #define RID_SVXSTR_PAGES                    (RID_SVX_START + 1002)
-#define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
-#define RID_SVXSTR_KEY_ADDINS_PATH          (RID_SVX_START + 1003)
-#define RID_SVXSTR_KEY_AUTOCORRECT_DIR      (RID_SVX_START + 1004)
-#define RID_SVXSTR_KEY_GLOSSARY_PATH        (RID_SVX_START + 1005)
-#define RID_SVXSTR_KEY_BACKUP_PATH          (RID_SVX_START + 1006)
-#define RID_SVXSTR_KEY_BASIC_PATH           (RID_SVX_START + 1007)
-#define RID_SVXSTR_KEY_BITMAP_PATH          (RID_SVX_START + 1008)
-#define RID_SVXSTR_KEY_CONFIG_DIR           (RID_SVX_START + 1009)
-#define RID_SVXSTR_KEY_DICTIONARY_PATH      (RID_SVX_START + 1010)
-#define RID_SVXSTR_KEY_FAVORITES_DIR        (RID_SVX_START + 1011)
-#define RID_SVXSTR_KEY_FILTER_PATH          (RID_SVX_START + 1012)
-#define RID_SVXSTR_KEY_GALLERY_DIR          (RID_SVX_START + 1013)
-#define RID_SVXSTR_KEY_GRAPHICS_PATH        (RID_SVX_START + 1014)
-#define RID_SVXSTR_KEY_HELP_DIR             (RID_SVX_START + 1015)
-#define RID_SVXSTR_KEY_LINGUISTIC_DIR       (RID_SVX_START + 1016)
-#define RID_SVXSTR_KEY_MODULES_PATH         (RID_SVX_START + 1017)
-#define RID_SVXSTR_KEY_PALETTE_PATH         (RID_SVX_START + 1018)
-#define RID_SVXSTR_KEY_PLUGINS_PATH         (RID_SVX_START + 1019)
-#define RID_SVXSTR_KEY_STORAGE_DIR          (RID_SVX_START + 1020)
-#define RID_SVXSTR_KEY_TEMP_PATH            (RID_SVX_START + 1021)
-#define RID_SVXSTR_KEY_TEMPLATE_PATH        (RID_SVX_START + 1022)
-#define RID_SVXSTR_KEY_USERCONFIG_PATH      (RID_SVX_START + 1023)
-#define RID_SVXSTR_KEY_WORK_PATH            (RID_SVX_START + 1024)
-#define RID_SVXSTR_KEY_USERDICTIONARY_DIR   (RID_SVX_START + 1025)
-
-#define RID_SVXSTR_READONLY_CONFIG_TIP      (RID_SVX_START + 1026)
-
-#define RID_SVXSTR_DELQUERY                 (RID_SVX_START + 1027)
-#define RID_SVXSTR_DELQUERY_TITLE           (RID_SVX_START + 1028)
-#define RID_SVXSTR_DELFAILED                (RID_SVX_START + 1029)
-#define RID_SVXSTR_DELFAILEDPERM            (RID_SVX_START + 1030)
-#define RID_SVXSTR_DELFAILED_TITLE          (RID_SVX_START + 1031)
-#define RID_SVXSTR_CREATEFAILED             (RID_SVX_START + 1032)
-#define RID_SVXSTR_CREATEFAILEDPERM         (RID_SVX_START + 1033)
-#define RID_SVXSTR_CREATEFAILEDDUP          (RID_SVX_START + 1034)
-#define RID_SVXSTR_CREATEFAILED_TITLE       (RID_SVX_START + 1035)
-#define RID_SVXSTR_RENAMEFAILED             (RID_SVX_START + 1036)
-#define RID_SVXSTR_RENAMEFAILEDPERM         (RID_SVX_START + 1037)
-#define RID_SVXSTR_RENAMEFAILED_TITLE       (RID_SVX_START + 1038)
-
-#define RID_SVXSTR_NEW_MENU                 (RID_SVX_START + 1039)
-#define RID_SVXSTR_NEW_TOOLBAR              (RID_SVX_START + 1040)
-#define RID_SVXSTR_MOVE_MENU                (RID_SVX_START + 1041)
-
-#define RID_SVXSTR_PRODUCTNAME_TOOLBARS         (RID_SVX_START + 1042)
-#define RID_SVXSTR_TOOLBAR                      (RID_SVX_START + 1043)
-#define RID_SVXSTR_TOOLBAR_CONTENT              (RID_SVX_START + 1044)
-#define RID_SVXSTR_COMMANDS                     (RID_SVX_START + 1045)
-#define RID_SVXSTR_COMMAND                      (RID_SVX_START + 1046)
-#define RID_SVXSTR_TOOLBAR_NAME                 (RID_SVX_START + 1047)
-#define RID_SVXSTR_ADD_SUBMENU                  (RID_SVX_START + 1048)
-#define RID_SVXSTR_SUBMENU_NAME                 (RID_SVX_START + 1049)
-#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
-#define RID_SVXSTR_EVENT_STARTAPP               (RID_SVX_START + 1051)
-#define RID_SVXSTR_EVENT_CLOSEAPP               (RID_SVX_START + 1052)
-#define RID_SVXSTR_EVENT_NEWDOC                 (RID_SVX_START + 1053)
-#define RID_SVXSTR_EVENT_CLOSEDOC               (RID_SVX_START + 1054)
-#define RID_SVXSTR_EVENT_PREPARECLOSEDOC        (RID_SVX_START + 1055)
-#define RID_SVXSTR_EVENT_OPENDOC                (RID_SVX_START + 1056)
-#define RID_SVXSTR_EVENT_SAVEDOC                (RID_SVX_START + 1057)
-#define RID_SVXSTR_EVENT_SAVEASDOC              (RID_SVX_START + 1058)
-#define RID_SVXSTR_EVENT_SAVEDOCDONE            (RID_SVX_START + 1059)
-#define RID_SVXSTR_EVENT_SAVEASDOCDONE          (RID_SVX_START + 1060)
-#define RID_SVXSTR_EVENT_ACTIVATEDOC            (RID_SVX_START + 1061)
-#define RID_SVXSTR_EVENT_DEACTIVATEDOC          (RID_SVX_START + 1062)
-#define RID_SVXSTR_EVENT_PRINTDOC               (RID_SVX_START + 1063)
-#define RID_SVXSTR_EVENT_MODIFYCHANGED          (RID_SVX_START + 1064)
-#define RID_SVXSTR_EVENT_MAILMERGE              (RID_SVX_START + 1065)
-#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE        (RID_SVX_START + 1066)
-//the form/dialog events
-#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067)
-#define RID_SVXSTR_EVENT_ACTIONPERFORMED        (RID_SVX_START + 1068)
-#define RID_SVXSTR_EVENT_CHANGED                (RID_SVX_START + 1069)
-#define RID_SVXSTR_EVENT_TEXTCHANGED            (RID_SVX_START + 1070)
-#define RID_SVXSTR_EVENT_ITEMSTATECHANGED       (RID_SVX_START + 1071)
-#define RID_SVXSTR_EVENT_FOCUSGAINED            (RID_SVX_START + 1072)
-#define RID_SVXSTR_EVENT_FOCUSLOST              (RID_SVX_START + 1073)
-#define RID_SVXSTR_EVENT_KEYTYPED               (RID_SVX_START + 1074)
-#define RID_SVXSTR_EVENT_KEYUP                  (RID_SVX_START + 1075)
-#define RID_SVXSTR_EVENT_MOUSEENTERED           (RID_SVX_START + 1076)
-#define RID_SVXSTR_EVENT_MOUSEDRAGGED           (RID_SVX_START + 1077)
-#define RID_SVXSTR_EVENT_MOUSEMOVED             (RID_SVX_START + 1078)
-#define RID_SVXSTR_EVENT_MOUSEPRESSED           (RID_SVX_START + 1079)
-#define RID_SVXSTR_EVENT_MOUSERELEASED          (RID_SVX_START + 1080)
-#define RID_SVXSTR_EVENT_MOUSEEXITED            (RID_SVX_START + 1081)
-#define RID_SVXSTR_EVENT_APPROVERESETTED        (RID_SVX_START + 1082)
-#define RID_SVXSTR_EVENT_SUBMITTED              (RID_SVX_START + 1083)
-#define RID_SVXSTR_EVENT_BEFOREUPDATE           (RID_SVX_START + 1084)
-#define RID_SVXSTR_EVENT_AFTERUPDATE            (RID_SVX_START + 1085)
-#define RID_SVXSTR_EVENT_LOADED                 (RID_SVX_START + 1086)
-#define RID_SVXSTR_EVENT_RELOADING              (RID_SVX_START + 1087)
-#define RID_SVXSTR_EVENT_RELOADED               (RID_SVX_START + 1088)
-#define RID_SVXSTR_EVENT_UNLOADING              (RID_SVX_START + 1089)
-#define RID_SVXSTR_EVENT_UNLOADED               (RID_SVX_START + 1090)
-#define RID_SVXSTR_EVENT_CONFIRMDELETE          (RID_SVX_START + 1091)
-#define RID_SVXSTR_EVENT_APPROVEROWCHANGE       (RID_SVX_START + 1092)
-#define RID_SVXSTR_EVENT_ROWCHANGE              (RID_SVX_START + 1093)
-#define RID_SVXSTR_EVENT_POSITIONING            (RID_SVX_START + 1094)
-#define RID_SVXSTR_EVENT_POSITIONED             (RID_SVX_START + 1095)
-#define RID_SVXSTR_EVENT_APPROVEPARAMETER       (RID_SVX_START + 1096)
-#define RID_SVXSTR_EVENT_ERROROCCURED           (RID_SVX_START + 1097)
-#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098)
-#define RID_SVXSTR_EVENT_RESETTED               (RID_SVX_START + 1099)
-#define RID_SVXSTR_ERROR_TITLE                  (RID_SVX_START + 1100)
-#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED     (RID_SVX_START + 1101)
-#define RID_SVXSTR_ERROR_RUNNING                (RID_SVX_START + 1102)
-#define RID_SVXSTR_EXCEPTION_RUNNING            (RID_SVX_START + 1103)
-#define RID_SVXSTR_ERROR_AT_LINE                (RID_SVX_START + 1104)
-#define RID_SVXSTR_EXCEPTION_AT_LINE            (RID_SVX_START + 1105)
-#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING      (RID_SVX_START + 1106)
-#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE      (RID_SVX_START + 1107)
-#define RID_SVXSTR_ERROR_TYPE_LABEL             (RID_SVX_START + 1108)
-#define RID_SVXSTR_ERROR_MESSAGE_LABEL          (RID_SVX_START + 1109)
-
-#define QUERY_DELETE_CONFIRM                    (RID_SVX_START + 1110)
-#define STR_LINKEDDOC_DOESNOTEXIST              (RID_SVX_START + 1111)
-#define STR_NAME_CONFLICT                       (RID_SVX_START + 1112)
-
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR           (RID_SVX_START + 1113)
-#define RID_SVXSTR_VER_PRESET_ONLYVER           (RID_SVX_START + 1114)
-#define RID_SVXSTR_CONFIRM_MENU_RESET           (RID_SVX_START + 1115)
-#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET        (RID_SVX_START + 1116)
-#define RID_SVXSTR_IMPORT_ICON_ERROR            (RID_SVX_START + 1117)
 
 #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE                (RID_SVX_START + 1118)
 #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT   (RID_SVX_START + 1119)
@@ -1326,71 +1016,38 @@
 #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE             (RID_SVX_START + 1133)
 #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR               (RID_SVX_START + 1134)
 
-#define RID_SVXSTR_LABEL_NEW_NAME                           (RID_SVX_START + 1135)
-#define RID_SVXSTR_RENAME_MENU                              (RID_SVX_START + 1136)
-#define RID_SVXSTR_RENAME_TOOLBAR                           (RID_SVX_START + 1137)
-
-#define RID_SVXSTR_BULLET_DESCRIPTIONS                      (RID_SVX_START + 1138)
-#define RID_SVXSTR_BULLET_DESCRIPTION_0                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)
-#define RID_SVXSTR_BULLET_DESCRIPTION_1                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)
-#define RID_SVXSTR_BULLET_DESCRIPTION_2                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)
-#define RID_SVXSTR_BULLET_DESCRIPTION_3                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)
-#define RID_SVXSTR_BULLET_DESCRIPTION_4                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)
-#define RID_SVXSTR_BULLET_DESCRIPTION_5                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)
-#define RID_SVXSTR_BULLET_DESCRIPTION_6                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)
-#define RID_SVXSTR_BULLET_DESCRIPTION_7                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)
-
-#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS                   (RID_SVX_START + 1146)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)
-
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS                  (RID_SVX_START + 1154)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)
-
-#define RID_SVXSTR_DIAGRAM_ROW                              (RID_SVX_START + 1162)
-#define RID_SVXSTR_DELETE_ICON_CONFIRM                      (RID_SVX_START + 1163) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_WARNING                     (RID_SVX_START + 1164) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_CONFIRM                     (RID_SVX_START + 1165) //added for issue73355
-#define RID_SVXSTR_YESTOALL                                 (RID_SVX_START + 1166) //added for issue73355
 #define RID_SVXSTR_SELMODE_BLK                              (RID_SVX_START + 1167)
 #define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN                  (RID_SVX_START + 1168)
-#define STR_LINKEDDOC_NO_SYSTEM_FILE                        (RID_SVX_START + 1169)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED                (RID_SVX_START + 1170)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED                (RID_SVX_START + 1171)
-
-#define RID_SVXSTR_EVENT_CREATEDOC                          (RID_SVX_START + 1172)
-#define RID_SVXSTR_EVENT_LOADDOCFINISHED                    (RID_SVX_START + 1173)
-#define RID_SVXSTR_EVENT_SAVEDOCFAILED                      (RID_SVX_START + 1174)
-#define RID_SVXSTR_EVENT_SAVEASDOCFAILED                    (RID_SVX_START + 1175)
-#define RID_SVXSTR_EVENT_COPYTODOC                          (RID_SVX_START + 1176)
-#define RID_SVXSTR_EVENT_COPYTODOCDONE                      (RID_SVX_START + 1177)
-#define RID_SVXSTR_EVENT_COPYTODOCFAILED                    (RID_SVX_START + 1178)
-#define RID_SVXSTR_EVENT_VIEWCREATED                        (RID_SVX_START + 1179)
-#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW                   (RID_SVX_START + 1180)
-#define RID_SVXSTR_EVENT_CLOSEVIEW                          (RID_SVX_START + 1181)
-#define RID_SVXSTR_EVENT_TITLECHANGED                       (RID_SVX_START + 1182)
-#define RID_SVXSTR_EVENT_MODECHANGED                        (RID_SVX_START + 1183)
-#define RID_SVXSTR_EVENT_VISAREACHANGED                     (RID_SVX_START + 1184)
-#define RID_SVXSTR_EVENT_STORAGECHANGED                     (RID_SVX_START + 1185)
-#define RID_SVXSTR_EVENT_MAILMERGE_END                      (RID_SVX_START + 1186)
-#define RID_SVXSTR_EVENT_FIELDMERGE                         (RID_SVX_START + 1187)
-#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED                (RID_SVX_START + 1188)
-#define RID_SVXSTR_EVENT_LAYOUT_FINISHED                    (RID_SVX_START + 1189)
     // if you add here, remember to adjust RID_SVXSTR_NEXTFREE
 
+#define RID_SVXSTR_BULLET_DESCRIPTIONS                      (RID_SVX_START + 1138)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS                   (RID_SVX_START + 1146)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS                  (RID_SVX_START + 1154)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_0                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_1                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_2                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_3                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_4                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_5                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_6                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_7                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
+
 #define RID_SVXSTR_NEXTFREE                                 (RID_SVX_START + 1190)
 
 // ----------------------------------------------------------------------------
@@ -1406,37 +1063,23 @@
 // ----------------------------------------------------------------------------
 // "Window" resource ids
 
-#define RID_SVX_WND_COMMON_LINGU            ( RID_SVX_START +  0 )
 
 // ----------------------------------------------------------------------------
 // "ModalDialog" resource ids
 
-#define RID_SVXDLG_ZOOM                     ( RID_SVX_START +  0 )
-#define RID_SVX_MDLG_HANGULHANJA            ( RID_SVX_START +  1 )
 #define RID_SVX_MDLG_FONTWORK_GALLERY       ( RID_SVX_START +  2 )
 #define RID_SVX_MDLG_EXTRUSION_DEPTH        ( RID_SVX_START +  3 )
-#define RID_SVX_MDLG_HANGULHANJA_OPT        ( RID_SVX_START +  4 )
-#define RID_SVX_MDLG_HANGULHANJA_EDIT       ( RID_SVX_START +  5 )
-#define RID_SVX_MDLG_HANGULHANJA_NEWDICT    ( RID_SVX_START +  6 )
-
-#define RID_SVX_FORMAT_CELLS_DLG            ( RID_SVX_START + 42 )
-#define RID_SVX_SPLITCELLDLG                ( RID_SVX_START + 43 )
-#define RID_SVX_NEWTABLE_DLG                ( RID_SVX_START + 44 )
 
 // ----------------------------------------------------------------------------
 // "Menu" resource ids
 #define RID_SVX_MDLG_SCRIPTORG_NEWLIB       ( RID_SVX_START +  7 )
 #define RID_SVX_MDLG_FONTWORK_CHARSPACING   ( RID_SVX_START + 19 )
 
-// ResId fuer den Notizzettel-Dialog
-#define RID_SVXDLG_POSTIT                   ( RID_SVX_START +   8 )
-
 // ResId fuer den ImportClipboard-Dialog
 // depricated
 //#define RID_SVXDLG_CLIPBOARD              ( RID_SVX_START +   9 )
 
 // ResId fuer den Sonderzeichen-Dialog
-#define RID_SVXDLG_CHARMAP                  ( RID_SVX_START +  10 )
 
 // allgemeine DBMgr-Dialoge
 // depricated
@@ -1463,116 +1106,42 @@
 #define RID_SVXPAGE_ERR_REP_SEND            ( RID_SVX_START +  11 )
 
 // ----------------------------------------------------------------------------
-// "MessageBox" resource ids
-
-#define RID_SVX_MSGBOX_JAVA_RESTART         ( RID_SVX_START +  0 )
-#define RID_SVX_MSGBOX_JAVA_RESTART2        ( RID_SVX_START +  1 )
-#define RID_SVX_MSGBOX_LANGUAGE_RESTART     ( RID_SVX_START +  2 )
-
-// ----------------------------------------------------------------------------
 
 // !!!! double defined ID's (see below) !!!
-#define RID_OFAPAGE_HTMLOPT             (RID_OFA_START + 100)
 #define RID_OFA_AUTOCORR_DLG            (RID_OFA_START + 101)
-#define RID_OFAPAGE_AUTOCORR_OPTIONS    (RID_OFA_START + 102)
 
-#define RID_OFAPAGE_AUTOCORR_REPLACE    (RID_OFA_START + 103)
-#define RID_OFAPAGE_AUTOCORR_EXCEPT     (RID_OFA_START + 104)
 #define RID_OFA_GENERAL_OPTIONS_DLG     (RID_OFA_START + 105)
 #define RID_OFADLG_INTERNET             (RID_OFA_START + 106)
 #define RID_OFA_TABNEW_DLG              (RID_OFA_START + 107)
 #define RID_OFADLG_BROWSER              (RID_OFA_START + 108)
-#define RID_OFAPAGE_AUTOCORR_QUOTE      (RID_OFA_START + 109)
-#define RID_OFAPAGE_AUTOFMT_APPLY       (RID_OFA_START + 110)
-#define RID_OFADLG_PRCNT_SET            (RID_OFA_START + 111)
 #define RID_OFA_FORMNEW_DLG             (RID_OFA_START + 112)
 #define RID_OFA_TABPROPERTIES           (RID_OFA_START + 113)
 #define RID_OFADLG_REGISTRATION         (RID_OFA_START + 114)
-#define RID_OFADLG_OPTIONS_TREE         (RID_OFA_START + 115)
-#define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
 #define RID_OFADLG_AWCP_VALUES          (RID_OFA_START + 117)
-#define RID_OFADLG_OPTIONS_TREE_HINT    (RID_OFA_START + 118)
-#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
-#define RID_OFAPAGE_MSFILTEROPT         (RID_OFA_START + 120)
-#define RID_OFAPAGE_MSFILTEROPT2        (RID_OFA_START + 121)
-#define RID_OFAPAGE_CONNPOOLOPTIONS     (RID_OFA_START + 122)
-#define RID_SFXPAGE_DBREGISTER          (RID_OFA_START + 123)
-#define DLG_DOCUMENTLINK                (RID_OFA_START + 124)
-#define RID_OFAPAGE_SMARTTAG_OPTIONS    (RID_OFA_START + 125)
 
 // TabPages --------------------------------------------------------------
 
 // !!!! double defined ID's (see above) !!!
-#define RID_RIDER_SLL_SITE              (RID_OFA_START + 100)
-#define RID_RIDER_SLL_PERSONAL          (RID_OFA_START + 101)
-#define RID_SW_TP_MAILCONFIG            (RID_OFA_START + 102)
-
-#define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
 
-#define OFA_TP_MISC                     (RID_OFA_START + 200)
-
-#define OFA_TP_VIEW                     (RID_OFA_START + 202)
 #define OFA_TP_APPEARANCE               (RID_OFA_START + 203)
 #define OFA_TP_TABPROPERTIES_GENERAL    (RID_OFA_START + 204)
-#define OFA_TP_LANGUAGES                (RID_OFA_START + 205)
 
 //die RID_??_TP_*  stehen nochmal im offids.hrc
-#define RID_SW_TP_CONTENT_OPT           (RID_OFA_START + 206)
+
 #define RID_SW_TP_LAYOUT_OPT            (RID_OFA_START + 207)
-#define RID_SW_TP_STD_FONT              (RID_OFA_START + 208)
-#define RID_SW_TP_OPTPRINT_PAGE         (RID_OFA_START + 209)
-#define RID_SW_TP_OPTTABLE_PAGE         (RID_OFA_START + 210)
-#define RID_SW_TP_OPTSHDWCRSR           (RID_OFA_START + 211)
-#define RID_SW_TP_REDLINE_OPT           (RID_OFA_START + 212)
 #define RID_SW_TP_OPTINSERT_PAGE        (RID_OFA_START + 213)
-#define RID_SW_TP_OPTLOAD_PAGE          (RID_OFA_START + 214)
 #define RID_SW_TP_OPTTEST_PAGE          (RID_OFA_START + 215)
 #define RID_SW_TP_OPTSRCVIEW            (RID_OFA_START + 216)
-#define RID_SW_TP_BACKGROUND            (RID_OFA_START + 217)
-#define SID_SC_TP_LAYOUT                (RID_OFA_START + 218)
-#define SID_SC_TP_CONTENT               (RID_OFA_START + 219)
-#define SID_SC_TP_INPUT                 (RID_OFA_START + 220)
-#define SID_SC_TP_GRID                  (RID_OFA_START + 221)
-#define SID_SC_TP_USERLISTS             (RID_OFA_START + 222)
-#define SID_SC_TP_CALC                  (RID_OFA_START + 223)
-#define SID_SC_TP_CHANGES               (RID_OFA_START + 224)
-#define SID_SD_TP_CONTENTS              (RID_OFA_START + 225)
+#define RID_SW_TP_OPTINSERT_HTML_PAGE   (RID_OFA_START + 238)
+#define RID_SW_TP_HTML_LAYOUT_OPT       (RID_OFA_START + 241)
 #define SID_SD_TP_LAYOUT                (RID_OFA_START + 226)
-#define SID_SD_TP_SNAP                  (RID_OFA_START + 227)
 #define SID_SD_TP_SCALE                 (RID_OFA_START + 228)
 #define SID_SD_TP_GRID                  (RID_OFA_START + 229)
-#define SID_SD_TP_PRINT                 (RID_OFA_START + 220)
-#define SID_SD_TP_MISC                  (RID_OFA_START + 231)
-#define SID_SI_TP_CONTENTS              (RID_OFA_START + 232)
 #define SID_SI_TP_LAYOUT                (RID_OFA_START + 233)
-#define SID_SI_TP_SNAP                  (RID_OFA_START + 234)
 #define SID_SI_TP_GRID                  (RID_OFA_START + 235)
-#define SID_SI_TP_PRINT                 (RID_OFA_START + 236)
-#define SID_SI_TP_MISC                  (RID_OFA_START + 237)
-#define RID_SW_TP_OPTINSERT_HTML_PAGE   (RID_OFA_START + 238)
 #define SID_SC_TP_MISC                  (RID_OFA_START + 239)
-#define RID_SW_TP_HTML_CONTENT_OPT      (RID_OFA_START + 240)
-#define RID_SW_TP_HTML_LAYOUT_OPT       (RID_OFA_START + 241)
-#define RID_SW_TP_HTML_OPTPRINT_PAGE    (RID_OFA_START + 242)
-#define RID_SW_TP_HTML_OPTTABLE_PAGE    (RID_OFA_START + 243)
-#define RID_SW_TP_HTML_OPTGRID_PAGE     (RID_OFA_START + 244)
 #define OFA_TP_TABPROPERTIES_TEXT       (RID_OFA_START + 245)
-#define RID_SW_TP_HTML_OPTSHDWCRSR      (RID_OFA_START + 246)
-#define RID_SW_TP_STD_FONT_CJK          (RID_OFA_START + 247)
-#define RID_SC_TP_PRINT                 (RID_OFA_START + 248)
 #define OFA_TP_HELPERPROG               (RID_OFA_START + 249)
-#define OFA_TP_MEMORY                   (RID_OFA_START + 250)
-#define RID_SW_TP_STD_FONT_CTL          (RID_OFA_START + 251)
-#define RID_OFA_TP_INTERNATIONAL        (RID_OFA_START + 252)       // 4 SC & ID 4 resource
-#define RID_OFA_TP_INTERNATIONAL_SD     (RID_OFA_START + 253)       // 4 SD
-#define RID_OFA_TP_INTERNATIONAL_IMPR   (RID_OFA_START + 254)       // 4 impress
-#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
-#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE      ( RID_OFA_START + 256 )
-
-//add for Dialog SchTransformTabDialog,SvxTransformTabDialog //CHINA001
-#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE           (RID_SVX_START + 998)
-#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT           (RID_SVX_START + 999)
 
 #endif
 
diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index ca2c3ac1e4f7..4ee362978429 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
@@ -34,7 +34,7 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/button.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "svx/svxdllapi.h"
 #include <basegfx/vector/b3dvector.hxx>
 
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index c4a7ce195267..af3551c83301 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -408,6 +408,7 @@ public:
     void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
     void SelectEntryByList( const XDashList* pList, const String& rStr,
                             const XDash& rDash, USHORT nDist = 0 );
+    void FillStyles();
 };
 
 /*************************************************************************
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index 4441df6f6ad7..cc90da3aff9e 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVXE3DITEM_HXX
 #define _SVXE3DITEM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/editdata.hxx b/svx/inc/svx/editdata.hxx
index b059ae25831c..8e3c9f853961 100644
--- a/svx/inc/svx/editdata.hxx
+++ b/svx/inc/svx/editdata.hxx
@@ -35,7 +35,7 @@
 #include <tools/string.hxx>
 #include "svx/svxdllapi.h"
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxItemSet;
 class SfxPoolItem;
diff --git a/svx/inc/svx/editobj.hxx b/svx/inc/svx/editobj.hxx
index f291adefcf71..31a62225ced1 100644
--- a/svx/inc/svx/editobj.hxx
+++ b/svx/inc/svx/editobj.hxx
@@ -34,7 +34,7 @@
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <rsc/rscsfx.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/eeitem.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/emphitem.hxx b/svx/inc/svx/emphitem.hxx
index fd80081f2d30..c6956a819dc3 100644
--- a/svx/inc/svx/emphitem.hxx
+++ b/svx/inc/svx/emphitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <vcl/vclenum.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/escpitem.hxx b/svx/inc/svx/escpitem.hxx
index 3c47837c99e8..f96c3479dd0f 100644
--- a/svx/inc/svx/escpitem.hxx
+++ b/svx/inc/svx/escpitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc
new file mode 100644
index 000000000000..bd7b2b1c31aa
--- /dev/null
+++ b/svx/inc/svx/exthelpid.hrc
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: helpid.hrc,v $
+ * $Revision: 1.78 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SVX_EXTHELPID_HRC
+#define _SVX_EXTHELPID_HRC
+// include ---------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// these HIDs are used in SVX and also in other modules, mainly CUI
+// the reason is that different controls have the same help texts assigned
+// but are implemented in different libraries
+// to avoid "exporting" the whole HID list only those few ones that are shared
+// are moved to this exported (delivered) hrc file
+
+// Help-Ids --------------------------------------------------------------
+#define HID_GALLERY_ACTUALIZE                     (HID_SVX_EXT0_START +  0)
+#define HID_GALLERY_TITLE                         (HID_SVX_EXT0_START +  1)

+
+// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// Overrun check ---------------------------------------------------------
+// -----------------------------------------------------------------------
+
+#define ACT_SVX_EXT_HID_END     (HID_SVX_EXT0_START +  1)
+#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#endif
+
diff --git a/svx/inc/svx/fhgtitem.hxx b/svx/inc/svx/fhgtitem.hxx
index 86d09bccfd8a..e77457a94e61 100644
--- a/svx/inc/svx/fhgtitem.hxx
+++ b/svx/inc/svx/fhgtitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 25e8d0c79759..7fb21f9d7b63 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -31,7 +31,7 @@
 #ifndef _FILLCTRL_HXX
 #define _FILLCTRL_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/flditem.hxx b/svx/inc/svx/flditem.hxx
index 1ed9ffbf3c57..1d14870d33d3 100644
--- a/svx/inc/svx/flditem.hxx
+++ b/svx/inc/svx/flditem.hxx
@@ -33,7 +33,7 @@
 #include <i18npool/lang.h>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/pstm.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 30b3ec389907..85e5e94f33ee 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
diff --git a/svx/source/inc/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 935e84c6448e..02e063e0314d 100644
--- a/svx/source/inc/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -71,7 +71,7 @@
 
 #ifndef _SVSTDARR_ULONGS
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <sfx2/ctrlitem.hxx>
 #include <tools/link.hxx>
@@ -79,7 +79,7 @@
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
 
-#include "fmprop.hrc"
+//#include "fmprop.hrc"
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/io/XObjectInputStream.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index 2488ad229fcd..924ae78c4182 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <sfx2/mnuitem.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/svx/inc/svx/forbiddenruleitem.hxx
index 8aea672c726d..24010eacc5ed 100644
--- a/svx/inc/svx/forbiddenruleitem.hxx
+++ b/svx/inc/svx/forbiddenruleitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/frmdiritem.hxx b/svx/inc/svx/frmdiritem.hxx
index 56678de69b19..e82638c94d95 100644
--- a/svx/inc/svx/frmdiritem.hxx
+++ b/svx/inc/svx/frmdiritem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/frmdir.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index e3665a47c707..04ae4814c91d 100644
--- a/svx/inc/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -34,9 +34,9 @@
 #include <tools/string.hxx>
 #include <tools/list.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include "svx/svxdllapi.h"
-#include "gallery.hrc"
+//#include "gallery.hrc"
 
 #include <cstdio>
 #include <list>
@@ -81,7 +81,7 @@ public:
 
     BOOL                    IsImported() const { return bImported; }
     BOOL                    IsReadOnly() const { return bReadOnly; }
-    BOOL                    IsDefault() const { return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); }
+    BOOL                    IsDefault() const;
 
     BOOL                    IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
 
diff --git a/svx/inc/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index ff7634d876d8..752c7cc005d7 100644
--- a/svx/inc/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -34,15 +34,43 @@
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/imap.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #include <svtools/transfer.hxx>
 #include <svx/svdobj.hxx>
-#include "galobj.hxx"
 #include <com/sun/star/uno/Reference.h>
-#ifndef _COM_SUN_STAR_AWT_XPROGRESSMONITOR_HPP
 #include <com/sun/star/awt/XProgressMonitor.hpp>
-#endif
 #include "svx/svxdllapi.h"
+#include <tools/date.hxx>
+#include <tools/time.hxx>
+
+// ------------
+// - Forwards -
+// ------------
+
+class GalleryTheme;
+
+// ----------------
+// - ExchangeData -
+// ----------------
+
+struct ExchangeData
+{
+    GalleryTheme*   pTheme;
+    String          aEditedTitle;
+    Date            aThemeChangeDate;
+    Time            aThemeChangeTime;
+};
+
+enum SgaObjKind
+{
+    SGA_OBJ_NONE = 0,   // Abstraktes Objekt
+    SGA_OBJ_BMP = 1,    // Bitmap-Objekt
+    SGA_OBJ_SOUND = 2,  // Sound-Objekt
+    SGA_OBJ_VIDEO = 3,  // Video-Objekt
+    SGA_OBJ_ANIM = 4,   // Animations-Objekt
+    SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt
+    SGA_OBJ_INET = 6    // Grafik aus dem Internet
+};
 
 // -----------
 // - Defines -
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index 9dd363c6f320..7281bc559b4d 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_GRFCROP_HXX
 #define _SVX_GRFCROP_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/svx/hngpnctitem.hxx b/svx/inc/svx/hngpnctitem.hxx
index 224933d2a9a5..dad568857bab 100644
--- a/svx/inc/svx/hngpnctitem.hxx
+++ b/svx/inc/svx/hngpnctitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/hyznitem.hxx b/svx/inc/svx/hyznitem.hxx
index 6e9464090698..0c6f46e09e8c 100644
--- a/svx/inc/svx/hyznitem.hxx
+++ b/svx/inc/svx/hyznitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/impgrf.hxx b/svx/inc/svx/impgrf.hxx
index d99bbd04d1ea..d99bbd04d1ea 100644
--- a/svx/inc/impgrf.hxx
+++ b/svx/inc/svx/impgrf.hxx
diff --git a/svx/inc/svx/itemtype.hxx b/svx/inc/svx/itemtype.hxx
index a65b9bf79b48..a01bea487147 100644
--- a/svx/inc/svx/itemtype.hxx
+++ b/svx/inc/svx/itemtype.hxx
@@ -41,7 +41,7 @@
 #include <tools/resid.hxx>
 #include <tools/bigint.hxx>
 #include <svx/dialmgr.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/shl.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/keepitem.hxx b/svx/inc/svx/keepitem.hxx
index ff1b14f9ff5c..f12f6a79e413 100644
--- a/svx/inc/svx/keepitem.hxx
+++ b/svx/inc/svx/keepitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/kernitem.hxx b/svx/inc/svx/kernitem.hxx
index 578d414bb77f..9e6f5b81da2b 100644
--- a/svx/inc/svx/kernitem.hxx
+++ b/svx/inc/svx/kernitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/langitem.hxx b/svx/inc/svx/langitem.hxx
index 73fd969e3176..5345fede13f7 100644
--- a/svx/inc/svx/langitem.hxx
+++ b/svx/inc/svx/langitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <i18npool/lang.h>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/lrspitem.hxx b/svx/inc/svx/lrspitem.hxx
index 47c97484d97d..1f54209cc82a 100644
--- a/svx/inc/svx/lrspitem.hxx
+++ b/svx/inc/svx/lrspitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx
index 3baa51d7cd7c..e73a3aed11f7 100644
--- a/svx/inc/svx/lspcitem.hxx
+++ b/svx/inc/svx/lspcitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 442f751ad95e..400eb4be9e54 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -1223,97 +1223,4 @@ BYTE  m_bTag;
 void  *m_pvBits;              // raster bits of the blip.
 #endif
 
-class SVX_DLLPUBLIC DffRecordHeader
-{
-
-public:
-    BYTE    nRecVer; // may be DFF_PSFLAG_CONTAINER
-    UINT16  nRecInstance;
-    UINT16  nImpVerInst;
-    UINT16  nRecType;
-    UINT32  nRecLen;
-    ULONG   nFilePos;
-public:
-    DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0), nRecType(0), nRecLen(0), nFilePos(0) {}
-    FASTBOOL IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; }
-    ULONG    GetRecBegFilePos() const { return nFilePos; }
-    ULONG    GetRecEndFilePos() const { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; }
-    void SeekToEndOfRecord(SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen ); }
-    void SeekToContent(    SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE ); }
-    void SeekToBegOfRecord(SvStream& rIn) const { rIn.Seek( nFilePos ); }
-
-    SVX_DLLPUBLIC friend SvStream& operator>>(SvStream& rIn, DffRecordHeader& rRec);
-
-};
-
-struct DffPropFlags
-{
-    BYTE    bSet        : 1;
-    BYTE    bComplex    : 1;
-    BYTE    bBlip       : 1;
-    BYTE    bSoftAttr   : 1;
-};
-
-class SvxMSDffManager;
-
-class SVX_DLLPUBLIC DffPropSet : public Table
-{
-    protected :
-
-        UINT32          mpContents[ 1024 ];
-        DffPropFlags    mpFlags[ 1024 ];
-
-    public :
-
-        DffPropSet( BOOL bInitialize = FALSE ){ if ( bInitialize )
-                                                memset( mpFlags, 0, 0x400 * sizeof( DffPropFlags ) ); };
-
-        inline BOOL IsProperty( UINT32 nRecType ) const { return ( mpFlags[ nRecType & 0x3ff ].bSet ); };
-        BOOL        IsHardAttribute( UINT32 nId ) const;
-        UINT32      GetPropertyValue( UINT32 nId, UINT32 nDefault = 0 ) const;
-        /** Returns a boolean property by its real identifier. */
-        bool        GetPropertyBool( UINT32 nId, bool bDefault = false ) const;
-        /** Returns a string property. */
-        ::rtl::OUString GetPropertyString( UINT32 nId, SvStream& rStrm ) const;
-        void        SetPropertyValue( UINT32 nId, UINT32 nValue ) const;
-        BOOL        SeekToContent( UINT32 nRecType, SvStream& rSt ) const;
-        void        Merge( DffPropSet& rMasterPropSet ) const;
-        void        InitializePropSet() const;
-        friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet );
-};
-
-class SfxItemSet;
-class SdrObject;
-struct DffObjData;
-
-class SVX_DLLPUBLIC DffPropertyReader : public DffPropSet
-{
-    const SvxMSDffManager&  rManager;
-    DffPropSet*             pDefaultPropSet;
-
-    void        ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const;
-    void        ApplyCustomShapeAdjustmentAttributes( SfxItemSet& rSet ) const;
-    void        ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
-    void        ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eShapeType ) const; // #i28269#
-    void        ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
-
-public:
-
-    INT32                   mnFix16Angle;
-
-    DffPropertyReader( const SvxMSDffManager& rManager );
-    ~DffPropertyReader();
-    INT32       Fix16ToAngle( INT32 nAngle ) const;
-
-#ifdef DBG_CUSTOMSHAPE
-    void        ReadPropSet( SvStream& rIn, void* pClientData, UINT32 nShapeType = 0 ) const;
-#else
-    void        ReadPropSet( SvStream& rIn, void* pClientData ) const;
-#endif
-
-    void        SetDefaultPropSet( SvStream& rIn, UINT32 nOffDgg ) const;
-    void        ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const;
-    void        ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
-};
-
 #endif
diff --git a/svx/inc/svx/nhypitem.hxx b/svx/inc/svx/nhypitem.hxx
index 78f81169cc9e..6cca0508a53d 100644
--- a/svx/inc/svx/nhypitem.hxx
+++ b/svx/inc/svx/nhypitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 5e6fe3737f94..7aee6f6bbb65 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -46,7 +46,7 @@
 #endif
 #include "svx/svxdllapi.h"
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 // forward ---------------------------------------------------------------
 
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index 6035f71bc196..b1525a8f56a6 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/numfmtsh.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx
index 9840ec1688ac..86f1eee764a7 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/svx/inc/svx/numitem.hxx
@@ -34,7 +34,7 @@
 
 #include <tools/link.hxx>
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/svxenum.hxx>
 #include <tools/gen.hxx>
 #ifndef _SVX_NUMDEF_HXX //autogen
@@ -47,7 +47,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/style/NumberingType.hpp>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include "svx/svxdllapi.h"
 
 class SvxBrushItem;
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 46c79b45e4d1..30a22938f888 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -40,7 +40,7 @@
 #include <vcl/bitmap.hxx>
 #include <svx/svx3ditems.hxx>
 #include <svx/xflclit.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/inc/svx/orphitem.hxx b/svx/inc/svx/orphitem.hxx
index b1962b31eadd..676e245c3770 100644
--- a/svx/inc/svx/orphitem.hxx
+++ b/svx/inc/svx/orphitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx
index 37e3d8ac71ee..e87ed9bd6114 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/svx/inc/svx/outliner.hxx
@@ -34,7 +34,7 @@
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 #include <svx/editdata.hxx>
 #include <i18npool/lang.h>
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index 740e3a9e6edc..a9f611474a1b 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/string.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/paravertalignitem.hxx b/svx/inc/svx/paravertalignitem.hxx
index 7fc1379307ad..a7026422cc97 100644
--- a/svx/inc/svx/paravertalignitem.hxx
+++ b/svx/inc/svx/paravertalignitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/pbinitem.hxx b/svx/inc/svx/pbinitem.hxx
index 92241320ad14..f6a490cd8316 100644
--- a/svx/inc/svx/pbinitem.hxx
+++ b/svx/inc/svx/pbinitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/pmdlitem.hxx b/svx/inc/svx/pmdlitem.hxx
index 211083065797..edbf627c516b 100644
--- a/svx/inc/svx/pmdlitem.hxx
+++ b/svx/inc/svx/pmdlitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/postitem.hxx b/svx/inc/svx/postitem.hxx
index 18870f34ecbb..b662f64116b5 100644
--- a/svx/inc/svx/postitem.hxx
+++ b/svx/inc/svx/postitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <vcl/vclenum.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/prszitem.hxx b/svx/inc/svx/prszitem.hxx
index 1b603acb0762..f075358f7a24 100644
--- a/svx/inc/svx/prszitem.hxx
+++ b/svx/inc/svx/prszitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index 53c713161156..200f7f997471 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -32,7 +32,7 @@
 
 #include <vcl/menu.hxx>
 #include <svtools/ruler.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "svx/svxdllapi.h"
 
 class SvxProtectItem;
diff --git a/svx/inc/svx/scriptspaceitem.hxx b/svx/inc/svx/scriptspaceitem.hxx
index d05fc45f8fe9..660d3c9c2019 100644
--- a/svx/inc/svx/scriptspaceitem.hxx
+++ b/svx/inc/svx/scriptspaceitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/scripttypeitem.hxx b/svx/inc/svx/scripttypeitem.hxx
index c35ae38b314b..75af8bcd8397 100644
--- a/svx/inc/svx/scripttypeitem.hxx
+++ b/svx/inc/svx/scripttypeitem.hxx
@@ -32,11 +32,11 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include "svx/svxdllapi.h"
 
 // class SvxScriptTypeItem ----------------------------------------------
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index 3ae426d921fa..27205b49ec8b 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDANGITM_HXX
 #define _SDANGITM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index 2301e0021b42..9678dec88968 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -31,7 +31,7 @@
 #ifndef _SDASAITM_HXX
 #define _SDASAITM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/list.hxx>
 
 class SdrCustomShapeAdjustmentValue
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index 882b3b74fedd..2499a857b965 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -33,7 +33,7 @@
 
 #include <svx/svddef.hxx>
 #include <svx/sdooitm.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
index a1c6ba0431d6..c20ec38e78d1 100644
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/svx/inc/svx/sdggaitm.hxx
@@ -31,7 +31,7 @@
 #ifndef _SDGGAITM_HXX
 #define _SDGGAITM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index 0f46c913c82e..0f27c6ef8ba4 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -32,7 +32,7 @@
 #define _SDGMOITM_HXX
 
 #include <goodies/grfmgr.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index 65f8a33443ed..b4f39d5fa76f 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDMETITM_HXX
 #define _SDMETITM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index 5a49830909bc..d8af5ef51428 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDOOITM_HXX
 #define _SDOOITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index 404b70504b99..b9e17365629f 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDPRCITM_HXX
 #define _SDPRCITM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx
index e91b05998837..5bdcda6e8116 100644
--- a/svx/inc/svx/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx
@@ -31,7 +31,7 @@
 #ifndef _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
 #define _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/sdr/properties/defaultproperties.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx
index 1845d152a65f..87806b4a72e4 100644
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/svx/inc/svx/sdrpagewindow.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/util/XModeChangeListener.hpp>
 #include <cppuhelper/implbase4.hxx>
 #include <svx/svdtypes.hxx> // fuer SdrLayerID
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/contnr.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx
index ae9547d5f1ae..27b8cde80a10 100644
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/svx/inc/svx/sdtaaitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDTAAITM_HXX
 #define _SDTAAITM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx
index 03ad7551df35..b34aaa5c2c0a 100644
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/svx/inc/svx/sdtacitm.hxx
@@ -30,7 +30,7 @@
 #ifndef sdtacitm_hxx
 #define sdtacitm_hxx
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
 
 // Anzahl der Durchlaeufe. 0=Endlos.
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index 9f56d1684852..bff071dab476 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDTADITM_HXX
 #define _SDTADITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index c51b0a6d8b62..ca816c5581ed 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDTAITM_HXX
 #define _SDTAITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index e73f704455f6..ef91d76f0374 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -30,7 +30,7 @@
 #ifndef SDTAKITM_HXX
 #define SDTAKITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx
index f1bb5a224140..84d82d561522 100644
--- a/svx/inc/svx/sdtayitm.hxx
+++ b/svx/inc/svx/sdtayitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDTAYITM_HXX
 #define _SDTAYITM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index 146b2c60bab1..467107d49812 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDTFSITM_HXX
 #define _SDTFSITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index 9e0b27a87404..88826007ef90 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SDYNITM_HXX
 #define _SDYNITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/svx/shaditem.hxx b/svx/inc/svx/shaditem.hxx
index c28be7ddc58a..90c33aef2410 100644
--- a/svx/inc/svx/shaditem.hxx
+++ b/svx/inc/svx/shaditem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <tools/color.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/shdditem.hxx b/svx/inc/svx/shdditem.hxx
index 5421aa54002d..f37f58ba048c 100644
--- a/svx/inc/svx/shdditem.hxx
+++ b/svx/inc/svx/shdditem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/sizeitem.hxx b/svx/inc/svx/sizeitem.hxx
index 5d796def9370..d99ed038a600 100644
--- a/svx/inc/svx/sizeitem.hxx
+++ b/svx/inc/svx/sizeitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/spltitem.hxx b/svx/inc/svx/spltitem.hxx
index e635ce57cdc3..7cf18a02ca93 100644
--- a/svx/inc/svx/spltitem.hxx
+++ b/svx/inc/svx/spltitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx
index eaaba216d929..6149916f0d6c 100644
--- a/svx/inc/svx/svdattr.hxx
+++ b/svx/inc/svx/svdattr.hxx
@@ -32,7 +32,7 @@
 #define _SVDATTR_HXX
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <tools/solar.h>
 #include <svx/sdangitm.hxx>
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 4960323feeb7..8d7d4552ea6c 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -39,7 +39,7 @@
 #include <tools/contnr.hxx>
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #include <svx/xpoly.hxx>
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 2873b77ac2ea..a9abeac76fc2 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -40,12 +40,12 @@
 #ifndef _MAPMOD_HXX //autogen
 #include <vcl/mapmod.hxx>
 #endif
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <tools/string.hxx>
 #include <tools/datetime.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/pageitem.hxx>
 #include <vcl/field.hxx>
 
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 349bf49ccf06..cc21e645e4d2 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -35,7 +35,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <vcl/mapmod.hxx>
 #include <tools/weakbase.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/timer.hxx>
 #include <svx/svdsob.hxx>
 #include <svx/svdtypes.hxx> // fuer SdrLayerID
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index cf5ae7e165d0..2d6323cc5a5d 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -32,7 +32,7 @@
 #define _SVDPAGV_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/svdhlpln.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <svx/svdsob.hxx>
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 48523dc97c3b..940133da5568 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -31,19 +31,20 @@
 #ifndef _SVDPNTV_HXX
 #define _SVDPNTV_HXX
 
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/undo.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/undo.hxx>
 #include <svx/svddrag.hxx>
 #include <svx/svdlayer.hxx>  // fuer SetOfByte
 #include <vcl/window.hxx>
 #include <svtools/colorcfg.hxx>
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/timer.hxx>
 #include "svx/svxdllapi.h"
 #include <svtools/optionsdrawinglayer.hxx>
+#include <unotools/options.hxx>
 
 //************************************************************
 //   Pre-Defines
@@ -127,7 +128,7 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster
+class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener
 {
     friend class                SdrPageView;
     friend class                FrameAnimator;
@@ -241,6 +242,7 @@ protected:
 protected:
     void AppendPaintWindow(SdrPaintWindow& rNew);
     SdrPaintWindow* RemovePaintWindow(SdrPaintWindow& rOld);
+    void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 );
 
 public:
     sal_uInt32 PaintWindowCount() const { return maPaintWindows.size(); }
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 717b1a070c6f..803b454a6f0c 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -32,9 +32,9 @@
 #define _SVDUNDO_HXX
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <tools/contnr.hxx>
 #include <tools/gen.hxx>
 #include <svx/svdtypes.hxx> // fuer enum RepeatFuncts
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index a6ae55eddafa..1fe40e40df41 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -38,6 +38,7 @@
 #include <svtools/accessibilityoptions.hxx>
 #include "svx/svxdllapi.h"
 #include <svx/svdcrtv.hxx>
+#include <unotools/options.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -197,8 +198,6 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi
 protected:
     SvtAccessibilityOptions maAccessibilityOptions;
 
-    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
-
 public:
     TYPEINFO();
     SdrView(SdrModel* pModel1, OutputDevice* pOut = 0L);
@@ -235,6 +234,8 @@ public:
     virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
     virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin);
 
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
+
     BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
     BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
 
diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx
index e956edb69803..998b20a7a751 100644
--- a/svx/inc/svx/svx3ditems.hxx
+++ b/svx/inc/svx/svx3ditems.hxx
@@ -30,8 +30,8 @@
 #ifndef _SVX3DITEMS_HXX
 #define _SVX3DITEMS_HXX
 
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 
 
 #include <svx/colritem.hxx>
diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx
index ea4585b20af6..5d61f303972d 100644
--- a/svx/inc/svx/svxacorr.hxx
+++ b/svx/inc/svx/svxacorr.hxx
@@ -33,7 +33,7 @@
 
 #include <com/sun/star/embed/XStorage.hpp>
 #include <tools/rtti.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <i18npool/lang.h>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx
index d98d0f19ff3e..f5b1bd21c148 100644
--- a/svx/inc/svx/svxbox.hxx
+++ b/svx/inc/svx/svxbox.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 
 #ifndef _LSTBOX_HXX //autogen
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index e4b3b6152022..23db741f0991 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -361,56 +361,47 @@ class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory
 public:
     static SvxAbstractDialogFactory* Create();
 
+    // define dtor as this will create typeinfo in svx library
+    virtual                             ~SvxAbstractDialogFactory();
+
     virtual SfxAbstractTabDialog*       CreateTextTabDialog( Window* pParent,
                                             const SfxItemSet* pAttrSet,
-                                            sal_uInt32 nResId,
                                             SdrView* pView,
                                             SdrModel* pModel=0 ) = 0 ; //add for SvxTextTabDialog
 
     virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
                                         const SdrView* pView,
-                                        sal_uInt32 nResId,
                                         USHORT nAnchorTypes = 0 ) = 0;      //add for SvxCaptionTabDialog CHINA001
 
     virtual AbstractSvxDistributeDialog*    CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
-                                            sal_uInt32 nResId,
                                             SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
                                             SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0;
 
     virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog CHINA001
-                                            HangulHanjaConversion::ConversionDirection _ePrimaryDirection,
-                                            sal_uInt32 nResId) = 0;
+                                            HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
 
-    virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent,  //add for FmShowColsDialog
-                                             sal_uInt32 nResId) = 0 ;
+    virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0;
 
     virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,  //add for SvxZoomDialog
-                                            const SfxItemSet& rCoreSet,
-                                            sal_uInt32 nResId) = 0 ;
+                                            const SfxItemSet& rCoreSet )=0;
 
     virtual AbstractSpellDialog *   CreateSvxSpellDialog(Window* pParent,
                                             SfxBindings* pBindings,
                                             svx::SpellDialogChildWindow* pSpellChildWindow )=0;
 
     virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent,  //add for ActualizeProgress
-                                            GalleryTheme* pThm,
-                                            sal_uInt32 nResId) = 0;
+                                            GalleryTheme* pThm ) = 0;
     virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,  //add for SearchProgress
-                                            const INetURLObject& rStartURL,
-                                            sal_uInt32 nResId) = 0;
-    virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent,  //add for TakeProgress
-                                            sal_uInt32 nResId) = 0;
+                                            const INetURLObject& rStartURL ) = 0;
+    virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) = 0;
     virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent,  //add for TitleDialog
-                                             const String& rOldText,
-                                            sal_uInt32 nResId) = 0;
+                                             const String& rOldText ) = 0;
     virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent,  //add for SvxZoomDialog
-                                            GalleryTheme* pThm,
-                                            sal_uInt32 nResId) = 0;
+                                            GalleryTheme* pThm ) = 0;
     virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent,  //add for GalleryThemeProperties
                                             ExchangeData* pData,
-                                            SfxItemSet* pItemSet,
-                                            sal_uInt32 nResId) = 0;
+                                            SfxItemSet* pItemSet ) = 0;
     virtual AbstractURLDlg * CreateURLDialog( Window* pParent,
                                             const String& rURL, const String& rAltText, const String& rDescription,
                                             const String& rTarget, const String& rName,
@@ -422,8 +413,7 @@ public:
                                             sal_uInt32 nResId) = 0;
     virtual VclAbstractDialog*      CreateSvxSearchAttributeDialog( Window* pParent,  //add for SvxSearchAttributeDialog
                                             SearchAttrItemList& rLst,
-                                            const USHORT* pWhRanges,
-                                            sal_uInt32 nResId )= 0;
+                                            const USHORT* pWhRanges)=0;
     virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,  //add for SvxSearchSimilarityDialog
                                                             BOOL bRelax,
                                                             USHORT nOther,
@@ -431,12 +421,10 @@ public:
                                                             USHORT nLonger ) = 0;
     virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
                                             const SfxItemSet& rCoreSet,
-                                            sal_uInt32 nResId,
                                             BOOL bEnableSelector = FALSE) = 0;
     virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
                                                                 const SfxItemSet* pAttr,
                                                                 const SdrView* pView,
-                                                                sal_uInt32 nResId,
                                                                 USHORT nAnchorTypes = 0) = 0;
     virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent,  //add for SchTransformTabDialog
                                                                 const SfxItemSet* pAttr,
@@ -445,11 +433,9 @@ public:
                                                                 bool bSizeTabPage = false
                                                                  )=0;
     virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
-                                                            const SfxItemSet& rOptionsSet, USHORT nUniqueId,
-                                                            INT32 nInitialFlags,
-                                                            sal_uInt32 nResId) = 0; //add for SvxJSearchOptionsDialog
-    virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent,
-                                                            sal_uInt32 nResId) = 0; //add for FmInputRecordNoDialog
+                                                            const SfxItemSet& rOptionsSet,
+                                                            INT32 nInitialFlags )=0;
+    virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0;
     virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 >  &xSpl,
                                             sal_uInt32 nResId ) = 0; //add for SvxNewDictionaryDialog
@@ -458,21 +444,18 @@ public:
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
                                             sal_uInt32 nResId) = 0;//add for SvxEditDictionaryDialog
     virtual AbstractSvxNameDialog *     CreateSvxNameDialog( Window* pParent,
-                                            const String& rName, const String& rDesc,
-                                            sal_uInt32 nResId ) = 0; //add for SvxNameDialog
+                                            const String& rName, const String& rDesc ) = 0; //add for SvxNameDialog
 
     // #i68101#
-    virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId) = 0;
-    virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId) = 0;
+    virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName ) = 0;
+    virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription) = 0;
 
     virtual AbstractSvxMessDialog *     CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
                                             const String& rText, const String& rDesc,
                                             Image* pImg = NULL ) = 0; //add for SvxMessDialog
 
-    virtual AbstractSvxMultiPathDialog *    CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId,
-                                                BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog
-    virtual AbstractSvxMultiFileDialog *    CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId,
-                                                BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog
+    virtual AbstractSvxMultiPathDialog *    CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog
+    virtual AbstractSvxMultiFileDialog *    CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog
     virtual AbstractSvxHpLinkDlg *  CreateSvxHpLinkDlg (Window* pParent,  //add for SvxMultiFileDialog
                                             SfxBindings* pBindings,
                                             sal_uInt32 nResId)=0;
@@ -483,28 +466,23 @@ public:
                                                         const Link& lnkContextSupplier)=0;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterEmboss (Window* pParent,  //add for GraphicFilterEmboss
                                                 const Graphic& rGraphic,
-                                                RECT_POINT eLightSource,
-                                                sal_uInt32 nResId)=0;
+                                                RECT_POINT eLightSource, sal_uInt32 nResId )=0;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterPosterSepia (Window* pParent,  //add for GraphicFilterPoster & GraphicFilterSepia
                                                 const Graphic& rGraphic,
                                                 USHORT nCount,
                                                 sal_uInt32 nResId)=0;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterSolarize (Window* pParent,  //add for GraphicFilterSolarize
                                                 const Graphic& rGraphic,
-                                                BYTE nGreyThreshold, BOOL bInvert,
-                                                sal_uInt32 nResId)=0;
+                                                BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterMosaic (Window* pParent,  //add for GraphicFilterMosaic
                                                 const Graphic& rGraphic,
-                                                USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
-                                                sal_uInt32 nResId)=0;
+                                                USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0;
     virtual AbstractSvxAreaTabDialog*       CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
-                                                            sal_uInt32 nResId,
                                                             const SdrView* pSdrView = NULL ) = 0 ;
     virtual SfxAbstractTabDialog*           CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
                                                                  SdrModel* pModel,
-                                                                 sal_uInt32 nResId,
                                                                  const SdrObject* pObj = NULL,
                                                                 BOOL bHasObj = TRUE )=0;
     virtual VclAbstractDialog*              CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
@@ -520,11 +498,10 @@ public:
                                                                         )=0;
     virtual AbstractSvxPostItDialog*        CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
                                                                         const SfxItemSet& rCoreSet,
-                                                                        sal_uInt32 nResId,
                                                                         BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0;
     virtual VclAbstractDialog*          CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0;
 
-    virtual CreateSvxDistributePage     GetSvxDistributePageCreatorFunc(USHORT nId ) = 0; //  add for SvxDistributePage
+    virtual CreateSvxDistributePage     GetSvxDistributePageCreatorFunc() = 0; //  add for SvxDistributePage
     virtual DialogGetRanges         GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog
 
     virtual AbstractScriptSelectorDialog*
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 4e3b1ebf4889..5c541b3b24dd 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -31,8 +31,8 @@
 #define _SVX_SVXIDS_HRC
 // include ------------------------------------------------------------------
 
-#include <svtools/memberid.hrc>
-#include <svtools/solar.hrc>
+#include <svl/memberid.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
 
@@ -147,7 +147,7 @@
 // --------------------------------------------------------------------------
 // Resource-Id's ? (obsolete??? at least the one beginning with SID???)
 // --------------------------------------------------------------------------
-
+/*
 #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
 #define RID_SW_TP_CONTENT_OPT           (RID_OFA_START + 206)
 #define RID_SW_TP_LAYOUT_OPT            (RID_OFA_START + 207)
@@ -196,8 +196,9 @@
 #define RID_OFA_TP_INTERNATIONAL        (RID_OFA_START + 252)       // 4 SC & ID 4 resource
 #define RID_OFA_TP_INTERNATIONAL_SD     (RID_OFA_START + 253)       // 4 SD
 #define RID_OFA_TP_INTERNATIONAL_IMPR   (RID_OFA_START + 254)       // 4 impress
+*/
+
 #define SID_ATTR_PARENTWINDOW           (RID_OFA_START + 255)
-#define RID_SW_TP_OPTCAPTION_PAGE       (RID_OFA_START + 256)
 
 // --------------------------------------------------------------------------
 // Event-Id's Block 1
diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc
index 019211697711..5d554cf67ebf 100644
--- a/svx/inc/svx/svxitems.hrc
+++ b/svx/inc/svx/svxitems.hrc
@@ -33,7 +33,7 @@
 // include ------------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // BOOL ---------------------------------------------------------------------
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index 58c6bb167e0f..229f80394ce7 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SXCECITM_HXX
 #define _SXCECITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index 239df3664a63..c94263e55d17 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -31,7 +31,7 @@
 #define _SXCIKITM_HXX
 
 #include <svx/svddef.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 enum SdrCircKind {SDRCIRC_FULL,
                   SDRCIRC_SECT,
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index f0eebfbc740b..35d496179e2a 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SXCTITM_HXX
 #define _SXCTITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index 2693daa4a309..a763a90e4b1f 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SXEKITM_HXX
 #define _SXEKITM_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx
index 3228dee660e7..72a258d2fa70 100644
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/svx/inc/svx/sxfiitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFXIITM_HXX
 #define _SFXIITM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/fract.hxx>
 
 /*************************************************************************/
diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx
index d09ef3261505..972bed84e8de 100644
--- a/svx/inc/svx/sxlayitm.hxx
+++ b/svx/inc/svx/sxlayitm.hxx
@@ -31,8 +31,8 @@
 #define _SYLAYITM_HXX
 
 #include <svx/svddef.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svdtypes.hxx>
 
 //------------------------------
diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx
index a2068a51e032..4d9f245e54b1 100644
--- a/svx/inc/svx/sxmfsitm.hxx
+++ b/svx/inc/svx/sxmfsitm.hxx
@@ -31,7 +31,7 @@
 #define _SXMFSITM_HXX
 
 #include <svx/svddef.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 // Formatstring (aehnl. Calc), z.B. "#.###,00km"
 // ueberschreibt SdrMeasureUnitItem und SdrMeasureShowUnitItem (n.i.)
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index a5979bceef00..ae537a976e25 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -31,7 +31,7 @@
 #define _SXMKITM_HXX
 
 #include <svx/svddef.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 enum SdrMeasureKind     {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i.
 
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index f8a65552b1c2..a708c9429678 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -31,7 +31,7 @@
 #define _SXMTPITM_HXX
 
 #include <svx/svddef.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE};
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index e48fcefc8315..9f721f67fef2 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -32,7 +32,7 @@
 
 #include <vcl/field.hxx>
 #include <svx/svddef.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 // Vorgabe einer Masseinheit. Der Zahlenwert wird in diese Einheit umgerechnet
diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx
index 8172df9cd200..ce5c5e72cfd1 100644
--- a/svx/inc/svx/sxonitm.hxx
+++ b/svx/inc/svx/sxonitm.hxx
@@ -31,7 +31,7 @@
 #define _SXONITM_HXX
 
 #include <svx/svddef.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 //------------------------------
 // class SdrObjectNameItem
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 4b52785756c9..e531ebfad54b 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -158,7 +158,7 @@
 // ITEMID_...-Defines im *.cxx
 
 #include <rsc/rscsfx.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svx/strarray.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx
index 58c9a6400aed..b910b1b1e704 100644
--- a/svx/inc/svx/tstpitem.hxx
+++ b/svx/inc/svx/tstpitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/svxenum.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/twolinesitem.hxx b/svx/inc/svx/twolinesitem.hxx
index cf7ec3c48f2e..5c0094db0f42 100644
--- a/svx/inc/svx/twolinesitem.hxx
+++ b/svx/inc/svx/twolinesitem.hxx
@@ -31,7 +31,7 @@
 #define _SVX_TWOLINESITEM_HXX
 
 #include <sal/types.h>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/udlnitem.hxx b/svx/inc/svx/udlnitem.hxx
index ca27f07b9602..33d5d59e3ff6 100644
--- a/svx/inc/svx/udlnitem.hxx
+++ b/svx/inc/svx/udlnitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/ulspitem.hxx b/svx/inc/svx/ulspitem.hxx
index 133246bcd1d9..9c57a445a0a7 100644
--- a/svx/inc/svx/ulspitem.hxx
+++ b/svx/inc/svx/ulspitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/unoedsrc.hxx b/svx/inc/svx/unoedsrc.hxx
index a4777b6469b4..6c3025072e3c 100644
--- a/svx/inc/svx/unoedsrc.hxx
+++ b/svx/inc/svx/unoedsrc.hxx
@@ -42,8 +42,8 @@
 #ifndef _SV_COLOR_HXX //autogen
 #include <tools/color.hxx>
 #endif
-#include <svtools/poolitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itempool.hxx>
 #include "svx/svxdllapi.h"
 
 #include <list>
diff --git a/svx/inc/svx/unoipset.hxx b/svx/inc/svx/unoipset.hxx
index b16079e515cd..ffc9f834f7b4 100644
--- a/svx/inc/svx/unoipset.hxx
+++ b/svx/inc/svx/unoipset.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "svx/svxdllapi.h"
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class SvxIDPropertyCombineList;
 class SdrItemPool;
diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx
index 39caa0849ec6..83671f2934f8 100644
--- a/svx/inc/svx/unopage.hxx
+++ b/svx/inc/svx/unopage.hxx
@@ -44,7 +44,7 @@
 #endif
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/mutxhelp.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index ebe1e375f58c..3c7f87f58fbd 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -33,7 +33,7 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <svx/svdpool.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <tools/list.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index f400376a6937..ec81d8beaa1c 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <tools/gen.hxx>
 #include <tools/weakbase.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/unoipset.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 4e1f91ca23da..e23b24a21957 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -82,7 +82,7 @@
 #include <svx/unoprnms.hxx>
 #include <svx/unomid.hxx>
 #include <svx/unotext.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <svx/svxids.hrc>
 
diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx
index 63ce0a28b739..46e26dbbc0a8 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/svx/inc/svx/unotext.hxx
@@ -50,11 +50,11 @@
 #include <com/sun/star/text/XTextCopy.hpp>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <svx/editdata.hxx>
 #include <svx/unoedsrc.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svxenum.hxx>
 #include <svx/outliner.hxx>
 #include <svx/unoforou.hxx>
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
index 6e294290098d..a58e83c1a38b 100644
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/svx/inc/svx/viewlayoutitem.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_VIEWLAYOUTITEM_HXX
 #define _SVX_VIEWLAYOUTITEM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/wghtitem.hxx b/svx/inc/svx/wghtitem.hxx
index eac6cb0da621..2a63885e3e42 100644
--- a/svx/inc/svx/wghtitem.hxx
+++ b/svx/inc/svx/wghtitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <vcl/vclenum.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/widwitem.hxx b/svx/inc/svx/widwitem.hxx
index 78f7a3a563e2..682e3bea5c39 100644
--- a/svx/inc/svx/widwitem.hxx
+++ b/svx/inc/svx/widwitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/inc/svx/writingmodeitem.hxx b/svx/inc/svx/writingmodeitem.hxx
index 02092073a6bf..0e481479a611 100644
--- a/svx/inc/svx/writingmodeitem.hxx
+++ b/svx/inc/svx/writingmodeitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <com/sun/star/text/WritingMode.hpp>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/wrlmitem.hxx b/svx/inc/svx/wrlmitem.hxx
index b2138548e50c..aa5116125d28 100644
--- a/svx/inc/svx/wrlmitem.hxx
+++ b/svx/inc/svx/wrlmitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx
index cf88f88ed80d..6ac90e8a8a93 100644
--- a/svx/inc/svx/xfillit.hxx
+++ b/svx/inc/svx/xfillit.hxx
@@ -38,7 +38,7 @@
 #include <svx/xgrad.hxx>
 #include <svx/xhatch.hxx>
 #include <svx/xenum.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include <svx/xflclit.hxx>
 #include <svx/xsflclit.hxx>
diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx
index 9bb4543beb51..4fbc0686a5ba 100644
--- a/svx/inc/svx/xfillit0.hxx
+++ b/svx/inc/svx/xfillit0.hxx
@@ -31,7 +31,7 @@
 #ifndef SVX_XFILLIT0_HXX
 #define SVX_XFILLIT0_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include <svx/xdef.hxx>
 #include <svx/xenum.hxx>
diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx
index 50bea4e013ba..f5ca7bc9efff 100644
--- a/svx/inc/svx/xflasit.hxx
+++ b/svx/inc/svx/xflasit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLASIT_HXX
 #define _SVX_XFLASIT_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx
index 2744982b8639..aecae3acdeb4 100644
--- a/svx/inc/svx/xflbckit.hxx
+++ b/svx/inc/svx/xflbckit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBCKIT_HXX
 #define _SVX_XFLBCKIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index 42117613cba4..231bab10f122 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBMPIT_HXX
 #define _SVX_XFLBMPIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx
index 332bbf9792b7..a0f88b111331 100644
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/svx/inc/svx/xflbmsli.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBMSLI_HXX
 #define _SVX_XFLBMSLI_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx
index 78263dd2c5e3..254428badb6c 100644
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/svx/inc/svx/xflbmsxy.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBMSXY_HXX
 #define _SVX_XFLBMSXY_HXX
 
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx
index c38fd9c45514..db969aa650c5 100644
--- a/svx/inc/svx/xflbmtit.hxx
+++ b/svx/inc/svx/xflbmtit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBMTIT_HXX
 #define _SVX_XFLBMTIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx
index 9f0c37f9b6b3..2dfd12f6d6dc 100644
--- a/svx/inc/svx/xflboxy.hxx
+++ b/svx/inc/svx/xflboxy.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBOXY_HXX
 #define _SVX_XFLBOXY_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx
index af2dee2fa116..a91c44d02831 100644
--- a/svx/inc/svx/xflbstit.hxx
+++ b/svx/inc/svx/xflbstit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBSTIT_HXX
 #define _SVX_XFLBSTIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx
index 828435432bb1..2f6744e4c022 100644
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/svx/inc/svx/xflbtoxy.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLBTOXY_HXX
 #define _SVX_XFLBTOXY_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx
index dd4738e340b3..5b78342d1ebf 100644
--- a/svx/inc/svx/xfltrit.hxx
+++ b/svx/inc/svx/xfltrit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFLTRIT_HXX
 #define _SVX_XFLTRIT_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx
index 839d636d41c2..a29dfb8540a8 100644
--- a/svx/inc/svx/xftadit.hxx
+++ b/svx/inc/svx/xftadit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFTADIT_HXX
 #define _SVX_XFTADIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx
index 33ca48003471..fc47ac7b6c7d 100644
--- a/svx/inc/svx/xftdiit.hxx
+++ b/svx/inc/svx/xftdiit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFTDIIT_HXX
 #define _SVX_XFTDIIT_HXX
 
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx
index ea428b141a40..f0d7fc1ac362 100644
--- a/svx/inc/svx/xftmrit.hxx
+++ b/svx/inc/svx/xftmrit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFTMRIT_HXX
 #define _SVX_XFTMRIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx
index 02866ed2975d..973a12095dd9 100644
--- a/svx/inc/svx/xftshit.hxx
+++ b/svx/inc/svx/xftshit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFTSHIT_HXX
 #define _SVX_XFTSHIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx
index cc4b87f71673..7d7744640533 100644
--- a/svx/inc/svx/xftshtit.hxx
+++ b/svx/inc/svx/xftshtit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFTSHTIT_HXX
 #define _SVX_XFTSHTIT_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 /*************************************************************************
 |*
diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx
index dd19518b0510..7f83e8e826b2 100644
--- a/svx/inc/svx/xftshxy.hxx
+++ b/svx/inc/svx/xftshxy.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFTSHXY_HXX
 #define _SVX_XFTSHXY_HXX
 
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx
index 062d4c1fd8e9..dd9b14e1f75d 100644
--- a/svx/inc/svx/xftstit.hxx
+++ b/svx/inc/svx/xftstit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XFTSTIT_HXX
 #define _SVX_XFTSTIT_HXX
 
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx
index 3d2ee96b0618..3cf97e3c7ce0 100644
--- a/svx/inc/svx/xgrscit.hxx
+++ b/svx/inc/svx/xgrscit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XGRSCIT_HXX
 #define _SVX_XGRSCIT_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 993f16eb1f43..b864cf0d20c0 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XIT_HXX
 #define _SVX_XIT_HXX
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/xdef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx
index 3181da265a64..46e8d34e32bc 100644
--- a/svx/inc/svx/xlineit.hxx
+++ b/svx/inc/svx/xlineit.hxx
@@ -35,8 +35,8 @@
 #include <svx/xcolit.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/xenum.hxx>
-#include <svtools/metitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/metitem.hxx>
+#include <svl/eitem.hxx>
 
 class XDash;
 class XDashTable;
diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx
index 57104bf05d06..41754785f0bf 100644
--- a/svx/inc/svx/xlineit0.hxx
+++ b/svx/inc/svx/xlineit0.hxx
@@ -32,7 +32,7 @@
 #define _SVX_XLINEIT0_HXX
 
 #include <svx/xenum.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 //---------------------
 // class LineStyleItem
 //---------------------
diff --git a/svx/inc/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx
index dc1016d0a05b..97b4bb2ac276 100644
--- a/svx/inc/xlinjoit.hxx
+++ b/svx/inc/svx/xlinjoit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XLINJOIT_HXX
 #define _SVX_XLINJOIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/xenum.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx
index 6743e4a30747..413de684537b 100644
--- a/svx/inc/svx/xlnasit.hxx
+++ b/svx/inc/svx/xlnasit.hxx
@@ -32,7 +32,7 @@
 #define _SVX_XLNASIT_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx
index f1a6fe3e2846..0adabb2862e5 100644
--- a/svx/inc/svx/xlnedcit.hxx
+++ b/svx/inc/svx/xlnedcit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XLNEDCIT_HXX
 #define _SVX_XLNEDCIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 //----------------------------
diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx
index 621bdd7b3c5b..13735ae5f7d6 100644
--- a/svx/inc/svx/xlnedwit.hxx
+++ b/svx/inc/svx/xlnedwit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XLNEDWIT_HXX
 #define _SVX_XLNEDWIT_HXX
 
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
 
 #define LINE_END_WIDTH_DEFAULT      (200)
diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx
index 9a76b644ffd4..c7d65bf1f106 100644
--- a/svx/inc/svx/xlnstcit.hxx
+++ b/svx/inc/svx/xlnstcit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XLNSTCIT_HXX
 #define _SVX_XLNSTCIT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 //------------------------------
diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx
index e7522e0761b3..a5899b7743cc 100644
--- a/svx/inc/svx/xlnstwit.hxx
+++ b/svx/inc/svx/xlnstwit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XLNSTWIT_HXX
 #define _SVX_XLNSTWIT_HXX
 
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
 
 #define LINE_START_WIDTH_DEFAULT        (200)
diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx
index 377f70730294..2590ea304e3b 100644
--- a/svx/inc/svx/xlntrit.hxx
+++ b/svx/inc/svx/xlntrit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XLNTRIT_HXX
 #define _SVX_XLNTRIT_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx
index 59be68eec389..11f832716a08 100644
--- a/svx/inc/svx/xlnwtit.hxx
+++ b/svx/inc/svx/xlnwtit.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XLNWTIT_HXX
 #define _SVX_XLNWTIT_HXX
 
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
 
 //---------------------
diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx
index c8e944801941..10fb329b6216 100644
--- a/svx/inc/svx/xpool.hxx
+++ b/svx/inc/svx/xpool.hxx
@@ -31,7 +31,7 @@
 #ifndef _XPOOL_HXX
 #define _XPOOL_HXX
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/xdef.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx
index ae65dba27427..02dc65747540 100644
--- a/svx/inc/svx/xsetit.hxx
+++ b/svx/inc/svx/xsetit.hxx
@@ -34,8 +34,8 @@
 #ifndef _XATTR_HXX
 #include <svx/xit.hxx>
 #endif
-#include <svtools/metitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/metitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/rectenum.hxx>
 
 #include <svx/xlnasit.hxx>
diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx
index dd7aaa7c9472..3cc0fbccc152 100644
--- a/svx/inc/svx/xtextit.hxx
+++ b/svx/inc/svx/xtextit.hxx
@@ -32,8 +32,8 @@
 #define _SVX_XTEXTITEM_HXX
 
 #include <svx/xenum.hxx>
-#include <svtools/metitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/metitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/xit.hxx>
 #include <svx/xcolit.hxx>
 
diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx
index 30989da4cd9d..3edf5114e8f9 100644
--- a/svx/inc/svx/xtextit0.hxx
+++ b/svx/inc/svx/xtextit0.hxx
@@ -32,7 +32,7 @@
 #define _SVX_TEXTIT0_HXX
 
 #include <svx/xenum.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
 
 /*************************************************************************
diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
index f802cb7ed61c..75aafc540ee3 100644
--- a/svx/inc/svx/zoomitem.hxx
+++ b/svx/inc/svx/zoomitem.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_ZOOMITEM_HXX
 #define _SVX_ZOOMITEM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
index b18f43ceaebc..c58cd255ae8d 100644
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/svx/inc/svx/zoomslideritem.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_ZOOMSLIDERITEM_HXX
 #define _SVX_ZOOMSLIDERITEM_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svxgrahicitem.hxx
index af88babba468..9e2dca690d94 100644
--- a/svx/inc/svxgrahicitem.hxx
+++ b/svx/inc/svxgrahicitem.hxx
@@ -31,7 +31,7 @@
 #define _SVX_GRAPHICITEM_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 #include <vcl/graph.hxx>
diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx
index f66e37033759..7dfa141b259a 100644
--- a/svx/inc/svxrtf.hxx
+++ b/svx/inc/svxrtf.hxx
@@ -35,11 +35,11 @@
 #include <tools/table.hxx>
 #endif
 #include <tools/string.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svtools/parrtf.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/txtrange.hxx b/svx/inc/txtrange.hxx
index ae83cb4bf2f5..1b7a05c1f9e5 100644
--- a/svx/inc/txtrange.hxx
+++ b/svx/inc/txtrange.hxx
@@ -34,7 +34,7 @@
 #ifndef _TXTRANGE_HXX
 #define _SVSTDARR_BOOLS
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx
index afd6cbec14a9..0ea3585d173a 100644
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/unoapi.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <sal/types.h>
 #include <goodies/grfmgr.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 class SvxShape;
diff --git a/svx/inc/unoedhlp.hxx b/svx/inc/unoedhlp.hxx
index b732ba867af1..317b9c9c7ab2 100644
--- a/svx/inc/unoedhlp.hxx
+++ b/svx/inc/unoedhlp.hxx
@@ -34,7 +34,7 @@
 #include <memory>
 #include <tools/solar.h>
 #include <svtools/textdata.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/unofdesc.hxx b/svx/inc/unofdesc.hxx
index 1e94a146ad4a..d434b090ad75 100644
--- a/svx/inc/unofdesc.hxx
+++ b/svx/inc/unofdesc.hxx
@@ -33,7 +33,7 @@
 
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/font.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/unolingu.hxx b/svx/inc/unolingu.hxx
index 8dc76a291ceb..c2ba7aa60565 100644
--- a/svx/inc/unolingu.hxx
+++ b/svx/inc/unolingu.hxx
@@ -201,9 +201,9 @@ public:
 //TL:TODO: remove those functions or make them inline
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XSpellChecker1 > SvxGetSpellChecker();
-::com::sun::star::uno::Reference<
+SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XHyphenator >    SvxGetHyphenator();
-::com::sun::star::uno::Reference<
+SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XThesaurus >     SvxGetThesaurus();
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XDictionaryList > SvxGetDictionaryList();
diff --git a/svx/inc/xattr.hxx b/svx/inc/xattr.hxx
index c1f5051b0565..bbd14abf0c99 100644
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/xattr.hxx
@@ -63,7 +63,7 @@ class XGradientTable;
 #include <svx/xfillit0.hxx>
 #include <svx/xtextit0.hxx>
 #include <svx/xsetit.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 
 
 #endif      // _XATTR_HXX
diff --git a/svx/inc/xmlcnitm.hxx b/svx/inc/xmlcnitm.hxx
index 3e38b80d8719..22b6e02955a0 100644
--- a/svx/inc/xmlcnitm.hxx
+++ b/svx/inc/xmlcnitm.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_XMLCNITM_HXX
 #define _SVX_XMLCNITM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
 class SvXMLNamespaceMap;
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 2f595a2de9d7..3f66b2ae19f8 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,4 +1,4 @@
-sx	svx	:	l10n connectivity xmloff linguistic jvmfwk avmedia configmgr ucb fileaccess drawinglayer NULL
+sx	svx	:	sfx2 l10n connectivity xmloff linguistic jvmfwk avmedia drawinglayer 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
@@ -43,11 +43,9 @@ sx	svx\source\unodraw						nmake	-	all	sx_undrw sx_inc NULL
 sx	svx\source\unoedit						nmake	-	all	sx_unedt 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\msfilter						nmake	-	all	sx_msfilt sx_inc NULL
 sx	svx\source\xml							nmake	-	all	sx_xml 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\source\cui                                                  nmake   -       all     sx_cui sx_inc NULL
-sx      svx\util                                                                nmake   -       all     sx_util sx_cui sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_eeng sx_fmcmp sx_form sx_gall sx_items sx_link sx_mnuc sx_msfilt sx_opt sx_outl sx_rtf sx_sdi sx_stbc sx_tbxc sx_undrw sx_unedt sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags 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_eeng sx_fmcmp sx_form sx_gall sx_items sx_link sx_mnuc sx_opt sx_outl sx_rtf sx_sdi sx_stbc sx_tbxc sx_undrw sx_unedt sx_ungal sx_xml 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
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index acbb689082ba..8b4675feb3e9 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -7,8 +7,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US
 mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\inc\svxslots.ilb %_DEST%\inc%_EXT%\svxslots.ilb
-..\%__SRC%\inc\*.ilb* %_DEST%\inc%_EXT%\*.ilb*
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
 ..\%__SRC%\lib\isvx*.lib %_DEST%\lib%_EXT%\isvx*.lib
 ..\%__SRC%\bin\gengal* %_DEST%\bin%_EXT%\gengal*
@@ -20,19 +18,164 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 
 mkdir: %_DEST%\inc%_EXT%\svx
+..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi
+..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi
+..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi
+
+..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx
+..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx
+..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx
+..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx
+..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx
+..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx
+..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx
+..\inc\svx\exthelpid.hrc %_DEST%\inc%_EXT%\svx\exthelpid.hrc
+
 ..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
 ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
+..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc
 ..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc
+..\source\items\boxobj.hxx %_DEST%\inc%_EXT%\svx\boxobj.hxx
+..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx
+
+../source/customshapes/EnhancedCustomShapeTypeNames.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx
+../source/customshapes/EnhancedCustomShapeGeometry.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx
+../inc/svx/EnhancedCustomShapeFunctionParser.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeFunctionParser.hxx
+../source/customshapes/EnhancedCustomShape2d.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShape2d.hxx
+../inc/xattr.hxx %_DEST%\inc%_EXT%\svx\xattr.hxx
+../inc/svdglob.hxx %_DEST%\inc%_EXT%\svx\svdglob.hxx
+../source/svdraw/svditext.hxx %_DEST%\inc%_EXT%\svx\svditext.hxx
+
+..\inc\AccessibleSelectionBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleSelectionBase.hxx
+..\inc\AccessibleStaticTextBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleStaticTextBase.hxx
+..\inc\acorrcfg.hxx %_DEST%\inc%_EXT%\svx\acorrcfg.hxx
+..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx
+..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx
+..\inc\asiancfg.hxx %_DEST%\inc%_EXT%\svx\asiancfg.hxx
+..\inc\bolnitem.hxx %_DEST%\inc%_EXT%\svx\bolnitem.hxx
+..\inc\bulitem.hxx %_DEST%\inc%_EXT%\svx\bulitem.hxx
+..\inc\charhiddenitem.hxx %_DEST%\inc%_EXT%\svx\charhiddenitem.hxx
+..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx
+..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx
+..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx
+..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx
+..\inc\countryid.hxx %_DEST%\inc%_EXT%\svx\countryid.hxx
+..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx
+..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc
+..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx
+..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx
+..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx
+..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx
+..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx
+..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx
+..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx
+..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx
+..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx
+..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx
+..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx
+..\inc\fontitem.hxx %_DEST%\inc%_EXT%\svx\fontitem.hxx
+..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx
+..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx
+..\inc\forbiddencharacterstable.hxx %_DEST%\inc%_EXT%\svx\forbiddencharacterstable.hxx
+..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx
+..\inc\fwdtitem.hxx %_DEST%\inc%_EXT%\svx\fwdtitem.hxx
+..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx
+..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx
+..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc
+..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx
+..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx
+..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx
+..\inc\htmlcfg.hxx %_DEST%\inc%_EXT%\svx\htmlcfg.hxx
+..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx
+..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx
+..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx
+..\inc\opengrf.hxx %_DEST%\inc%_EXT%\svx\opengrf.hxx
+..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx
+..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx
+..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx
+..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx
+..\inc\linkmgr.hxx %_DEST%\inc%_EXT%\svx\linkmgr.hxx
+..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx
+..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx
+..\inc\mscodec.hxx %_DEST%\inc%_EXT%\svx\mscodec.hxx
+..\inc\msoleexp.hxx %_DEST%\inc%_EXT%\svx\msoleexp.hxx
+..\inc\nlbkitem.hxx %_DEST%\inc%_EXT%\svx\nlbkitem.hxx
+..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx
+..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx
+..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx
+..\inc\opaqitem.hxx %_DEST%\inc%_EXT%\svx\opaqitem.hxx
+..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx
+..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx
+..\inc\optitems.hxx %_DEST%\inc%_EXT%\svx\optitems.hxx
+..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx
+..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx
+..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx
+..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx
+..\inc\pgrditem.hxx %_DEST%\inc%_EXT%\svx\pgrditem.hxx
+..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx
+..\inc\prntitem.hxx %_DEST%\inc%_EXT%\svx\prntitem.hxx
+..\inc\protitem.hxx %_DEST%\inc%_EXT%\svx\protitem.hxx
+..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx
+..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx
+..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx
+..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx
+..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx
+..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx
+..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx
+..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx
+..\inc\srchcfg.hxx %_DEST%\inc%_EXT%\svx\srchcfg.hxx
+..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx
+..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx
+..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx
+..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc
+..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx
+..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx
+..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx
 ..\inc\svxgrahicitem.hxx %_DEST%\inc%_EXT%\svx\svxgrahicitem.hxx
-..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx
+..\inc\svxmsbas.hxx %_DEST%\inc%_EXT%\svx\svxmsbas.hxx
+..\inc\svxrtf.hxx %_DEST%\inc%_EXT%\svx\svxrtf.hxx
+..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx
+..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx
+..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx
+..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx
+..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx
+..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx
+..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx
+..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx
+..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx
+..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx
+..\inc\txtrange.hxx %_DEST%\inc%_EXT%\svx\txtrange.hxx
+..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx
+..\inc\unoedhlp.hxx %_DEST%\inc%_EXT%\svx\unoedhlp.hxx
+..\inc\unofdesc.hxx %_DEST%\inc%_EXT%\svx\unofdesc.hxx
+..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx
+..\inc\UnoForbiddenCharsTable.hxx %_DEST%\inc%_EXT%\svx\UnoForbiddenCharsTable.hxx
+..\inc\unolingu.hxx %_DEST%\inc%_EXT%\svx\unolingu.hxx
+..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx
+..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx
+..\inc\unonrule.hxx %_DEST%\inc%_EXT%\svx\unonrule.hxx
+..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx
+..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx
+..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx
+..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx
+..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx
+..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\svx\xmlcnitm.hxx
+..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx
+..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx
+..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx
+..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx
+..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx
+..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx
 ..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx
+..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
+
+..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
+..\inc\svx\impgrf.hxx %_DEST%\inc%_EXT%\svx\impgrf.hxx
+..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx
 ..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx
 ..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc
-..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx
-..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx
 ..\inc\svx\svddef.hxx %_DEST%\inc%_EXT%\svx\svddef.hxx
 ..\inc\svx\svdfppt.hxx %_DEST%\inc%_EXT%\svx\svdfppt.hxx
-..\inc\linkmgr.hxx %_DEST%\inc%_EXT%\svx\linkmgr.hxx
 ..\inc\svx\ipolypolygoneditorcontroller.hxx %_DEST%\inc%_EXT%\svx\ipolypolygoneditorcontroller.hxx
 ..\inc\svx\polypolygoneditor.hxx %_DEST%\inc%_EXT%\svx\polypolygoneditor.hxx
 ..\inc\svx\svdsob.hxx %_DEST%\inc%_EXT%\svx\svdsob.hxx
@@ -40,13 +183,10 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\adjitem.hxx %_DEST%\inc%_EXT%\svx\adjitem.hxx
 ..\inc\svx\akrnitem.hxx %_DEST%\inc%_EXT%\svx\akrnitem.hxx
 ..\inc\svx\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx
-..\inc\asiancfg.hxx %_DEST%\inc%_EXT%\svx\asiancfg.hxx
 ..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx
 ..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx
 ..\inc\svx\blnkitem.hxx %_DEST%\inc%_EXT%\svx\blnkitem.hxx
-..\inc\charhiddenitem.hxx %_DEST%\inc%_EXT%\svx\charhiddenitem.hxx
 ..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx
-..\inc\bolnitem.hxx %_DEST%\inc%_EXT%\svx\bolnitem.hxx
 ..\inc\svx\borderline.hxx %_DEST%\inc%_EXT%\svx\borderline.hxx
 ..\inc\svx\boxitem.hxx %_DEST%\inc%_EXT%\svx\boxitem.hxx
 ..\inc\svx\brkitem.hxx %_DEST%\inc%_EXT%\svx\brkitem.hxx
@@ -54,18 +194,13 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx
 ..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx
 ..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx
-..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx
-..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx
-..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx
 ..\inc\svx\cmapitem.hxx %_DEST%\inc%_EXT%\svx\cmapitem.hxx
 ..\inc\svx\cntritem.hxx %_DEST%\inc%_EXT%\svx\cntritem.hxx
 ..\inc\svx\colritem.hxx %_DEST%\inc%_EXT%\svx\colritem.hxx
-..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx
 ..\inc\svx\contdlg.hxx %_DEST%\inc%_EXT%\svx\contdlg.hxx
 ..\inc\svx\tabarea.hxx %_DEST%\inc%_EXT%\svx\tabarea.hxx
 ..\inc\svx\tabline.hxx %_DEST%\inc%_EXT%\svx\tabline.hxx
 ..\inc\svx\crsditem.hxx %_DEST%\inc%_EXT%\svx\crsditem.hxx
-..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx
 ..\inc\svx\cscoitem.hxx %_DEST%\inc%_EXT%\svx\cscoitem.hxx
 ..\inc\svx\colrctrl.hxx %_DEST%\inc%_EXT%\svx\colrctrl.hxx
 ..\inc\svx\cube3d.hxx %_DEST%\inc%_EXT%\svx\cube3d.hxx
@@ -79,89 +214,52 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\dialmgr.hxx %_DEST%\inc%_EXT%\svx\dialmgr.hxx
 ..\inc\svx\dlgctl3d.hxx %_DEST%\inc%_EXT%\svx\dlgctl3d.hxx
 ..\inc\svx\dlgctrl.hxx %_DEST%\inc%_EXT%\svx\dlgctrl.hxx
-..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx
-..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx
 ..\inc\svx\dialogs.hrc %_DEST%\inc%_EXT%\svx\dialogs.hrc
 ..\inc\svx\escpitem.hxx %_DEST%\inc%_EXT%\svx\escpitem.hxx
 ..\inc\svx\extrud3d.hxx %_DEST%\inc%_EXT%\svx\extrud3d.hxx
 ..\inc\svx\escherex.hxx %_DEST%\inc%_EXT%\svx\escherex.hxx
-..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx
 ..\inc\svx\f3dchild.hxx %_DEST%\inc%_EXT%\svx\f3dchild.hxx
 ..\inc\svx\fhgtitem.hxx %_DEST%\inc%_EXT%\svx\fhgtitem.hxx
 ..\inc\svx\fillctrl.hxx %_DEST%\inc%_EXT%\svx\fillctrl.hxx
 ..\inc\svx\float3d.hxx %_DEST%\inc%_EXT%\svx\float3d.hxx
 ..\inc\svx\flditem.hxx %_DEST%\inc%_EXT%\svx\flditem.hxx
-..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx
 ..\inc\svx\fntctl.hxx %_DEST%\inc%_EXT%\svx\fntctl.hxx
 ..\inc\svx\fntctrl.hxx %_DEST%\inc%_EXT%\svx\fntctrl.hxx
 ..\inc\svx\fntszctl.hxx %_DEST%\inc%_EXT%\svx\fntszctl.hxx
-..\inc\fontitem.hxx %_DEST%\inc%_EXT%\svx\fontitem.hxx
 ..\inc\svx\fontwork.hxx %_DEST%\inc%_EXT%\svx\fontwork.hxx
 ..\inc\svx\framebordertype.hxx %_DEST%\inc%_EXT%\svx\framebordertype.hxx
 ..\inc\svx\framelink.hxx %_DEST%\inc%_EXT%\svx\framelink.hxx
 ..\inc\svx\framelinkarray.hxx %_DEST%\inc%_EXT%\svx\framelinkarray.hxx
 ..\inc\svx\frmsel.hxx %_DEST%\inc%_EXT%\svx\frmsel.hxx
-..\inc\fwdtitem.hxx %_DEST%\inc%_EXT%\svx\fwdtitem.hxx
-..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx
-..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx
-..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc
-..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc
-..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx
-..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx
 ..\inc\svx\graphctl.hxx %_DEST%\inc%_EXT%\svx\graphctl.hxx
 ..\inc\svx\hdft.hxx %_DEST%\inc%_EXT%\svx\hdft2.hxx
-..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx
 ..\inc\svx\hyznitem.hxx %_DEST%\inc%_EXT%\svx\hyznitem.hxx
 ..\inc\svx\ifaceids.hxx %_DEST%\inc%_EXT%\svx\ifaceids.hxx
-..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx
-..\inc\impgrf.hxx %_DEST%\inc%_EXT%\svx\impgrf.hxx
-..\inc\opengrf.hxx %_DEST%\inc%_EXT%\svx\opengrf.hxx
-..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx
 ..\inc\svx\itemwin.hxx %_DEST%\inc%_EXT%\svx\itemwin.hxx
 ..\inc\svx\keepitem.hxx %_DEST%\inc%_EXT%\svx\keepitem.hxx
 ..\inc\svx\kernitem.hxx %_DEST%\inc%_EXT%\svx\kernitem.hxx
 ..\inc\svx\langbox.hxx %_DEST%\inc%_EXT%\svx\langbox.hxx
 ..\inc\svx\langitem.hxx %_DEST%\inc%_EXT%\svx\langitem.hxx
-..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx
-..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx
 ..\inc\svx\lcolitem.hxx %_DEST%\inc%_EXT%\svx\lcolitem.hxx
-..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx
 ..\inc\svx\lrspitem.hxx %_DEST%\inc%_EXT%\svx\lrspitem.hxx
 ..\inc\svx\lspcitem.hxx %_DEST%\inc%_EXT%\svx\lspcitem.hxx
-..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx
-..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx
 ..\inc\svx\nhypitem.hxx %_DEST%\inc%_EXT%\svx\nhypitem.hxx
-..\inc\nlbkitem.hxx %_DEST%\inc%_EXT%\svx\nlbkitem.hxx
 ..\inc\svx\numinf.hxx %_DEST%\inc%_EXT%\svx\numinf.hxx
 ..\inc\svx\numfmtsh.hxx %_DEST%\inc%_EXT%\svx\numfmtsh.hxx
-..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx
 ..\inc\svx\obj3d.hxx %_DEST%\inc%_EXT%\svx\obj3d.hxx
-..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx
-..\inc\opaqitem.hxx %_DEST%\inc%_EXT%\svx\opaqitem.hxx
-..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx
-..\inc\optitems.hxx %_DEST%\inc%_EXT%\svx\optitems.hxx
 ..\inc\svx\optlingu.hxx %_DEST%\inc%_EXT%\svx\optlingu.hxx
 ..\inc\svx\orphitem.hxx %_DEST%\inc%_EXT%\svx\orphitem.hxx
 ..\inc\svx\pagectrl.hxx %_DEST%\inc%_EXT%\svx\pagectrl.hxx
 ..\inc\svx\pageitem.hxx %_DEST%\inc%_EXT%\svx\pageitem.hxx
 ..\inc\svx\paperinf.hxx %_DEST%\inc%_EXT%\svx\paperinf.hxx
 ..\inc\svx\paraprev.hxx %_DEST%\inc%_EXT%\svx\paraprev.hxx
-..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx
 ..\inc\svx\pbinitem.hxx %_DEST%\inc%_EXT%\svx\pbinitem.hxx
 ..\inc\svx\pmdlitem.hxx %_DEST%\inc%_EXT%\svx\pmdlitem.hxx
 ..\inc\svx\polysc3d.hxx %_DEST%\inc%_EXT%\svx\polysc3d.hxx
-..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx
 ..\inc\svx\postitem.hxx %_DEST%\inc%_EXT%\svx\postitem.hxx
-..\inc\prntitem.hxx %_DEST%\inc%_EXT%\svx\prntitem.hxx
-..\inc\protitem.hxx %_DEST%\inc%_EXT%\svx\protitem.hxx
 ..\inc\svx\prszitem.hxx %_DEST%\inc%_EXT%\svx\prszitem.hxx
-..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx
 ..\inc\svx\rectenum.hxx %_DEST%\inc%_EXT%\svx\rectenum.hxx
-..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx
-..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx
-..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx
 ..\inc\svx\ruler.hxx %_DEST%\inc%_EXT%\svx\ruler.hxx
-..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx
 ..\inc\svx\scene3d.hxx %_DEST%\inc%_EXT%\svx\scene3d.hxx
 ..\inc\svx\e3dsceneupdater.hxx %_DEST%\inc%_EXT%\svx\e3dsceneupdater.hxx
 ..\inc\svx\sdangitm.hxx %_DEST%\inc%_EXT%\svx\sdangitm.hxx
@@ -188,14 +286,12 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\sdtfchim.hxx %_DEST%\inc%_EXT%\svx\sdtfchim.hxx
 ..\inc\svx\sdtaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaitm.hxx
 ..\inc\svx\sdtakitm.hxx %_DEST%\inc%_EXT%\svx\sdtakitm.hxx
-
 ..\inc\svx\sdtayitm.hxx %_DEST%\inc%_EXT%\svx\sdtayitm.hxx
 ..\inc\svx\sdtcfitm.hxx %_DEST%\inc%_EXT%\svx\sdtcfitm.hxx
 ..\inc\svx\sdtditm.hxx %_DEST%\inc%_EXT%\svx\sdtditm.hxx
 ..\inc\svx\sdtfsitm.hxx %_DEST%\inc%_EXT%\svx\sdtfsitm.hxx
 ..\inc\svx\sdtmfitm.hxx %_DEST%\inc%_EXT%\svx\sdtmfitm.hxx
 ..\inc\svx\sdynitm.hxx %_DEST%\inc%_EXT%\svx\sdynitm.hxx
-..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx
 ..\inc\svx\shaditem.hxx %_DEST%\inc%_EXT%\svx\shaditem.hxx
 ..\inc\svx\shdditem.hxx %_DEST%\inc%_EXT%\svx\shdditem.hxx
 ..\inc\svx\sizeitem.hxx %_DEST%\inc%_EXT%\svx\sizeitem.hxx
@@ -205,8 +301,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\SpellPortions.hxx %_DEST%\inc%_EXT%\svx\SpellPortions.hxx
 ..\inc\svx\SpellDialogChildWindow.hxx %_DEST%\inc%_EXT%\svx\SpellDialogChildWindow.hxx
 ..\inc\svx\splwrap.hxx %_DEST%\inc%_EXT%\svx\splwrap.hxx
-..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx
-..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx
 ..\inc\svx\stddlg.hxx %_DEST%\inc%_EXT%\svx\stddlg.hxx
 ..\inc\svx\strarray.hxx %_DEST%\inc%_EXT%\svx\strarray.hxx
 ..\inc\svx\svdattr.hxx %_DEST%\inc%_EXT%\svx\svdattr.hxx
@@ -223,8 +317,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\svdglue.hxx %_DEST%\inc%_EXT%\svx\svdglue.hxx
 ..\inc\svx\svdhdl.hxx %_DEST%\inc%_EXT%\svx\svdhdl.hxx
 ..\inc\svx\svdhlpln.hxx %_DEST%\inc%_EXT%\svx\svdhlpln.hxx
-..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx
-..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx
 ..\inc\svx\svdmark.hxx %_DEST%\inc%_EXT%\svx\svdmark.hxx
 ..\inc\svx\svdmodel.hxx %_DEST%\inc%_EXT%\svx\svdmodel.hxx
 ..\inc\svx\svdmrkv.hxx %_DEST%\inc%_EXT%\svx\svdmrkv.hxx
@@ -251,7 +343,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\svdpagv.hxx %_DEST%\inc%_EXT%\svx\svdpagv.hxx
 ..\inc\svx\sdrpagewindow.hxx %_DEST%\inc%_EXT%\svx\sdrpagewindow.hxx
 ..\inc\svx\svdpntv.hxx %_DEST%\inc%_EXT%\svx\svdpntv.hxx
-..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx
 ..\inc\svx\svdpoev.hxx %_DEST%\inc%_EXT%\svx\svdpoev.hxx
 ..\inc\svx\svdpool.hxx %_DEST%\inc%_EXT%\svx\svdpool.hxx
 ..\inc\svx\svdsnpv.hxx %_DEST%\inc%_EXT%\svx\svdsnpv.hxx
@@ -260,13 +351,10 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\svdoutl.hxx %_DEST%\inc%_EXT%\svx\svdoutl.hxx
 ..\inc\svx\svdview.hxx %_DEST%\inc%_EXT%\svx\svdview.hxx
 ..\inc\svx\svdxcgv.hxx %_DEST%\inc%_EXT%\svx\svdxcgv.hxx
-..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx
 ..\inc\svx\svxbox.hxx %_DEST%\inc%_EXT%\svx\svxbox.hxx
-..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx
 ..\inc\svx\svxfont.hxx %_DEST%\inc%_EXT%\svx\svxfont.hxx
 ..\inc\svx\svxenum.hxx %_DEST%\inc%_EXT%\svx\svxenum.hxx
 ..\inc\svx\svxids.hrc %_DEST%\inc%_EXT%\svx\svxids.hrc
-..\inc\svxrtf.hxx %_DEST%\inc%_EXT%\svx\svxrtf.hxx
 ..\inc\svx\sxallitm.hxx %_DEST%\inc%_EXT%\svx\sxallitm.hxx
 ..\inc\svx\sxcaitm.hxx %_DEST%\inc%_EXT%\svx\sxcaitm.hxx
 ..\inc\svx\sxcecitm.hxx %_DEST%\inc%_EXT%\svx\sxcecitm.hxx
@@ -309,36 +397,26 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\sxsoitm.hxx %_DEST%\inc%_EXT%\svx\sxsoitm.hxx
 ..\inc\svx\sxtraitm.hxx %_DEST%\inc%_EXT%\svx\sxtraitm.hxx
 ..\inc\svx\tbcontrl.hxx %_DEST%\inc%_EXT%\svx\tbcontrl.hxx
-..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx
-..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx
-..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx
-..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx
 ..\inc\svx\thesdlg.hxx %_DEST%\inc%_EXT%\svx\thesdlg.hxx
 ..\inc\svx\tstpitem.hxx %_DEST%\inc%_EXT%\svx\tstpitem.hxx
-..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx
-..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx
 ..\inc\svx\udlnitem.hxx %_DEST%\inc%_EXT%\svx\udlnitem.hxx
 ..\inc\svx\ulspitem.hxx %_DEST%\inc%_EXT%\svx\ulspitem.hxx
-..\inc\unolingu.hxx %_DEST%\inc%_EXT%\svx\unolingu.hxx
 ..\inc\svx\unomid.hxx %_DEST%\inc%_EXT%\svx\unomid.hxx
 ..\inc\svx\unopage.hxx %_DEST%\inc%_EXT%\svx\unopage.hxx
 ..\inc\svx\unoprnms.hxx %_DEST%\inc%_EXT%\svx\unoprnms.hxx
 ..\inc\svx\unoshape.hxx %_DEST%\inc%_EXT%\svx\unoshape.hxx
 ..\inc\svx\shapepropertynotifier.hxx %_DEST%\inc%_EXT%\svx\shapepropertynotifier.hxx
 ..\inc\svx\shapeproperty.hxx %_DEST%\inc%_EXT%\svx\shapeproperty.hxx
-..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx
 ..\inc\svx\unoipset.hxx %_DEST%\inc%_EXT%\svx\unoipset.hxx
 ..\inc\svx\unoprov.hxx %_DEST%\inc%_EXT%\svx\unoprov.hxx
 ..\inc\svx\unomod.hxx %_DEST%\inc%_EXT%\svx\unomod.hxx
 ..\inc\svx\unomodel.hxx %_DEST%\inc%_EXT%\svx\unomodel.hxx
 ..\inc\svx\fmdpage.hxx %_DEST%\inc%_EXT%\svx\fmdpage.hxx
 ..\inc\svx\fmsearch.hxx %_DEST%\inc%_EXT%\svx\fmsearch.hxx
-..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx
 ..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx
 ..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx
 ..\inc\svx\wghtitem.hxx %_DEST%\inc%_EXT%\svx\wghtitem.hxx
 ..\inc\svx\widwitem.hxx %_DEST%\inc%_EXT%\svx\widwitem.hxx
-..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx
 ..\inc\svx\wrlmitem.hxx %_DEST%\inc%_EXT%\svx\wrlmitem.hxx
 ..\inc\svx\xbitmap.hxx %_DEST%\inc%_EXT%\svx\xbitmap.hxx
 ..\inc\svx\xbtmpit.hxx %_DEST%\inc%_EXT%\svx\xbtmpit.hxx
@@ -380,7 +458,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx
 ..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
 ..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
-..\inc\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
 ..\inc\svx\xlnasit.hxx %_DEST%\inc%_EXT%\svx\xlnasit.hxx
 ..\inc\svx\xlnclit.hxx %_DEST%\inc%_EXT%\svx\xlnclit.hxx
 ..\inc\svx\xlndsit.hxx %_DEST%\inc%_EXT%\svx\xlndsit.hxx
@@ -392,11 +469,9 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\xlnstwit.hxx %_DEST%\inc%_EXT%\svx\xlnstwit.hxx
 ..\inc\svx\xlntrit.hxx %_DEST%\inc%_EXT%\svx\xlntrit.hxx
 ..\inc\svx\xlnwtit.hxx %_DEST%\inc%_EXT%\svx\xlnwtit.hxx
-..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx
 ..\inc\svx\xpoly.hxx %_DEST%\inc%_EXT%\svx\xpoly.hxx
 ..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\svx\xpool.hxx
 ..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\xpool.hxx
-..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx
 ..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\svx\xsetit.hxx
 ..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\xsetit.hxx
 ..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\svx\xtable.hxx
@@ -405,13 +480,12 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\xtextit.hxx
 ..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\svx\xtextit0.hxx
 ..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\xtextit0.hxx
-..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx
-..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
 ..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx
 ..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
 ..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
 ..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
-..\source\items\boxobj.hxx %_DEST%\inc%_EXT%\svx\boxobj.hxx
+
+
 ..\inc\svx\itemtype.hxx %_DEST%\inc%_EXT%\svx\itemtype.hxx
 ..\inc\svx\outliner.hxx %_DEST%\inc%_EXT%\svx\outliner.hxx
 ..\inc\svx\paragraphdata.hxx %_DEST%\inc%_EXT%\svx\paragraphdata.hxx
@@ -420,70 +494,42 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\editeng.hxx %_DEST%\inc%_EXT%\svx\editeng.hxx
 ..\inc\svx\eedata.hxx %_DEST%\inc%_EXT%\svx\eedata.hxx
 ..\inc\svx\editobj.hxx %_DEST%\inc%_EXT%\svx\editobj.hxx
-..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx
-..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx
 ..\inc\svx\editview.hxx %_DEST%\inc%_EXT%\svx\editview.hxx
 ..\inc\svx\eeitem.hxx %_DEST%\inc%_EXT%\svx\eeitem.hxx
 ..\inc\svx\eeitemid.hxx %_DEST%\inc%_EXT%\svx\eeitemid.hxx
-..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx
 ..\inc\svx\svxacorr.hxx %_DEST%\inc%_EXT%\svx\svxacorr.hxx
 ..\inc\svx\swafopt.hxx %_DEST%\inc%_EXT%\svx\swafopt.hxx
-..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx
-..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx
-..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx
-..\inc\txtrange.hxx %_DEST%\inc%_EXT%\svx\txtrange.hxx
 ..\inc\svx\fmmodel.hxx %_DEST%\inc%_EXT%\svx\fmmodel.hxx
 ..\inc\svx\fmpage.hxx %_DEST%\inc%_EXT%\svx\fmpage.hxx
 ..\inc\svx\fmview.hxx %_DEST%\inc%_EXT%\svx\fmview.hxx
-..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx
 ..\inc\svx\fmglob.hxx %_DEST%\inc%_EXT%\svx\fmglob.hxx
 ..\inc\svx\fmshell.hxx %_DEST%\inc%_EXT%\svx\fmshell.hxx
-..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc
-..\inc\bulitem.hxx %_DEST%\inc%_EXT%\svx\bulitem.hxx
 ..\inc\svx\svdouno.hxx %_DEST%\inc%_EXT%\svx\svdouno.hxx
 ..\inc\svx\deflt3d.hxx %_DEST%\inc%_EXT%\svx\deflt3d.hxx
 ..\inc\svx\unotext.hxx %_DEST%\inc%_EXT%\svx\unotext.hxx
 ..\inc\svx\unofield.hxx %_DEST%\inc%_EXT%\svx\unofield.hxx
 ..\inc\svx\mutxhelp.hxx %_DEST%\inc%_EXT%\svx\mutxhelp.hxx
 ..\inc\svx\AccessibleTextHelper.hxx %_DEST%\inc%_EXT%\svx\AccessibleTextHelper.hxx
-..\inc\AccessibleStaticTextBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleStaticTextBase.hxx
 ..\inc\svx\unoviwed.hxx %_DEST%\inc%_EXT%\svx\unoviwed.hxx
 ..\inc\svx\unoviwou.hxx %_DEST%\inc%_EXT%\svx\unoviwou.hxx
 ..\inc\svx\unoedsrc.hxx %_DEST%\inc%_EXT%\svx\unoedsrc.hxx
-..\inc\unoedhlp.hxx %_DEST%\inc%_EXT%\svx\unoedhlp.hxx
 ..\inc\svx\unofored.hxx %_DEST%\inc%_EXT%\svx\unofored.hxx
 ..\inc\svx\unoforou.hxx %_DEST%\inc%_EXT%\svx\unoforou.hxx
 ..\inc\svx\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx
-..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx
-..\inc\mscodec.hxx %_DEST%\inc%_EXT%\svx\mscodec.hxx
 ..\inc\svx\msdffimp.hxx %_DEST%\inc%_EXT%\svx\msdffimp.hxx
 ..\inc\svx\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx
 ..\inc\svx\msfiltertracer.hxx %_DEST%\inc%_EXT%\svx\msfiltertracer.hxx
 ..\inc\svx\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx
 ..\inc\svx\numitem.hxx %_DEST%\inc%_EXT%\svx\numitem.hxx
 ..\inc\svx\numdef.hxx %_DEST%\inc%_EXT%\svx\numdef.hxx
-..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx
 ..\inc\svx\fmdmod.hxx %_DEST%\inc%_EXT%\svx\fmdmod.hxx
-..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx
 ..\inc\svx\fmgridcl.hxx %_DEST%\inc%_EXT%\svx\fmgridcl.hxx
-..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx
 ..\inc\svx\gridctrl.hxx %_DEST%\inc%_EXT%\svx\gridctrl.hxx
-..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx
-..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx
-..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx
-..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx
-..\inc\unofdesc.hxx %_DEST%\inc%_EXT%\svx\unofdesc.hxx
 ..\inc\svx\unoshprp.hxx %_DEST%\inc%_EXT%\svx\unoshprp.hxx
-..\inc\svxmsbas.hxx %_DEST%\inc%_EXT%\svx\svxmsbas.hxx
-..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx
-..\inc\msoleexp.hxx %_DEST%\inc%_EXT%\svx\msoleexp.hxx
-..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx
 ..\inc\svx\sdasaitm.hxx %_DEST%\inc%_EXT%\svx\sdasaitm.hxx
 ..\inc\svx\sdasitm.hxx %_DEST%\inc%_EXT%\svx\sdasitm.hxx
-..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx
 ..\inc\svx\grfcrop.hxx %_DEST%\inc%_EXT%\svx\grfcrop.hxx
 ..\inc\svx\grfflt.hxx %_DEST%\inc%_EXT%\svx\grfflt.hxx
-..\inc\unonrule.hxx %_DEST%\inc%_EXT%\svx\unonrule.hxx
 ..\inc\svx\svx3ditems.hxx %_DEST%\inc%_EXT%\svx\svx3ditems.hxx
 ..\inc\svx\msocximex.hxx %_DEST%\inc%_EXT%\svx\msocximex.hxx
 ..\inc\svx\emphitem.hxx %_DEST%\inc%_EXT%\svx\emphitem.hxx
@@ -496,26 +542,16 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\charrotateitem.hxx %_DEST%\inc%_EXT%\svx\charrotateitem.hxx
 ..\inc\svx\charreliefitem.hxx %_DEST%\inc%_EXT%\svx\charreliefitem.hxx
 ..\inc\svx\paravertalignitem.hxx %_DEST%\inc%_EXT%\svx\paravertalignitem.hxx
-..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx
-..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx
-..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx
 ..\inc\svx\dbaexchange.hxx %_DEST%\inc%_EXT%\svx\dbaexchange.hxx
 ..\inc\svx\dbaobjectex.hxx %_DEST%\inc%_EXT%\svx\dbaobjectex.hxx
-..\inc\srchcfg.hxx %_DEST%\inc%_EXT%\svx\srchcfg.hxx
 ..\inc\svx\ucsubset.hxx %_DEST%\inc%_EXT%\svx\ucsubset.hxx
 ..\inc\svx\ucsubset.hrc %_DEST%\inc%_EXT%\svx\ucsubset.hrc
-..\inc\UnoForbiddenCharsTable.hxx %_DEST%\inc%_EXT%\svx\UnoForbiddenCharsTable.hxx
-..\inc\forbiddencharacterstable.hxx %_DEST%\inc%_EXT%\svx\forbiddencharacterstable.hxx
 ..\inc\svx\dataaccessdescriptor.hxx %_DEST%\inc%_EXT%\svx\dataaccessdescriptor.hxx
-..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\svx\xmlcnitm.hxx
-..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx
-..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx
 ..\inc\svx\frmdir.hxx %_DEST%\inc%_EXT%\svx\frmdir.hxx
 ..\inc\svx\frmdiritem.hxx %_DEST%\inc%_EXT%\svx\frmdiritem.hxx
 ..\inc\svx\frmdirlbox.hxx %_DEST%\inc%_EXT%\svx\frmdirlbox.hxx
 ..\inc\svx\AccessibleContextBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleContextBase.hxx
 ..\inc\svx\AccessibleComponentBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleComponentBase.hxx
-..\inc\AccessibleSelectionBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleSelectionBase.hxx
 ..\inc\svx\AccessibleShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleShape.hxx
 ..\inc\svx\AccessibleGraphicShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleGraphicShape.hxx
 ..\inc\svx\AccessibleOLEShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleOLEShape.hxx
@@ -528,35 +564,27 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\ChildrenManager.hxx %_DEST%\inc%_EXT%\svx\ChildrenManager.hxx
 ..\inc\svx\ShapeTypeHandler.hxx %_DEST%\inc%_EXT%\svx\ShapeTypeHandler.hxx
 ..\inc\svx\SvxShapeTypes.hxx %_DEST%\inc%_EXT%\svx\SvxShapeTypes.hxx
-..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx
-..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx
-..\inc\pgrditem.hxx %_DEST%\inc%_EXT%\svx\pgrditem.hxx
 ..\inc\svx\writingmodeitem.hxx %_DEST%\inc%_EXT%\svx\writingmodeitem.hxx
-..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx
-..\inc\countryid.hxx %_DEST%\inc%_EXT%\svx\countryid.hxx
 ..\inc\svx\svdoashp.hxx %_DEST%\inc%_EXT%\svx\svdoashp.hxx
-..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx
 ..\inc\svx\extrusionbar.hxx %_DEST%\inc%_EXT%\svx\extrusionbar.hxx
 ..\inc\svx\fontworkbar.hxx %_DEST%\inc%_EXT%\svx\fontworkbar.hxx
-..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx
 ..\inc\svx\svxdlg.hxx %_DEST%\inc%_EXT%\svx\svxdlg.hxx
-..\inc\acorrcfg.hxx %_DEST%\inc%_EXT%\svx\acorrcfg.hxx
-..\inc\htmlcfg.hxx %_DEST%\inc%_EXT%\svx\htmlcfg.hxx
-..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx
-..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx
-..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx
-..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx
 ..\inc\svx\tbxcolorupdate.hxx %_DEST%\inc%_EXT%\svx\tbxcolorupdate.hxx
 ..\inc\svx\svxdllapi.h %_DEST%\inc%_EXT%\svx\svxdllapi.h
-..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc
 ..\inc\svx\SmartTagMgr.hxx %_DEST%\inc%_EXT%\svx\SmartTagMgr.hxx
 ..\inc\svx\SmartTagItem.hxx %_DEST%\inc%_EXT%\svx\SmartTagItem.hxx
 ..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx
 ..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx
-..\inc\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
 ..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx
 ..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx
 
+..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
+..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
+..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
+..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
+..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
+..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx
+
 mkdir: %_DEST%\inc%_EXT%\svx\sdr
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties
 ..\inc\svx\sdr\properties\properties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\properties.hxx
diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk
index 2ea64ddedbba..c86488daee1e 100644
--- a/svx/sdi/makefile.mk
+++ b/svx/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,10 +47,11 @@ SDI1EXPORT=svx
 # --- Files --------------------------------------------------------
 
 SVSDI1DEPEND= \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
         svxitems.sdi \
     fmslots.sdi \
     svx.sdi	\
-    $(SOLARINCXDIR)$/sfxslots.ilb	\
     xoitems.sdi \
     svxitems.sdi
 
diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi
index af1fb77adc2f..5b776c2e05d8 100644
--- a/svx/sdi/svxslots.sdi
+++ b/svx/sdi/svxslots.sdi
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-import "sfxslots.ilb"
-
 module
 "BD25A480-30AB-101C-A17D-000024021828"
 "C049C7E0-30AB-101C-A17D-000024021828"
@@ -36,11 +34,12 @@ SvxItems
 [
 HelpText( "Svx-Items" )
 SlotIdFile( "svxslots.hrc" )
-TypeLibFile( "svxslots.tlb" )
 ]
 {
     //=========================================================================
 
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
     include "svxitems.sdi"
     include "xoitems.sdi"
     include "svx.sdi"
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 15da06a17054..8bfc618dfbd9 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -36,7 +36,7 @@
 // Global header
 //
 //------------------------------------------------------------------------
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/editdata.hxx>
 #include <svx/outliner.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index d4675b9b76f7..d2b775321dfe 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -31,8 +31,8 @@
 #ifndef _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX
 #define _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX
 
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 
 #include <memory>
 #include <svx/unoedsrc.hxx>
diff --git a/svx/source/accessibility/AccessibleStaticTextBase.cxx b/svx/source/accessibility/AccessibleStaticTextBase.cxx
index 333c555bb746..ddc77e9e0ba4 100644
--- a/svx/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/svx/source/accessibility/AccessibleStaticTextBase.cxx
@@ -1016,9 +1016,9 @@ namespace accessibility
             const beans::PropertyValue* pItr = aIntersectionSeq.getConstArray();
             const beans::PropertyValue* pEnd  = pItr + aIntersectionSeq.getLength();
             const beans::PropertyValue* pFind = ::std::find_if( pItr, pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), boost::cref( pDefAttr[i] ) ) );
-            if ( pFind == pEnd && pFind->Handle != 0)
+            if ( pFind == pEnd && pDefAttr[i].Handle != 0)
             {
-                aDiffVec.push_back( *pFind );
+                aDiffVec.push_back( pDefAttr[i] );
             }
         }
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 9423e6719a40..7a51543b23ec 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -44,7 +44,7 @@
 #include <rtl/uuid.h>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <svtools/colorcfg.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
diff --git a/svx/source/cui/makefile.mk b/svx/source/cui/makefile.mk
deleted file mode 100755
index 7a1db4a85f19..000000000000
--- a/svx/source/cui/makefile.mk
+++ /dev/null
@@ -1,234 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.65 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJNAME=svx
-TARGET=cui
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=cui
-SRC1FILES =  \
-        acccfg.src \
-        align.src \
-        autocdlg.src \
-        backgrnd.src \
-        bbdlg.src \
-        border.src \
-        cfg.src \
-        chardlg.src \
-        charmap.src \
-        commonlingui.src \
-        connect.src \
-        connpooloptions.src \
-        cuiimapdlg.src \
-        dbregister.src \
-        doclinkdialog.src \
-        dstribut.src \
-        eventdlg.src \
-        fontsubs.src \
-        grfflt.src \
-        grfpage.src \
-        hangulhanjadlg.src \
-        hlmarkwn.src\
-        iconcdlg.src \
-        internationaloptions.src \
-        macroass.src \
-        macropg.src \
-        measure.src \
-        newtabledlg.src \
-        numfmt.src \
-        numpages.src \
-        optfltr.src \
-        optgdlg.src \
-        opthtml.src \
-        optjava.src \
-        optmemory.src \
-        optupdt.src \
-        page.src \
-        paragrph.src \
-        postdlg.src \
-        readonlyimage.src \
-        scriptdlg.src \
-        sdrcelldlg.src \
-        securityoptions.src \
-        selector.src \
-        SpellDialog.src \
-        splitcelldlg.src\
-        srchxtra.src \
-        svuidlg.src \
-        swpossizetabpage.src \
-        tabstpge.src \
-        textanim.src \
-        textattr.src \
-        treeopt.src \
-        webconninfo.src \
-        zoom.src \
-        insrc.src
-
-SRS2NAME=cuidrawdlgs
-SRC2FILES =  \
-        dlgname.src \
-        labdlg.src \
-        tabarea.src \
-        tabline.src \
-        transfrm.src
-
-SLOFILES+=\
-        $(SLO)$/tparea.obj \
-        $(SLO)$/borderconn.obj \
-        $(SLO)$/cuiexp.obj \
-        $(SLO)$/dlgfact.obj \
-        $(SLO)$/init.obj \
-        $(SLO)$/scriptdlg.obj \
-        $(SLO)$/commonlingui.obj \
-        $(SLO)$/selector.obj \
-        $(SLO)$/fontsubs.obj \
-        $(SLO)$/linkdlg.obj \
-        $(SLO)$/pastedlg.obj \
-        $(SLO)$/plfilter.obj \
-        $(SLO)$/insdlg.obj \
-        $(SLO)$/optHeaderTabListbox.obj \
-        $(SLO)$/sdbcdriverenum.obj \
-        $(SLO)$/connpoolsettings.obj \
-        $(SLO)$/dbregisterednamesconfig.obj \
-        $(SLO)$/dbregistersettings.obj \
-        $(SLO)$/dbregister.obj \
-        $(SLO)$/doclinkdialog.obj \
-        $(SLO)$/connpoolconfig.obj \
-        $(SLO)$/internationaloptions.obj \
-        $(SLO)$/connpooloptions.obj \
-        $(SLO)$/optgdlg.obj \
-        $(SLO)$/optmemory.obj \
-        $(SLO)$/opthtml.obj \
-        $(SLO)$/optfltr.obj \
-        $(SLO)$/treeopt.obj \
-        $(SLO)$/autocdlg.obj \
-        $(SLO)$/textanim.obj \
-        $(SLO)$/labdlg.obj \
-        $(SLO)$/dstribut.obj \
-        $(SLO)$/hangulhanjadlg.obj \
-        $(SLO)$/showcols.obj \
-        $(SLO)$/zoom.obj \
-        $(SLO)$/cuigaldlg.obj \
-        $(SLO)$/cuiimapwnd.obj \
-        $(SLO)$/hlmarkwn.obj \
-        $(SLO)$/cuicharmap.obj \
-        $(SLO)$/srchxtra.obj \
-        $(SLO)$/bbdlg.obj \
-        $(SLO)$/swpossizetabpage.obj \
-        $(SLO)$/transfrm.obj \
-        $(SLO)$/cuisrchdlg.obj \
-        $(SLO)$/cuitbxform.obj \
-        $(SLO)$/optdict.obj \
-        $(SLO)$/dlgname.obj \
-        $(SLO)$/multipat.obj \
-        $(SLO)$/multifil.obj \
-        $(SLO)$/iconcdlg.obj \
-        $(SLO)$/hltpbase.obj \
-        $(SLO)$/hldocntp.obj \
-        $(SLO)$/hldoctp.obj \
-        $(SLO)$/hlinettp.obj \
-        $(SLO)$/hlmailtp.obj \
-        $(SLO)$/cuihyperdlg.obj \
-        $(SLO)$/cuifmsearch.obj \
-        $(SLO)$/cuigrfflt.obj \
-        $(SLO)$/readonlyimage.obj \
-        $(SLO)$/optaccessibility.obj \
-        $(SLO)$/optsave.obj \
-        $(SLO)$/optasian.obj \
-        $(SLO)$/optpath.obj \
-        $(SLO)$/optcolor.obj \
-        $(SLO)$/optjsearch.obj \
-        $(SLO)$/optinet2.obj \
-        $(SLO)$/securityoptions.obj \
-        $(SLO)$/webconninfo.obj \
-        $(SLO)$/optctl.obj \
-        $(SLO)$/optjava.obj \
-        $(SLO)$/optupdt.obj \
-        $(SLO)$/optimprove.obj \
-        $(SLO)$/optimprove2.obj \
-        $(SLO)$/optgenrl.obj \
-        $(SLO)$/connect.obj \
-        $(SLO)$/tabarea.obj \
-        $(SLO)$/tabline.obj \
-        $(SLO)$/measure.obj \
-        $(SLO)$/tpshadow.obj \
-        $(SLO)$/tpline.obj \
-        $(SLO)$/tpgradnt.obj \
-        $(SLO)$/tpcolor.obj \
-        $(SLO)$/tpbitmap.obj \
-        $(SLO)$/tphatch.obj \
-        $(SLO)$/tplneend.obj \
-        $(SLO)$/tplnedef.obj \
-        $(SLO)$/SpellAttrib.obj \
-        $(SLO)$/SpellDialog.obj \
-        $(SLO)$/numpages.obj \
-        $(SLO)$/paragrph.obj \
-        $(SLO)$/tabstpge.obj \
-        $(SLO)$/textattr.obj \
-        $(SLO)$/align.obj \
-        $(SLO)$/backgrnd.obj \
-        $(SLO)$/border.obj \
-        $(SLO)$/chardlg.obj \
-        $(SLO)$/numfmt.obj \
-        $(SLO)$/page.obj \
-        $(SLO)$/postdlg.obj \
-        $(SLO)$/sdrcelldlg.obj \
-        $(SLO)$/splitcelldlg.obj \
-        $(SLO)$/newtabledlg.obj \
-        $(SLO)$/grfpage.obj \
-        $(SLO)$/cfgchart.obj \
-        $(SLO)$/eventdlg.obj \
-        $(SLO)$/macropg.obj \
-        $(SLO)$/acccfg.obj\
-        $(SLO)$/macroass.obj \
-        $(SLO)$/cfg.obj \
-        $(SLO)$/cfgutil.obj \
-        $(SLO)$/optchart.obj \
-        $(SLO)$/insrc.obj
-
-.IF "$(GUI)"=="WNT"
-SLOFILES+=$(SLO)$/winpluginlib.obj
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 0ef28d7972dc..940b882f2e7c 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -33,7 +33,6 @@
 #include "EnhancedCustomShape2d.hxx"
 #include "EnhancedCustomShapeGeometry.hxx"
 #include "EnhancedCustomShapeTypeNames.hxx"
-#include "EnhancedCustomShapeFunctionParser.hxx"
 #include <svx/svdoashp.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index 6be05a9e588d..2d0f306ab66b 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -36,13 +36,13 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/awt/Point.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
-#include <EnhancedCustomShapeFunctionParser.hxx>
+#include <svx/EnhancedCustomShapeFunctionParser.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <vector>
@@ -52,6 +52,7 @@
 #define DFF_CUSTOMSHAPE_EXCH            4
 
 class SdrModel;
+class SdrObject;
 class SfxItemSet;
 struct SvxMSDffVertPair;
 struct SvxMSDffCalculationData;
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 07f7c2ab6bea..63759e1dc4b9 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -37,8 +37,8 @@
 #include <svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xsflclit.hxx>
 #include <svx/xit.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 8ae4e34197c5..673e95877fcb 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -48,7 +48,7 @@
 #include <svx/outlobj.hxx>
 #include <svx/outliner.hxx>
 #include <svx/svdoutl.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 022b7505cb44..ee848c95192a 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -30,7 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShapeFunctionParser.hxx"
 #include "EnhancedCustomShape2d.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/fract.hxx>
@@ -39,6 +38,7 @@
 // we're synchronized externally.
 // But watch out, the parser might have
 // state not visible to this code!
+
 #define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
 #if defined(VERBOSE) && defined(DBG_UTIL)
 #include <typeinfo>
@@ -1001,6 +1001,7 @@ template< typename T > struct custom_real_parser_policies : public ::boost::spir
                                                    ( '-' multiplicative_expression )* )
 
     */
+
 class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
 {
 public:
@@ -1162,6 +1163,8 @@ const ParserContextSharedPtr& getParserContext()
 
 namespace EnhancedCustomShape  {
 
+
+
 ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape )
 {
     // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_*
@@ -1192,6 +1195,8 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& rF
                                     ::boost::spirit::space_p ) );
     OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
 
+
+
     // input fully congested by the parser?
     if( !aParseInfo.full )
         throw ParseError( "EnhancedCustomShapeFunctionParser::parseFunction(): string not fully parseable" );
@@ -1201,7 +1206,10 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& rF
     if( pContext->maOperandStack.size() != 1 )
         throw ParseError( "EnhancedCustomShapeFunctionParser::parseFunction(): incomplete or empty expression" );
 
+
     return pContext->maOperandStack.top();
 }
 
+
 }
+
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 9c2678126436..391bf075675e 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -37,7 +37,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include <tools/shl.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 91f6021b92b9..cda3f993a76b 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -34,7 +34,7 @@
 #include <tools/shl.hxx>
 #include <vcl/metaact.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svtools/colrdlg.hxx>
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index fa07ac74d517..0c87beb39a74 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -35,7 +35,7 @@
 #include <tools/shl.hxx>
 #include <vcl/salbtype.hxx>     // FRound
 #include <vcl/msgbox.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svtools/miscopt.hxx>
@@ -421,7 +421,7 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
     Point           aPos( aTbx1.GetPosPixel() );
       SvtMiscOptions  aMiscOptions;
 
-    aMiscOptions.AddListener( LINK( this, SvxSuperContourDlg, MiscHdl ) );
+    aMiscOptions.AddListenerLink( LINK( this, SvxSuperContourDlg, MiscHdl ) );
 
     aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
     aTbx1.SetSizePixel( aTbxSize );
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9ef7073971b6..d1ef3768eaa7 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <comphelper/types.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "rtl/ustrbuf.hxx"
 
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 7012dab1e89c..2c4af6be9784 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -47,7 +47,7 @@
 
 // === includes (global) =================================================
 #include <sfx2/app.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/msgbox.hxx>
 // === /includes (global) ================================================
 
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index f74e502cc05a..574a68a6ce91 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -39,7 +39,7 @@
 
 #include <svx/dialmgr.hxx>
 #include <tools/rc.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 
 static ResMgr* pResMgr=0;
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 8123a353bc63..edaa2cb92adb 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -35,7 +35,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/view3d.hxx>
 #include <svx/fmmodel.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/sphere3d.hxx>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index d2b01ac62ab4..d0a15be5e4f2 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -60,6 +60,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
+#include "linectrl.hrc"
 
 #define OUTPUT_DRAWMODE_COLOR       (DRAWMODE_DEFAULT)
 #define OUTPUT_DRAWMODE_CONTRAST    (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT)
@@ -1774,6 +1775,30 @@ void LineLB::Fill( const XDashList* pList )
     SetUpdateMode( TRUE );
 }
 
+void LineLB::FillStyles()
+{
+    ResMgr& rMgr = DIALOG_MGR();
+
+    // Linienstile
+    Clear();
+    InsertEntry( String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) );
+
+    const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
+    Bitmap aBitmap ( SVX_RES ( RID_SVXCTRL_LINECTRL ) );
+    Color aSourceColors[2];
+    Color aDestColors[2];
+
+    aSourceColors[0] = Color( COL_WHITE );
+    aSourceColors[1] = Color( COL_BLACK );
+
+    aDestColors[0] = rStyles.GetFieldColor();
+    aDestColors[1] = rStyles.GetFieldTextColor();
+
+    aBitmap.Replace ( aSourceColors, aDestColors, 2 );
+    Image aSolidLine ( aBitmap );
+    InsertEntry( String( ResId( RID_SVXSTR_SOLID, rMgr ) ), aSolidLine );
+}
+
 /************************************************************************/
 
 void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp )
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 5dee73abe484..1d2b295a793d 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -39,7 +39,7 @@
 #include <unolingu.hxx>
 
 #include <svtools/langtab.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index a380e480f295..f407e532f1fd 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -65,7 +65,7 @@
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <rtl/bootstrap.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 
 #define RET_BACK    100
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 5018bd28a640..58455f48589e 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -50,7 +50,7 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_XUB_STRLEN
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <svtools/colorcfg.hxx>
 
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index a3b57230da55..7ff915a51650 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -30,10 +30,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
 #include <unotools/localedatawrapper.hxx>
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 24f9d805a502..9e87debfe3bd 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -194,7 +194,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC );
+                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC);
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
                     if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
                         aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx
index 3a3f35d36e0a..64555110937f 100644
--- a/svx/source/dialog/hangulhanja.cxx
+++ b/svx/source/dialog/hangulhanja.cxx
@@ -34,8 +34,8 @@
 #include <vcl/msgbox.hxx> //add CHINA001
 #include <vcl/button.hxx>
 // header for class SvtLinguConfig
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 
 #include <set>
 #include <map>
@@ -347,7 +347,7 @@ namespace svx
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if(pFact)
             {
-                m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection, RID_SVX_MDLG_HANGULHANJA);
+                m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection );
                 DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!");//CHINA001
 
                 m_pConversionDialog->EnableRubySupport( m_pAntiImpl->HasRubySupport() );
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index bb80d3dd588e..741df55c960a 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
@@ -560,7 +560,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
-        SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, RID_SVXDLG_BBDLG,bEnableBackgroundSelector );
+        SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
         if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
         {
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index adc1317cdece..ad5854e8bb9c 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -33,13 +33,11 @@
 
 // include ---------------------------------------------------------------
 #include <vcl/settings.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include "hyperdlg.hxx"
 #include <svx/svxdlg.hxx> //CHINA001
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "hyperdlg.hrc"
-
 
 //########################################################################
 //#                                                                      #
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index 0cb6cc4d52df..413289599d33 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -33,16 +33,16 @@
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/configitem.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <svtools/inetimg.hxx>
-#include <svtools/urlbmk.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/urlbmk.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/imgmgr.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/objsh.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -66,6 +66,8 @@ public:
     ~SearchDefaultConfigItem_Impl();
 
     const OUString&    GetDefaultSearchEngine(){ return sDefaultEngine;}
+    virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+    virtual void            Commit();
 };
 
 /*-- 11.11.2003 14:20:59---------------------------------------------------
@@ -86,6 +88,14 @@ SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl()
 {
 }
 
+void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
+void SearchDefaultConfigItem_Impl::Commit()
+{
+}
+
 /*************************************************************************
 |*
 |* Dialog zum Einf"ugen/"Andern eines Hyperlink
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index a9c43347b7bf..2157fecc7cce 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -52,13 +52,13 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/group.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/eitem.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
@@ -230,7 +230,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
     maCbbTarget.SetLoseFocusHdl( LINK( this, SvxIMapDlg, URLLoseFocusHdl ) );
 
        SvtMiscOptions aMiscOptions;
-    aMiscOptions.AddListener( LINK( this, SvxIMapDlg, MiscHdl ) );
+    aMiscOptions.AddListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) );
 
     aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
     aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() );
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index d835dd1a129e..37a9959acd89 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -38,7 +38,7 @@
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 
 #include <xoutbmp.hxx>
 #include <svx/dialmgr.hxx>
@@ -52,7 +52,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/svdpagv.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/xlineit.hxx>
 #include <sfx2/evntconf.hxx>
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 0b8ecd942215..012e3bf7e06c 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -34,7 +34,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/menu.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/imap.hxx>
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx
index 59292068852b..b29671d6b36b 100644
--- a/svx/source/dialog/impgrf.cxx
+++ b/svx/source/dialog/impgrf.cxx
@@ -35,14 +35,14 @@
 #include <limits.h>             // USHRT_MAX
 #include <tools/urlobj.hxx>
 #include <tools/bigint.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <ucbhelper/content.hxx>
 #include <osl/file.hxx>
@@ -55,7 +55,7 @@ using namespace com::sun::star::uno;
 #include "impgrf.hrc"
 
 #define _SVX_IMPGRF_CXX
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 
 #include <svx/dialmgr.hxx>
 #include "svxerr.hxx"
@@ -111,7 +111,7 @@ int LoadGraphic( const String &rPath, const String &rFilterName,
         nRes = pFilter->ImportGraphic( rGraphic, rPath, *pStream,
                                        nFilter, pDeterminedFormat );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( nRes )
     {
         if( pMed )
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index c54081365a11..7bcdcf4a4c1f 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -54,10 +54,8 @@ SRC1FILES =  \
         dlgctrl.src \
         docrecovery.src \
         fontwork.src \
-        frmdirlbox.src \
         frmsel.src \
         hdft.src \
-        hyperdlg.src \
         hyphen.src \
         hyprlink.src \
         imapdlg.src \
@@ -70,6 +68,7 @@ SRC1FILES =  \
         rubydialog.src\
         ruler.src \
         srchdlg.src \
+        svxbmpnumvalueset.src \
         swframeposstrings.src \
         thesdlg.src \
         txenctab.src \
@@ -129,7 +128,6 @@ LIB2OBJFILES= \
         $(SLO)$/passwd.obj \
         $(SLO)$/pfiledlg.obj \
         $(SLO)$/prtqry.obj \
-        $(SLO)$/radiobtnbox.obj \
         $(SLO)$/relfld.obj \
         $(SLO)$/rlrcitem.obj \
         $(SLO)$/rubydialog.obj \
@@ -166,12 +164,3 @@ SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 .INCLUDE :  target.mk
 
-$(INCCOM)$/cuilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    $(RM) $@
-    echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SLO)$/svxdlg.obj : $(INCCOM)$/cuilib.hxx
diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx
index 6457cefad316..1056c6f1c162 100644
--- a/svx/source/dialog/opengrf.cxx
+++ b/svx/source/dialog/opengrf.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
 #include <com/sun/star/ui/dialogs/XFilePreview.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
 #endif
@@ -58,7 +58,7 @@
 #endif
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svx/dialmgr.hxx>
 #include "opengrf.hxx"
 
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index a83c052dafea..53e1e8bea1e9 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 
 // INCLUDE ---------------------------------------------------------------
-#include <svtools/rectitem.hxx>
+#include <svl/rectitem.hxx>
 
 
 
@@ -48,7 +48,7 @@
 #include "protitem.hxx"
 #include "rlrcitem.hxx"
 #include "rulritem.hxx"
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 // class SvxRulerItem ----------------------------------------------------
 
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index c957290d55c4..8c4d1cc07cd0 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/text/XRubySelection.hpp>
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 60bb838c6e96..4668e0c42fa0 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -42,92 +42,14 @@ String RID_SVXSTR_GRADIENT
 {
     Text [ en-US ] = "Gradient" ;
 };
-String RID_SVXSTR_DESC_GRADIENT
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r den Farbverlauf ein: : Geben Sie hier bitte den Namen f�r den Farbverlauf ein: */
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r den Farbverlauf ein: : Geben Sie hier bitte den Namen f�r den Farbverlauf ein: */
-    Text [ en-US ] = "Please enter a name for the gradient:" ;
-};
-String RID_SVXSTR_DEL_GRADIENT
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Farbverlauf l�schen : Farbverlauf l�schen */
-    /* ### ACHTUNG: Neuer Text in Resource? Farbverlauf l�schen : Farbverlauf l�schen */
-    Text [ en-US ] = "Delete gradient" ;
-};
-String RID_SVXSTR_ASK_DEL_GRADIENT
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gel�scht werden? : Soll der Farbverlauf wirklich gel�scht werden? */
-    /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gel�scht werden? : Soll der Farbverlauf wirklich gel�scht werden? */
-    Text [ en-US ] = "Do you want to delete the gradient?" ;
-};
-String RID_SVXSTR_ASK_CHANGE_GRADIENT
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Farbverlauf �ndern \noder einen neuen Farbverlauf hinzuf�gen. : Der Farbverlauf wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Farbverlauf �ndern \noder einen neuen Farbverlauf hinzuf�gen. */
-    /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Farbverlauf �ndern \noder einen neuen Farbverlauf hinzuf�gen. : Der Farbverlauf wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Farbverlauf �ndern \noder einen neuen Farbverlauf hinzuf�gen. */
-    Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ;
-};
 String RID_SVXSTR_BITMAP
 {
     Text [ en-US ] = "Bitmap" ;
 };
-String RID_SVXSTR_DESC_NEW_BITMAP
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die Bitmap ein: : Geben Sie hier bitte den Namen f�r die Bitmap ein: */
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die Bitmap ein: : Geben Sie hier bitte den Namen f�r die Bitmap ein: */
-    Text [ en-US ] = "Please enter a name for the bitmap:" ;
-};
-String RID_SVXSTR_DESC_EXT_BITMAP
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die externe Bitmap ein: : Geben Sie hier bitte den Namen f�r die externe Bitmap ein: */
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die externe Bitmap ein: : Geben Sie hier bitte den Namen f�r die externe Bitmap ein: */
-    Text [ en-US ] = "Please enter a name for the external bitmap:" ;
-};
-String RID_SVXSTR_DEL_BITMAP
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Bitmap l�schen : Bitmap l�schen */
-    /* ### ACHTUNG: Neuer Text in Resource? Bitmap l�schen : Bitmap l�schen */
-    Text [ en-US ] = "Delete bitmap" ;
-};
-String RID_SVXSTR_ASK_DEL_BITMAP
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gel�scht werden? : Soll die Bitmap wirklich gel�scht werden? */
-    /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gel�scht werden? : Soll die Bitmap wirklich gel�scht werden? */
-    Text [ en-US ] = "Are you sure you want to delete the bitmap?" ;
-};
-String RID_SVXSTR_ASK_CHANGE_BITMAP
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Bitmap �ndern \noder eine neue Bitmap hinzuf�gen. : Die Bitmap wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Bitmap �ndern \noder eine neue Bitmap hinzuf�gen. */
-    /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Bitmap �ndern \noder eine neue Bitmap hinzuf�gen. : Die Bitmap wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Bitmap �ndern \noder eine neue Bitmap hinzuf�gen. */
-    Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ;
-};
 String RID_SVXSTR_LINESTYLE
 {
     Text [ en-US ] = "Line Style" ;
 };
-String RID_SVXSTR_DESC_LINESTYLE
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r den Linienstil ein: : Geben Sie hier bitte den Namen f�r den Linienstil ein: */
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r den Linienstil ein: : Geben Sie hier bitte den Namen f�r den Linienstil ein: */
-    Text [ en-US ] = "Please enter a name for the line style:" ;
-};
-String RID_SVXSTR_DEL_LINESTYLE
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Linienstil l�schen : Linienstil l�schen */
-    /* ### ACHTUNG: Neuer Text in Resource? Linienstil l�schen : Linienstil l�schen */
-    Text [ en-US ] = "Delete line style" ;
-};
-String RID_SVXSTR_ASK_DEL_LINESTYLE
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gel�scht werden? : Soll der Linienstil wirklich gel�scht werden? */
-    /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gel�scht werden? : Soll der Linienstil wirklich gel�scht werden? */
-    Text [ en-US ] = "Do you want to delete the line style?" ;
-};
-String RID_SVXSTR_ASK_CHANGE_LINESTYLE
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Linienstil �ndern \noder einen neuen Linienstil hinzuf�gen. : Der Linienstil wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Linienstil �ndern \noder einen neuen Linienstil hinzuf�gen. */
-    /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Linienstil �ndern \noder einen neuen Linienstil hinzuf�gen. : Der Linienstil wurde ge�ndert und nicht gesichert. \nSie k�nnen den selektierten Linienstil �ndern \noder einen neuen Linienstil hinzuf�gen. */
-    Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
-};
 String RID_SVXSTR_INVISIBLE
 {
     Text [ en-US ] = "Invisible" ;
@@ -140,116 +62,11 @@ String RID_SVXSTR_HATCH
 {
     Text [ en-US ] = "Hatching" ;
 };
-String RID_SVXSTR_DESC_HATCH
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die Schraffur ein: : Geben Sie hier bitte den Namen f�r die Schraffur ein: */
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die Schraffur ein: : Geben Sie hier bitte den Namen f�r die Schraffur ein: */
-    Text [ en-US ] = "Please enter a name for the hatching:" ;
-};
-String RID_SVXSTR_DEL_HATCH
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Schraffur l�schen : Schraffur l�schen */
-    /* ### ACHTUNG: Neuer Text in Resource? Schraffur l�schen : Schraffur l�schen */
-    Text [ en-US ] = "Delete hatching" ;
-};
-String RID_SVXSTR_ASK_DEL_HATCH
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gel�scht werden? : Soll die Schraffur wirklich gel�scht werden? */
-    /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gel�scht werden? : Soll die Schraffur wirklich gel�scht werden? */
-    Text [ en-US ] = "Do you want to delete the hatching?" ;
-};
-String RID_SVXSTR_ASK_CHANGE_HATCH
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Schraffur �ndern \noder eine neue Schraffur hinzuf�gen. : Die Schraffur wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Schraffur �ndern \noder eine neue Schraffur hinzuf�gen. */
-    /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Schraffur �ndern \noder eine neue Schraffur hinzuf�gen. : Die Schraffur wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Schraffur �ndern \noder eine neue Schraffur hinzuf�gen. */
-    Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ;
-};
-String RID_SVXSTR_CHANGE
-{
-    /* ### ACHTUNG: Neuer Text in Resource? �ndern : �ndern */
-    /* ### ACHTUNG: Neuer Text in Resource? �ndern : �ndern */
-    Text [ en-US ] = "Modify" ;
-};
-String RID_SVXSTR_ADD
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Hinzuf�gen : Hinzuf�gen */
-    /* ### ACHTUNG: Neuer Text in Resource? Hinzuf�gen : Hinzuf�gen */
-    Text [ en-US ] = "Add" ;
-};
-String RID_SVXSTR_DESC_COLOR
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die neue Farbe ein: : Geben Sie hier bitte den Namen f�r die neue Farbe ein: */
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r die neue Farbe ein: : Geben Sie hier bitte den Namen f�r die neue Farbe ein: */
-    Text [ en-US ] = "Please enter a name for the new color:" ;
-};
-String RID_SVXSTR_DEL_COLOR
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Farbe l�schen : Farbe l�schen */
-    /* ### ACHTUNG: Neuer Text in Resource? Farbe l�schen : Farbe l�schen */
-    Text [ en-US ] = "Delete color" ;
-};
-String RID_SVXSTR_ASK_DEL_COLOR
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gel�scht werden? : Soll die Farbe wirklich gel�scht werden? */
-    /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gel�scht werden? : Soll die Farbe wirklich gel�scht werden? */
-    Text [ en-US ] = "Do you want to delete the color?" ;
-};
-String RID_SVXSTR_ASK_CHANGE_COLOR
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Farbe �ndern \noder eine neue Farbe hinzuf�gen. : Die Farbe wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Farbe �ndern \noder eine neue Farbe hinzuf�gen. */
-    /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Farbe �ndern \noder eine neue Farbe hinzuf�gen. : Die Farbe wurde ge�ndert und nicht gesichert. \nSie k�nnen die selektierte Farbe �ndern \noder eine neue Farbe hinzuf�gen. */
-    Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ;
-};
-String RID_SVXSTR_TABLE
-{
-    Text [ en-US ] = "Table" ;
-};
-String RID_SVXSTR_WRITE_DATA_ERROR
-{
-    Text [ en-US ] = "The file could not be saved!" ;
-};
-String RID_SVXSTR_READ_DATA_ERROR
-{
-    Text [ en-US ] = "The file could not be loaded!" ;
-};
-String RID_SVXSTR_WARN_TABLE_OVERWRITE
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde ge�ndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde ge�ndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
-    /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde ge�ndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde ge�ndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
-    Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ;
-};
-String RID_SVXSTR_WARN_NAME_DUPLICATE
-{
-    Text [ en-US ] = "The name you have entered already exists. \nPlease choose another name." ;
-};
 String RID_SVXSTR_LINEEND
 {
     Text [ en-US ] = "Arrowheads" ;
 };
-String RID_SVXSTR_DESC_LINEEND
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r das neue Linienende ein: : Geben Sie hier bitte den Namen f�r das neue Linienende ein: */
-    /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen f�r das neue Linienende ein: : Geben Sie hier bitte den Namen f�r das neue Linienende ein: */
-    Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
-};
-String RID_SVXSTR_DEL_LINEEND
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Linienende l�schen : Linienende l�schen */
-    /* ### ACHTUNG: Neuer Text in Resource? Linienende l�schen : Linienende l�schen */
-    Text [ en-US ] = "Delete line ends" ;
-};
-String RID_SVXSTR_ASK_DEL_LINEEND
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gel�scht werden? : Soll das Linienende wirklich gel�scht werden? */
-    /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gel�scht werden? : Soll das Linienende wirklich gel�scht werden? */
-    Text [ en-US ] = "Do you want to delete the arrowhead?" ;
-};
-String RID_SVXSTR_ASK_CHANGE_LINEEND
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde ge�ndert und nicht gesichert. \nM�chten Sie das Linienende jetzt sichern? : Das Linienende wurde ge�ndert und nicht gesichert. \nM�chten Sie das Linienende jetzt sichern? */
-    /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde ge�ndert und nicht gesichert. \nM�chten Sie das Linienende jetzt sichern? : Das Linienende wurde ge�ndert und nicht gesichert. \nM�chten Sie das Linienende jetzt sichern? */
-    Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ;
-};
+
 String RID_SVXSTR_CLOSE
 {
     /* ### ACHTUNG: Neuer Text in Resource? Schlie�en : Schlie�en */
@@ -1375,6 +1192,30 @@ String RID_SVXSTR_TRASNGR0
 
  // ********************************************************************** EOF
 
+ // RID_SVXSTR_FIELDUNIT_TABLE --------------------------------------------
+
+StringArray RID_SVXSTR_FIELDUNIT_TABLE
+{
+    ItemList [ en-US ] =
+    {
+        < "Millimeter" ; FUNIT_MM ; > ;
+        < "Centimeter" ; FUNIT_CM ; > ;
+        < "Meter" ; FUNIT_M ; > ;
+        < "Kilometer" ; FUNIT_KM ; > ;
+        < "Inch" ; FUNIT_INCH ; > ;
+        < "Foot" ; FUNIT_FOOT ; > ;
+        < "Miles" ; FUNIT_MILE ; > ;
+        < "Pica" ; FUNIT_PICA ; > ;
+        < "Point" ; FUNIT_POINT ; > ;
+    };
+    };
+
+// unbekannte Zeichenfarbe
+String RID_SVXSTR_COLOR_USER
+{
+    Text [ en-US ] = "User" ;
+};
+
 
 
 
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index a3885763887f..a55fe24d6955 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 #include <tools/pstm.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 
 #include <svx/svxids.hrc>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 918234222135..9a121a578448 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -35,16 +35,16 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/morebtn.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/style.hxx>
-#include <svtools/searchopt.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/style.hxx>
+#include <unotools/searchopt.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -52,7 +52,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #include <sfx2/app.hxx>
 #include <toolkit/unohlp.hxx>
@@ -286,47 +286,6 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen )
     SrchAttrItemList::Remove( nPos, nLen );
 }
 
-/* //CHINA001
-// class SvxJSearchOptionsDialog -----------------------------------------
-
-SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
-            Window *pParent,
-            const SfxItemSet& rOptionsSet, USHORT nUniqueId, INT32 nInitialFlags ) :
-    SfxSingleTabDialog  ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
-    nInitialTlFlags( nInitialFlags )
-{
-    pPage = (SvxJSearchOptionsPage *)
-                    SvxJSearchOptionsPage::Create( this, rOptionsSet );
-    SetTabPage( pPage );    //! implicitly calls pPage->Reset(...)!
-    pPage->EnableSaveOptions( FALSE );
-}
-
-
-SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
-{
-    // pPage will be implicitly destroyed by the
-    // SfxSingleTabDialog destructor
-}
-
-
-void SvxJSearchOptionsDialog::Activate()
-{
-    pPage->SetTransliterationFlags( nInitialTlFlags );
-}
-
-
-INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const
-{
-    return pPage->GetTransliterationFlags();
-}
-
-
-void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
-{
-    pPage->SetTransliterationFlags( nSettings );
-}
-*/ //CHINA001
-
 #if ENABLE_LAYOUT
 #undef SfxModelessDialog
 #define SfxModelessDialog(bindings, child, parent, id) SfxDialog (parent, "find-and-replace.xml", id, bindings, child)
@@ -1589,12 +1548,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
     {
         SfxItemSet aSet( SFX_APP()->GetPool() );
         pSearchItem->SetTransliterationFlags( GetTransliterationFlags() );
-        //CHINA001 SvxJSearchOptionsDialog aDlg( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS,
-        //CHINA001                          pSearchItem->GetTransliterationFlags() );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXPAGE_JSEARCH_OPTIONS, pSearchItem->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS );
+            AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet,
+                    pSearchItem->GetTransliterationFlags() );
             DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
             int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute();
             if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
@@ -2280,7 +2238,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG )
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
-        VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges, RID_SVXDLG_SEARCHATTR );
+        VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
         pDlg->Execute();
         delete pDlg;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 9ab1eb43de5c..dcfaabf0f415 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -37,17 +37,17 @@
 #include <tools/shl.hxx>
 #include <i18npool/mslangid.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #ifndef _SVX_HELPID_HRC
 #include <helpid.hrc>
 #endif
 #include <svx/numitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <gallery.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/brshitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
@@ -60,7 +60,7 @@
 #include <drawitem.hxx>
 #include <numvset.hxx>
 #include <htmlmode.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <unolingu.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src
new file mode 100644
index 000000000000..065bc7ee8f64
--- /dev/null
+++ b/svx/source/dialog/svxbmpnumvalueset.src
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: numpages.src,v $
+ * $Revision: 1.64.242.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <svx/dialogs.hrc>
+
+String RID_SVXSTR_BULLET_DESCRIPTION_0
+{
+    Text [en-US] = "Solid small circular bullets";
+};
+String RID_SVXSTR_BULLET_DESCRIPTION_1
+{
+    Text [en-US] = "Solid large circular bullets";
+};
+String RID_SVXSTR_BULLET_DESCRIPTION_2
+{
+    Text [en-US] = "Solid diamond bullets";
+};
+String RID_SVXSTR_BULLET_DESCRIPTION_3
+{
+    Text [en-US] = "Solid large square bullets";
+};
+String RID_SVXSTR_BULLET_DESCRIPTION_4
+{
+    Text [en-US] = "Right pointing arrow bullets filled out";
+};
+String RID_SVXSTR_BULLET_DESCRIPTION_5
+{
+    Text [en-US] = "Right pointing arrow bullets";
+};
+String RID_SVXSTR_BULLET_DESCRIPTION_6
+{
+    Text [en-US] = "Check mark bullets";
+};
+String RID_SVXSTR_BULLET_DESCRIPTION_7
+{
+    Text [en-US] = "Tick mark bullets";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
+{
+    Text [en-US] = "Number 1) 2) 3)";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
+{
+    Text [en-US] = "Number 1. 2. 3.";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_2
+{
+    Text [en-US] = "Number (1) (2) (3)";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_3
+{
+    Text [en-US] = "Uppercase Roman number I. II. III.";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_4
+{
+    Text [en-US] = "Uppercase letter A) B) C)";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_5
+{
+    Text [en-US] = "Lowercase letter a) b) c)";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_6
+{
+    Text [en-US] = "Lowercase letter (a) (b) (c)";
+};
+String RID_SVXSTR_SINGLENUM_DESCRIPTION_7
+{
+    Text [en-US] = "Lowercase Roman number i. ii. iii.";
+};
+
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
+{
+    Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet";
+};
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
+{
+    Text [en-US] = "Numeric, lowercase letters, solid small circular bullet";
+};
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
+{
+    Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet";
+};
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
+{
+    Text [en-US] = "Numeric";
+};
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
+{
+    Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet";
+};
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
+{
+    Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet";
+};
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
+{
+    Text [en-US] = "Numeric with all sublevels";
+};
+String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
+{
+    Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet";
+};
+
diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx
index ce22fb392e67..7be500b0a3c7 100644
--- a/svx/source/dialog/svxdlg.cxx
+++ b/svx/source/dialog/svxdlg.cxx
@@ -32,12 +32,13 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svxdlg.hxx>
-#include "cuilib.hxx"
-
-#include <osl/module.hxx>
-#include <tools/string.hxx>
 
 SvxAbstractDialogFactory* SvxAbstractDialogFactory::Create()
 {
     return (SvxAbstractDialogFactory*) VclAbstractDialogFactory::Create();
 }
+
+SvxAbstractDialogFactory::~SvxAbstractDialogFactory()
+{
+}
+
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 712b66b86da1..a07cf1f254d2 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -37,11 +37,11 @@
 #include <limits.h>
 #include <tools/shl.hxx>
 #include <vcl/image.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/rectitem.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 
 
@@ -2761,8 +2761,9 @@ void SvxRuler::EvalModifier()
      case KEY_MOD1:  {
          const RulerType eType = GetDragType();
          nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL;
-         if(RULER_TYPE_BORDER == eType || RULER_TYPE_TAB == eType||
-            RULER_TYPE_MARGIN1&&pColumnItem)
+         if( RULER_TYPE_TAB == eType ||
+             ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ) &&
+               pColumnItem ) )
              PrepareProportional_Impl(eType);
          break;
      }
diff --git a/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx
index 7a5497181b59..c27115ff64cd 100644
--- a/svx/source/dialog/thesdlg.cxx
+++ b/svx/source/dialog/thesdlg.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <tools/shl.hxx>
-#include <svtools/lngmisc.hxx>
+#include <svl/lngmisc.hxx>
 #include <vcl/wrkwin.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/svx/source/editeng/SvXMLAutoCorrectExport.cxx
index 011c8bede485..b5c3d5865495 100644
--- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx
+++ b/svx/source/editeng/SvXMLAutoCorrectExport.cxx
@@ -33,7 +33,7 @@
 #include <SvXMLAutoCorrectExport.hxx>
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <xmloff/xmltoken.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/svx/source/editeng/SvXMLAutoCorrectImport.cxx
index 04748767dcac..49718e68fb94 100644
--- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx
+++ b/svx/source/editeng/SvXMLAutoCorrectImport.cxx
@@ -37,7 +37,7 @@
 
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <xmloff/xmltoken.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx
index 601e8497baa3..e0e34ed085d4 100644
--- a/svx/source/editeng/acorrcfg.cxx
+++ b/svx/source/editeng/acorrcfg.cxx
@@ -35,8 +35,8 @@
 #include <sfx2/app.hxx>
 
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/urihelper.hxx>
 
 #include <svx/svxacorr.hxx>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/svx/source/editeng/editattr.hxx b/svx/source/editeng/editattr.hxx
index 6c964590bbea..c8e2a1c268f1 100644
--- a/svx/source/editeng/editattr.hxx
+++ b/svx/source/editeng/editattr.hxx
@@ -54,7 +54,7 @@ class SvxFieldItem;
 class SvxLanguageItem;
 class SvxEmphasisMarkItem;
 class SvxCharReliefItem;
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 
 class SfxVoidItem;
diff --git a/svx/source/editeng/editdbg.hxx b/svx/source/editeng/editdbg.hxx
index 842c927948e3..e75a0baef217 100644
--- a/svx/source/editeng/editdbg.hxx
+++ b/svx/source/editeng/editdbg.hxx
@@ -31,7 +31,7 @@
 #ifndef _EDITDBG_HXX
 #define _EDITDBG_HXX
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/string.hxx>
 #include <stdio.h>
 
diff --git a/svx/source/editeng/editdoc.hxx b/svx/source/editeng/editdoc.hxx
index 872f19485ae6..3364157cfc1a 100644
--- a/svx/source/editeng/editdoc.hxx
+++ b/svx/source/editeng/editdoc.hxx
@@ -38,9 +38,9 @@
 #include <editattr.hxx>
 #include <edtspell.hxx>
 #include <svx/svxfont.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/itempool.hxx>
 #include <tools/table.hxx>
 
 class ImpEditEngine;
diff --git a/svx/source/editeng/editdoc2.cxx b/svx/source/editeng/editdoc2.cxx
index 030dfb1ad615..c779e0d53734 100644
--- a/svx/source/editeng/editdoc2.cxx
+++ b/svx/source/editeng/editdoc2.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 
 #include <eeng_pch.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/rtti.hxx>
 #include <svx/lspcitem.hxx>
 #include <svx/adjitem.hxx>
diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index 059dae19c8f8..58a735529d2c 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.cxx
@@ -36,8 +36,8 @@
 #define USE_SVXFONT
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/ctloptions.hxx>
 #include <svtools/ctrltool.hxx>
 
 #include <svx/svxfont.hxx>
@@ -1128,7 +1128,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
             break;
             default:
             {
-                #if (OSL_DEBUG_LEVEL > 1) && !defined( PRODUCT )
+                #if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
                     if ( ( nCode == KEY_W ) && rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
                     {
                         SfxItemSet aAttribs = pEditView->GetAttribs();
diff --git a/svx/source/editeng/editeng.hrc b/svx/source/editeng/editeng.hrc
index 2068e91c4bce..280c90f66341 100644
--- a/svx/source/editeng/editeng.hrc
+++ b/svx/source/editeng/editeng.hrc
@@ -31,7 +31,7 @@
 #define _EDITENG_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_EDITUNDO_DEL            ( RID_EDIT_START + 0 )
diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx
index fb5e921f60f0..92bba45fa007 100644
--- a/svx/source/editeng/editobj.cxx
+++ b/svx/source/editeng/editobj.cxx
@@ -50,8 +50,8 @@
 #include <svx/numitem.hxx>
 #include <svx/brshitem.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/intitem.hxx>
-#include <vcl/fontcvt.hxx>
+#include <svl/intitem.hxx>
+#include <unotools/fontcvt.hxx>
 #include <tools/tenccvt.hxx>
 
 DBG_NAME( EE_EditTextObject )
diff --git a/svx/source/editeng/editobj2.hxx b/svx/source/editeng/editobj2.hxx
index 2ed9c8b3e6d8..27883757230e 100644
--- a/svx/source/editeng/editobj2.hxx
+++ b/svx/source/editeng/editobj2.hxx
@@ -34,7 +34,7 @@
 #include <svx/editobj.hxx>
 #include <editdoc.hxx>
 
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 
 
 class SfxStyleSheetPool;
diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx
index 6776f57ea2b6..e67d17832f6d 100644
--- a/svx/source/editeng/editview.cxx
+++ b/svx/source/editeng/editview.cxx
@@ -38,13 +38,13 @@
 #define _SOLAR__PRIVATE 1
 
 #include <i18npool/mslangid.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/ctrltool.hxx>
 
 #include <sfx2/srchitem.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <impedit.hxx>
 #include <svx/editeng.hxx>
@@ -72,7 +72,7 @@
 #include <linguistic/lngprops.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 
 
 using ::rtl::OUString;
diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx
index df6725cff00f..63f788e192d5 100644
--- a/svx/source/editeng/edtspell.cxx
+++ b/svx/source/editeng/edtspell.cxx
@@ -39,8 +39,8 @@
 #include <edtspell.hxx>
 #include <svx/flditem.hxx>
 #include <fontitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/editeng/eehtml.hxx b/svx/source/editeng/eehtml.hxx
index 37d96dde87da..44146eb0d227 100644
--- a/svx/source/editeng/eehtml.hxx
+++ b/svx/source/editeng/eehtml.hxx
@@ -31,7 +31,7 @@
 #ifndef _EEHTML_HXX
 #define _EEHTML_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include <editdoc.hxx>
 #include <sfx2/sfxhtml.hxx>
diff --git a/svx/source/editeng/eeobj.cxx b/svx/source/editeng/eeobj.cxx
index 8dd58f8a5d41..aadc1bd111f3 100644
--- a/svx/source/editeng/eeobj.cxx
+++ b/svx/source/editeng/eeobj.cxx
@@ -38,7 +38,7 @@
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <svx/editeng.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 using namespace ::com::sun::star;
diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx
index 0d1872f96549..fb715925546c 100644
--- a/svx/source/editeng/eerdll.cxx
+++ b/svx/source/editeng/eerdll.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <eerdll.hxx>
 #include <eerdll2.hxx>
 #include <svx/lspcitem.hxx>
@@ -46,7 +46,7 @@
 #include <svx/flditem.hxx>
 #include <svx/emphitem.hxx>
 #include <svx/scriptspaceitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/svx/source/editeng/eertfpar.cxx b/svx/source/editeng/eertfpar.cxx
index a659b0e513f0..dd5afec53e7b 100644
--- a/svx/source/editeng/eertfpar.cxx
+++ b/svx/source/editeng/eertfpar.cxx
@@ -35,7 +35,7 @@
 
 #include <eertfpar.hxx>
 #include <impedit.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/escpitem.hxx>
 #include <svx/fhgtitem.hxx>
 #include "fontitem.hxx"
diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx
index 16f0c1f5277d..44e8086e1748 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/svx/source/editeng/impedit.cxx
@@ -57,7 +57,7 @@
 #include <vos/mutex.hxx>
 
 #include <svx/flditem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/transfer.hxx>
 
 #include <sot/exchange.hxx>
diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx
index 25b7cec4f449..6c4cd7cfb17f 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/svx/source/editeng/impedit.hxx
@@ -42,7 +42,7 @@
 #include <vcl/cursor.hxx>
 
 #include <vcl/dndhelp.hxx>
-#include <svtools/ondemand.hxx>
+#include <svl/ondemand.hxx>
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker.hpp>
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index f8cd7e67a4c9..9e8236f3b536 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.cxx
@@ -44,9 +44,9 @@
 #include <edtspell.hxx>
 #include <eeobj.hxx>
 #include <txtrange.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <acorrcfg.hxx>
 
 #include <svx/fhgtitem.hxx>
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index d272991953c5..72cf588bc6a1 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -36,7 +36,7 @@
 #include <vcl/gdimtf.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
@@ -68,7 +68,7 @@
 #include <svx/numitem.hxx>
 
 #include <svtools/colorcfg.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 
 #include <forbiddencharacterstable.hxx>
 
diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx
index 3c98c0d23818..9d551dd94682 100644
--- a/svx/source/editeng/impedit5.cxx
+++ b/svx/source/editeng/impedit5.cxx
@@ -37,7 +37,7 @@
 #include <svx/editeng.hxx>
 #include <editdbg.hxx>
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 
 #include <svx/lrspitem.hxx>
diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx
index 88e1543ab8c9..2cba63650f21 100644
--- a/svx/source/editeng/svxacorr.cxx
+++ b/svx/source/editeng/svxacorr.cxx
@@ -50,13 +50,13 @@
 // fuer die Sort-String-Arrays aus dem SVMEM.HXX
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef SVTOOLS_FSTATHELPER_HXX
-#include <svtools/fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 #endif
 #include <svtools/helpopt.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/charclass.hxx>
 #ifndef _COM_SUN_STAR_I18N_UNICODETYPE_HDL_
 #include <com/sun/star/i18n/UnicodeType.hdl>
@@ -1354,10 +1354,6 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             else if( nRet & ChgOrdinalNumber)   nHelpId = 22;
         }
 
-        DBG_ASSERT( nHelpId && nHelpId < (HID_AUTOCORR_HELP_END -
-                                          HID_AUTOCORR_HELP_START + 1),
-                    "wrong HelpId Range" );
-
         if( nHelpId )
         {
             nHelpId += HID_AUTOCORR_HELP_START - 1;
@@ -1385,7 +1381,7 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
         if( pLists )
             pLists->SaveCplSttExceptList();
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         DBG_ERROR("speichern einer leeren Liste?");
@@ -1401,7 +1397,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
         if(pLists)
             pLists->SaveWrdSttExceptList();
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         DBG_ERROR("speichern einer leeren Liste?");
diff --git a/svx/source/editeng/txtrange.cxx b/svx/source/editeng/txtrange.cxx
index 223219ae4b6a..7a33745fd974 100644
--- a/svx/source/editeng/txtrange.cxx
+++ b/svx/source/editeng/txtrange.cxx
@@ -67,7 +67,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg
     bInner( bInnr ),
     bVertical( bVert )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = FALSE;
 #endif
     pRangeArr = new Range[ nCacheSize ];
diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx
index 39ece655d631..fce15ed61bac 100644
--- a/svx/source/editeng/unolingu.cxx
+++ b/svx/source/editeng/unolingu.cxx
@@ -40,7 +40,7 @@
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/logfile.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -57,7 +57,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 #include <i18npool/mslangid.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index a5147c55e81e..71a5ba2065f8 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -33,7 +33,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/colrdlg.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewsh.hxx>
@@ -50,7 +50,7 @@
 #include <svx/fmpage.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 
 #include <dlgutil.hxx>
@@ -65,7 +65,7 @@
 
 #include <gallery.hxx>
 #define GALLERY_THEME "3D"
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 
 #include <svx/float3d.hxx>
 #include "float3d.hrc"
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 2d3408ffeb86..905bd7706a1f 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -52,7 +52,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/xlnclit.hxx>
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/xlnwtit.hxx>
@@ -68,7 +68,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/metaact.hxx>
 #include <svx/svx3ditems.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/xgrscit.hxx>
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 9cca99b55188..48783368f7db 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -39,11 +39,11 @@
 #include <vcl/svapp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include "globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/xlnclit.hxx>
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xlnwtit.hxx>
 
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 22ef5777f730..0e2b87be4ca7 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -40,7 +40,7 @@
 #endif
 #include "globl3d.hxx"
 #include <svx/svdpage.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/e3dundo.hxx>
 #include <svx/svdtrans.hxx>
@@ -50,7 +50,7 @@
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/svx3ditems.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/sdr/properties/e3dsceneproperties.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index c210919bd09d..7a710c19cbad 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -70,7 +70,7 @@
 #ifndef _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include <comphelper/extract.hxx>
@@ -80,9 +80,9 @@
 #include <connectivity/dbtools.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/fmtfield.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <tools/multisel.hxx>
 #include <tools/shl.hxx>
 #include <tools/diagnose_ex.h>
@@ -892,7 +892,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if(pFact)
             {
-                AbstractFmShowColsDialog* pDlg = pFact->CreateFmShowColsDialog(NULL, RID_SVX_DLG_SHOWGRIDCOLUMNS);
+                AbstractFmShowColsDialog* pDlg = pFact->CreateFmShowColsDialog(NULL);
                 DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
                 pDlg->SetColumns(xCols);
                 pDlg->Execute();
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 0bfc7c768973..7a0c7c0378bb 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -34,7 +34,7 @@
 #include "fmgridif.hxx"
 #include "fmprop.hrc"
 #include "fmservs.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmurl.hxx"
 #include "formcontrolfactory.hxx"
 #include "gridcell.hxx"
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b70ba93a00e1..f4229b1bcb0c 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -34,7 +34,7 @@
 
 #include "fmprop.hrc"
 #include "fmresids.hrc"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "gridcell.hxx"
 #include "gridcols.hxx"
 #include "sdbdatacolumn.hxx"
@@ -66,7 +66,7 @@
 #include <rtl/math.hxx>
 #include <svtools/calendar.hxx>
 #include <svtools/fmtfield.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <svtools/svmedit.hxx>
 #include <svx/dialmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index da7fe3447b0a..f56f8e0c7e86 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #include <comphelper/types.hxx>
 #include "fmservs.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 //------------------------------------------------------------------------------
 const ::comphelper::StringSequence& getColumnTypes()
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index afff309168ac..49f0bdfafda0 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -37,7 +37,7 @@
 #include <svx/gridctrl.hxx>
 #include "gridcell.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include <svtools/stringtransfer.hxx>
 
 #ifndef _SVX_FMPROP_HRC
diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk
index 1e86308f9c44..1f3afe242783 100644
--- a/svx/source/fmcomp/makefile.mk
+++ b/svx/source/fmcomp/makefile.mk
@@ -46,8 +46,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 SRS1NAME=fmcomp
 SRC1FILES= \
-    gridctrl.src	\
-    showcols.src
+    gridctrl.src	
 
 LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
 LIB1OBJFILES= \
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 3e30601ef0fd..ee3a8369b2ee 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -37,7 +37,7 @@
 
 #include <svx/dialmgr.hxx>
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <vos/mutex.hxx>
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index b7d5f3a7281e..fb9d625ce6e2 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -45,7 +45,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svtools/urlcontrol.hxx>
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/confignode.hxx>
 #include <unotools/ucbhelper.hxx>
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index ffe012734ae5..2ce8e1728ee4 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -44,9 +44,9 @@
 #include <svx/dialmgr.hxx>
 #include <svx/fmshell.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/viewoptions.hxx>
-#include <svtools/svtools.hrc>
+#include <unotools/pathoptions.hxx>
+#include <unotools/viewoptions.hxx>
+#include <svl/svtools.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objitem.hxx>
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 7ac8f8afbe29..b9ef8224a9ef 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -64,7 +64,7 @@
 #include <svx/fmshell.hxx>
 #include <fmshimp.hxx>
 #include <fmservs.hxx>
-#include <fmtools.hxx>
+#include <svx/fmtools.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 9748426c0b26..9fb7bd9b8f90 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -47,7 +47,8 @@
 
 #include <comphelper/processfactory.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
+
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx
index 48db5acbb01e..af2a103c5d03 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/fmctrler.cxx
@@ -41,7 +41,7 @@
 #include "fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmurl.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmshell.hxx"
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index b50cee74a252..8edcfbedb0ba 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -33,7 +33,7 @@
 #include "fmexch.hxx"
 
 #include <sot/storage.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #ifndef _SVX_DBEXCH_HRC
 #include <dbexch.hrc>
@@ -43,7 +43,7 @@
 #include <tools/diagnose_ex.h>
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index b5a055730f71..691acb8a33e4 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 /** === end UNO includes === **/
 #include <svx/fmmodel.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index e2c9101b718c..c2d2fe10b956 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include <comphelper/stl_types.hxx>
 #include <svx/svdobj.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 
 #ifndef _FM_FMOBJFAC_HXX
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 0ead41eb87bc..658afe14e1ad 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -78,7 +78,7 @@
 #include "fmprop.hrc"
 #endif
 #include "fmundo.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 using namespace ::svxform;
 #endif
 #include <comphelper/property.hxx>
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index ed4cd890ec9e..547334114716 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -34,7 +34,7 @@
 #include "svxerr.hxx"
 #include "fmpgeimp.hxx"
 #include "fmundo.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmprop.hrc"
 #include "fmservs.hxx"
 #include "fmobj.hxx"
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index ccdfb2b1af39..2819045c237d 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include "fmvwimp.hxx"
 #include <svx/fmshell.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 #ifndef _SVX_FMPROP_HRC
 #include "fmprop.hrc"
@@ -56,11 +56,11 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/visitem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/intitem.hxx>
+#include <svl/visitem.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
@@ -79,7 +79,7 @@
 #endif
 #include "fmexch.hxx"
 #include <svx/fmglob.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/shl.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/fmmodel.hxx>
@@ -91,7 +91,7 @@
 #include <vcl/sound.hxx>
 #include "fmexpl.hxx"
 #include "formcontrolling.hxx"
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/processfactory.hxx>
@@ -795,7 +795,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 DBG_ASSERT( pFact, "no dialog factory!" );
                 if ( pFact )
                 {
-                    ::std::auto_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL, RID_SVX_DLG_INPUTRECORDNO ) );
+                    ::std::auto_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
                     DBG_ASSERT( dlg.get(), "Dialogdiet fail!" );
                     dlg->SetValue( rController->getCursor()->getRow() );
                     if ( dlg->Execute() == RET_OK )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e4d656a06f28..4d265d324820 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -48,7 +48,7 @@
 #include "svditer.hxx"
 #include "fmservs.hxx"
 #include "fmpgeimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #ifndef _SVX_FMPROP_HRC
 #include "fmprop.hrc"
 #endif
@@ -3919,6 +3919,10 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >&
         }
 }
 
+void FmXFormShell::Commit()
+{
+}
+
 //------------------------------------------------------------------------
 void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 {
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 95759df4c0ef..c1552e095848 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "fmsrccfg.hxx"
-#include <svtools/filerec.hxx>
+#include <svl/filerec.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <comphelper/processfactory.hxx>
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3d1235624802..4e2b8ba20fd2 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -34,7 +34,7 @@
 #ifndef _SVX_FMRESIDS_HRC
 #include "fmresids.hrc"
 #endif
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmsrccfg.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -69,11 +69,8 @@
 #include "fmsrcimp.hxx"
 #include <svx/fmsearch.hxx>
 
-#ifndef _FMSEARCH_HRC
-#include "fmsearch.hrc"
-#endif
 #include <comphelper/numbers.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #define EQUAL_BOOKMARKS(a, b) a == b
 
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 14529b8ac9b7..b332e4a7ab40 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -48,10 +48,10 @@
 #endif
 
 #include "flagsdef.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 //........................................................................
 namespace svx
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index fc7f1aa78558..b5f583102981 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -66,12 +66,12 @@
 #include <sfx2/request.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/stringtransfer.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index df8b51b8b82f..0a97bdd981b7 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "svx/dbtoolsclient.hxx"
 #include "fmservs.hxx"
 #include <svx/fmglob.hxx>
@@ -91,8 +91,8 @@
 #include "fmprop.hrc"
 #endif
 #include <sfx2/bindings.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <cppuhelper/servicefactory.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 2436113312cc..b88bf659418c 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -47,7 +47,7 @@
 #ifndef _FM_FMMODEL_HXX
 #include <svx/fmmodel.hxx>
 #endif
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include <svx/fmpage.hxx>
 #ifndef _SVX_FMRESIDS_HRC
 #include "fmresids.hrc"
@@ -56,7 +56,7 @@
 #include <svx/dialmgr.hxx>
 #include "fmpgeimp.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <tools/shl.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 222407a36021..fff345413296 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -35,7 +35,7 @@
 #undef REFERENCE
 #endif
 #include <svtools/ehdl.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -61,7 +61,7 @@
 #include <svx/fmpage.hxx>
 #include <svx/fmshell.hxx>
 #include "fmpgeimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmshimp.hxx"
 #include "fmservs.hxx"
 #include "fmprop.hrc"
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 46750d524a4d..0e7592d4b3a0 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -39,7 +39,7 @@
 #include "fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmundo.hxx"
 #include "fmvwimp.hxx"
 #include "formcontrolfactory.hxx"
@@ -90,7 +90,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/numbers.hxx>
 #include <comphelper/property.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/stdtext.hxx>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index da3c2634b63c..afc7e8ace77f 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -56,7 +56,7 @@
 
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/numbers.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/gen.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 104d2f423eb5..454bdef5d8bf 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -35,7 +35,7 @@
 #include "fmurl.hxx"
 #include <svx/svxids.hrc>
 #include "fmprop.hrc"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/form/runtime/FormOperations.hpp>
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index b649be94d106..e5d8e15903fe 100644
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
@@ -49,8 +49,6 @@ SRC1FILES= \
     fmexpl.src 		\
     filtnav.src		\
     fmstring.src 	\
-    tbxform.src		\
-    fmsearch.src	\
     formshell.src   \
     datanavi.src
 
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index f90f0d8c2ce4..e03f3d121514 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -47,6 +47,7 @@
 #include "fmpgeimp.hxx"
 #include "fmitems.hxx"
 #include "fmobj.hxx"
+#include "fmprop.hrc"
 #include <vcl/wrkwin.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index df87fda4007e..9fbab082b34c 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -39,6 +39,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdpagv.hxx>
 
+#include "fmprop.hrc"
 
 #include "fmundo.hxx"
 #include "fmhelp.hrc"
diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
index 7fe8c934d982..bf3fc39c7e5b 100644
--- a/svx/source/form/sdbdatacolumn.cxx
+++ b/svx/source/form/sdbdatacolumn.cxx
@@ -149,17 +149,17 @@ namespace svxform
         return m_xColumn->getBytes();
     }
 
-    Date DataColumn::getDate() throw( SQLException, RuntimeException )
+    com::sun::star::util::Date DataColumn::getDate() throw( SQLException, RuntimeException )
     {
         return m_xColumn->getDate();
     }
 
-    Time DataColumn::getTime() throw( SQLException, RuntimeException )
+    com::sun::star::util::Time DataColumn::getTime() throw( SQLException, RuntimeException )
     {
         return m_xColumn->getTime();
     }
 
-    DateTime DataColumn::getTimestamp() throw( SQLException, RuntimeException )
+    com::sun::star::util::DateTime DataColumn::getTimestamp() throw( SQLException, RuntimeException )
     {
         return m_xColumn->getTimestamp();
     }
@@ -255,12 +255,12 @@ namespace svxform
         m_xColumnUpdate->updateDate(x);
     }
 
-    void DataColumn::updateTime(const Time& x) throw( SQLException, RuntimeException )
+    void DataColumn::updateTime(const com::sun::star::util::Time& x) throw( SQLException, RuntimeException )
     {
         m_xColumnUpdate->updateTime(x);
     }
 
-    void DataColumn::updateTimestamp(const DateTime& x) throw( SQLException, RuntimeException )
+    void DataColumn::updateTimestamp(const com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException )
     {
         m_xColumnUpdate->updateTimestamp(x);
     }
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 4ad118418981..50736536bfd0 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 
 #include "tabwin.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 #include "stringlistresource.hxx"
 
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index ee9fd0c165b8..bcdde07ec84e 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -33,9 +33,9 @@
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <tools/ref.hxx>
 #include <tools/shl.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index 5ef0c3f5c447..4a94b165b1b6 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_svx.hxx"
 #include <sfx2/objitem.hxx>
 #include <sfx2/msg.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/crsditem.hxx>
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index a58b654fe277..bf0cfb22748c 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -33,12 +33,12 @@
 
 #include <vcl/split.hxx>
 #include <vcl/ctrl.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include "gallery.hrc"
-#include "galmisc.hxx"
-#include "gallery1.hxx"
+#include "svx/galmisc.hxx"
+#include "svx/gallery1.hxx"
 #include "galbrws1.hxx"
 #include "galbrws2.hxx"
 #include "galbrws.hxx"
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 1e49bd65dfcb..57fd3a07513e 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -37,13 +37,12 @@
 #include <ucbhelper/content.hxx>
 #include <sfx2/app.hxx>
 #include "helpid.hrc"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
-#include "galdlg.hxx"
+#include "svx/galmisc.hxx"
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
-
+#include "gallery.hrc"
 #include <algorithm>
 
 #include <svx/svxdlg.hxx> //CHINA001
@@ -316,7 +315,7 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const String & rThemeName, boo
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Got no AbstractDialogFactory!");
-    VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( NULL, mpExchangeData, mpThemePropsDlgItemSet, RID_SVXTABDLG_GALLERYTHEME );
+    VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( NULL, mpExchangeData, mpThemePropsDlgItemSet );
     DBG_ASSERT(pThemeProps, "Got no GalleryThemePropertiesDialog!");
 
     if ( bCreateNew )
@@ -415,7 +414,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if(pFact)
             {
-                VclAbstractRefreshableDialog* aActualizeProgress = pFact->CreateActualizeProgressDialog( this, pTheme, RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS );
+                VclAbstractRefreshableDialog* aActualizeProgress = pFact->CreateActualizeProgressDialog( this, pTheme );
                 DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");//CHINA001
 
                 aActualizeProgress->Update();  //CHINA001 aActualizeProgress.Update();
@@ -440,7 +439,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
             //CHINA001 TitleDialog      aDlg( this, aOldName );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
-            AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName, RID_SVXDLG_GALLERY_TITLE );
+            AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName );
             DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
 
             if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
@@ -477,7 +476,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme, RID_SVXDLG_GALLERY_THEMEID );
+                    AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme );
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
 
                     if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 344843c69740..23c8e6840626 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -31,7 +31,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/menu.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vector>
 #include "galbrws.hxx"
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 8240f607f5fa..6e212a0ff58b 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -35,23 +35,26 @@
 #include <sot/formats.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/urlbmk.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/urlbmk.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/transfer.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/brshitem.hxx>
 #include "helpid.hrc"
-#include "gallery1.hxx"
+#include "gallery.hxx"
+#include "galobj.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
-#include "galdlg.hxx"
+#include "galctrl.hxx"
+#include "svx/galmisc.hxx"
 #include "galbrws2.hxx"
+#include "gallery.hrc"
 #include <vcl/svapp.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
@@ -321,7 +324,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     const Link  aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
     Font        aInfoFont( maInfoBar.GetControlFont() );
 
-    maMiscOptions.AddListener( LINK( this, GalleryBrowser2, MiscHdl ) );
+    maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
 
     maViewBox.InsertItem( TBX_ID_ICON, aDummyImage );
     maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK );
@@ -353,7 +356,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
 
 GalleryBrowser2::~GalleryBrowser2()
 {
-    maMiscOptions.RemoveListener( LINK( this, GalleryBrowser2, MiscHdl ) );
+    maMiscOptions.RemoveListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
 
     delete mpPreview;
     delete mpListView;
@@ -1014,7 +1017,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
-                        AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldTitle, RID_SVXDLG_GALLERY_TITLE );
+                        AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldTitle );
                         DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
                         if( aDlg->Execute() == RET_OK )//CHINA001 if( aDlg.Execute() == RET_OK )
                         {
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 4b0ada475ec0..09a95bec67a2 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -38,10 +38,14 @@
 #include "helpid.hrc"
 #include "galbrws2.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galctrl.hxx"
 #include "AccessibleStringWrap.hxx"
 #include <svx/svxfont.hxx>
+#include "galobj.hxx"
+#include <avmedia/mediawindow.hxx>
+#include "gallery.hrc"
+#include <svx/impgrf.hxx>
 
 // -----------
 // - Defines -
@@ -82,6 +86,28 @@ GalleryPreview::~GalleryPreview()
 {
 }
 
+
+bool GalleryPreview::SetGraphic( const INetURLObject& _aURL )
+{
+    bool bRet = true;
+    Graphic aGraphic;
+    if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) )
+    {
+        aGraphic = BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) );
+    }
+    else
+    {
+        GraphicFilter*  pFilter = GetGrfFilter();
+        GalleryProgress aProgress( pFilter );
+        if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) )
+            bRet = false;
+    }
+
+    SetGraphic( aGraphic );
+    Invalidate();
+    return bRet;
+}
+
 // ------------------------------------------------------------------------
 
 void GalleryPreview::InitSettings()
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index d8bc33f5b1e8..c0c58f32b74e 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -31,12 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
 #include "galbrws.hxx"
 #include "gallery.hxx"
+#include "galobj.hxx"
 
 // -----------
 // - Statics -
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index ebe95d7b096c..4da768dc7a49 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -74,412 +74,8 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER
     };
 };
 
-
-/******************************************************************************/
-
-TabDialog RID_SVXTABDLG_GALLERY
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Text [ en-US ] = "Properties of " ;
-    Moveable = TRUE ;
-    TabControl 1
-    {
-        OutputSize = TRUE ;
-        PageList =
-        {
-            PageItem
-            {
-                Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ;
-                Text [ en-US ] = "General" ;
-            };
-        };
-    };
-};
-
-/******************************************************************************/
-
-TabDialog RID_SVXTABDLG_GALLERYTHEME
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Text [ en-US ] = "Properties of " ;
-    Moveable = TRUE ;
-    TabControl 1
-    {
-        OutputSize = TRUE ;
-        PageList =
-        {
-            PageItem
-            {
-                Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ;
-                Text [ en-US ] = "General" ;
-            };
-            PageItem
-            {
-                Identifier = RID_SVXTABPAGE_GALLERYTHEME_FILES ;
-                Text [ en-US ] = "Files" ;
-            };
-        };
-    };
-};
-
-/******************************************************************************/
-
-TabPage RID_SVXTABPAGE_GALLERY_GENERAL
-{
-    HelpId = HID_GALLERY_PROPERTIES_GENERAL;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
-    FixedImage FI_MS_IMAGE
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 20 , 20 ) ;
-    };
-    Edit EDT_MS_NAME
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 10 ) ;
-        Size = MAP_APPFONT ( 194 , 12 ) ;
-    };
-    FixedLine FL_MS_GENERAL_FIRST
-    {
-        Pos = MAP_APPFONT ( 6 , 36 ) ;
-        Size = MAP_APPFONT ( 248 , 1 ) ;
-    };
-    FixedText FT_MS_TYPE
-    {
-        Pos = MAP_APPFONT ( 6 , 43 ) ;
-        Size = MAP_APPFONT ( 51 , 10 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "Type:" ;
-    };
-    FixedText FT_MS_SHOW_TYPE
-    {
-        Pos = MAP_APPFONT ( 60 , 43 ) ;
-        Size = MAP_APPFONT ( 194 , 10 ) ;
-    };
-    FixedText FT_MS_PATH
-    {
-        Pos = MAP_APPFONT ( 6 , 57 ) ;
-        Size = MAP_APPFONT ( 51 , 10 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "Location:" ;
-    };
-    FixedText FT_MS_SHOW_PATH
-    {
-        Pos = MAP_APPFONT ( 60 , 57 ) ;
-        Size = MAP_APPFONT ( 194 , 10 ) ;
-    };
-    FixedText FT_MS_CONTENT
-    {
-        Pos = MAP_APPFONT ( 6 , 71 ) ;
-        Size = MAP_APPFONT ( 51 , 10 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "Contents:" ;
-    };
-    FixedText FT_MS_SHOW_CONTENT
-    {
-        Pos = MAP_APPFONT ( 60 , 71 ) ;
-        Size = MAP_APPFONT ( 194 , 10 ) ;
-    };
-    FixedLine FL_MS_GENERAL_SECOND
-    {
-        Pos = MAP_APPFONT ( 6 , 91 ) ;
-        Size = MAP_APPFONT ( 248 , 1 ) ;
-    };
-    FixedText FT_MS_CHANGEDATE
-    {
-        Pos = MAP_APPFONT ( 6 , 98 ) ;
-        Size = MAP_APPFONT ( 51 , 10 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "Modified:" ;
-    };
-    FixedText FT_MS_SHOW_CHANGEDATE
-    {
-        Pos = MAP_APPFONT ( 60 , 98 ) ;
-        Size = MAP_APPFONT ( 194 , 10 ) ;
-    };
-};
-
-/******************************************************************************/
-
-TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
-{
-    HelpId = HID_GALLERY_BROWSER ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
-    FixedText FT_FILETYPE
-    {
-        Pos = MAP_APPFONT ( 6 , 8 ) ;
-        Size = MAP_APPFONT ( 48 , 10 ) ;
-        Text [ en-US ] = "~File type" ;
-    };
-    ComboBox CBB_FILETYPE
-    {
-        Pos = MAP_APPFONT ( 57 , 6 ) ;
-        Size = MAP_APPFONT ( 121 , 69 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        AutoSize = TRUE;
-        AutoHScroll = TRUE ;
-    };
-    MultiListBox LBX_FOUND
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 23  ) ;
-        Size = MAP_APPFONT ( 172 , 156 ) ;
-        TabStop = TRUE ;
-        SimpleMode = TRUE ;
-    };
-    PushButton BTN_SEARCH
-    {
-        Pos = MAP_APPFONT ( 184 , 6  ) ;
-        Size = MAP_APPFONT ( 70 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Find Files..." ;
-    };
-    PushButton BTN_TAKE
-    {
-        Pos = MAP_APPFONT ( 184 , 24  ) ;
-        Size = MAP_APPFONT ( 70 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Add" ;
-    };
-    PushButton BTN_TAKEALL
-    {
-        Pos = MAP_APPFONT ( 184 , 42 ) ;
-        Size = MAP_APPFONT ( 70 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "A~dd All" ;
-    };
-    CheckBox CBX_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 184 , 76  ) ;
-        Size = MAP_APPFONT ( 70 , 12 ) ;
-        Text [ en-US ] = "Pr~eview" ;
-    };
-    Window WND_BRSPRV
-    {
-        HelpId = HID_GALLERY_PREVIEW;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 184 , 91 ) ;
-        Size = MAP_APPFONT ( 70 , 88 ) ;
-    };
-    PushButton BTN_MADDIN1
-    {
-        Pos = MAP_APPFONT ( 220 , 63 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Maddin1" ;
-    };
-    PushButton BTN_MADDIN2
-    {
-        Pos = MAP_APPFONT ( 220 , 80 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Maddin2" ;
-    };
-};
-
-/******************************************************************************/
-
-ModalDialog RID_SVXDLG_GALLERY_TITLE
-{
-    HelpId = HID_GALLERY_TITLE;
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 168 , 63 ) ;
-    Text [ en-US ] = "Enter Title" ;
-    Moveable = TRUE ;
-
-    OkButton BTN_OK
-    {
-        DefButton = TRUE ;
-        Pos = MAP_APPFONT ( 112 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 112 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 112 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-
-    FixedLine FL_TITLE
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text [ en-US ] = "Title" ;
-    };
-    Edit EDT_TITLE
-    {
-        HelpId = HID_GALLERY_TITLE_EDIT;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 18 ) ;
-        Size = MAP_APPFONT ( 88, 12 ) ;
-    };
-};
-
-/******************************************************************************/
-
-ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
-{
-    HelpId = HID_GALLERY_SEARCH ;
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 124 , 86 ) ;
-    Text [ en-US ] = "Find" ;
-    Moveable = TRUE ;
-    FixedLine FL_SEARCH_DIR
-    {
-        Pos = MAP_APPFONT ( 6 , 33 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "Directory" ;
-    };
-    FixedText FT_SEARCH_DIR
-    {
-        Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 37 , 66 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_SEARCH_TYPE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "File type" ;
-    };
-    FixedText FT_SEARCH_TYPE
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-    };
-};
-
-/******************************************************************************/
-
-ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
-{
-    HelpId = HID_GALLERY_APPLY ;
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 124 , 56 ) ;
-    Text [ en-US ] = "Apply" ;
-    Moveable = TRUE ;
-    FixedLine FL_TAKE_PROGRESS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "File" ;
-    };
-    FixedText FT_TAKE_FILE
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 37 , 36 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
-/******************************************************************************/
-
-ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
-{
-    HelpId = HID_GALLERY_ACTUALIZE ;
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 124 , 56 ) ;
-    Text [ en-US ] = "Update" ;
-    Moveable = TRUE ;
-    FixedLine FL_ACTUALIZE_PROGRESS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "File" ;
-    };
-    FixedText FT_ACTUALIZE_FILE
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 37 , 36 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
-ModalDialog RID_SVXDLG_GALLERY_THEMEID
-{
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 180 , 63 ) ;
-    Text [ en-US ] = "Theme ID" ;
-    Moveable = TRUE ;
-    OkButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 124 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 124 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_ID
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "ID";
-    };
-    ListBox LB_RESNAME
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 100 , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        HScroll = TRUE ;
-        VScroll = TRUE ;
-    };
-};
-
 /******************************************************************************/
 
-CheckBox RID_SVXDLG_GALLERY_CBX
-{
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( 120 , 12 ) ;
-    TabStop = TRUE ;
-    Text [ en-US ] = "S~ubdirectories" ;
-};
 String RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS
 {
     Text [ en-US ] = "Update";
@@ -488,10 +84,6 @@ String RID_SVXSTR_GALLERY_FOPENERROR
 {
     Text [ en-US ] = "This file cannot be opened" ;
 };
-String RID_SVXSTR_GALLERY_NOFILES
-{
-    Text [ en-US ] = "<No Files>" ;
-};
 String RID_SVXSTR_GALLERY_NOTHEME
 {
     Text [ en-US ] = "Invalid Theme Name!" ;
@@ -544,10 +136,6 @@ String RID_SVXSTR_GALLERY_DELETEDD
 {
     Text [ en-US ] = "Do you want to delete the linked file?" ;
 };
-String RID_SVXSTR_GALLERY_SEARCH
-{
-    Text [ en-US ] = "Do you want to update the file list?" ;
-};
 String RID_SVXSTR_GALLERY_SGIERROR
 {
     Text [ en-US ] = "This file cannot be opened.\nDo you want to enter a different search path? " ;
@@ -564,18 +152,6 @@ String RID_SVXSTR_GALLERY_THEMEERR
 {
     Text [ en-US ] = "This theme name already exists.\nPlease choose a different one." ;
 };
-String RID_SVXSTR_GALLERYPROPS_THEME
-{
-    Text [ en-US ] = "Theme;Themes" ;
-};
-String RID_SVXSTR_GALLERYPROPS_OBJECT
-{
-    Text [ en-US ] = "Object;Objects" ;
-};
-String RID_SVXSTR_GALLERYPROPS_GALTHEME
-{
-    Text [ en-US ] = "Gallery Theme" ;
-};
 String RID_SVXSTR_GALLERY_IMPORTTHEME
 {
     Text [ en-US ] = "I~mport..." ;
@@ -584,22 +160,10 @@ String RID_SVXSTR_GALLERY_CREATETHEME
 {
     Text [ en-US ] = "New Theme..." ;
 };
-String RID_SVXSTR_GALLERY_READONLY
-{
-    Text [ en-US ] = " (read-only)" ;
-};
-String RID_SVXSTR_GALLERY_ALLFILES
-{
-    Text [ en-US ] = "<All Files>" ;
-};
 String RID_SVXSTR_GALLERY_DIALOGID
 {
     Text [ en-US ] = "Assign ID" ;
 };
-String RID_SVXSTR_GALLERY_ID_EXISTS
-{
-    Text [ en-US ] = "This ID already exists..." ;
-};
 String RID_SVXSTR_GALLERY_TITLE
 {
     Text [ en-US ] = "Title" ;
@@ -629,41 +193,21 @@ Bitmap RID_SVXBMP_THEME_NORMAL
     File = "galnors.bmp" ;
 };
 
-Bitmap RID_SVXBMP_THEME_NORMAL_BIG
-{
-    File = "galnorl.bmp" ;
-};
-
 Bitmap RID_SVXBMP_THEME_IMPORTED
 {
     File = "galimps.bmp" ;
 };
 
-Bitmap RID_SVXBMP_THEME_IMPORTED_BIG
-{
-    File = "galimpl.bmp" ;
-};
-
 Bitmap RID_SVXBMP_THEME_READONLY
 {
     File = "galrdos.bmp" ;
 };
 
-Bitmap RID_SVXBMP_THEME_READONLY_BIG
-{
-    File = "galrdol.bmp" ;
-};
-
 Bitmap RID_SVXBMP_THEME_DEFAULT
 {
     File = "galdefs.bmp" ;
 };
 
-Bitmap RID_SVXBMP_THEME_DEFAULT_BIG
-{
-    File = "galdefl.bmp" ;
-};
-
 Bitmap RID_SVXBMP_GALLERY_MEDIA
 {
     File = "galmedia.bmp";
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 7e0faeeb4994..a71a72e64c21 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -36,12 +36,13 @@
 #include <tools/vcompat.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/docfile.hxx>
 #include "gallery.hxx"
-#include "galmisc.hxx"
+#include "gallery.hrc"
+#include "svx/galmisc.hxx"
 #include "galtheme.hxx"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 
@@ -919,3 +920,7 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener )
             ImplDeleteCachedTheme( pTheme );
     }
 }
+
+BOOL GalleryThemeEntry::IsDefault() const
+{ return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); }
+
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index d531404e083f..bbf0771c65de 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -37,15 +37,15 @@
 #include <ucbhelper/content.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/solar.hrc>
-#include <svtools/urihelper.hxx>
+#include <svl/solar.hrc>
+#include <svl/urihelper.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/docfile.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <vcl/svapp.hxx>
 
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmmodel.hxx>
@@ -53,9 +53,9 @@
 #include <svx/unomodel.hxx>
 #include "codec.hxx"
 #include "gallery.hrc"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/TransferInfo.hpp>
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index b5cdd332362d..5aeb1a80fea5 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -38,17 +38,17 @@
 #include <sfx2/docfac.hxx>
 
 #include <comphelper/classids.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <tools/rcid.h>
 #include <tools/vcompat.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include <svx/fmpage.hxx>
 #include "gallery.hrc"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galobj.hxx"
 #include <vcl/salbtype.hxx>     // FRound
 #include <vcl/svapp.hxx>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 6bfb2232829f..2c792070c646 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -45,7 +45,7 @@
 #include <sot/filelist.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/docfile.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <svx/svdograf.hxx>
@@ -54,12 +54,15 @@
 #include <svx/unomodel.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include "galtheme.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-
+#include "galobj.hxx"
+#include <svx/gallery1.hxx>
+#include "galtheme.hrc"
+#include <vcl/lstbox.hxx>
 #include "gallerydrawmodel.hxx"
 
 // --------------
@@ -1574,3 +1577,26 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme )
 {
     return rTheme.ReadData( rIn );
 }
+
+void GalleryTheme::ImplSetModified( BOOL bModified )
+{ pThm->SetModified( bModified ); }
+
+const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); }
+const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); }
+const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); }
+const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); }
+UINT32 GalleryTheme::GetId() const { return pThm->GetId(); }
+void GalleryTheme::SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
+BOOL GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
+BOOL GalleryTheme::IsImported() const { return pThm->IsImported(); }
+BOOL GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
+BOOL GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
+BOOL GalleryTheme::IsModified() const { return pThm->IsModified(); }
+const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); }
+
+void GalleryTheme::InsertAllThemes( ListBox& rListBox )
+{
+    for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
+        rListBox.InsertEntry( String( GAL_RESID( i ) ) );
+}
+
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 06089c97c166..e5d35df22fdd 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/regpathhelper.hxx>
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
+#include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
@@ -70,10 +71,9 @@
 #include <rtl/bootstrap.hxx>
 
 #include <galtheme.hxx>
-#include <gallery1.hxx>
+#include <svx/gallery1.hxx>
 
 using namespace ::vos;
-using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::lang;
@@ -221,7 +221,7 @@ static void PrintHelp()
     fprintf( stdout, "\t\t\tare required.\n");
 }
 
-static OUString Smartify( const OUString &rPath )
+static rtl::OUString Smartify( const rtl::OUString &rPath )
 {
     INetURLObject aURL;
     aURL.SetSmartURL( rPath );
@@ -234,7 +234,7 @@ static OUString Smartify( const OUString &rPath )
 void GalApp::Init()
 {
     if( getenv( "OOO_INSTALL_PREFIX" ) == NULL ) {
-        OUString fileName = GetAppFileName();
+        rtl::OUString fileName = GetAppFileName();
         int lastSlash = fileName.lastIndexOf( '/' );
 #ifdef WNT
         // Don't know which directory separators GetAppFileName() returns on Windows.
@@ -242,9 +242,9 @@ void GalApp::Init()
         if( fileName.lastIndexOf( '\\' ) > lastSlash )
             lastSlash = fileName.lastIndexOf( '\\' );
 #endif
-        OUString baseBinDir = fileName.copy( 0, lastSlash );
-        OUString installPrefix = baseBinDir + OUString::createFromAscii( "/../.." );
-        OUString assignment = OUString::createFromAscii( "OOO_INSTALL_PREFIX=" ) + installPrefix;
+        rtl::OUString baseBinDir = fileName.copy( 0, lastSlash );
+        rtl::OUString installPrefix = baseBinDir + rtl::OUString::createFromAscii( "/../.." );
+        rtl::OUString assignment = rtl::OUString::createFromAscii( "OOO_INSTALL_PREFIX=" ) + installPrefix;
         putenv( strdup( OUSTRING_CSTR( assignment )));
     }
     OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) );
@@ -262,7 +262,7 @@ void GalApp::Init()
 
 void GalApp::InitUCB()
 {
-    OUString aEmpty;
+    rtl::OUString aEmpty;
     Sequence< Any > aArgs(6);
     aArgs[0]
         <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
@@ -287,7 +287,7 @@ void GalApp::Main()
 
     for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
     {
-        OUString aParam = GetCommandLineParam( i );
+        rtl::OUString aParam = GetCommandLineParam( i );
 
         if( aParam.equalsAscii( "--help" ) ||
             aParam.equalsAscii( "-h" ) )
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 0b862e1be691..dc96c2b9ecfc 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -52,7 +52,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vos/mutex.hxx>
 #include <comphelper/broadcasthelper.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <set>
 #include <map>
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 2bb298836d02..ce382a1986bc 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -32,11 +32,11 @@
 
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/form/XForm.hpp>
-#include <svtools/lstner.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/lstner.hxx>
+#include <svl/brdcst.hxx>
 #include <vcl/window.hxx>
 #include <sfx2/childwin.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/ctrlitem.hxx>
@@ -46,7 +46,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
 #include <vcl/dockwin.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmexch.hxx"
 #include <connectivity/sqlparse.hxx>
 #include "fmexch.hxx"
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 285cb90320d2..70072a0fe7de 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -40,7 +40,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/childwin.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 //========================================================================
 class FmPropBrwMgr : public SfxChildWindow
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
index 7a973e129280..060f1fdb04db 100644
--- a/svx/source/inc/fmctrler.hxx
+++ b/svx/source/inc/fmctrler.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_FMCTRLER_HXX
 #define _SVX_FMCTRLER_HXX
 
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "formcontrolling.hxx"
 #include "sqlparserclient.hxx"
 #include "delayedevent.hxx"
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index df60ba931739..6f2ced3c98ca 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -30,11 +30,11 @@
 #ifndef _SVX_FMEXPL_HXX
 #define _SVX_FMEXPL_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/lstner.hxx>
+#include <svl/brdcst.hxx>
 #include <vcl/window.hxx>
 #include <sfx2/childwin.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/ctrlitem.hxx>
@@ -57,7 +57,7 @@
 #include <svx/fmview.hxx>
 
 #include "fmexch.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 class SdrObjListIter;
 class FmFormShell;
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 30bdefaf1c58..e637c57f0c15 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -31,7 +31,7 @@
 #define _SVX_FMITEMS_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <comphelper/uno3.hxx>
 //  FORWARD_DECLARE_INTERFACE(awt,XControlContainer)
 FORWARD_DECLARE_INTERFACE(uno,Any)
diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index 95a478fc5aee..67cb5d36e5bb 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.hrc
@@ -31,7 +31,7 @@
 #define _SVX_FMRESIDS_HRC
 
 // include     -----------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // unnamed ressources -------------------------------------------------------
 // sub ressources .....................
@@ -80,11 +80,6 @@
 #define RID_SVXDLG_TAB_ORDER                        (RID_FORMS_START + 4)
 #define RID_SVXDLG_SETFORM                          (RID_FORMS_START + 5)
 #define RID_SVX_FMEXPLORER                          (RID_FORMS_START + 6)
-#define RID_SVXDLG_SEARCHFORM                       (RID_FORMS_START + 7)
-#define RID_SVXERR_SEARCH_NORECORD                  (RID_FORMS_START + 8)
-#define RID_SVXERR_SEARCH_GENERAL_ERROR             (RID_FORMS_START + 9)
-#define RID_SVX_DLG_INPUTRECORDNO                   (RID_FORMS_START + 10)
-#define RID_SVX_DLG_SHOWGRIDCOLUMNS                 (RID_FORMS_START + 11)
 #define RID_SVXDLG_ADD_DATAITEM                     (RID_FORMS_START + 12)
 #define RID_SVXDLG_ADD_CONDITION                    (RID_FORMS_START + 13)
 #define RID_SVXDLG_NAMESPACE_ITEM                   (RID_FORMS_START + 14)
@@ -147,8 +142,6 @@
 #define RID_STR_UNDO_MODEL_REPLACE                  (RID_FORMS_START +  31)
 #define RID_STR_NAVIGATIONBAR                       (RID_FORMS_START +  32)
 #define RID_STR_DEFAULT_CONTROL                     (RID_FORMS_START +  33)
-#define RID_STR_OVERFLOW_FORWARD                    (RID_FORMS_START +  34)
-#define RID_STR_OVERFLOW_BACKWARD                   (RID_FORMS_START +  35)
 #define RID_STR_FORM                                (RID_FORMS_START +  36)
 #define RID_STR_FIELDSELECTION                      (RID_FORMS_START +  37)
 #define RID_STR_NO_PROPERTIES                       (RID_FORMS_START +  38)
@@ -187,9 +180,6 @@
 #define RID_STR_CONTROL                             (RID_FORMS_START +  71)
 #define RID_STR_POSTFIX_DATE                        (RID_FORMS_START +  72)
 #define RID_STR_POSTFIX_TIME                        (RID_FORMS_START +  73)
-#define RID_STR_FROM_TOP                            (RID_FORMS_START +  74)
-#define RID_STR_FROM_BOTTOM                         (RID_FORMS_START +  75)
-#define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  76)
 #define RID_STR_NODATACONTROLS                      (RID_FORMS_START +  77)
 #define RID_STR_FILTER_NAVIGATOR                    (RID_FORMS_START +  78)
 #define RID_STR_FILTER_FILTER_FOR                   (RID_FORMS_START +  79)
@@ -198,10 +188,6 @@
 #define RID_STR_SYNTAXERROR                         (RID_FORMS_START +  82)
 #define RID_STR_MOVING_CURSOR                       (RID_FORMS_START +  83)
 #define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY      (RID_FORMS_START +  84)
-#define RID_STR_SEARCH_ANYWHERE                     (RID_FORMS_START +  85)
-#define RID_STR_SEARCH_BEGINNING                    (RID_FORMS_START +  86)
-#define RID_STR_SEARCH_END                          (RID_FORMS_START +  87)
-#define RID_STR_SEARCH_WHOLE                        (RID_FORMS_START +  88)
 #define RID_STR_AUTOFIELD                           (RID_FORMS_START +  89)
 #define RID_STR_SVT_SQL_SYNTAX_ERROR                (RID_FORMS_START +  90)
 #define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE        (RID_FORMS_START +  91)
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 85644ea5daba..89c384dd2648 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -57,21 +57,21 @@
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/svarray.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/svarray.hxx>
+#include <svl/lstner.hxx>
 
 #define _SVSTDARR_BOOLS
 #define _SVSTDARR_BYTES
 #define _SVSTDARR_LONGS
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sfx2/mnuitem.hxx>
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 #include "fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <vos/thread.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 #include <tools/debug.hxx>
 #include <cppuhelper/component.hxx>
 #include <comphelper/stl_types.hxx>
@@ -534,6 +534,7 @@ private:
 
     // ConfigItem related stuff
     virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
+    virtual void Commit();
     void implAdjustConfigCache();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index eb2475bc56e8..0d6acf4f2909 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -31,7 +31,7 @@
 #ifndef _FMSRCIMP_HXX
 #define _FMSRCIMP_HXX
 
-#include "fmtools.hxx"
+#include <svx/fmtools.hxx>
 #include <vos/thread.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/awt/XTextComponent.hpp>
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 596eaac0014e..be53cc727df2 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -51,7 +51,7 @@
 #include <cppuhelper/implbase3.hxx>
 
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <comphelper/uno3.hxx>
 
 class FmFormModel;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index cb747e3a894c..504aaff7acf3 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -35,7 +35,7 @@
 
 #include "sqlparserclient.hxx"
 #include "typeconversionclient.hxx"
-#include "fmtools.hxx"
+#include "svx/fmtools.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/sdb/XColumn.hpp>
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index 2b16060bbb4e..839d34018853 100644
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -33,7 +33,7 @@
 
 #include <vcl/mapmod.hxx>
 
-//#include <svtools/lstner.hxx>
+//#include <svl/lstner.hxx>
 //#include <vcl/timer.hxx>
 //#include <svx/svdsob.hxx>
 //#include <svx/svdtypes.hxx> // fuer SdrLayerID
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index be46c05a58d5..8feda5ef6b68 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/form/XForm.hpp>
 
 //#ifndef _SVX_FMTOOLS_HXX
-//#include "fmtools.hxx"
+//#include "svx/fmtools.hxx"
 //#endif
 #include <comphelper/propmultiplex.hxx>
 #include <svtools/transfer.hxx>
diff --git a/svx/source/inc/unoedprx.hxx b/svx/source/inc/unoedprx.hxx
index 4758b17dd621..a260063d7525 100644
--- a/svx/source/inc/unoedprx.hxx
+++ b/svx/source/inc/unoedprx.hxx
@@ -32,7 +32,7 @@
 #define _SVX_UNOEDPRX_HXX
 
 #include <memory>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <svx/unoedsrc.hxx>
 
 #include <svx/editdata.hxx>
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index cff148376d2a..510379d54ab5 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -33,7 +33,7 @@
 #endif
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #include "intro.hrc"
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 9a59a643168f..eea02180d922 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_IMAGEMGR_HRC
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 726aea57287f..73ea6edca1c6 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -40,7 +40,7 @@
 #endif
 
 
-//#include <svtools/memberid.hrc>
+//#include <svl/memberid.hrc>
 //#include "svxids.hrc"
 //#include "svxitems.hrc"
 
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 5e07c233f115..59c907b476b2 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -34,7 +34,7 @@
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_STRINGSDTOR
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <clipfmtitem.hxx>
 #include <com/sun/star/frame/status/ClipboardFormats.hpp>
 
diff --git a/svx/source/items/flditem.cxx b/svx/source/items/flditem.cxx
index 56f1a1986d82..05cdddcf307a 100644
--- a/svx/source/items/flditem.cxx
+++ b/svx/source/items/flditem.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <vcl/metaact.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/urlobj.hxx>
 
 #define _SVX_FLDITEM_CXX
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 39d21f253663..95d27d0341c3 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -52,14 +52,14 @@
 
 #define _SVX_FRMITEMS_CXX
 
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <svtools/wallitem.hxx>
-#include <svtools/cntwall.hxx>
+#include <svl/cntwall.hxx>
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <impgrf.hxx>
+#include <svx/impgrf.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svxitems.hrc>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
index ef4bf0b00149..d99f1705f5b4 100644
--- a/svx/source/items/makefile.mk
+++ b/svx/source/items/makefile.mk
@@ -50,6 +50,7 @@ LIBTARGET=NO
 SRS1NAME=svxitems
 SRC1FILES =  \
         svxerr.src		\
+        page.src \
         svxitems.src
 
 LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index ca6333753769..cb26266abb01 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -40,8 +40,8 @@
 #include <i18npool/mslangid.hxx>
 
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 
 #include <svtools/langtab.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/items/page.src b/svx/source/items/page.src
new file mode 100644
index 000000000000..85cfd79e8cda
--- /dev/null
+++ b/svx/source/items/page.src
@@ -0,0 +1,258 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: page.src,v $
+ * $Revision: 1.71 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ // include ---------------------------------------------------------------
+
+#include <svx/dialogs.hrc>
+
+String RID_SVXSTR_PAPER_A0
+{
+    Text = "A0" ;
+};
+String RID_SVXSTR_PAPER_A1
+{
+    Text = "A1" ;
+};
+String RID_SVXSTR_PAPER_A2
+{
+    Text = "A2" ;
+};
+String RID_SVXSTR_PAPER_A3
+{
+    Text = "A3" ;
+};
+String RID_SVXSTR_PAPER_A4
+{
+    Text = "A4" ;
+};
+String RID_SVXSTR_PAPER_A5
+{
+    Text = "A5" ;
+};
+String RID_SVXSTR_PAPER_B4_ISO
+{
+    Text = "B4 (ISO)" ;
+};
+String RID_SVXSTR_PAPER_B5_ISO
+{
+    Text = "B5 (ISO)" ;
+};
+String RID_SVXSTR_PAPER_LETTER
+{
+    Text = "Letter" ;
+};
+String RID_SVXSTR_PAPER_LEGAL
+{
+    Text = "Legal" ;
+};
+String RID_SVXSTR_PAPER_TABLOID
+{
+    Text = "Tabloid" ;
+};
+String RID_SVXSTR_PAPER_USER
+{
+    Text [ en-US ] = "User Defined" ;
+};
+String RID_SVXSTR_PAPER_B6_ISO
+{
+    Text = "B6 (ISO)" ;
+};
+String RID_SVXSTR_PAPER_C4
+{
+    Text = "C4 Envelope" ;
+};
+String RID_SVXSTR_PAPER_C5
+{
+    Text = "C5 Envelope" ;
+};
+String RID_SVXSTR_PAPER_C6
+{
+    Text = "C6 Envelope" ;
+};
+String RID_SVXSTR_PAPER_C65
+{
+    Text = "C6/5 Envelope" ;
+};
+String RID_SVXSTR_PAPER_DL
+{
+    Text = "DL Envelope" ;
+};
+String RID_SVXSTR_PAPER_DIA
+{
+    Text = "Dia Slide" ;
+};
+String RID_SVXSTR_PAPER_SCREEN
+{
+    Text [ en-US ] = "Screen" ;
+};
+String RID_SVXSTR_PAPER_C
+{
+    Text = "C" ;
+};
+String RID_SVXSTR_PAPER_D
+{
+    Text = "D" ;
+};
+String RID_SVXSTR_PAPER_E
+{
+    Text = "E" ;
+};
+String RID_SVXSTR_PAPER_EXECUTIVE
+{
+       Text = "Executive" ;
+};
+String RID_SVXSTR_PAPER_LEGAL2
+{
+    Text = "Long Bond" ;
+};
+String RID_SVXSTR_PAPER_MONARCH
+{
+    Text = "#8 (Monarch) Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM675
+{
+    Text = "#6 3/4 (Personal) Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM9
+{
+    Text = "#9 Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM10
+{
+    Text = "#10 Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM11
+{
+    Text = "#11 Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM12
+{
+    Text = "#12 Envelope" ;
+};
+String RID_SVXSTR_PAPER_KAI16
+{
+    Text = "16 Kai" ;
+};
+String RID_SVXSTR_PAPER_KAI32
+{
+    Text = "32 Kai" ;
+};
+String RID_SVXSTR_PAPER_KAI32BIG
+{
+    Text = "Big 32 Kai" ;
+};
+String RID_SVXSTR_PAPER_B4_JIS
+{
+    Text = "B4 (JIS)" ;
+};
+String RID_SVXSTR_PAPER_B5_JIS
+{
+    Text = "B5 (JIS)" ;
+};
+String RID_SVXSTR_PAPER_B6_JIS
+{
+    Text = "B6 (JIS)" ;
+};
+String RID_SVXSTR_PAPERBIN
+{
+    Text [ en-US ] = "Paper tray" ;
+};
+String RID_SVXSTR_PAPERBIN_SETTINGS
+{
+    Text [ en-US ] = "[From printer settings]" ;
+};
+ // ********************************************************************** EOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 4d96adb0c3b1..54eaf9b5898e 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -40,7 +40,7 @@
 #include <svx/unomid.hxx>
 #include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/style/BreakType.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index d97ba065441d..bcdc7f451352 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -39,7 +39,7 @@
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
 #endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include <comphelper/types.hxx>
 
@@ -51,9 +51,9 @@ using namespace ::com::sun::star;
 #define GLOBALOVERFLOW3
 
 #define _SVX_PARAITEM_CXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <svx/svxitems.hrc>
 
 #include <svx/lspcitem.hxx>
@@ -283,7 +283,7 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation
     XubString&          rText, const IntlWrapper *
 )   const
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     rText.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SvxLineSpacingItem" ));
 #else
     rText.Erase();
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx
index 2d1e5b6ebf9f..d891dc29b10c 100644
--- a/svx/source/items/textitem.cxx
+++ b/svx/source/items/textitem.cxx
@@ -47,7 +47,7 @@
 #define GLOBALOVERFLOW3
 
 
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <svx/svxids.hrc>
 #include <svx/svxitems.hrc>
 #include <vcl/vclenum.hxx>
@@ -56,10 +56,10 @@
 
 #include <rtl/ustring.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <svtools/langtab.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/ctrltool.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 8921bff841c1..0b922d5cfd12 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/container/XStringKeyMap.hpp>
 #endif
 #include <svtools/stdmenu.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 3cd538e4c079..aa8f73189533 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -35,9 +35,9 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/gen.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sot/exchange.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
 #include <clipboardctl.hxx>
 #include <clipfmtitem.hxx>
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 65bf41c48825..4a4f2a54a1f0 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headern
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/stdmenu.hxx>
 #include <svtools/ctrltool.hxx>
 #include <sfx2/app.hxx>
diff --git a/svx/source/options/asiancfg.cxx b/svx/source/options/asiancfg.cxx
index 5046c6b1d32c..a6b3c7d4f3f0 100644
--- a/svx/source/options/asiancfg.cxx
+++ b/svx/source/options/asiancfg.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <asiancfg.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/svx/source/options/htmlcfg.cxx b/svx/source/options/htmlcfg.cxx
index 9069ab50fcb3..1df8ac788eab 100644
--- a/svx/source/options/htmlcfg.cxx
+++ b/svx/source/options/htmlcfg.cxx
@@ -265,6 +265,11 @@ void    SvxHtmlOptions::Commit()
     }
     PutProperties(aNames, aValues);
 }
+
+void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
 // -----------------------------------------------------------------------
 USHORT  SvxHtmlOptions::GetFontSize(USHORT nPos) const
 {
diff --git a/svx/source/options/makefile.mk b/svx/source/options/makefile.mk
index d68703983ebd..6f15d41ad019 100644
--- a/svx/source/options/makefile.mk
+++ b/svx/source/options/makefile.mk
@@ -47,24 +47,7 @@ LIBTARGET=NO
 
 SRS1NAME=$(TARGET)
 SRC1FILES=\
-    optaccessibility.src    \
-    optasian.src    \
-    optcolor.src    \
-    optjsearch.src  \
-    optgenrl.src    \
-    optdict.src     \
-    optsave.src     \
-    optpath.src     \
-    optlingu.src    \
-    optgrid.src     \
-    optinet2.src    \
-    multipat.src    \
-    optctl.src      \
-    optchart.src    \
-    optimprove.src
-
-EXCEPTIONSFILES=\
-    $(SLO)$/optlingu.obj
+    optgrid.src     
 
 LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
 LIB1OBJFILES= \
@@ -72,7 +55,6 @@ LIB1OBJFILES= \
 
 LIB2TARGET= $(SLB)$/$(TARGET).lib
 LIB2OBJFILES= \
-    $(SLO)$/optlingu.obj \
     $(SLO)$/htmlcfg.obj \
     $(SLO)$/optitems.obj    \
     $(SLO)$/optgrid.obj \
diff --git a/svx/source/options/srchcfg.cxx b/svx/source/options/srchcfg.cxx
index 0bd97a67d7af..110bfc56ce61 100644
--- a/svx/source/options/srchcfg.cxx
+++ b/svx/source/options/srchcfg.cxx
@@ -34,7 +34,7 @@
 #ifndef _SVX_SRCHNCFG_HXX
 #include <srchcfg.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svx/source/outliner/outl_pch.hxx b/svx/source/outliner/outl_pch.hxx
index 698eac0c2dae..18d23c188d25 100644
--- a/svx/source/outliner/outl_pch.hxx
+++ b/svx/source/outliner/outl_pch.hxx
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <svx/editeng.hxx>
 #include <svx/editview.hxx>
diff --git a/svx/source/outliner/outleeng.cxx b/svx/source/outliner/outleeng.cxx
index a9d797de3c09..6f5f5f68e5ab 100644
--- a/svx/source/outliner/outleeng.cxx
+++ b/svx/source/outliner/outleeng.cxx
@@ -37,7 +37,7 @@
 #include <outleeng.hxx>
 #include <paralist.hxx>
 #include <outliner.hrc>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/eeitem.hxx>
 #include "editstat.hxx"
 #include "outlundo.hxx"
diff --git a/svx/source/outliner/outlin2.cxx b/svx/source/outliner/outlin2.cxx
index eb435ca6ae7f..f2da8129d87f 100644
--- a/svx/source/outliner/outlin2.cxx
+++ b/svx/source/outliner/outlin2.cxx
@@ -33,7 +33,7 @@
 #include <outl_pch.hxx>
 
 #include <tools/list.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <vcl/mapmod.hxx>
 
 #include <forbiddencharacterstable.hxx>
diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx
index fc144cf4304f..ab93e04b8461 100644
--- a/svx/source/outliner/outliner.cxx
+++ b/svx/source/outliner/outliner.cxx
@@ -34,7 +34,7 @@
 #include <outl_pch.hxx>
 
 #include <math.h>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <vcl/wrkwin.hxx>
 #define _OUTLINER_CXX
 #include <svx/outliner.hxx>
@@ -46,8 +46,8 @@
 #include <editstat.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <svx/editobj.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemset.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/metric.hxx>
 #include <svx/numitem.hxx>
 #include <svx/adjitem.hxx>
@@ -57,7 +57,7 @@
 #include <goodies/grfmgr.hxx>
 #include <svx/svxfont.hxx>
 #include <svx/brshitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 // #101498# calculate if it's RTL or not
 #include <unicode/ubidi.h>
diff --git a/svx/source/outliner/outliner.hrc b/svx/source/outliner/outliner.hrc
index 85a6d044a8be..36c5f1728fcd 100644
--- a/svx/source/outliner/outliner.hrc
+++ b/svx/source/outliner/outliner.hrc
@@ -31,7 +31,7 @@
 #define _OUTLINER_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #ifndef RID_OUTL_START
diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx
index a69776df14e8..bd19e20a9a2a 100644
--- a/svx/source/outliner/outlvw.cxx
+++ b/svx/source/outliner/outlvw.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <outl_pch.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #define _OUTLINER_CXX
 #include <svx/outliner.hxx>
@@ -44,7 +44,7 @@
 #include <svx/eeitem.hxx>
 #include <svx/numitem.hxx>
 #include <vcl/window.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <editstat.hxx>
 
 
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 0282b519499c..a33ee3f7dfe4 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/sdr/attribute/sdrformtextattribute.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <svx/xftdiit.hxx>
 #include <svx/xftstit.hxx>
@@ -52,7 +52,7 @@
 #include <svx/sdshcitm.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xdash.hxx>
 #include <svx/xlndsit.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 7527b177b3a4..6c9d9a4c4c24 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -35,7 +35,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #ifndef ITEMID_GRF_CROP
 #define ITEMID_GRF_CROP 0
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index 309e554b0329..c5c682222fde 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -41,7 +41,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // includes for special text box shadow (SC)
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xhatch.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xflclit.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index 1366ed26ca1a..c57c153e9e40 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -37,7 +37,7 @@
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
 #include <svx/sdr/primitive2d/sdrellipseprimitive2d.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/sxciaitm.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
index 1c34cf6ae77b..18a82377d582 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
@@ -36,7 +36,7 @@
 #include <svx/svdomeas.hxx>
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/sxmbritm.hxx>
 #include <svx/sxmlhitm.hxx>
 #include <svx/sxmtritm.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index cefb3e065165..0eab2c882ce5 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -37,7 +37,7 @@
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
 #include <svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
 #include <svx/svdmodel.hxx>
 
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 4e57166b4723..ca19c8594e2f 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -31,14 +31,14 @@
 
 #include "precompiled_svx.hxx"
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xdef.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
@@ -67,7 +67,7 @@
 #include <svx/sdr/attribute/sdrtextattribute.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
 #include <svx/xbtmpit.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/svapp.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <svx/svx3ditems.hxx>
@@ -556,7 +556,7 @@ namespace drawinglayer
                 const XGradient& rGradient = ((XFillFloatTransparenceItem*)pGradientItem)->GetGradientValue();
                 const sal_uInt8 nStartLuminance(rGradient.GetStartColor().GetLuminance());
                 const sal_uInt8 nEndLuminance(rGradient.GetEndColor().GetLuminance());
-                const bool bCompletelyTransparent(0xff == nStartLuminance == nEndLuminance);
+                const bool bCompletelyTransparent(0xff == nStartLuminance && 0xff == nEndLuminance);
 
                 if(!bCompletelyTransparent)
                 {
diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
index 1f08584a9079..6f997a2658ef 100644
--- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
+++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
@@ -31,7 +31,7 @@
 
 #include <svx/sdr/primitive3d/sdrattributecreator3d.hxx>
 #include <svx/svx3ditems.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/TextureProjectionMode.hpp>
 #include <drawinglayer/attribute/sdrattribute3d.hxx>
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 297eb77e1319..4fcdb12ffe5c 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -33,10 +33,10 @@
 #include <svx/sdr/properties/attributeproperties.hxx>
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <tools/debug.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/whiter.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svddef.hxx>
 #include <svx/xit.hxx>
@@ -54,7 +54,7 @@
 #include <svx/svdpage.hxx>
 
 // #114265#
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 94dbb3c20315..7f33ee39854e 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/captionproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
 #include <svx/svddef.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/svdocapt.hxx>
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 63b12505da59..1043aaf2b9d0 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/circleproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
 #include <svx/svddef.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index e36fef84c4a2..cc144525e264 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/connectorproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
 #include <svx/svddef.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/svdoedge.hxx>
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index c95659e8a26a..88dd25fab96b 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -31,14 +31,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/customshapeproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/sdtagitm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itemset.hxx>
+#include <svl/smplhint.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 6e826fa594b3..1f4d1bd65c88 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/defaultproperties.hxx>
 #include <svx/sdr/properties/itemsettools.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemset.hxx>
+#include <svl/whiter.hxx>
 
 #include <vector>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index 55f485c9f41a..6434bc4c67be 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/e3dcompoundproperties.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/scene3d.hxx>
 
diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx
index 3d25f5d79ee4..37b934d2289f 100644
--- a/svx/source/sdr/properties/e3dextrudeproperties.cxx
+++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/e3dextrudeproperties.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/extrud3d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx
index 5b6b19581710..ba051dcc542f 100644
--- a/svx/source/sdr/properties/e3dlatheproperties.cxx
+++ b/svx/source/sdr/properties/e3dlatheproperties.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/e3dlatheproperties.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/lathe3d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index 8fa772d7158a..78ecb989b49b 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/e3dproperties.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svddef.hxx>
 #include <svx/obj3d.hxx>
 
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index c55b3839f804..7ae476929bc4 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/e3dsceneproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemset.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svddef.hxx>
 #include <svx/scene3d.hxx>
 #include <svditer.hxx>
diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx
index 35f59f5126e3..c8444358dec7 100644
--- a/svx/source/sdr/properties/e3dsphereproperties.cxx
+++ b/svx/source/sdr/properties/e3dsphereproperties.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/e3dsphereproperties.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/sphere3d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index ec02c36e2694..a6433942a235 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/emptyproperties.hxx>
 #include <tools/debug.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 8f478540d993..c7eaf8a91afd 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/graphicproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
 #include <svx/svddef.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/svdograf.hxx>
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index cb0bc1d37889..6370978c4527 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/groupproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemset.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svddef.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/svdogrp.hxx>
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index 1052f469cc07..ad99a6eb6755 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <tools/debug.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemset.hxx>
+#include <svl/whiter.hxx>
 
 #include <vector>
 #include <svx/svdogrp.hxx>
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index ed5ba1241396..e5d02ff97459 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/measureproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
 #include <svx/svddef.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/svdomeas.hxx>
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 5d7e6aa94c06..90cfa5e7bd31 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/pageproperties.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
 
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index b3cc32d71536..be25b62bb935 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/properties.hxx>
 #include <svx/sdr/properties/itemsettools.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svdogrp.hxx>
 #include <svditer.hxx>
 
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index f720e1b9d1b2..8f9626b37a02 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -31,10 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/sdr/properties/textproperties.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 682766a2c32c..2c4e03a5d181 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -39,7 +39,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/sfxsids.hrc>
 
 // Ranges ----------------------------------------------------------------
@@ -345,7 +345,7 @@
 #define RID_RES_SBACHAOS_ERR_CONTEXTS   (OFA_RES_UNNAMED_START +  1)
 
 // HelpIds ---------------------------------------------------------------
-
+/*
 #define HID_AUTOCORR_DLG                (HID_OFA_START +  0)
 #define HID_OFAPAGE_AUTOCORR_OPTIONS    (HID_OFA_START +  1)
 #define HID_OFAPAGE_AUTOCORR_REPLACE    (HID_OFA_START +  2)
@@ -435,7 +435,7 @@
 #define UID_OFA_CONNPOOL_DRIVERLIST_BACK    (HID_OFA_START + 122)
 #define HID_OFA_TP_HELPERPROG               (HID_OFA_START + 123)
 #define HID_OFA_TP_MEMORY                   (HID_OFA_START + 124)
-
+*/
 // "Uberlaufkontrolle der HID's
 #define ACT_HID_END     HID_OFA_TP_MEMORY
 #if ACT_HID_END > HID_OFA_END
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 0e23ea3a8a38..695424878729 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -28,16 +28,7 @@
  *
  ************************************************************************/
 
-#ifndef _GLOBLMN_HRC
-#include "globlmn_tmpl.hrc"
-#endif
-#ifndef _GLOBALACC_SRC
-#include "globlac.hrc"
-#endif
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
-
 #include "app.hrc"
 
  //----------------------------------------------------------------------------
@@ -50,8 +41,6 @@ ErrorBox RID_ERRBOX_MODULENOTINSTALLED
     Message [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed.";
 };
 
- // Image-Listen ----------------------------------------------------------
-
 #define IMAGE_ID_LIST\
     IdList = {\
         SID_HLINKBAR_LINK; \
@@ -110,29 +99,8 @@ ImageList RID_DEFAULTIMAGELIST_LCH
 
 // Strings ---------------------------------------------------------------
 
-#define MN_EDIT 20
-#define MN_VIEW 21
-#define MN_EXTRA 22
-#define MN_WIN 30
-#define MN_HELP 31
-#define MN_TEMPLATES 11
-
-#define  ACC Accelerator
-#define ACCK AcceleratorItem
-
- // die Acceleratoren
-
 String RID_DESKTOP
 {
     Text = "%PRODUCTNAME" ;
 };
 
-String STR_SD_STAROFFICE_XML_DRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME XML (Draw)";
-};
-
-String STR_SD_STAROFFICE_XML_IMPRESS
-{
-    Text [ en-US ] = "%PRODUCTNAME XML (Impress)";
-};
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 160acae81f29..d2ecdbc13eec 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -36,7 +36,7 @@
 #ifndef _STATUS_HXX //autogen
 #include <vcl/status.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 46223e8b977f..8b4f0907431d 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -36,7 +36,7 @@
 #ifndef _STATUS_HXX //autogen
 #include <vcl/status.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 
 #define _SVX_MODCTRL_CXX
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 1895aad4cae1..92953295b88f 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -42,9 +42,9 @@
 #include <vcl/menu.hxx>
 #endif
 #include <vcl/image.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/stritem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 58fd6784852c..9fd8448a8091 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -36,7 +36,7 @@
 #ifndef _STATUS_HXX //autogen
 #include <vcl/status.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 787985d0e7e9..a73aeaa3ab8c 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -41,7 +41,7 @@
 #endif
 #include <vcl/image.hxx>
 //#ifndef _SFXITEMPOOL_HXX
-//#include <svtools/itempool.hxx>
+//#include <svl/itempool.hxx>
 //#endif
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/app.hxx>
@@ -50,9 +50,9 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxsids.hrc>
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk
index e777ad70d3f1..6e158341ae92 100644
--- a/svx/source/svdraw/makefile.mk
+++ b/svx/source/svdraw/makefile.mk
@@ -122,11 +122,7 @@ LIB2OBJFILES= \
          $(SLO)$/ActionDescriptionProvider.obj \
          $(SLO)$/impgrfll.obj
 
-LIB3TARGET= $(SLB)$/$(TARGET)-msfilter.lib
-LIB3OBJFILES= \
-         $(SLO)$/svdfppt.obj         \
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) $(LIB3OBJFILES)
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) 
 
 SRS1NAME=svdstr
 SRC1FILES= svdstr.src
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 97a2802573d8..356546e409a0 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -52,7 +52,7 @@
 #include <svx/svdattrx.hxx>
 #include <svx/svdpool.hxx>
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include "xmlcnitm.hxx"
 
 #include <svx/svxids.hrc>
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 2c6f0891b396..48f6df15c5fd 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -38,7 +38,7 @@
 #define _MATH_H
 #endif
 #include <tools/bigint.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/rectenum.hxx>
 #include <svx/svxids.hrc>   // fuer SID_ATTR_TRANSFORM_...
@@ -56,8 +56,8 @@
 #include "svdstr.hrc"   // Namen aus der Resource
 #include "svdglob.hxx"  // StringCache
 #include <svx/eeitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/whiter.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/e3dsceneupdater.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 8a9c80c37ec7..f8394525dfcf 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -816,7 +816,7 @@ void SdrEditView::DistributeMarkedObjects()
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr, RID_SVXPAGE_DISTRIBUTE);
+            AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr);
             DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
             UINT16 nResult = pDlg->Execute();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 08dd4b33781a..e3d2f3390201 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -36,14 +36,14 @@
 #include <svtools/accessibilityoptions.hxx>
 
 #include <svx/svdedxv.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 //#include <tools/string.h>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/hatch.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/style.hxx>
+#include <svl/whiter.hxx>
+#include <svl/style.hxx>
 #include <editstat.hxx>
 #include <tools/config.hxx>
 #include <vcl/cursor.hxx>
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 6f4ee781dc37..980cb30563c1 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -44,10 +44,10 @@
 #include <svx/svdoutl.hxx>
 #include <vcl/bmpacc.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <tools/config.hxx>
-#include <svtools/cacheoptions.hxx>
-#include <svtools/whiter.hxx>
+#include <unotools/cacheoptions.hxx>
+#include <svl/whiter.hxx>
 #include <tools/bigint.hxx>
 #include "fontitem.hxx"
 #include <svx/colritem.hxx>
@@ -59,13 +59,13 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/svdoole2.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <comphelper/processfactory.hxx>
 #include <i18npool/lang.h>
 #include <unotools/charclass.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 30c3ff62531a..6682e421c180 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -70,7 +70,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdetc.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <vcl/salbtype.hxx>     // FRound
 
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 9c37d2e556ca..3c0cd7a19be5 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -63,12 +63,12 @@
 #include <svx/fhgtitem.hxx>
 
 #include <svx/charscaleitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/flagitem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/flagitem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/rectitem.hxx>
 
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #include <sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index d2e70af1eeb7..14e628c9b518 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -48,7 +48,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #include <svx/obj3d.hxx>
 #include <svx/scene3d.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <svx/svdoedge.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 0eab890b49f0..be84f0688580 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -42,7 +42,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <tools/string.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/xit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xlndsit.hxx>
@@ -77,24 +77,24 @@
 #include "fontitem.hxx"
 #include <svx/colritem.hxx>
 #include <svx/fhgtitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <tools/bigint.hxx>
 #include <svx/numitem.hxx>
 #include <bulitem.hxx>
 #include <svx/outlobj.hxx>
 #include "forbiddencharacterstable.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 
 // #90477#
 #include <tools/tenccvt.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 // #95114#
 #include <vcl/svapp.hxx>
 #include <svx/sdr/properties/properties.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 217916633998..4c4c39f7225b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include "unopolyhelper.hxx"
 #include <comphelper/processfactory.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <svx/svdogrp.hxx>
 #include <vcl/salbtype.hxx>     // FRound
@@ -80,7 +80,7 @@
 #include <svx/writingmodeitem.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/svxids.hrc>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/sdr/properties/customshapeproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx>
 #include <svx/xlnclit.hxx>
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index d4d4717535b8..a44d72c47123 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -46,8 +46,8 @@
 #include <svx/svdorect.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdomeas.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/xenum.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xlnstwit.hxx>
@@ -67,9 +67,9 @@
 //#include <svx/charscaleitem.hxx>
 #include <svx/xlnstcit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <svtools/style.hxx>
-#include <svtools/style.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/style.hxx>
+#include <svl/style.hxx>
+#include <svl/whiter.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlntrit.hxx>
@@ -87,7 +87,7 @@
 #include <svx/xlnstit.hxx>
 #include <svx/sdr/properties/attributeproperties.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include "xlinjoit.hxx"
+#include "svx/xlinjoit.hxx"
 #include <svdoimp.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 7ba4aec3e565..013eaed311c6 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -86,7 +86,7 @@
 #include <svx/xfltrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xflftrit.hxx>
-#include "xlinjoit.hxx"
+#include "svx/xlinjoit.hxx"
 #include <svx/unopage.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/xenum.hxx>
@@ -97,7 +97,7 @@
 #include <svx/svdpool.hxx>
 #include <svx/editeng.hxx>
 #include <vcl/salbtype.hxx>     // FRound
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 
 // #97849#
 #include <svx/fmmodel.hxx>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 102b5b1eb824..be3529ea4818 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include <tools/bigint.hxx>
 #include <svx/xlnwtit.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xpoly.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index b3175566d561..0be63fefa61f 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <tools/bigint.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnedwit.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index e55eeaae42b7..7e608887c6fc 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -48,8 +48,8 @@
 #include <svx/svdetc.hxx>
 #include "svdglob.hxx"   // StringCache
 #include "svdstr.hrc"    // Objektname
-#include <svtools/style.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/style.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/eeitem.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/connectorproperties.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3f5da01e101b..84e571736328 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -41,9 +41,9 @@
 #include <sot/storage.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <goodies/grfmgr.hxx>
 #include <vcl/svapp.hxx>
 
@@ -58,7 +58,7 @@
 #include <svx/svdpagv.hxx>
 #include "svdviter.hxx"
 #include <svx/svdview.hxx>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/xbitmap.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 5782ca91b74b..ea29c860e8ab 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/lnkbase.hxx>
 #include <tools/urlobj.hxx>
 
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 #include <svx/xpool.hxx>
 #include <svx/xpoly.hxx>
@@ -58,7 +58,7 @@
 #include "svdstr.hrc"    // Objektname
 
 #include <svx/svxids.hrc>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/sdr/properties/groupproperties.hxx>
 
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 330b7f5c37f6..411058a766c6 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -45,8 +45,8 @@
 #include <svx/svdview.hxx>
 #include "svdglob.hxx"   // StringCache
 #include "svdstr.hrc"    // Objektname
-#include <svtools/style.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/style.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/xlnstwit.hxx>
@@ -63,7 +63,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/measureproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a2b6991773e1..67505e12ba73 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -73,8 +73,8 @@
 #include <svtools/transfer.hxx>
 #include <cppuhelper/implbase5.hxx>
 
-#include <svtools/solar.hrc>
-#include <svtools/urihelper.hxx>
+#include <svl/solar.hrc>
+#include <svl/urihelper.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 
@@ -85,7 +85,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svtools/chartprettypainter.hxx>
 #include <svx/sdr/contact/viewcontactofsdrole2obj.hxx>
 #include <svx/svdograf.hxx>
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index be174aeb5d69..edbba120732e 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -41,7 +41,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdoutl.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/sdr/properties/pageproperties.hxx>
 
 // #111111#
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 6b2f02299d4a..7ae49a7a795a 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -51,7 +51,7 @@
 #include <svx/editobj.hxx>
 #include <svx/outliner.hxx>
 #include <svx/fhgtitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/flditem.hxx>
 #include <svx/xftouit.hxx>
@@ -59,9 +59,9 @@
 #include <svx/xflgrit.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/xflclit.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/editeng.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/sdr/properties/textproperties.hxx>
 
 // #110496#
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 03e43a5eb57c..072c40c8a1f3 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -42,7 +42,7 @@
 #include <editstat.hxx>
 #include <vcl/salbtype.hxx>
 #include <svx/sdtfchim.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <drawinglayer/animation/animationtiming.hxx>
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index f6a30d40b3d5..058d0c1a4513 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -38,7 +38,7 @@
 #include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <vcl/salbtype.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <algorithm>
@@ -63,7 +63,7 @@
 #include <svx/xlnclit.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 #include <svx/xlndsit.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx>
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 87d0ad3ef9cf..99d5b051a362 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/svdotext.hxx>
 #include "svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool
@@ -47,8 +47,8 @@
 
 
 #include <svx/editview.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/whiter.hxx>
 #include <svx/outlobj.hxx>
 #include <svx/outliner.hxx>
 #include <svx/eeitem.hxx>
@@ -56,10 +56,10 @@
 #include <svx/fhgtitem.hxx>
 
 #include <svx/charscaleitem.hxx>
-#include <svtools/style.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/style.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/lrspitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/numitem.hxx>
 #include <svx/editeng.hxx>
 #include <svx/postitem.hxx>
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index f384cc9b4326..945bc2e48f91 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -37,7 +37,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/outliner.hxx>
 #include <editstat.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/sdtfchim.hxx>
 
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index ff997b3f7556..d61655beb306 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -51,7 +51,7 @@
 #include <linkmgr.hxx>
 #include <tools/urlobj.hxx>
 
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 // #90477#
 #include <tools/tenccvt.hxx>
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index aaed882cae3d..beb39b6285c3 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -43,7 +43,7 @@
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <svx/sdr/properties/properties.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svditer.hxx>
 #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index fe9b89fa4295..6f76cf4cde7a 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -36,7 +36,7 @@
 #include <editstat.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 DBG_NAME(SdrOutliner)
 /*************************************************************************
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index c89c458aa9c7..8c46e1d06bb6 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -42,7 +42,7 @@
 #endif
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <svx/svdpntv.hxx>
 #include <svx/editdata.hxx>
@@ -66,10 +66,10 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sxlayitm.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/style.hxx>
+#include <svl/whiter.hxx>
+#include <svl/style.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/svdouno.hxx>
 #include <vcl/svapp.hxx>
@@ -289,14 +289,14 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
     // Flag zur Visualisierung von Gruppen
     bVisualizeEnteredGroup = TRUE;
 
-    StartListening( maColorConfig );
+    maColorConfig.AddListener(this);
     onChangeColorConfig();
 }
 
 SdrPaintView::~SdrPaintView()
 {
     DBG_DTOR(SdrPaintView,NULL);
-    EndListening( maColorConfig );
+    maColorConfig.RemoveListener(this);
     ClearPageView();
 
 #ifdef DBG_UTIL
@@ -345,12 +345,12 @@ void __EXPORT SdrPaintView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint
             }
         }
     }
+}
 
-    if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_COLORS_CHANGED )
-    {
-        onChangeColorConfig();
-        InvalidateAllWin();
-    }
+void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_uInt32 )
+{
+    onChangeColorConfig();
+    InvalidateAllWin();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 038eb96b35e6..3bd09667a067 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -40,7 +40,7 @@
 #include "svx/svdmodel.hxx"
 #include "svx/fhgtitem.hxx"
 #include <svx/eeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ )
 : mpOutlinerParaObject( pOutlinerParaObject )
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 380cf0523212..5bf21f8f30c2 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -38,7 +38,7 @@
 #include <vcl/virdev.hxx>
 #include <tools/bigint.hxx>
 #include <tools/debug.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 08cee1eb17d3..ed76f2884c9e 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -47,7 +47,7 @@
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <svx/sdr/properties/properties.hxx>
 #include <svx/svdocapt.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/e3dsceneupdater.hxx>
 
 #include "svdviter.hxx"
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index cd37fa21f9f5..edda4b700e29 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -185,14 +185,14 @@ SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut)
 {
     bTextEditOnObjectsWithoutTextIfTextTool=FALSE;
 
-    StartListening( maAccessibilityOptions );
+    maAccessibilityOptions.AddListener(this);
 
     onAccessibilityOptionsChanged();
 }
 
 SdrView::~SdrView()
 {
-    EndListening( maAccessibilityOptions );
+    maAccessibilityOptions.RemoveListener(this);
 }
 
 BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
@@ -1298,7 +1298,7 @@ XubString SdrView::GetStatusText()
         aStr.SearchAndReplaceAscii("%2", UniString::CreateFromInt32(nLin + 1));
         aStr.SearchAndReplaceAscii("%3", UniString::CreateFromInt32(nCol + 1));
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         aStr += UniString( RTL_CONSTASCII_USTRINGPARAM( ", Level " ) );
         aStr += UniString::CreateFromInt32( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
 #endif
@@ -1560,14 +1560,10 @@ BOOL SdrView::IsDeleteMarkedPossible() const
     return IsDeleteMarkedObjPossible();
 }
 
-void SdrView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
+void SdrView::ConfigurationChanged( ::utl::ConfigurationBroadcaster*p, sal_uInt32 nHint)
 {
-    if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_ACCESSIBILITY_CHANGED )
-    {
-        onAccessibilityOptionsChanged();
-    }
-
-     SdrCreateView::Notify(rBC, rHint);
+    onAccessibilityOptionsChanged();
+     SdrCreateView::ConfigurationChanged(p, nHint);
 }
 
 SvtAccessibilityOptions& SdrView::getAccessibilityOptions()
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index e64396ac4819..4a9facd69281 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdsob.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index b9a197ed89fb..22de2cfe3888 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -52,8 +52,8 @@
 #include "svdglob.hxx"  // StringCache
 #include "xoutbmp.hxx"
 #include <vcl/metaact.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itempool.hxx>
 #include <tools/bigint.hxx>
 #include <sot/formats.hxx>
 
@@ -62,7 +62,7 @@
 #include <vcl/virdev.hxx>
 
 // b4967543
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 // #i72535#
 #include "fmobj.hxx"
diff --git a/svx/source/svrtf/rtfgrf.cxx b/svx/source/svrtf/rtfgrf.cxx
index de90302586d0..978f07f2acfa 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/svx/source/svrtf/rtfgrf.cxx
@@ -40,11 +40,11 @@
 #include <svtools/rtftoken.h>
 #include <svtools/filter.hxx>
 
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "svxrtf.hxx"
 
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #undef DEBUG_JP
 #endif
 
diff --git a/svx/source/svrtf/rtfitem.cxx b/svx/source/svrtf/rtfitem.cxx
index 889298b89f35..8e19f67fb0f7 100644
--- a/svx/source/svrtf/rtfitem.cxx
+++ b/svx/source/svrtf/rtfitem.cxx
@@ -92,8 +92,8 @@
 
 
 #include <svtools/rtftoken.h>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
 
 #include "svxrtf.hxx"
 
diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx
index 24e3c6f89666..a9d153562650 100644
--- a/svx/source/svrtf/svxrtf.cxx
+++ b/svx/source/svrtf/svxrtf.cxx
@@ -37,10 +37,10 @@
 #include <ctype.h>
 #include <tools/datetime.hxx>
 #include <rtl/tencinfo.h>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
 #include <svtools/rtftoken.h>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #include <comphelper/string.hxx>
 
diff --git a/svx/source/svxlink/fileobj.cxx b/svx/source/svxlink/fileobj.cxx
index d159c7f78abe..6e0925da2bb2 100644
--- a/svx/source/svxlink/fileobj.cxx
+++ b/svx/source/svxlink/fileobj.cxx
@@ -58,7 +58,7 @@
 #include <svx/dialogs.hrc>
 #include "xoutbmp.hxx"
 #include "opengrf.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 
 namespace css = ::com::sun::star;
 
@@ -391,7 +391,7 @@ BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
     if( pStream && ERRCODE_IO_PENDING == pStream->GetError() )
         pStream->ResetError();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( nRes )
     {
         if( xMed.Is() && !pStream )
diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx
index 4f66ba983c06..26cc0bace065 100644
--- a/svx/source/svxlink/linkmgr.cxx
+++ b/svx/source/svxlink/linkmgr.cxx
@@ -37,10 +37,10 @@
 #include <vcl/graph.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/rectitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
@@ -50,8 +50,8 @@
 #include <sfx2/dispatch.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/itemset.hxx>
+#include <svl/urihelper.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 
 #include "linkmgr.hxx"
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 42034f2bd0cb..f7fcfc763e6f 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -37,8 +37,8 @@
 #include <com/sun/star/table/TableBorder.hpp>
 
 #include <cppuhelper/typeprovider.hxx>
-#include <svtools/style.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/itemset.hxx>
 
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index bd9401e562f6..5a518e34502f 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -38,9 +38,9 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/style.hxx>
+#include <svl/lstner.hxx>
+#include <svl/hint.hxx>
+#include <svl/style.hxx>
 
 #include "celleditsource.hxx"
 #include "cell.hxx"
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 44caaee6c148..97e06fd4bb61 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -45,7 +45,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include "editstat.hxx"
 #include "svx/outlobj.hxx"
 #include "svx/svdview.hxx"
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index b1d4171c459a..345ce9315156 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -43,7 +43,7 @@
 #include <sal/config.h>
 
 #include <vcl/svapp.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 
 #include <sfx2/request.hxx>
 
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 9109c6bb32d5..6475ec5fc1a5 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -5,7 +5,7 @@
 #define __SVX_COLORWINDOW_HXX_
 
 #include <sfx2/tbxctrl.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index f4964d1b1ff1..3b484d770397 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -41,9 +41,9 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/colritem.hxx>
 #include "chrtitem.hxx"
 #include <tools/urlobj.hxx>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 111f2394836a..13a01b6dc31b 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svx.hxx"
 #include <com/sun/star/text/WritingMode.hpp>
 #include <sfx2/app.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/fmmodel.hxx>
 #include <sfx2/dispatch.hxx>
 #include <dlgutil.hxx>
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index d4540bb363e7..23dfd9f32719 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -34,7 +34,7 @@
 #include "formatpaintbrushctrl.hxx"
 
 // header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 // header for define SFX_APP
 #include <sfx2/app.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index a556110c69c5..50da14402fae 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -41,9 +41,9 @@
 #endif
 #include <vcl/fixed.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 846cb1f81825..518621a4cc38 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -279,26 +279,7 @@ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt )
 
 void SvxLineBox::FillControl()
 {
-    Clear();
-
-    InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) );
-
-    Bitmap aBitmap ( SVX_RES ( RID_SVXCTRL_LINECTRL ) );
-
-    ::Color aSourceColors[2];
-    ::Color aDestColors[2];
-
-    aSourceColors[0] = ::Color( COL_WHITE );
-    aSourceColors[1] = ::Color( COL_BLACK );
-
-    const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
-    aDestColors[0] = rStyles.GetFieldColor();
-    aDestColors[1] = rStyles.GetFieldTextColor();
-
-    aBitmap.Replace ( aSourceColors, aDestColors, 2 );
-    Image aSolidLine ( aBitmap );
-    InsertEntry( SVX_RESSTR(RID_SVXSTR_SOLID), aSolidLine );
-
+    FillStyles();
     if ( !mpSh )
         mpSh = SfxObjectShell::Current();
 
@@ -309,6 +290,7 @@ void SvxLineBox::FillControl()
             Fill( pItem->GetDashList() );
     }
 
+
 //  rBindings.Invalidate( SID_ATTR_LINE_DASH );
 }
 //========================================================================
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 74c4d2a55e86..0054b0f23ef5 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -38,7 +38,7 @@
 #ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
 
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 0cc0fa700f28..977054166752 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -43,11 +43,11 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <tools/gen.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
 #include <svx/dialmgr.hxx>
 #include <lboxctrl.hxx>
 #ifndef _VCL_MNEMONIC_HXX_
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index 2fa2f9d2feac..9a05becc205f 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <vcl/toolbox.hxx>
 #include <sfx2/app.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d631a2dac467..5c283b3aae24 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -36,35 +36,35 @@
 
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <tools/shl.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/bmpacc.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/ctrlbox.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/templdlg.hxx>
-#include <svtools/isethint.hxx>
+#include <svl/isethint.hxx>
 #include <sfx2/querystatus.hxx>
 #include <sfx2/sfxstatuslistener.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/fontoptions.hxx>
+#include <unotools/fontoptions.hxx>
 #ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
 #endif
 
 #include <vcl/svapp.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #define _SVX_TBCONTRL_CXX
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 7b00096efc49..6ef9cf94f0c1 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index fb5e96271f87..28864c49a0d6 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -35,7 +35,7 @@
 
 #include <tools/ref.hxx>
 #include <tools/shl.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/imagemgr.hxx>
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 6fbbcce20305..daeef8f74cec 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -34,9 +34,9 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <verttexttbxctrl.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index d18fcaeb3cba..c40c5c5df8d5 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -355,7 +355,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
 #include "gallery.hxx"
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape )
 {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index b6189fd35f61..45a38fd86361 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -47,8 +47,8 @@
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
 // header for class SvtLinguConfigItem
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 // header for class IntlWrapper
 #include <unotools/intlwrapper.hxx>
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index b05db957af7a..868ccfd06f76 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -39,8 +39,8 @@
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
 // header for class SvtLinguConfigItem
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 #ifndef _SVX_HELPID_HRC
 #include "helpid.hrc"
 #endif
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
index 601f2594a080..7803592de2ee 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
@@ -68,13 +68,13 @@ ModalDialog DLG_CHINESETRANSLATION
     Moveable = TRUE ;
     SVLook = TRUE;
 
-    Text [ en-US ] = "Chinese Translation";
+    Text [ en-US ] = "Chinese Conversion";
 
     FixedLine FL_DIRECTION
     {
         Pos = MAP_APPFONT ( COL_1 , ROW_1 ) ;
         Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
-        Text [ en-US ] = "Translation direction";
+        Text [ en-US ] = "Conversion direction";
     };
 
     DIRECTION_RADIOBUTTONS( COL_2, ROW_2, (FULL_WIDTH - COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) )
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 5d1af9af2190..ebd8f83e00f0 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -59,7 +59,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <svtools/FilterConfigItem.hxx>
-#include <svtools/outstrm.hxx>
+#include <svl/outstrm.hxx>
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
@@ -69,7 +69,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
 #include "xoutbmp.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "unoapi.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
@@ -837,7 +837,9 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                     if ( aGraphic.GetType() == GRAPHIC_BITMAP )
                     {
                         Size aSizePixel( aGraphic.GetSizePixel() );
-                        if ( rSettings.mnWidth && rSettings.mnHeight && ( rSettings.mnWidth != aSizePixel.Width() ) || ( rSettings.mnHeight != aSizePixel.Height() ) )
+                        if( rSettings.mnWidth && rSettings.mnHeight &&
+                            ( ( rSettings.mnWidth != aSizePixel.Width() ) ||
+                              ( rSettings.mnHeight != aSizePixel.Height() ) ) )
                         {
                             BitmapEx aBmpEx( aGraphic.GetBitmapEx() );
                             aBmpEx.Scale( Size( rSettings.mnWidth, rSettings.mnHeight ) );
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 14e23ace3a98..61c006822231 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -32,9 +32,9 @@
 #include "precompiled_svx.hxx"
 
 #include <set>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
 #include <comphelper/stl_types.hxx>
 
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 515171e5a1c7..1bb5a60e1946 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -37,7 +37,7 @@
 #include <cppuhelper/implbase2.hxx>
 
 #include <vector>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/xit.hxx>
 
 #include <svx/xdef.hxx>
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 0f414eb2b7ce..12d35898439e 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -43,7 +43,7 @@
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <comphelper/stl_types.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include "unoapi.hxx"
 #include "xmlcnitm.hxx"
 
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 99e54a165ac3..671de49dc4ba 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -30,9 +30,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xit.hxx>
 #ifndef SVX_LIGHT
 #ifndef _SFXDOCFILE_HXX
@@ -45,7 +45,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
 #include "unoapi.hxx"
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include <svx/unomid.hxx>
 #include <svx/unoprnms.hxx>
 #include "unofill.hxx"
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 91ffcd28b45d..5ca18dcfa558 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 1eaa0d974dbd..2a56c3868ae1 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <com/sun/star/drawing/LineDash.hpp>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 
 #include <vector>
 #include "UnoNameItemTable.hxx"
diff --git a/svx/source/unodraw/unofdesc.cxx b/svx/source/unodraw/unofdesc.cxx
index 6b9ed30cda29..389729795a36 100644
--- a/svx/source/unodraw/unofdesc.cxx
+++ b/svx/source/unodraw/unofdesc.cxx
@@ -45,7 +45,7 @@
 #include <svx/crsditem.hxx>
 #include <svx/wrlmitem.hxx>
 #include <svx/unomid.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #include "unofdesc.hxx"
 
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index f13997b92e8e..460ac59dbc20 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <com/sun/star/awt/Gradient.hpp>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include "UnoNameItemTable.hxx"
 
 #include <svx/xgrad.hxx>
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 2360f2650aba..f715db91c585 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <com/sun/star/drawing/Hatch.hpp>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include "UnoNameItemTable.hxx"
 
 #include <svx/xhatch.hxx>
diff --git a/svx/source/unodraw/unoipset.cxx b/svx/source/unodraw/unoipset.cxx
index 36c7139bd3ad..1574b97308f5 100644
--- a/svx/source/unodraw/unoipset.cxx
+++ b/svx/source/unodraw/unoipset.cxx
@@ -31,12 +31,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/list.hxx>
 
 #include <hash_map>
 #include <vector>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <svx/unoipset.hxx>
 #include <svx/svdpool.hxx>
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index c0e301f3792e..01f6698e3830 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -38,7 +38,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/list.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <svtools/unoevent.hxx>
 #include <comphelper/sequence.hxx>
 
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index e2ba9fd9a219..9e73954bf870 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -36,12 +36,12 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <cppuhelper/implbase2.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/lstner.hxx>
 #include <svx/xlnedit.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx
index 7947cde7e790..af4a327edb7d 100644
--- a/svx/source/unodraw/unonrule.cxx
+++ b/svx/source/unodraw/unonrule.cxx
@@ -43,7 +43,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase5.hxx>
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <goodies/grfmgr.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index d6d0913c4070..e6d7e1821435 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -47,7 +47,7 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/fltcall.hxx>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 3f7f58a1e9ad..d09ba5d439dc 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <vcl/svapp.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <svtools/fltcall.hxx>
 #include <vos/mutex.hxx>
 #include <svx/unotext.hxx>
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 81439effcfc1..89896f558fa1 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -35,11 +35,11 @@
 
 #include <svx/unoshtxt.hxx>
 #include <unoedhlp.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <rtl/ref.hxx>
 #include <osl/mutex.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/style.hxx>
+#include <svl/hint.hxx>
+#include <svl/style.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdobj.hxx>
@@ -350,6 +350,9 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel )
 
 void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
+    // #i105988 keep reference to this object
+    rtl::Reference< SvxTextEditSourceImpl > xThis( this );
+
     const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
     const SvxViewHint* pViewHint = PTR_CAST( SvxViewHint, &rHint );
 
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index a238d9c4a4f3..1358e3005b02 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <com/sun/star/awt/Gradient.hpp>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xflftrit.hxx>
 
diff --git a/svx/source/unoedit/unoedsrc.cxx b/svx/source/unoedit/unoedsrc.cxx
index 5714d38c75ec..67d11a49c90e 100644
--- a/svx/source/unoedit/unoedsrc.cxx
+++ b/svx/source/unoedit/unoedsrc.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 #include <svx/unoedsrc.hxx>
 
diff --git a/svx/source/unoedit/unofored.cxx b/svx/source/unoedit/unofored.cxx
index c06c37ae2070..14c8fb20a768 100644
--- a/svx/source/unoedit/unofored.cxx
+++ b/svx/source/unoedit/unofored.cxx
@@ -35,7 +35,7 @@
 #include <svx/eeitem.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editview.hxx>
 #include <unoedhlp.hxx>
diff --git a/svx/source/unoedit/unoforou.cxx b/svx/source/unoedit/unoforou.cxx
index c54f76d5f4dc..a98b6830b698 100644
--- a/svx/source/unoedit/unoforou.cxx
+++ b/svx/source/unoedit/unoforou.cxx
@@ -32,16 +32,16 @@
 #include "precompiled_svx.hxx"
 
 #include <algorithm>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editdata.hxx>
 #include <svx/outliner.hxx>
 #include <unoedhlp.hxx>
 #include <svx/svdobj.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/eeitem.hxx>
 
diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx
index a46533657f1c..a4d8c36462e6 100644
--- a/svx/source/unoedit/unotext.cxx
+++ b/svx/source/unoedit/unotext.cxx
@@ -38,16 +38,16 @@
 #include <com/sun/star/text/XTextField.hdl>
 #endif
 #include <vos/mutex.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <svx/eeitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <fontitem.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/svdobj.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
diff --git a/svx/source/unoedit/unotext2.cxx b/svx/source/unoedit/unotext2.cxx
index 3a5ae174c579..bc9fb01fbe62 100644
--- a/svx/source/unoedit/unotext2.cxx
+++ b/svx/source/unoedit/unotext2.cxx
@@ -34,7 +34,7 @@
 #include <vos/mutex.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 9eaf4f1aa440..5a8f93423e27 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -34,19 +34,15 @@
 #include "unogalitem.hxx"
 #include "unogaltheme.hxx"
 #include "galtheme.hxx"
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
-#ifndef _SV_SVAPP_HXX_
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _SV_GRAPH_HXX_
 #include <vcl/graph.hxx>
-#endif
-#include <svtools/itemprop.hxx>
-#include <svtools/itempool.hxx>
-
+#include <svl/itemprop.hxx>
+#include <svl/itempool.hxx>
+#include "galobj.hxx"
 
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_
 #include <com/sun/star/beans/PropertyState.hpp>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 683a67e2b253..6e3a16336f62 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -36,15 +36,15 @@
 #include "unogaltheme.hxx"
 #include "unogalitem.hxx"
 #include "galtheme.hxx"
-#include "gallery1.hxx"
-#include "galmisc.hxx"
+#include "svx/gallery1.hxx"
+#include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
 #ifndef _SV_SVAPP_HXX_
 #include <vcl/svapp.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index 4900c6396a9d..5af538defc08 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -34,7 +34,7 @@
 #include <list>
 
 #include <cppuhelper/implbase1.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/gallery/XGalleryTheme.hpp>
 
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 126f49fe0b50..f9c9379989b5 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -33,13 +33,13 @@
 
 #include "unogalthemeprovider.hxx"
 #include "unogaltheme.hxx"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
 #ifndef _SV_SVAPP_HXX_
 #include <vcl/svapp.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <com/sun/star/gallery/XGalleryTheme.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 7ab6a44fd3fb..7f43bc2df269 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -49,7 +49,7 @@
 #include <vcl/metaact.hxx>
 #include <tools/zcodec.hxx>
 
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "xmlgrhlp.hxx"
 
 #include <algorithm>
diff --git a/svx/source/xml/xmltxtexp.cxx b/svx/source/xml/xmltxtexp.cxx
index 5db6cc809bce..e941988b097e 100644
--- a/svx/source/xml/xmltxtexp.cxx
+++ b/svx/source/xml/xmltxtexp.cxx
@@ -38,8 +38,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <tools/debug.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/brdcst.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sfx2/docfile.hxx>
 #ifndef _SVSTOR_HXX
diff --git a/svx/source/xml/xmltxtimp.cxx b/svx/source/xml/xmltxtimp.cxx
index 9bbe425dce66..b0087c6b4e26 100644
--- a/svx/source/xml/xmltxtimp.cxx
+++ b/svx/source/xml/xmltxtimp.cxx
@@ -44,7 +44,7 @@
 #ifndef _SVSTOR_HXX
 #include <sot/storage.hxx>
 #endif
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <sfx2/docfile.hxx>
 #include <xmloff/xmlimp.hxx>
 #include "xmloff/xmlmetae.hxx"
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index a9258118ed43..0eda2eeb375f 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -38,10 +38,10 @@
 #include <tools/poly.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "impgrf.hxx"
+#include "svx/impgrf.hxx"
 #include "xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 6fae754662ee..6b05262d2321 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -43,16 +43,16 @@
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #include <tools/stream.hxx>
 
 #include "unoapi.hxx"
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include "unopolyhelper.hxx"
 
 #include <tools/bigint.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/dialogs.hrc>
 #include "svdstr.hrc"
 #include "xattr.hxx"
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 5cdd3b9a74b6..d7db2994a68e 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -37,7 +37,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
 #include <toolkit/unohlp.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/dialogs.hrc>
 #include "xattr.hxx"
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index d8ccea2a9ecc..1ee473e7b8b7 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -38,13 +38,13 @@
 #include <svx/xflasit.hxx>
 #include <svx/xfillit0.hxx>
 #ifndef _SFXIPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #ifndef _SFXIPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xdef.hxx>
 #include "xexch.hxx"
 
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 052e52152415..12dc4c2f823a 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -36,7 +36,7 @@
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svxids.hrc>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 /*************************************************************************
 |*
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 629fc0dd928d..2f91fc1d828b 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -44,7 +44,7 @@
 
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 45f0f056bc0d..1e945e9f20bb 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -37,7 +37,7 @@
 #include "XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "xmlxtexp.hxx"
 #include "xmlxtimp.hxx"
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index ca81ab19fe5e..a050e566e6f4 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -48,7 +48,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 4b2153ae2802..6f79eccf9f92 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -46,7 +46,7 @@
 
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index a389a97526e9..91b00c52be3a 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -47,7 +47,7 @@
 
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 3d298811f2b6..ab105d8e21cf 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -49,7 +49,7 @@
 #ifndef _SV_APP_HXX
 #include <vcl/svapp.hxx>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 
 #include <svx/dialogs.hrc>
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index 9f1a665b4061..8721fe1ff29f 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -31,359 +31,85 @@
 #include "hidother.hrc"
 #include <svx/svxids.hrc>
 #include "../inc/fmhelp.hrc"
-#include "../source/cui/svuidlg.hrc"
 
-hidspecial SID_GALLERY_IMPORTTHEME          { HelpID = SID_GALLERY_IMPORTTHEME; };
-hidspecial HID_GALLERY_NEW_THEME            { HelpID = HID_GALLERY_NEW_THEME; };
-hidspecial HID_GALLERY_WINDOW               { HelpID = HID_GALLERY_WINDOW; };
-hidspecial HID_GALLERY_TITLE                { HelpID = HID_GALLERY_TITLE; };
-hidspecial HID_GALLERY_TITLE_EDIT           { HelpID = HID_GALLERY_TITLE_EDIT; };
-hidspecial HID_IMPGRF_BTN_STANDARD          { HelpID = HID_IMPGRF_BTN_STANDARD; };
-hidspecial HID_IMPGRF_BTN_INTERNET          { HelpID = HID_IMPGRF_BTN_INTERNET; };
-hidspecial HID_IMPGRF_BTN_PROPERTIES        { HelpID = HID_IMPGRF_BTN_PROPERTIES; };
-hidspecial HID_IMPGRF_BTN_FILTER            { HelpID = HID_IMPGRF_BTN_FILTER; };
-hidspecial HID_IMPGRF_CB_LINK               { HelpID = HID_IMPGRF_CB_LINK; };
-hidspecial HID_IMPGRF_CB_PREVIEW            { HelpID = HID_IMPGRF_CB_PREVIEW; };
-hidspecial HID_INTERFACE_BASIDE_VIEWSH      { HelpID = HID_INTERFACE_BASIDE_VIEWSH; };
-hidspecial HID_POPUP_COLOR                  { HelpID = HID_POPUP_COLOR; };
-hidspecial HID_POPUP_COLOR_CTRL             { HelpID = HID_POPUP_COLOR_CTRL; };
-hidspecial HID_POPUP_BRUSH                  { HelpID = HID_POPUP_BRUSH; };
-hidspecial HID_POPUP_FRAME                  { HelpID = HID_POPUP_FRAME; };
-hidspecial HID_POPUP_LINE                   { HelpID = HID_POPUP_LINE ; };
-hidspecial HID_TPCOLOR_RGB_1                { HelpID = HID_TPCOLOR_RGB_1; };
-hidspecial HID_TPCOLOR_RGB_2                { HelpID = HID_TPCOLOR_RGB_2; };
-hidspecial HID_TPCOLOR_RGB_3                { HelpID = HID_TPCOLOR_RGB_3; };
-hidspecial HID_TPCOLOR_CMYK_1               { HelpID = HID_TPCOLOR_CMYK_1; };
-hidspecial HID_TPCOLOR_CMYK_2               { HelpID = HID_TPCOLOR_CMYK_2; };
-hidspecial HID_TPCOLOR_CMYK_3               { HelpID = HID_TPCOLOR_CMYK_3; };
-hidspecial HID_REDLINING_FILTER_CB_ACTION   { HelpID = HID_REDLINING_FILTER_CB_ACTION; };
-
-hidspecial HID_REDLINING_DLG                { HelpID = HID_REDLINING_DLG; };
-hidspecial HID_REDLINING_EDIT               { HelpID = HID_REDLINING_EDIT; };
-hidspecial HID_REDLINING_PREV               { HelpID = HID_REDLINING_PREV; };
-hidspecial HID_REDLINING_NEXT               { HelpID = HID_REDLINING_NEXT; };
-hidspecial HID_REDLINING_TABCONTROL         { HelpID = HID_REDLINING_TABCONTROL; };
-
-hidspecial HID_FORM_NAVIGATOR               { HelpID =HID_FORM_NAVIGATOR        ;};
-hidspecial HID_FORM_NAVIGATOR_WIN           { HelpID =HID_FORM_NAVIGATOR_WIN    ;};
-hidspecial HID_FIELD_SEL                    { HelpID =HID_FIELD_SEL             ;};
-hidspecial HID_FIELD_SEL_WIN                { HelpID =HID_FIELD_SEL_WIN         ;};
-hidspecial HID_FILTER_NAVIGATOR             { HelpID =HID_FILTER_NAVIGATOR      ;};
-hidspecial HID_FILTER_NAVIGATOR_WIN         { HelpID =HID_FILTER_NAVIGATOR_WIN  ;};
-
-hidspecial HID_VALUESET_SINGLENUM           { HelpID = HID_VALUESET_SINGLENUM ;};
-hidspecial HID_VALUESET_BULLET              { HelpID = HID_VALUESET_BULLET   ;};
-hidspecial HID_VALUESET_NUM                 { HelpID = HID_VALUESET_NUM      ;};
-hidspecial HID_VALUESET_NUMBMP              { HelpID = HID_VALUESET_NUMBMP   ;};
-
-hidspecial HID_OPTPATH_HEADERBAR            { HelpId = HID_OPTPATH_HEADERBAR    ;};
-hidspecial HID_OPTCOOKIES_HEADERBAR         { HelpId = HID_OPTCOOKIES_HEADERBAR ;};
-
-hidspecial HID_TPPAGE_FULLSIZE              { HelpId = HID_TPPAGE_FULLSIZE      ;};
-hidspecial HID_OPTINET2_CTL_COOKIES         { HelpId = HID_OPTINET2_CTL_COOKIES ;};
-hidspecial HID_OPTPATH_CTL_PATH             { HelpId = HID_OPTPATH_CTL_PATH     ;};
-
-hidspecial HID_POPUP_LINEEND                { HelpId = HID_POPUP_LINEEND            ;};
-hidspecial HID_POPUP_LINEEND_CTRL           { HelpId = HID_POPUP_LINEEND_CTRL       ;};
-
-hidspecial HID_GRID_TRAVEL_FIRST            { HelpID = HID_GRID_TRAVEL_FIRST ;};
-hidspecial HID_GRID_TRAVEL_PREV             { HelpID = HID_GRID_TRAVEL_PREV ;};
-hidspecial HID_GRID_TRAVEL_NEXT             { HelpID = HID_GRID_TRAVEL_NEXT ;};
-hidspecial HID_GRID_TRAVEL_LAST             { HelpID = HID_GRID_TRAVEL_LAST ;};
-hidspecial HID_GRID_TRAVEL_NEW              { HelpID = HID_GRID_TRAVEL_NEW ;};
-hidspecial HID_GRID_TRAVEL_ABSOLUTE         { HelpID = HID_GRID_TRAVEL_ABSOLUTE ;};
-hidspecial HID_GRID_NUMBEROFRECORDS         { HelpID = HID_GRID_NUMBEROFRECORDS ;};
-
-hidspecial UID_SEARCH_RECORDSTATUS          { HelpID = UID_SEARCH_RECORDSTATUS ;};
-
-hidspecial HID_ICCDIALOG_RESET_BTN          { HelpID = HID_ICCDIALOG_RESET_BTN ;};
-hidspecial HID_ICCDIALOG_OK_BTN             { HelpID = HID_ICCDIALOG_OK_BTN ;};
-hidspecial HID_ICCDIALOG_CANCEL_BTN         { HelpID = HID_ICCDIALOG_CANCEL_BTN ;};
-hidspecial HID_ICCDIALOG_CHOICECTRL         { HelpID = HID_ICCDIALOG_CHOICECTRL ;};
-
-hidspecial HID_HYPERDLG_INET_PATH           { HelpID = HID_HYPERDLG_INET_PATH ;};
-hidspecial HID_HYPERDLG_MAIL_PATH           { HelpID = HID_HYPERDLG_MAIL_PATH ;};
-hidspecial HID_HYPERDLG_DOC_PATH            { HelpID = HID_HYPERDLG_DOC_PATH ;};
-
-//HID_AUTOCORR_HELP_START
-#define HID_AUTOCORR_HELP_WORD                  HID_AUTOCORR_HELP_START+0
-#define HID_AUTOCORR_HELP_SENT                  HID_AUTOCORR_HELP_START+1
-#define HID_AUTOCORR_HELP_SENTWORD              HID_AUTOCORR_HELP_START+2
-#define HID_AUTOCORR_HELP_ACORWORD              HID_AUTOCORR_HELP_START+3
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       HID_AUTOCORR_HELP_START+4
 #define HID_AUTOCORR_HELP_ACORSENTWORD          HID_AUTOCORR_HELP_START+5
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       HID_AUTOCORR_HELP_START+6
-#define HID_AUTOCORR_HELP_CHGTOENEMDASH         HID_AUTOCORR_HELP_START+7
-#define HID_AUTOCORR_HELP_WORDENEMDASH          HID_AUTOCORR_HELP_START+8
-#define HID_AUTOCORR_HELP_SENTENEMDASH          HID_AUTOCORR_HELP_START+9
-#define HID_AUTOCORR_HELP_SENTWORDENEMDASH      HID_AUTOCORR_HELP_START+10
-#define HID_AUTOCORR_HELP_ACORWORDENEMDASH      HID_AUTOCORR_HELP_START+11
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       HID_AUTOCORR_HELP_START+12
 #define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH  HID_AUTOCORR_HELP_START+13
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       HID_AUTOCORR_HELP_START+14
+#define HID_AUTOCORR_HELP_ACORWORD              HID_AUTOCORR_HELP_START+3
+#define HID_AUTOCORR_HELP_ACORWORDENEMDASH      HID_AUTOCORR_HELP_START+11
+#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL     HID_AUTOCORR_HELP_START+20
+#define HID_AUTOCORR_HELP_CHGORDINALNUMBER      HID_AUTOCORR_HELP_START+21
 #define HID_AUTOCORR_HELP_CHGQUOTES             HID_AUTOCORR_HELP_START+15
 #define HID_AUTOCORR_HELP_CHGSGLQUOTES          HID_AUTOCORR_HELP_START+16
-#define HID_AUTOCORR_HELP_SETINETATTR           HID_AUTOCORR_HELP_START+17
-#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE    HID_AUTOCORR_HELP_START+18
+#define HID_AUTOCORR_HELP_CHGTOENEMDASH         HID_AUTOCORR_HELP_START+7
 #define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL       HID_AUTOCORR_HELP_START+19
-#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL     HID_AUTOCORR_HELP_START+20
-#define HID_AUTOCORR_HELP_CHGORDINALNUMBER      HID_AUTOCORR_HELP_START+21
-
-hidspecial HID_AUTOCORR_HELP_WORD           { HelpID =  HID_AUTOCORR_HELP_WORD;};
-hidspecial HID_AUTOCORR_HELP_SENT           { HelpID =  HID_AUTOCORR_HELP_SENT;};
-hidspecial HID_AUTOCORR_HELP_SENTWORD       { HelpID =  HID_AUTOCORR_HELP_SENTWORD;};
-hidspecial HID_AUTOCORR_HELP_ACORWORD       { HelpID =  HID_AUTOCORR_HELP_ACORWORD;};
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       { HelpID =  HID_AUTOCORR_HELP_START+4;};
+#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE    HID_AUTOCORR_HELP_START+18
+#define HID_AUTOCORR_HELP_SENT                  HID_AUTOCORR_HELP_START+1
+#define HID_AUTOCORR_HELP_SENTENEMDASH          HID_AUTOCORR_HELP_START+9
+#define HID_AUTOCORR_HELP_SENTWORD              HID_AUTOCORR_HELP_START+2
+#define HID_AUTOCORR_HELP_SENTWORDENEMDASH      HID_AUTOCORR_HELP_START+10
+#define HID_AUTOCORR_HELP_SETINETATTR           HID_AUTOCORR_HELP_START+17
+#define HID_AUTOCORR_HELP_WORD                  HID_AUTOCORR_HELP_START+0
+#define HID_AUTOCORR_HELP_WORDENEMDASH          HID_AUTOCORR_HELP_START+8
 hidspecial HID_AUTOCORR_HELP_ACORSENTWORD   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORD;};
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       { HelpID =  HID_AUTOCORR_HELP_START+6;};
-hidspecial HID_AUTOCORR_HELP_CHGTOENEMDASH      { HelpID =  HID_AUTOCORR_HELP_CHGTOENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_WORDENEMDASH           { HelpID =  HID_AUTOCORR_HELP_WORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SENTENEMDASH           { HelpID =  HID_AUTOCORR_HELP_SENTENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SENTWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_SENTWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_ACORWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_ACORWORDENEMDASH;};
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       { HelpID =  HID_AUTOCORR_HELP_START+4;};
 hidspecial HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH;};
-// not used at time hidspecial HID_AUTOCORR_HELP_ACORSENT       { HelpID =  HID_AUTOCORR_HELP_START+6;};
+hidspecial HID_AUTOCORR_HELP_ACORWORD       { HelpID =  HID_AUTOCORR_HELP_ACORWORD;};
+hidspecial HID_AUTOCORR_HELP_ACORWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_ACORWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL  { HelpID =  HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;};
+hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER   { HelpID =  HID_AUTOCORR_HELP_CHGORDINALNUMBER;};
 hidspecial HID_AUTOCORR_HELP_CHGQUOTES          { HelpID =  HID_AUTOCORR_HELP_CHGQUOTES;};
 hidspecial HID_AUTOCORR_HELP_CHGSGLQUOTES       { HelpID =  HID_AUTOCORR_HELP_CHGSGLQUOTES;};
-hidspecial HID_AUTOCORR_HELP_SETINETATTR        { HelpID =  HID_AUTOCORR_HELP_SETINETATTR;};
-hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID =  HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;};
+hidspecial HID_AUTOCORR_HELP_CHGTOENEMDASH      { HelpID =  HID_AUTOCORR_HELP_CHGTOENEMDASH;};
 hidspecial HID_AUTOCORR_HELP_CHGWEIGHTUNDERL    { HelpID =  HID_AUTOCORR_HELP_CHGWEIGHTUNDERL;};
-hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL  { HelpID =  HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;};
-hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER   { HelpID =  HID_AUTOCORR_HELP_CHGORDINALNUMBER;};
-
-hidspecial HID_CLB_EDIT_MODULES_DICS            { HelpID =  HID_CLB_EDIT_MODULES_DICS       ;};
-hidspecial HID_CLB_EDIT_MODULES_MODULES         { HelpID =  HID_CLB_EDIT_MODULES_MODULES    ;};
-hidspecial HID_CLB_LINGU_MODULES                { HelpID =  HID_CLB_LINGU_MODULES           ;};
-hidspecial HID_CLB_LINGU_OPTIONS                { HelpID =  HID_CLB_LINGU_OPTIONS           ;};
-
-hidspecial SID_DSBROWSER_EXPLORER               { HelpID =  SID_DSBROWSER_EXPLORER          ;};
-
-hidspecial UID_FORMPROPBROWSER_FRAME            { HelpID =  UID_FORMPROPBROWSER_FRAME       ;};
-
-hidspecial HID_WARN_NAME_DUPLICATE              { HelpID = HID_WARN_NAME_DUPLICATE ;};
-
-hidspecial HID_GALLERY_NEWTHEME                 { HelpID = HID_GALLERY_NEWTHEME ;};
-hidspecial HID_GALLERY_THEMELIST                { HelpID = HID_GALLERY_THEMELIST ;};
-
-hidspecial HID_GALLERY_ICONVIEW                 { HelpID = HID_GALLERY_ICONVIEW ;};
-hidspecial HID_GALLERY_LISTVIEW                 { HelpID = HID_GALLERY_LISTVIEW ;};
-hidspecial HID_OPTIONS_COLORCONFIG_SAVE_SCHEME  { HelpID = HID_OPTIONS_COLORCONFIG_SAVE_SCHEME ;};
-hidspecial HID_OPTIONS_COLORCONFIG_COLORLIST_WIN    { HelpID = HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ;};
-
+hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID =  HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;};
+hidspecial HID_AUTOCORR_HELP_SENT           { HelpID =  HID_AUTOCORR_HELP_SENT;};
+hidspecial HID_AUTOCORR_HELP_SENTENEMDASH           { HelpID =  HID_AUTOCORR_HELP_SENTENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_SENTWORD       { HelpID =  HID_AUTOCORR_HELP_SENTWORD;};
+hidspecial HID_AUTOCORR_HELP_SENTWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_SENTWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_SETINETATTR        { HelpID =  HID_AUTOCORR_HELP_SETINETATTR;};
+hidspecial HID_AUTOCORR_HELP_WORD           { HelpID =  HID_AUTOCORR_HELP_WORD;};
+hidspecial HID_AUTOCORR_HELP_WORDENEMDASH           { HelpID =  HID_AUTOCORR_HELP_WORDENEMDASH;};
+hidspecial HID_FIELD_SEL                    { HelpID =HID_FIELD_SEL             ;};
+hidspecial HID_FIELD_SEL_WIN                { HelpID =HID_FIELD_SEL_WIN         ;};
 hidspecial HID_FILL_ATTR_LISTBOX                { HelpID = HID_FILL_ATTR_LISTBOX ;};
 hidspecial HID_FILL_TYPE_LISTBOX                { HelpID = HID_FILL_TYPE_LISTBOX ;};
-hidspecial HID_OPTIONS_COLORCONFIG_NAME_SCHEME  { HelpID = HID_OPTIONS_COLORCONFIG_NAME_SCHEME ;};
-
-//HID_AUTOCORR_HELP_END
-
-hidspecial HID_OPTIONS_PATHS_SELECTFOLDER       { HelpID = HID_OPTIONS_PATHS_SELECTFOLDER; };
-hidspecial HID_GALLERY_NEWTHEME_FINDFILES       { HelpID = HID_GALLERY_NEWTHEME_FINDFILES; };
-hidspecial HID_GALLERY_NEWTHEME_ADDFILES        { HelpID = HID_GALLERY_NEWTHEME_ADDFILES; };
-hidspecial HID_NUMBERINGOPT_SEL_GRF_FROM_FILE   { HelpID = HID_NUMBERINGOPT_SEL_GRF_FROM_FILE; };
-hidspecial HID_REDLINING_VIEW_DG_VIEW_TABLE     { HelpID = HID_REDLINING_VIEW_DG_VIEW_TABLE ; };
+hidspecial HID_FILTER_NAVIGATOR             { HelpID =HID_FILTER_NAVIGATOR      ;};
+hidspecial HID_FILTER_NAVIGATOR_WIN         { HelpID =HID_FILTER_NAVIGATOR_WIN  ;};
+hidspecial HID_FORM_NAVIGATOR               { HelpID =HID_FORM_NAVIGATOR        ;};
+hidspecial HID_FORM_NAVIGATOR_WIN           { HelpID =HID_FORM_NAVIGATOR_WIN    ;};
+hidspecial HID_GALLERY_ICONVIEW                 { HelpID = HID_GALLERY_ICONVIEW ;};
+hidspecial HID_GALLERY_LISTVIEW                 { HelpID = HID_GALLERY_LISTVIEW ;};
+hidspecial HID_GALLERY_NEWTHEME                 { HelpID = HID_GALLERY_NEWTHEME ;};
+hidspecial HID_GALLERY_PREVIEW              { HelpID = HID_GALLERY_PREVIEW; };
+hidspecial HID_GALLERY_THEMELIST                { HelpID = HID_GALLERY_THEMELIST ;};
+hidspecial HID_GALLERY_TITLE                { HelpID = HID_GALLERY_TITLE; };
+hidspecial HID_GALLERY_WINDOW               { HelpID = HID_GALLERY_WINDOW; };
+hidspecial HID_GRID_NUMBEROFRECORDS         { HelpID = HID_GRID_NUMBEROFRECORDS ;};
+hidspecial HID_GRID_TRAVEL_ABSOLUTE         { HelpID = HID_GRID_TRAVEL_ABSOLUTE ;};
+hidspecial HID_GRID_TRAVEL_FIRST            { HelpID = HID_GRID_TRAVEL_FIRST ;};
+hidspecial HID_GRID_TRAVEL_LAST             { HelpID = HID_GRID_TRAVEL_LAST ;};
+hidspecial HID_GRID_TRAVEL_NEW              { HelpID = HID_GRID_TRAVEL_NEW ;};
+hidspecial HID_GRID_TRAVEL_NEXT             { HelpID = HID_GRID_TRAVEL_NEXT ;};
+hidspecial HID_GRID_TRAVEL_PREV             { HelpID = HID_GRID_TRAVEL_PREV ;};
+hidspecial HID_INTERFACE_BASIDE_VIEWSH      { HelpID = HID_INTERFACE_BASIDE_VIEWSH; };
+hidspecial HID_POPUP_COLOR                  { HelpID = HID_POPUP_COLOR; };
+hidspecial HID_POPUP_COLOR_CTRL             { HelpID = HID_POPUP_COLOR_CTRL; };
+hidspecial HID_POPUP_FRAME                  { HelpID = HID_POPUP_FRAME; };
+hidspecial HID_POPUP_LINE                   { HelpID = HID_POPUP_LINE ; };
+hidspecial HID_POPUP_LINEEND                { HelpId = HID_POPUP_LINEEND            ;};
+hidspecial HID_POPUP_LINEEND_CTRL           { HelpId = HID_POPUP_LINEEND_CTRL       ;};
+hidspecial HID_REDLINING_FILTER_CB_ACTION   { HelpID = HID_REDLINING_FILTER_CB_ACTION; };
+hidspecial HID_REDLINING_TABCONTROL         { HelpID = HID_REDLINING_TABCONTROL; };
 hidspecial HID_REDLINING_VIEW_DG_VIEW_HEADER    { HelpID = HID_REDLINING_VIEW_DG_VIEW_HEADER; };
-
-hidspecial HID_SPLDLG_BUTTON_CLOSE              { HelpID =  HID_SPLDLG_BUTTON_CLOSE       ; };
-hidspecial HID_SPLDLG_BUTTON_IGNORE             { HelpID =  HID_SPLDLG_BUTTON_IGNORE      ; };
-hidspecial HID_SPLDLG_BUTTON_IGNOREALL          { HelpID =  HID_SPLDLG_BUTTON_IGNOREALL   ; };
-hidspecial HID_SPLDLG_BUTTON_IGNORERULE          { HelpID =  HID_SPLDLG_BUTTON_IGNORERULE   ; };
-hidspecial HID_SPLDLG_BUTTON_CHANGE             { HelpID =  HID_SPLDLG_BUTTON_CHANGE      ; };
-hidspecial HID_SPLDLG_BUTTON_CHANGEALL          { HelpID =  HID_SPLDLG_BUTTON_CHANGEALL   ; };
-hidspecial HID_SPLDLG_BUTTON_EXPLAIN            { HelpID =  HID_SPLDLG_BUTTON_EXPLAIN     ; };
-hidspecial HID_SPLDLG_CHECKBOX_CHECKGRAMMAR     { HelpID =  HID_SPLDLG_CHECKBOX_CHECKGRAMMAR ; };
-
-
-
-hidspecial HID_HANGULDLG_BUTTON_CLOSE           { HelpID =  HID_HANGULDLG_BUTTON_CLOSE    ; };
-hidspecial HID_HANGULDLG_BUTTON_IGNORE          { HelpID =  HID_HANGULDLG_BUTTON_IGNORE   ; };
-hidspecial HID_HANGULDLG_BUTTON_IGNOREALL       { HelpID =  HID_HANGULDLG_BUTTON_IGNOREALL; };
-hidspecial HID_HANGULDLG_BUTTON_CHANGE          { HelpID =  HID_HANGULDLG_BUTTON_CHANGE   ; };
-hidspecial HID_HANGULDLG_BUTTON_CHANGEALL       { HelpID =  HID_HANGULDLG_BUTTON_CHANGEALL; };
-
-hidspecial HID_SPLDLG_EDIT_NEWWORD          { HelpID =  HID_SPLDLG_EDIT_NEWWORD    ; };
-hidspecial HID_HANGULDLG_EDIT_NEWWORD       { HelpID =  HID_HANGULDLG_EDIT_NEWWORD ; };
-
-hidspecial HID_COLORPAGE_DOCCOLOR_LB                   { HelpID =  HID_COLORPAGE_DOCCOLOR_LB                    ; };
-hidspecial HID_COLORPAGE_DOCBOUNDARIES_LB              { HelpID =  HID_COLORPAGE_DOCBOUNDARIES_LB               ; };
-hidspecial HID_COLORPAGE_APPBACKGROUND_LB              { HelpID =  HID_COLORPAGE_APPBACKGROUND_LB               ; };
-hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_LB           { HelpID =  HID_COLORPAGE_OBJECTBOUNDARIES_LB            ; };
-hidspecial HID_COLORPAGE_TABLEBOUNDARIES_LB            { HelpID =  HID_COLORPAGE_TABLEBOUNDARIES_LB             ; };
-hidspecial HID_COLORPAGE_FONTCOLOR_LB                  { HelpID =  HID_COLORPAGE_FONTCOLOR_LB                   ; };
-hidspecial HID_COLORPAGE_LINKS_LB                      { HelpID =  HID_COLORPAGE_LINKS_LB                       ; };
-hidspecial HID_COLORPAGE_LINKSVISITED_LB               { HelpID =  HID_COLORPAGE_LINKSVISITED_LB                ; };
-hidspecial HID_COLORPAGE_ANCHOR_LB                     { HelpID =  HID_COLORPAGE_ANCHOR_LB                      ; };
-hidspecial HID_COLORPAGE_SPELL_LB                      { HelpID =  HID_COLORPAGE_SPELL_LB                       ; };
-hidspecial HID_COLORPAGE_WRITERTEXTGRID_LB             { HelpID =  HID_COLORPAGE_WRITERTEXTGRID_LB              ; };
-hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_LB        { HelpID =  HID_COLORPAGE_WRITERFIELDSHADINGS_LB         ; };
-hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_LB          { HelpID =  HID_COLORPAGE_WRITERIDXSHADINGS_LB           ; };
-hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_LB         { HelpID =  HID_COLORPAGE_WRITERDIRECTCURSOR_LB          ; };
-hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_LB       { HelpID =  HID_COLORPAGE_WRITERNOTESINDICATOR_LB        ; };
-hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB      { HelpID =  HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB       ; };
-hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB    { HelpID =  HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB     ; };
-hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_LB           { HelpID =  HID_COLORPAGE_WRITERPAGEBREAKS_LB            ; };
-hidspecial HID_COLORPAGE_HTMLSGML_LB                   { HelpID =  HID_COLORPAGE_HTMLSGML_LB                    ; };
-hidspecial HID_COLORPAGE_HTMLCOMMENT_LB                { HelpID =  HID_COLORPAGE_HTMLCOMMENT_LB                 ; };
-hidspecial HID_COLORPAGE_HTMLKEYWORD_LB                { HelpID =  HID_COLORPAGE_HTMLKEYWORD_LB                 ; };
-hidspecial HID_COLORPAGE_HTMLUNKNOWN_LB                { HelpID =  HID_COLORPAGE_HTMLUNKNOWN_LB                 ; };
-hidspecial HID_COLORPAGE_CALCGRID_LB                   { HelpID =  HID_COLORPAGE_CALCGRID_LB                    ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAK_LB              { HelpID =  HID_COLORPAGE_CALCPAGEBREAK_LB               ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB        { HelpID =  HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB         ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB     { HelpID =  HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB      ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVE_LB              { HelpID =  HID_COLORPAGE_CALCDETECTIVE_LB               ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_LB         { HelpID =  HID_COLORPAGE_CALCDETECTIVEERROR_LB          ; };
-hidspecial HID_COLORPAGE_CALCREFERENCE_LB              { HelpID =  HID_COLORPAGE_CALCREFERENCE_LB               ; };
-hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_LB        { HelpID =  HID_COLORPAGE_CALCNOTESBACKGROUND_LB         ; };
-hidspecial HID_COLORPAGE_DRAWGRID_LB                   { HelpID =  HID_COLORPAGE_DRAWGRID_LB                    ; };
-hidspecial HID_COLORPAGE_DRAWDRAWING_LB                { HelpID =  HID_COLORPAGE_DRAWDRAWING_LB                 ; };
-hidspecial HID_COLORPAGE_DRAWFILL_LB                   { HelpID =  HID_COLORPAGE_DRAWFILL_LB                    ; };
-hidspecial HID_COLORPAGE_BASICIDENTIFIER_LB            { HelpID =  HID_COLORPAGE_BASICIDENTIFIER_LB             ; };
-hidspecial HID_COLORPAGE_BASICCOMMENT_LB               { HelpID =  HID_COLORPAGE_BASICCOMMENT_LB                ; };
-hidspecial HID_COLORPAGE_BASICNUMBER_LB                { HelpID =  HID_COLORPAGE_BASICNUMBER_LB                 ; };
-hidspecial HID_COLORPAGE_BASICSTRING_LB                { HelpID =  HID_COLORPAGE_BASICSTRING_LB                 ; };
-hidspecial HID_COLORPAGE_BASICOPERATOR_LB              { HelpID =  HID_COLORPAGE_BASICOPERATOR_LB               ; };
-hidspecial HID_COLORPAGE_BASICKEYWORD_LB               { HelpID =  HID_COLORPAGE_BASICKEYWORD_LB                ; };
-hidspecial HID_COLORPAGE_BASICERROR_LB                 { HelpID =  HID_COLORPAGE_BASICERROR_LB                  ; };
-hidspecial HID_COLORPAGE_DOCCOLOR_CB                   { HelpID =  HID_COLORPAGE_DOCCOLOR_CB                    ; };
-hidspecial HID_COLORPAGE_DOCBOUNDARIES_CB              { HelpID =  HID_COLORPAGE_DOCBOUNDARIES_CB               ; };
-hidspecial HID_COLORPAGE_APPBACKGROUND_CB              { HelpID =  HID_COLORPAGE_APPBACKGROUND_CB               ; };
-hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_CB           { HelpID =  HID_COLORPAGE_OBJECTBOUNDARIES_CB            ; };
-hidspecial HID_COLORPAGE_TABLEBOUNDARIES_CB            { HelpID =  HID_COLORPAGE_TABLEBOUNDARIES_CB             ; };
-hidspecial HID_COLORPAGE_FONTCOLOR_CB                  { HelpID =  HID_COLORPAGE_FONTCOLOR_CB                   ; };
-hidspecial HID_COLORPAGE_LINKS_CB                      { HelpID =  HID_COLORPAGE_LINKS_CB                       ; };
-hidspecial HID_COLORPAGE_LINKSVISITED_CB               { HelpID =  HID_COLORPAGE_LINKSVISITED_CB                ; };
-hidspecial HID_COLORPAGE_ANCHOR_CB                     { HelpID =  HID_COLORPAGE_ANCHOR_CB                      ; };
-hidspecial HID_COLORPAGE_SPELL_CB                      { HelpID =  HID_COLORPAGE_SPELL_CB                       ; };
-hidspecial HID_COLORPAGE_WRITERTEXTGRID_CB             { HelpID =  HID_COLORPAGE_WRITERTEXTGRID_CB              ; };
-hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_CB        { HelpID =  HID_COLORPAGE_WRITERFIELDSHADINGS_CB         ; };
-hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_CB          { HelpID =  HID_COLORPAGE_WRITERIDXSHADINGS_CB           ; };
-hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_CB         { HelpID =  HID_COLORPAGE_WRITERDIRECTCURSOR_CB          ; };
-hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_CB       { HelpID =  HID_COLORPAGE_WRITERNOTESINDICATOR_CB        ; };
-hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB      { HelpID =  HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB       ; };
-hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB    { HelpID =  HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB     ; };
-hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_CB           { HelpID =  HID_COLORPAGE_WRITERPAGEBREAKS_CB            ; };
-hidspecial HID_COLORPAGE_HTMLSGML_CB                   { HelpID =  HID_COLORPAGE_HTMLSGML_CB                    ; };
-hidspecial HID_COLORPAGE_HTMLCOMMENT_CB                { HelpID =  HID_COLORPAGE_HTMLCOMMENT_CB                 ; };
-hidspecial HID_COLORPAGE_HTMLKEYWORD_CB                { HelpID =  HID_COLORPAGE_HTMLKEYWORD_CB                 ; };
-hidspecial HID_COLORPAGE_HTMLUNKNOWN_CB                { HelpID =  HID_COLORPAGE_HTMLUNKNOWN_CB                 ; };
-hidspecial HID_COLORPAGE_CALCGRID_CB                   { HelpID =  HID_COLORPAGE_CALCGRID_CB                    ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAK_CB              { HelpID =  HID_COLORPAGE_CALCPAGEBREAK_CB               ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB        { HelpID =  HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB         ; };
-hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB     { HelpID =  HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB      ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVE_CB              { HelpID =  HID_COLORPAGE_CALCDETECTIVE_CB               ; };
-hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_CB         { HelpID =  HID_COLORPAGE_CALCDETECTIVEERROR_CB          ; };
-hidspecial HID_COLORPAGE_CALCREFERENCE_CB              { HelpID =  HID_COLORPAGE_CALCREFERENCE_CB               ; };
-hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_CB        { HelpID =  HID_COLORPAGE_CALCNOTESBACKGROUND_CB         ; };
-hidspecial HID_COLORPAGE_DRAWGRID_CB                   { HelpID =  HID_COLORPAGE_DRAWGRID_CB                    ; };
-hidspecial HID_COLORPAGE_DRAWDRAWING_CB                { HelpID =  HID_COLORPAGE_DRAWDRAWING_CB                 ; };
-hidspecial HID_COLORPAGE_DRAWFILL_CB                   { HelpID =  HID_COLORPAGE_DRAWFILL_CB                    ; };
-hidspecial HID_COLORPAGE_BASICIDENTIFIER_CB            { HelpID =  HID_COLORPAGE_BASICIDENTIFIER_CB             ; };
-hidspecial HID_COLORPAGE_BASICCOMMENT_CB               { HelpID =  HID_COLORPAGE_BASICCOMMENT_CB                ; };
-hidspecial HID_COLORPAGE_BASICNUMBER_CB                { HelpID =  HID_COLORPAGE_BASICNUMBER_CB                 ; };
-hidspecial HID_COLORPAGE_BASICSTRING_CB                { HelpID =  HID_COLORPAGE_BASICSTRING_CB                 ; };
-hidspecial HID_COLORPAGE_BASICOPERATOR_CB              { HelpID =  HID_COLORPAGE_BASICOPERATOR_CB               ; };
-hidspecial HID_COLORPAGE_BASICKEYWORD_CB               { HelpID =  HID_COLORPAGE_BASICKEYWORD_CB                ; };
-hidspecial HID_COLORPAGE_BASICERROR_CB                 { HelpID =  HID_COLORPAGE_BASICERROR_CB                  ; };
-
-hidspecial HID_COLORPAGE_DBREPORTHEADER_CB          { HelpID =  HID_COLORPAGE_DBREPORTHEADER_CB                  ; };
-hidspecial HID_COLORPAGE_DBREPORTFOOTER_CB          { HelpID =  HID_COLORPAGE_DBREPORTFOOTER_CB                  ; };
-hidspecial HID_COLORPAGE_DBPAGEHEADER_CB            { HelpID =  HID_COLORPAGE_DBPAGEHEADER_CB                  ; };
-hidspecial HID_COLORPAGE_DBPAGEFOOTER_CB            { HelpID =  HID_COLORPAGE_DBPAGEFOOTER_CB                  ; };
-hidspecial HID_COLORPAGE_DBGROUPHEADER_CB           { HelpID =  HID_COLORPAGE_DBGROUPHEADER_CB                  ; };
-hidspecial HID_COLORPAGE_DBGROUPFOOTER_CB           { HelpID =  HID_COLORPAGE_DBGROUPFOOTER_CB                  ; };
-hidspecial HID_COLORPAGE_DBCOLUMNHEADER_CB          { HelpID =  HID_COLORPAGE_DBCOLUMNHEADER_CB                  ; };
-hidspecial HID_COLORPAGE_DBCOLUMNFOOTER_CB          { HelpID =  HID_COLORPAGE_DBCOLUMNFOOTER_CB                  ; };
-hidspecial HID_COLORPAGE_DBDETAIL_CB                { HelpID =  HID_COLORPAGE_DBDETAIL_CB                  ; };
-
-hidspecial HID_COLORPAGE_DBREPORTHEADER_LB          { HelpID =  HID_COLORPAGE_DBREPORTHEADER_LB                  ; };
-hidspecial HID_COLORPAGE_DBREPORTFOOTER_LB          { HelpID =  HID_COLORPAGE_DBREPORTFOOTER_LB                  ; };
-hidspecial HID_COLORPAGE_DBPAGEHEADER_LB            { HelpID =  HID_COLORPAGE_DBPAGEHEADER_LB                  ; };
-hidspecial HID_COLORPAGE_DBPAGEFOOTER_LB            { HelpID =  HID_COLORPAGE_DBPAGEFOOTER_LB                  ; };
-hidspecial HID_COLORPAGE_DBGROUPHEADER_LB           { HelpID =  HID_COLORPAGE_DBGROUPHEADER_LB                  ; };
-hidspecial HID_COLORPAGE_DBGROUPFOOTER_LB           { HelpID =  HID_COLORPAGE_DBGROUPFOOTER_LB                  ; };
-hidspecial HID_COLORPAGE_DBCOLUMNHEADER_LB          { HelpID =  HID_COLORPAGE_DBCOLUMNHEADER_LB                  ; };
-hidspecial HID_COLORPAGE_DBCOLUMNFOOTER_LB          { HelpID =  HID_COLORPAGE_DBCOLUMNFOOTER_LB                  ; };
-hidspecial HID_COLORPAGE_DBDETAIL_LB                { HelpID =  HID_COLORPAGE_DBDETAIL_LB                  ; };
-
-
-hidspecial HID_GALLERY_EDIT_MSNAME                     { HelpID =  HID_GALLERY_EDIT_MSNAME ; };
-hidspecial HID_OFAPAGE_AUTOCORR_CLB                 { HelpId = HID_OFAPAGE_AUTOCORR_CLB; };
-hidspecial HID_OFAPAGE_AUTOFORMAT_CLB               { HelpId = HID_OFAPAGE_AUTOFORMAT_CLB; };
-hidspecial HID_OFA_MAILATTACH_TABBAR                { HelpId = HID_OFA_MAILATTACH_TABBAR; };
-hidspecial HID_OFA_MAILATTACH_ATTACH_LB             { HelpId = HID_OFA_MAILATTACH_ATTACH_LB; };
-hidspecial HID_OFA_FONT_SUBST_CLB                   { HelpId = HID_OFA_FONT_SUBST_CLB; };
-
-hidspecial HID_REGISTRATION_REGISTER                { HelpId = HID_REGISTRATION_REGISTER  ; };
-hidspecial HID_REGISTRATION_ENABLE_KEY              { HelpId = HID_REGISTRATION_ENABLE_KEY; };
-
-hidspecial HID_AUTOCORR_LANGUAGE                    { HelpId = HID_AUTOCORR_LANGUAGE; };
-
-hidspecial HID_OFADLG_TREELISTBOX                   { HelpId = HID_OFADLG_TREELISTBOX; };
-
-hidspecial HID_OFADLG_TREE_GENERAL                  { HelpId = HID_OFADLG_TREE_GENERAL              ; };
-hidspecial HID_OFADLG_TREE_INTERNET                 { HelpId = HID_OFADLG_TREE_INTERNET             ; };
-hidspecial HID_OFADLG_TREE_BROWSER                  { HelpId = HID_OFADLG_TREE_BROWSER              ; };
-hidspecial HID_OFADLG_TREE_TEXT                     { HelpId = HID_OFADLG_TREE_TEXT                 ; };
-hidspecial HID_OFADLG_TREE_HTML                     { HelpId = HID_OFADLG_TREE_HTML                 ; };
-hidspecial HID_OFADLG_TREE_CALC                     { HelpId = HID_OFADLG_TREE_CALC                 ; };
-hidspecial HID_OFADLG_TREE_PRESENTATION             { HelpId = HID_OFADLG_TREE_PRESENTATION         ; };
-hidspecial HID_OFADLG_TREE_DRAWING                  { HelpId = HID_OFADLG_TREE_DRAWING              ; };
-hidspecial HID_OFADLG_TREE_IMAGE                    { HelpId = HID_OFADLG_TREE_IMAGE                ; };
-hidspecial HID_OFADLG_TREE_FORMULA                  { HelpId = HID_OFADLG_TREE_FORMULA              ; };
-hidspecial HID_OFAPAGE_MSFLTR2_CLB                   { HelpId = HID_OFAPAGE_MSFLTR2_CLB             ; };
-
-hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK         { HelpId = UID_OFA_CONNPOOL_DRIVERLIST_BACK; };
-hidspecial HID_OFA_CONNPOOL_DRIVERLIST              { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; };
-hidspecial HID_DBPATH_CTL_PATH                      { HelpId = HID_DBPATH_CTL_PATH; };
-hidspecial HID_DBPATH_HEADERBAR                     { HelpId = HID_DBPATH_HEADERBAR; };
-
-hidspecial HID_HANGULDLG_BUTTON_OPTIONS             { HelpId = HID_HANGULDLG_BUTTON_OPTIONS; };
-
-hidspecial HID_SCRIPTSBOX             { HelpId = HID_SCRIPTSBOX; };
-hidspecial HID_SELECTOR_CATEGORIES    { HelpId = HID_SELECTOR_CATEGORIES; };
-hidspecial HID_SELECTOR_COMMANDS      { HelpId = HID_SELECTOR_COMMANDS; };
-hidspecial HID_SVX_MACRO_LB_EVENT     { HelpId = HID_SVX_MACRO_LB_EVENT; };
-hidspecial HID_SVX_CONFIG_EVENT       { HelpId = HID_SVX_CONFIG_EVENT; };
-hidspecial HID_SELECTOR_DIALOG        { HelpId = HID_SELECTOR_DIALOG; };
-hidspecial HID_SVX_CONFIG_MENU        { HelpId = HID_SVX_CONFIG_MENU; };
-hidspecial HID_SVX_CONFIG_TOOLBAR     { HelpId = HID_SVX_CONFIG_TOOLBAR; };
-hidspecial HID_SVX_CONFIG_MENU_CONTENTS { HelpId = HID_SVX_CONFIG_MENU_CONTENTS; };
-hidspecial HID_SVX_CONFIG_TOOLBAR_CONTENTS { HelpId = HID_SVX_CONFIG_TOOLBAR_CONTENTS; };
-hidspecial HID_SVX_NEW_TOOLBAR         { HelpId = HID_SVX_NEW_TOOLBAR; };
-hidspecial HID_SVX_MODIFY_TOOLBAR      { HelpId = HID_SVX_MODIFY_TOOLBAR; };
-hidspecial HID_SVX_NEW_TOOLBAR_ITEM    { HelpId = HID_SVX_NEW_TOOLBAR_ITEM; };
-hidspecial HID_SVX_MODIFY_TOOLBAR_ITEM { HelpId = HID_SVX_MODIFY_TOOLBAR_ITEM; };
-hidspecial HID_SVX_SAVE_IN             { HelpId = HID_SVX_SAVE_IN; };
-hidspecial HID_SVX_CONFIG_MENU_ORGANIZER { HelpId = HID_SVX_CONFIG_MENU_ORGANIZER; };
-hidspecial HID_SVX_CONFIG_ICON_SELECTOR { HelpId = HID_SVX_CONFIG_ICON_SELECTOR; };
-hidspecial HID_SVX_CONFIG_NAME_SUBMENU { HelpId = HID_SVX_CONFIG_NAME_SUBMENU; };
-hidspecial HID_SVX_CONFIG_RENAME_MENU  { HelpId = HID_SVX_CONFIG_RENAME_MENU; };
-hidspecial HID_SVX_CONFIG_RENAME_MENU_ITEM  { HelpId = HID_SVX_CONFIG_RENAME_MENU_ITEM; };
-hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR    { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR; };
-hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM  { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM; };
-
-hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; };
-hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; };
-hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; };
-hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED; };
-hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL; };
+hidspecial HID_REDLINING_VIEW_DG_VIEW_TABLE     { HelpID = HID_REDLINING_VIEW_DG_VIEW_TABLE ; };
 hidspecial HID_SVX_CHINESE_DICTIONARY_CB_REVERSE { HelpId = HID_SVX_CHINESE_DICTIONARY_CB_REVERSE; };
 hidspecial HID_SVX_CHINESE_DICTIONARY_LB_HEADER { HelpId = HID_SVX_CHINESE_DICTIONARY_LB_HEADER; };
 hidspecial HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED; };
 hidspecial HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL; };
-
-hidspecial HID_SVX_RUN_MACRO { HelpId = HID_SVX_RUN_MACRO; };
-hidspecial HID_SVX_BASIC_MACRO_ORGANIZER { HelpId = HID_SVX_BASIC_MACRO_ORGANIZER; };
-hidspecial HID_SVX_BASIC_DIALOG_ORGANIZER { HelpId = HID_SVX_BASIC_DIALOG_ORGANIZER; };
-hidspecial HID_SVX_COMMON_MACRO_ORGANIZER { HelpId = HID_SVX_COMMON_MACRO_ORGANIZER; };
-
-hidspecial HID_HANGULDLG_SUGGESTIONS { HelpId = HID_HANGULDLG_SUGGESTIONS; };
-hidspecial HID_HANGULDLG_SUGGESTIONS_GRID { HelpId = HID_HANGULDLG_SUGGESTIONS_GRID; };
-hidspecial HID_HANGULDLG_SUGGESTIONS_LIST { HelpId = HID_HANGULDLG_SUGGESTIONS_LIST; };
-hidspecial HID_MACROCHECKDIALOG                 { HelpID = HID_MACROCHECKDIALOG; };
-hidspecial HID_MACRO_HEADERTABLISTBOX           { HelpID = HID_MACRO_HEADERTABLISTBOX; };
-
-hidspecial HID_PASTE_DLG        { HelpId = HID_PASTE_DLG; };
-hidspecial HID_LINKDLG_TABLB    { HelpId = HID_LINKDLG_TABLB; };
-hidspecial HID_OPTIONS_JAVA_LIST { HelpId = HID_OPTIONS_JAVA_LIST; };
-
+hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED; };
+hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL; };
+hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; };
+hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; };
+hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; };
+hidspecial SID_DSBROWSER_EXPLORER               { HelpID =  SID_DSBROWSER_EXPLORER          ;};
+hidspecial SID_GALLERY_IMPORTTHEME          { HelpID = SID_GALLERY_IMPORTTHEME; };
+hidspecial UID_FORMPROPBROWSER_FRAME            { HelpID =  UID_FORMPROPBROWSER_FRAME       ;};
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 3dcf5ca250f3..1dffe3a953c8 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -99,7 +99,6 @@ LIB5FILES=\
     $(SLB)$/form-core.lib \
     $(SLB)$/gal.lib \
     $(SLB)$/items-core.lib \
-    $(SLB)$/msfilter-core.lib \
     $(SLB)$/options-core.lib
 
 LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
@@ -111,7 +110,8 @@ LIB6FILES=\
     $(SLB)$/properties.lib \
     $(SLB)$/svdraw-core.lib \
     $(SLB)$/svxlink.lib \
-    $(SLB)$/svxrtf-core.lib    \
+    $(SLB)$/svxrtf-core.lib \
+    $(SLB)$/svxrtf.lib \
     $(SLB)$/table-core.lib \
     $(SLB)$/tbxctrls-core.lib  \
     $(SLB)$/toolbars.lib \
@@ -120,13 +120,6 @@ LIB6FILES=\
     $(SLB)$/xml.lib \
     $(SLB)$/xout.lib
 
-# Objects needed for the svxmsfilter library.
-LIB7TARGET= $(SLB)$/$(TARGET)_7.lib
-LIB7FILES=\
-    $(SLB)$/msfilter-msfilter.lib \
-    $(SLB)$/svdraw-msfilter.lib \
-    $(SLB)$/svxrtf.lib
-
 HELPIDFILES=    ..$/inc$/helpid.hrc
 
 # svxcore
@@ -205,83 +198,10 @@ SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=	$(SHL2TARGET)
 DEFLIB2NAME=$(TARGET) $(TARGET)_2 $(TARGET)_3 $(TARGET)_4
 
-# cui
-SHL3TARGET= cui$(DLLPOSTFIX)
-SHL3VERSIONMAP= cui.map
-SHL3IMPLIB=icui
-SHL3DEPN=$(SHL2TARGETN)
-
-SHL3DEF=	$(MISC)$/$(SHL3TARGET).def
-DEF3NAME=	$(SHL3TARGET)
-
-SHL3LIBS=	$(SLB)$/cui.lib
-
-SHL3STDLIBS= \
-            $(SVXCORELIB) \
-            $(SVXLIB) \
-            $(AVMEDIALIB) \
-            $(SFX2LIB) \
-            $(GOODIESLIB) \
-            $(BASEGFXLIB) \
-            $(BASICLIB) \
-            $(LNGLIB) \
-            $(SVTOOLLIB) \
-            $(TKLIB) \
-            $(VCLLIB) \
-            $(SVLLIB) \
-            $(UNOTOOLSLIB) \
-            $(TOOLSLIB) \
-            $(I18NISOLANGLIB) \
-            $(COMPHELPERLIB) \
-            $(UCBHELPERLIB) \
-            $(CPPUHELPERLIB)        \
-            $(CPPULIB) \
-            $(VOSLIB) \
-            $(SALLIB) \
-            $(JVMFWKLIB) \
-            $(ICUUCLIB)
-
 .IF "$(debug)$(dbgutil)"!=""
 SHL2STDLIBS += $(CPPUHELPERLIB)
 .ENDIF # "$(debug)$(dbgutil)"!=""
 
-.IF "$(GUI)"=="WNT"
-SHL3STDLIBS+= \
-             $(SHLWAPILIB) \
-             $(ADVAPI32LIB)
-.ENDIF # WNT
-
-# svxmsfilter library
-SHL4TARGET= svxmsfilter$(DLLPOSTFIX)
-SHL4IMPLIB= isvxmsfilter
-SHL4USE_EXPORTS=name
-SHL4DEPN=$(SHL1TARGETN)
-SHL4LIBS= $(LIB7TARGET)
-
-SHL4STDLIBS= \
-             $(SVXCORELIB) \
-             $(SFX2LIB) \
-             $(XMLOFFLIB) \
-             $(GOODIESLIB) \
-             $(BASEGFXLIB) \
-             $(BASICLIB) \
-             $(SVTOOLLIB) \
-             $(TKLIB) \
-             $(VCLLIB) \
-             $(SVLLIB) \
-             $(SOTLIB) \
-             $(UNOTOOLSLIB) \
-             $(TOOLSLIB) \
-             $(XMLSCRIPTLIB) \
-             $(COMPHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
-             $(SALLIB)
-
-SHL4DEF=	$(MISC)$/$(SHL4TARGET).def
-DEF4NAME=	$(SHL4TARGET)
-DEFLIB4NAME=$(TARGET)_7
-
 # ------------------------------------------------------------------------------
 
 # Resource files
@@ -290,9 +210,7 @@ SRSFILELIST=\
         $(SRS)$/editeng.srs \
         $(SRS)$/outliner.srs \
         $(SRS)$/dialogs.srs \
-        $(SRS)$/cui.srs \
         $(SRS)$/drawdlgs.srs \
-        $(SRS)$/cuidrawdlgs.srs \
         $(SRS)$/mnuctrls.srs \
         $(SRS)$/stbctrls.srs \
         $(SRS)$/tbxctrls.srs \
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 6c1399812d4c..e7bf4840f793 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -89,10 +89,10 @@
 #include <fwdtitem.hxx>
 
 // SVTOOLS
-#include <svtools/undo.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/undo.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/printdlg.hxx>
 
 #include <osl/file.hxx>
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index fe1c22612d60..2036553465be 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -37,7 +37,7 @@
 #include <boost/shared_ptr.hpp>
 #include <sot/storage.hxx>
 #ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #include <sal/main.h>
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index e01041edafcd..36e9bdd08639 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -31,8 +31,6 @@
 #ifndef _POSTITMGR_HXX
 #define _POSTITMGR_HXX
 
-#include <svtools/lstner.hxx>
-
 #include <list>
 #include <vector>
 #include <svx/outlobj.hxx>
@@ -41,8 +39,10 @@
 #include <tools/debug.hxx>
 #include <swrect.hxx>
 #include <unotools/configitem.hxx>
+#include <unotools/options.hxx>
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/uno/Any.hxx>
+#include <svl/lstner.hxx>
 
 class SwWrtShell;
 class SwDoc;
@@ -139,6 +139,9 @@ class SwNoteProps: public utl::ConfigItem
                  }
                  return aNames;
             }
+
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 class SwPostItMgr: public SfxListener
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index fcf9d727f05e..8ea953136e49 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -46,9 +46,9 @@
 #include <vcl/wrkwin.hxx>
 #endif
 #include <sot/storage.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 
 class SfxItemSet;
 
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 03815a265c18..7f4c88b6081c 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -385,7 +385,7 @@ public:
 //                                                   RTL_TEXTENCODING_ASCII_US),
 //                 int nDepth = -1) const;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static unsigned long GetInstances();
     unsigned long GetSerial();
 #endif
@@ -494,7 +494,7 @@ protected:
      */
     mutable tSwNumberTreeChildren::iterator mItLastValid;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     /**
        Counter for the number of created instances.
      */
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 964371ca40da..31041cd700dc 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -32,7 +32,7 @@
 
 
 #define _SVSTDARR_STRINGSISORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class SwDoc;
 class SwAutoCompleteWord_Impl;
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 1b209ac0b47c..8447210a2d01 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -35,7 +35,7 @@
 #include <toxe.hxx>
 
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class SwAuthDataArr;
 /* -----------------21.09.99 13:32-------------------
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 91f1e538d355..e336a4fea524 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -30,7 +30,7 @@
 #ifndef _CALC_HXX
 #define _CALC_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #ifndef __SBX_SBXVALUE //autogen
 #include <basic/sbxvar.hxx>
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index cd25c3c6f892..fe8051c8465c 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -30,7 +30,7 @@
 #ifndef _CCOLL_HXX
 #define _CCOLL_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/string.hxx>
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 1ea47d89f8c9..6ce11b1e6cb8 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -31,8 +31,8 @@
 #ifndef _CELLATR_HXX
 #define _CELLATR_HXX
 
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
 #include "swdllapi.h"
 #include "format.hxx"
 #include "cellfml.hxx"
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 85fea8317ef2..b0c8a54125f0 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -111,7 +111,7 @@ struct SwContentAtPos
         SW_NUMLABEL         = 0x0200, // #i23726#
         SW_CONTENT_CHECK    = 0x0400, // --> FME 2005-05-13 #i43742# <--
         SW_SMARTTAG         = 0x0800
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ,SW_CURR_ATTRS      = 0x4000        // nur zum Debuggen
         ,SW_TABLEBOXVALUE   = 0x8000        // nur zum Debuggen
 #endif
@@ -465,7 +465,7 @@ public:
      */
     void Combine();
 
-#if defined( PRODUCT )
+#if !defined(DBG_UTIL)
     void SttCrsrMove() { ++nCrsrMove; StartAction(); }
     void EndCrsrMove( const BOOL bIdleEnd = FALSE )
             { EndAction( bIdleEnd ); --nCrsrMove; }
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 0c359bd05cdb..dfb67a7025f9 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/string.hxx>
 #include <tools/link.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/util/Date.hpp>
 #include "swdllapi.h"
 #include <swdbdata.hxx>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index de82d9056ff9..df81a13dab12 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -60,7 +60,7 @@ class SwList;
 // <--
 #include <IDocumentExternalData.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <vcl/timer.hxx>
@@ -77,7 +77,7 @@ class SwList;
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <vos/ref.hxx>
 #include <svx/svdtypes.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/numitem.hxx>
 #include "comphelper/implementationreference.hxx"
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
@@ -492,7 +492,7 @@ private:
     bool mbColumnSelection       : 1;    // true: this content has bee created by a column selection
                                          //       (clipboard docs only)
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bool mbXMLExport : 1;                // TRUE: during XML export
 #endif
 
@@ -1066,7 +1066,7 @@ public:
     inline void SetOLEPrtNotifyPending( bool bSet = true );
     void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bool InXMLExport() const            { return mbXMLExport; }
     void SetXMLExport( bool bFlag )     { mbXMLExport = bFlag; }
 #endif
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index c8ffcba549ab..d993c0949f2a 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 #include <tools/table.hxx>
 #endif
 #include <swtypes.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 typedef SwFieldType* SwFldTypePtr;
 #define GROW_FLDTYPES   16
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 6ed3f6d652bd..a0c7635029f0 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -39,7 +39,7 @@
 #include <swdll.hxx>
 #include <shellid.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/embedhlp.hxx>
 
 class SwDoc;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index e93972690e66..f7e6019de511 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -34,10 +34,10 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/style.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/itemset.hxx>
 #include "swdllapi.h"
 
 class SwDoc;
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index f3e41abf199f..6048a18c3a8b 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -35,7 +35,7 @@
 #include <tools/datetime.hxx>
 
 
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 #include "fldbas.hxx"
 #include "numrule.hxx"
diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index b2c5d411f07a..be792453e485 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.hxx
@@ -30,7 +30,7 @@
 #ifndef _EDGLBLDC_HXX
 #define _EDGLBLDC_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SwSection;
 class SwTOXBase;
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index 8cfa04648cf7..8b8a6c8bfde4 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -32,7 +32,7 @@
 #define _EDIMP_HXX
 
 #include <tools/solar.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SwPaM;
 class SwNodeIndex;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 1ce87e0df410..d802eb910cff 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/font.hxx>
 #include <svx/swafopt.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx
index f9fae69e7358..3d7c8a19085d 100644
--- a/sw/inc/errhdl.hxx
+++ b/sw/inc/errhdl.hxx
@@ -30,7 +30,7 @@
 #ifndef _ERRHDL_HXX
 #define _ERRHDL_HXX
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 #include <tools/solar.h>
 #include <sal/types.h>
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 83629f8cf6d5..00a7c57efb3b 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -30,7 +30,7 @@
 #ifndef _EXPFLD_HXX
 #define _EXPFLD_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swdllapi.h"
 #include <fldbas.hxx>
 #include <cellfml.hxx>
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index c11c6b9ecaf0..05b88d1bd5a6 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -32,7 +32,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <pam.hxx>
 #include <i18npool/lang.h>
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index c34d6f484037..b201dddf4f05 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -31,7 +31,7 @@
 #define _FCHRFMT_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <calbck.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 11213224844c..186ca702c8f0 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -278,7 +278,7 @@ protected:
 
 public:
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     virtual ~SwFieldType();
 #endif
     static  const String&   GetTypeStr( USHORT nTypeId );
@@ -337,7 +337,7 @@ public:
 
     // ResId
     USHORT              Which() const
-#ifdef PRODUCT
+#ifndef DBG_UTIL
         { return pType->Which(); }
 #else
         ;       // in fldbas.cxx implementiert
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index 287e6544712b..0ac8b016d24d 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -31,7 +31,7 @@
 #define _FLYPOS_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <swdllapi.h>
 
 class SwFrmFmt;
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index fd6975205347..d74ed247e0cc 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -34,7 +34,7 @@
 #include <hintids.hxx>
 #include <swtypes.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 struct SwPosition;
 class IntlWrapper;
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 1d4df2210f15..b39475c8a54c 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -31,7 +31,7 @@
 #define _FMTAUTOFMT_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <format.hxx>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index c10898ca5716..58d87a06ae42 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -31,7 +31,7 @@
 #define _FMTCLBL_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 3a4069f22acb..c50bfd5bc1a2 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -31,7 +31,7 @@
 #define _FMTCLDS_HXX
 
 #include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index d229f91b8b78..20e33fbe7439 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -31,7 +31,7 @@
 #define _FMTCNCT_HXX
 
 #include <hintids.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <format.hxx>
 #include <calbck.hxx>
 
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index c5b262331e44..f5a5443c14be 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTCNTNT_HXX
 #define _FMTCNTNT_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index d06a64cf9bfd..8b4d3cb285b7 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTCOL_HXX
 #define _FMTCOL_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swdllapi.h"
 #include <format.hxx>
 #include <swtypes.hxx>      // fuer MAXLEVEL
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index a45e9fafc495..b7ab6bc01543 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -31,7 +31,7 @@
 #define _FMTEIRO_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index c018e8c31c14..3bb498aee050 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -31,7 +31,7 @@
 #define _FMTFLCNT_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SwFrmFmt;
 class SwTxtFlyCnt;
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 2ca982e80c0b..58fbe2c05699 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -30,9 +30,9 @@
 #ifndef _FMTFLD_HXX
 #define _FMTFLD_HXX
 
-#include <svtools/poolitem.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/smplhint.hxx>
 
 #include "swdllapi.h"
 #include <calbck.hxx>
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index a33cf8a16475..c049b9e9eaa0 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -31,7 +31,7 @@
 #define _FMTFOLLOWTEXTFLOW_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 93107807d1cd..7227d719c51c 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTFORDR_HXX
 #define _FMTFORDR_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index b28e3ac94be1..f2486aa916f0 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -31,7 +31,7 @@
 #define _FMTFSIZE_HXX
 
 #include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <swtypes.hxx>
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index e31001ced75f..ca04985bff76 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -31,7 +31,7 @@
 #define _FMTFTN_HXX
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 
 class SwDoc;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 8e95c4e7128a..b5cbfbfdc6bf 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTFTNTX_HXX
 #define _FMTFTNTX_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include <numrule.hxx>
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index d6661c9d4ddc..1f8e8289ee86 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -32,7 +32,7 @@
 
 #include <hintids.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <calbck.hxx>
 
 class SwFrmFmt;
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 8efd538ca6e3..4d030da66a7c 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -31,7 +31,7 @@
 #define _FMTINFMT_HXX
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 
 class SvxMacro;
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 357e6cd743b3..db8a694063c3 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -31,7 +31,7 @@
 #define SW_FMTLINE_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 43e7ef090df5..0b14626b518e 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTTSPLT_HXX
 #define _FMTTSPLT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 952181d0498c..f676469b908f 100755..100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -31,7 +31,7 @@
 #ifndef SW_FMTMETA_HXX
 #define SW_FMTMETA_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <sfx2/Metadatable.hxx>
 
 #include <boost/shared_ptr.hpp>
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 8c2dcaff59bd..bdd03264e45c 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -37,7 +37,7 @@
 #include <hintids.hxx>
 #include <swtypes.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 
 class IntlWrapper;
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 2c3f88f962b2..0cf3f4a82523 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -31,7 +31,7 @@
 #define _FMTPDSC_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index cb12e38cf582..0be58da182aa 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -32,7 +32,7 @@
 
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SwTxtRefMark;
 
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index b398721e6246..6e15073813ab 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTROWSPLT_HXX
 #define _FMTROWSPLT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 516d5c3d8eed..b7a461427477 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -32,7 +32,7 @@
 
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SwTxtRuby;
 
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index ec6abe89e936..32b0e7d8e9bf 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -33,7 +33,7 @@
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 // --> OD 2006-08-15 #i68520# - refactoring
 // separate enumeration <SwSurround> in own header file
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index bfc82fd4913a..b4bd47a68e9b 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTURL_HXX
 #define _FMTURL_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index b9ece15840e7..098c42cafc01 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -32,7 +32,7 @@
 
 #include <hintids.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
 
 class SW_DLLPUBLIC SwFmtWrapInfluenceOnObjPos: public SfxPoolItem
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 15ab804b5ee0..a06ed6b61769 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -32,7 +32,7 @@
 
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class SwTxtFtn;
 class SwNodeIndex;
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index f9a232bae0ef..377f1edbada3 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -32,8 +32,8 @@
 
 #include <hintids.hxx>      // fuer die WhichIds @@@ must be included first @@@
 #include <tools/gen.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/grfcrop.hxx>
 #include "swdllapi.h"
 #include <swatrset.hxx>     // fuer inlines
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index f709c95038f0..6bab531ad1c5 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define HID_BASE                    HID_APP_START
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 17b62c0d4760..032f4de88fd4 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -31,7 +31,7 @@
 #define _SW_HF_EAT_SPACINGITEM_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index f1911ce7f0c1..16f8568bcf74 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -88,14 +88,6 @@ public:
 };
 
 
-class SwInsChr: public SwMsgPoolItem
-{
-public:
-    xub_StrLen nPos;
-
-    SwInsChr( USHORT nP );
-};
-
 class SwInsTxt: public SwMsgPoolItem
 {
 public:
@@ -214,7 +206,7 @@ public:
 
     USHORT Count() const { return pChgSet->Count(); }
     void ClearItem( USHORT nWhichL = 0 )
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     { pChgSet->ClearItem( nWhichL ); }
 #else
         ;
@@ -270,17 +262,6 @@ public:
 //};
 // <--
 
-class SwNRuleLowerLevel : public SwMsgPoolItem
-{
-    const String& rName;
-    BYTE nLvl;
-public:
-    SwNRuleLowerLevel( const String& rRuleName, BYTE nLevel );
-
-    const String& GetName() const { return rName; }
-    BYTE GetLevel() const { return nLvl; }
-};
-
 class SwFindNearestNode : public SwMsgPoolItem
 {
     const SwNode *pNd, *pFnd;
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 9837a4e664bc..5b28034aa27a 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -43,7 +43,7 @@ class SwIndex;
 class SwIndexReg;
 struct SwPosition;
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define INLINE inline
 #else
 #define INLINE
@@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwIndex
 {
     friend class SwIndexReg;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static int nSerial;
     int MySerial;
 #endif
@@ -150,7 +150,7 @@ public:
     void MoveTo( SwIndexReg& rArr );
 };
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 
 inline xub_StrLen SwIndex::operator++()
 {
diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx
index 8a770d5b012c..52ce6ea2e4ec 100644
--- a/sw/inc/istyleaccess.hxx
+++ b/sw/inc/istyleaccess.hxx
@@ -31,7 +31,7 @@
 #define _ISTYLEACCESS_HXX
 
 #include <vector>
-#include <svtools/stylepool.hxx>
+#include <svl/stylepool.hxx>
 
 /*--------------------------------------------------------------------
     Management of (automatic) styles
diff --git a/sw/inc/makefile.mk b/sw/inc/makefile.mk
index 36aa66102618..16adca8192b8 100644
--- a/sw/inc/makefile.mk
+++ b/sw/inc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,10 +44,10 @@ TARGET=inc
 
 .INCLUDE :  target.mk
 
-.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
+.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
 ALLTAR : \
     $(SLO)$/precompiled.pch \
     $(SLO)$/precompiled_ex.pch
-    
+
 .ENDIF			# "$(ENABLE_PCH)"!=""
 
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index d17311027111..b800cb3dfc8e 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -33,7 +33,7 @@
 #include <tools/string.hxx>
 #include <vcl/wintypes.hxx>
 #include <vcl/field.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <unotools/configitem.hxx>
 #include "swdllapi.h"
 #include "authratr.hxx"
@@ -78,6 +78,7 @@ class SwRevisionConfig : public utl::ConfigItem
         ~SwRevisionConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -108,6 +109,7 @@ class SwInsertConfig : public utl::ConfigItem
         ~SwInsertConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -134,6 +136,7 @@ class SwTableConfig : public utl::ConfigItem
         ~SwTableConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -163,6 +166,7 @@ class SwMiscConfig : public utl::ConfigItem
         ~SwMiscConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 6bbd72778498..9f27b1885fe1 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -32,7 +32,7 @@
 #define _NDARR_HXX
 
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #ifndef _BPARR_HXX
 #include <bparr.hxx>
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index e5a3ee794e0b..67cb84367515 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -31,7 +31,7 @@
 #define _NDHINTS_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/mempool.hxx>
 
 #include "swtypes.hxx"
@@ -117,7 +117,7 @@ public:
         { return m_HintStarts[nIdx]; }
     inline USHORT Count() const { return m_HintStarts.Count(); }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bool Check() const;
 #endif
 };
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 0942621991e8..82153fa5b5e1 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwNodeIndex
     friend void SwNodes::DeRegisterIndex( SwNodeIndex& );
     friend void SwNodes::RemoveNode( ULONG, ULONG, BOOL );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static int nSerial;
     int MySerial;
 #endif
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 5aa259b68c06..4862dafc6aac 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -89,7 +89,7 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry
 {
     friend class SwNodes;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static long nSerial;
     long nMySerial;
 #endif
@@ -114,7 +114,7 @@ protected:
 public:
     virtual ~SwNode();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     long int GetSerial() const { return nMySerial; }
 #endif
 
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 9b3714c806bf..dfaa5101c01c 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -116,7 +116,7 @@ public:
 private:
     friend void _FinitCore();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     long int nSerial;
     static long int nInstances;
 #endif
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 18579f1a918b..95e9c0ad42bb 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -192,8 +192,8 @@ public:
             m_pMark = m_pPoint;
         }
     }
+#ifndef DBG_UTIL
 
-#ifdef PRODUCT
     void Exchange()
     {
         if (m_pPoint != m_pMark)
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 3f65056e1cd5..e1b2ced1b513 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 #ifndef _PARATR_HXX
 #define _PARATR_HXX
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <calbck.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 0a43d2c73d96..e8aadd472aa6 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -33,6 +33,7 @@
 #ifdef PRECOMPILED_HEADERS
 
 //---MARKER---
+
 #include "sal/config.h"
 #include "sal/types.h"
 
@@ -511,8 +512,6 @@
 #include "cppuhelper/weak.hxx"
 #include "cppuhelper/weakref.hxx"
 
-#include "cppunit/simpleheader.hxx"
-
 #include "framework/interaction.hxx"
 
 #include "goodies/grfmgr.hxx"
@@ -613,99 +612,99 @@
 #include "sot/storinfo.hxx"
 
 #include "svtools/FilterConfigItem.hxx"
-#include "svtools/PasswordHelper.hxx"
+#include "svl/PasswordHelper.hxx"
 #include "svtools/accessibilityoptions.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/cjkoptions.hxx"
-#include "svtools/cmdoptions.hxx"
-#include "svtools/cntnrsrt.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntnrsrt.hxx"
 #include "svtools/collatorres.hxx"
 #include "svtools/colorcfg.hxx"
-#include "svtools/compatibility.hxx"
+#include "unotools/compatibility.hxx"
 #include "svtools/controldims.hrc"
-#include "svtools/ctloptions.hxx"
+#include "svl/ctloptions.hxx"
 #include "svtools/ctrlbox.hxx"
 #include "svtools/ctrltool.hxx"
 #include "svtools/editbrowsebox.hxx"
 #include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
+#include "svl/eitem.hxx"
 #include "svtools/embedhlp.hxx"
 #include "svtools/embedtransfer.hxx"
 #include "svtools/filter.hxx"
-#include "svtools/flagitem.hxx"
-#include "svtools/fltrcfg.hxx"
-#include "svtools/fstathelper.hxx"
-#include "svtools/globalnameitem.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "svl/fstathelper.hxx"
+#include "svl/globalnameitem.hxx"
 #include "svtools/headbar.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/htmltokn.h"
-#include "svtools/imageitm.hxx"
+#include "svl/imageitm.hxx"
 #include "svtools/imap.hxx"
 #include "svtools/indexentryres.hxx"
-#include "svtools/inethist.hxx"
+#include "svl/inethist.hxx"
 #include "svtools/inetimg.hxx"
 #include "svtools/insdlg.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/isethint.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/languageoptions.hxx"
-#include "svtools/lckbitem.hxx"
-#include "svtools/lingucfg.hxx"
-#include "svtools/linguprops.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/misccfg.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/ownlist.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "svl/languageoptions.hxx"
+#include "svl/lckbitem.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lstner.hxx"
+#include "unotools/misccfg.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "svl/ownlist.hxx"
 #include "svtools/parhtml.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/poolitem.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
 #include "svtools/prgsbar.hxx"
 #include "svtools/printdlg.hxx"
 #include "svtools/prnsetup.hxx"
-#include "svtools/ptitem.hxx"
-#include "svtools/rectitem.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
 #include "svtools/rtfkeywd.hxx"
 #include "svtools/rtfout.hxx"
 #include "svtools/rtftoken.h"
 #include "svtools/ruler.hxx"
-#include "svtools/saveopt.hxx"
+#include "unotools/saveopt.hxx"
 #include "svtools/scriptedtext.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
-#include "svtools/solar.hrc"
-#include "svtools/sourceviewconfig.hxx"
+#include "svl/solar.hrc"
+#include "unotools/sourceviewconfig.hxx"
 #include "svtools/stdctrl.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hrc"
-#include "svtools/style.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hrc"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
 #include "svtools/svmedit.hxx"
 #include "svtools/svparser.hxx"
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include "svtools/svtabbx.hxx"
 #include "svtools/svtreebx.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
 #include "svtools/templdlg.hxx"
 #include "svtools/textview.hxx"
 #include "svtools/transfer.hxx"
 #include "svtools/txtattr.hxx"
 #include "svtools/txtcmp.hxx"
-#include "svtools/undo.hxx"
-#include "svtools/undoopt.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
 #include "svtools/unoevent.hxx"
 #include "svtools/unoimap.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
-#include "svtools/useroptions.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
 #include "svtools/valueset.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
 #include "svtools/xtextedt.hxx"
 
 #include "svx/IAccessibleParent.hxx"
@@ -731,7 +730,7 @@
 #include "svx/editstat.hxx"
 #include "svx/editview.hxx"
 #include "svx/eeitem.hxx"
-#include "svx/escherex.hxx"
+#include "filter/msfilter/escherex.hxx"
 #include "svx/extrusionbar.hxx"
 #include "svx/extrusioncontrols.hxx"
 #include "svx/fillctrl.hxx"
@@ -766,11 +765,11 @@
 #include "svx/lboxctrl.hxx"
 #include "svx/linectrl.hxx"
 #include "svx/linkmgr.hxx"
-#include "svx/mscodec.hxx"
-#include "svx/msdffimp.hxx"
-#include "svx/msfiltertracer.hxx"
-#include "svx/msocximex.hxx"
-#include "svx/msoleexp.hxx"
+#include "filter/msfilter/mscodec.hxx"
+#include "filter/msfilter/msdffimp.hxx"
+#include "filter/msfilter/msfiltertracer.hxx"
+#include "filter/msfilter/msocximex.hxx"
+#include "filter/msfilter/msoleexp.hxx"
 #include "svx/numitem.hxx"
 #include "svx/numvset.hxx"
 #include "svx/objfac3d.hxx"
@@ -921,7 +920,7 @@
 #include "vcl/fixed.hxx"
 #include "vcl/fldunit.hxx"
 #include "vcl/font.hxx"
-#include "vcl/fontcvt.hxx"
+#include "unotools/fontcvt.hxx"
 #include "vcl/graph.hxx"
 #include "vcl/group.hxx"
 #include "vcl/help.hxx"
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 3f36c6015f6c..19ec6ed6084f 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -35,7 +35,7 @@
 #include <redline.hxx>
 #include <vector>
 #include <vcl/window.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 class SwTxtFld;
 class SwRootFrm;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index ebf6e8cd9325..a35caaaae3f0 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -34,12 +34,12 @@
 #include <tools/string.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <pam.hxx>
 
 #include <IDocumentRedlineAccess.hxx>
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 class SfxItemSet;
 class SwView;
diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index f910a44ca859..1f225aeeb8b0 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -34,9 +34,9 @@
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 //Nur die History anziehen, um das docnew.cxx gegen die CLOOK's zu behaupten.
 
@@ -78,8 +78,7 @@ class SwCharFmt;
 
 #include <memory>
 
-
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 class Writer;
 #define OUT_HSTR_HINT( name )    \
     friend Writer& OutUndo_Hstr_ ## name( Writer&, const SwHistoryHint& );
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index a175159fc418..41d1d7f890b1 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -30,7 +30,7 @@
 #ifndef _RUBYLIST_HXX
 #define _RUBYLIST_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <swtypes.hxx>
 #include <fmtruby.hxx>
 
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index c530c8280870..1310325575cd 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -38,7 +38,7 @@
 #ifndef _TOOLS_REF_HXX
 #include <tools/ref.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <frmfmt.hxx>
 
 // Forward Deklaration
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 3be5406cf62c..45d413ced105 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -538,7 +538,7 @@ public:
     inline SvStream& OutULong( ULONG nVal )     { return OutULong( Strm(), nVal ); }
 
     void SetStrm( SvStream& rStrm ) { pStrm = &rStrm; }
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     SvStream& Strm() { return *pStrm; }
 #else
     SvStream& Strm();
@@ -637,6 +637,8 @@ public:
 
 typedef Reader* (*FnGetReader)();
 typedef void (*FnGetWriter)(const String&, const String& rBaseURL, WriterRef&);
+ULONG SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, BOOL, const String& );
+ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
 
 struct SwReaderWriterEntry
 {
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 4c7bb09ebe45..8c677c9ed8db 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -39,7 +39,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 struct SW_DLLPUBLIC ShellResource : public Resource
@@ -72,6 +72,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     String          aStrNone;
     // fuer Felder, die Fixiert sind
     String          aFixedStr;
+    // custom fields of type css::util::Duration
+    String          sDurationFormat;
 
     //names of TOXs
     String          aTOXIndexName;
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index 103b58ed71b9..5b93f92e298d 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -31,7 +31,7 @@
 #define _SORTOPT_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include "swdllapi.h"
 
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 3042f1def0c9..eccfc1a5b347 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -31,8 +31,8 @@
 #define _SWATRSET_HXX
 #include <tools/solar.h>
 #include <tools/mempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <swdllapi.h>
 
 class SwModify;
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index 8b7e9c2ea451..d2556a31bccf 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.hxx
@@ -40,6 +40,8 @@ public:
 
     void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
                      sal_uInt32* pValues );
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 #endif
diff --git a/sw/inc/swhints.hxx b/sw/inc/swhints.hxx
index c4090cbe54f3..6c7b69eff7a6 100644
--- a/sw/inc/swhints.hxx
+++ b/sw/inc/swhints.hxx
@@ -30,7 +30,7 @@
 #ifndef SW_HINTS_HXX
 #define SW_HINTS_HXX
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #define SW_BROADCASTID_START            SFX_HINT_USER00
 #define SW_BROADCAST_DRAWVIEWS_CREATED  SW_BROADCASTID_START
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 57e8a3a1a31a..553ee20d9bc1 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -32,11 +32,12 @@
 #include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <vcl/fldunit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/options.hxx>
 #include <sfx2/module.hxx>
 
 #include <tools/shl.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "swdllapi.h"
 #include "shellid.hxx"
 #include <fldupde.hxx>
@@ -77,7 +78,7 @@ namespace com{ namespace sun{ namespace star{ namespace scanner{
     class XScannerManager;
 }}}}
 
-class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener
+class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::ConfigurationListener
 {
     String              sActAuthor;
 
@@ -126,6 +127,8 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener
     // Hint abfangen fuer DocInfo
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
+    virtual void        ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
+
 protected:
     // Briefumschlaege, Etiketten
     void                InsertEnv(SfxRequest&);
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index 0b1e42070101..793746877d9f 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -30,7 +30,7 @@
 #ifndef _SWREGION_HXX
 #define _SWREGION_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include "swrect.hxx"
 
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 1a62bb3d4dfd..1699cf439030 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -33,12 +33,12 @@
 #ifndef _TOOLS_REF_HXX
 #include <tools/ref.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tblenum.hxx>
 #include <swtypes.hxx>
 #include <calbck.hxx>
 #include <swrect.hxx>
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #include <node.hxx>         // fuer StartNode->GetMyIndex
 #else
 class SwStartNode;
@@ -111,7 +111,7 @@ protected:
 
     BOOL        bModifyLocked   :1;
     BOOL        bNewModel       :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bool bDontChangeModel;  // This is set by functions (like Merge()) to forbid a laet model change
 #endif
 
@@ -210,7 +210,7 @@ public:
     BOOL Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
                 SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bDontChangeModel = true;
 #endif
         return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) :
@@ -219,7 +219,7 @@ public:
     BOOL SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1,
                    BOOL bSameHeight = FALSE )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bDontChangeModel = true;
 #endif
         return bNewModel ? NewSplitRow( pDoc, rBoxes, nCnt, bSameHeight ) :
@@ -323,7 +323,7 @@ public:
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
     BOOL SetRowHeight( SwTableBox& rAktBox, USHORT eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void CheckConsistency() const;
 #endif
 };
@@ -412,7 +412,7 @@ public:
 
     const SwStartNode *GetSttNd() const { return pSttNd; }
     ULONG GetSttIdx() const
-#ifdef PRODUCT
+#ifndef DBG_UTIL
         { return pSttNd ? pSttNd->GetIndex() : 0; }
 #else
         ;
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index ce997cc3f43d..1ce8f7318131 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -30,7 +30,7 @@
 #ifndef _SWUNDO_HXX
 #define _SWUNDO_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 // die Ids fuer StdAktionen
 enum SwUndoId
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 092d6b12f22b..10eff5c1f33f 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -33,7 +33,7 @@
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_LONGS
 #define _SVSTDARR_BOOLS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #ifndef INCLUDED_VECTOR
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 0b26219ab7e1..3ca914531882 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -47,7 +47,7 @@ JP 20.07.95:
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 **************************************************************************/
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "hintids.hxx"          //_immmer_ vor den solar-items!
 #include <svx/algitem.hxx>
 #include <svx/fontitem.hxx>
@@ -65,7 +65,7 @@ JP 20.07.95:
 #include <svx/brshitem.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/bolnitem.hxx>
 #include "swdllapi.h"
 
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index d87768664fe5..9bd5ef390da1 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -30,7 +30,7 @@
 #ifndef _TBLSEL_HXX
 #define _TBLSEL_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <swtable.hxx>
 #include <swrect.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index c502454efcea..659b05207aa9 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -31,7 +31,7 @@
 #define SW_TGRDITEM_HXX
 
 #include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 9223ffa2d9df..65a4879485b7 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -34,8 +34,8 @@
 #include <tools/string.hxx>
 
 #include <svx/svxenum.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/svarray.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <toxe.hxx>
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 32fedb3753a0..4ceb64e90f0d 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -31,7 +31,7 @@
 #define _TXATBASE_HXX
 
 #include <tools/solar.h>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <hintids.hxx>
 #include <errhdl.hxx>
 
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index e50eb2dbda77..a087ebcb087d 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -32,7 +32,7 @@
 
 #include <tools/solar.h>
 #include <sal/types.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <svx/langitem.hxx>
 #include <hintids.hxx>
 
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index daefe85aa09a..5b08b496a360 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -36,9 +36,9 @@
 #define _SVSTDARR_BOOLS
 #define _SVSTDARR_BYTES
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <numrule.hxx>
 #include <itabenum.hxx>
@@ -115,7 +115,7 @@ namespace utl {
     class TransliterationWrapper;
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 class Writer;
 class SwUndo;
 #define OUT_UNDOBJ( name )  \
diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx
index b115919a5623..87e896d76046 100644
--- a/sw/inc/unoatxt.hxx
+++ b/sw/inc/unoatxt.hxx
@@ -41,8 +41,8 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <cppuhelper/implbase3.hxx> // helper for implementations
 #include <cppuhelper/implbase4.hxx> // helper for implementations
 #include <cppuhelper/implbase5.hxx> // helper for implementations
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 05857bbc6fe1..5b277af11a49 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 // <--
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class SdrMarkList;
 class SdrView;
diff --git a/sw/inc/unoevent.hxx b/sw/inc/unoevent.hxx
index 40beb04943e5..6cb39ac5c481 100644
--- a/sw/inc/unoevent.hxx
+++ b/sw/inc/unoevent.hxx
@@ -31,7 +31,7 @@
 #define _UNOEVENT_HXX
 
 #include <svtools/unoevent.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 
 class SvxMacroItem;
diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx
index 5b5dceac47e3..38b70b308bd0 100644
--- a/sw/inc/unoevtlstnr.hxx
+++ b/sw/inc/unoevtlstnr.hxx
@@ -30,7 +30,7 @@
 #ifndef _UNOEVTLSTNR_HXX
 #define _UNOEVTLSTNR_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/uno/Reference.h>
 
 namespace com{namespace sun{namespace star{
diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx
index 3dbe497b2e3c..2e31ed8766de 100644
--- a/sw/inc/unomailmerge.hxx
+++ b/sw/inc/unomailmerge.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/text/XMailMergeBroadcaster.hpp>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <sfx2/objsh.hxx>   // SfxObjectShellRef
 
 #include <functional>
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 892b778b0fe3..c5fcbfe15489 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -30,7 +30,7 @@
 #ifndef _UNOMAP_HXX
 #define _UNOMAP_HXX
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #define PROPERTY_NONE 0
 
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index b7a6c54d2bd2..0447c39920df 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -34,8 +34,8 @@
 #include <unoevtlstnr.hxx>
 #include <unobaseclass.hxx>
 #include <unocrsr.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/svarray.hxx>
 #include <frmfmt.hxx>
 #include <flyenum.hxx>
 #include <fldbas.hxx>
diff --git a/sw/inc/unoport.hxx b/sw/inc/unoport.hxx
index ef20027994cf..acf21fc501f3 100644
--- a/sw/inc/unoport.hxx
+++ b/sw/inc/unoport.hxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <memory>
 #include <deque>
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index bc9cd02a3ac7..81f5710b811b 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -44,7 +44,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <tools/string.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class SwDoc;
 class SwFmtCol;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 7c9e00f6671f..fbadd2da1618 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -31,8 +31,8 @@
 #define _UNOSTYLE_HXX
 
 #include <boost/shared_ptr.hpp>
-#include <svtools/style.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/style.hxx>
+#include <svl/lstner.hxx>
 #include <unocoll.hxx>
 #include <unomap.hxx>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 5ebe07e7f633..7bb2af6393d1 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -30,7 +30,7 @@
 #ifndef _UNOTXDOC_HXX
 #define _UNOTXDOC_HXX
 #include "swdllapi.h"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -70,7 +70,7 @@
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <svx/fmdmod.hxx>
 #include <svx/UnoForbiddenCharsTable.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index d650d90cf08e..b3feded02ea1 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -175,7 +175,7 @@ protected:
 
     BYTE            nTblDest;           // Ziel fuer Tabellenhintergrund
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // korrespondieren zu den Angaben in ui/config/cfgvw.src
     BOOL  bTest1        :1;     // Test-Flag  "Layout not loading"
     BOOL  bTest2        :1;     // Test-Flag  "WYSIWYG++"
@@ -417,7 +417,7 @@ public:
     USHORT GetViewLayoutColumns() const { return mnViewLayoutColumns; }
     void   SetViewLayoutColumns( USHORT nNew ) { mnViewLayoutColumns = nNew; }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // korrespondieren zu den Angaben in ui/config/cfgvw.src
     inline BOOL IsTest1() const     { return bTest1; }
     inline void SetTest1( BOOL b )  { bTest1 = b; }
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 7a8d0eb0c273..f12b3ecbe9bc 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <tools/rtti.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <ring.hxx>
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index a240e166d197..f1fd0abb4ae4 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -169,7 +169,7 @@ public:
     // TRUE: an die Position kann der Cursor gesetzt werden
     virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
     virtual BOOL IsSelOvr( int eFlags =
@@ -213,7 +213,7 @@ public:
     // TRUE: an die Position kann der Cursor gesetzt werden
     virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
     virtual BOOL IsSelOvr( int eFlags =
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 426a9f040379..6fd49c1d77b0 100644..100755
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -1,4 +1,4 @@
-sw	sw	:    l10n connectivity OOo:writerperfect svx stoc uui writerfilter vbahelper NULL
+sw      sw      :    filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL
 sw	sw										usr1	-	all	sw_mkout NULL
 sw	sw\inc									nmake		-	all	sw_inc NULL
 sw	sw\uiconfig\layout									nmake	-	all	sw_layout NULL
diff --git a/sw/qa/complex/checkColor/makefile.mk b/sw/qa/complex/checkColor/makefile.mk
index 0541b44e1d44..d9f7060a83fb 100755
--- a/sw/qa/complex/checkColor/makefile.mk
+++ b/sw/qa/complex/checkColor/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/checkColor
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
 JAVAFILES       = CheckChangeColor.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/sw/qa/complex/indeterminateState/makefile.mk b/sw/qa/complex/indeterminateState/makefile.mk
index 5261e70667be..731822e03278 100755
--- a/sw/qa/complex/indeterminateState/makefile.mk
+++ b/sw/qa/complex/indeterminateState/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/indeterminateState
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = CheckIndeterminateState.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/sw/qa/complex/writer/makefile.mk b/sw/qa/complex/writer/makefile.mk
index de5200d47142..9aa7e95c9af2 100755
--- a/sw/qa/complex/writer/makefile.mk
+++ b/sw/qa/complex/writer/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/writer
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = CheckIndexedPropertyValues.java CheckNamedPropertyValues.java CheckCrossReferences.java CheckBookmarks.java CheckFlies.java TextPortionEnumerationTest.java
 JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index ad069407b669..cc10355d75e7 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 #define TIMELOG
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <bparr.hxx>
 #include <string>
 #include <stdlib.h>
diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk
index 66308d1eed33..3982536b28e5 100644
--- a/sw/qa/core/makefile.mk
+++ b/sw/qa/core/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     CFLAGS+=/Ob1
@@ -52,17 +52,7 @@ SHL1OBJS=$(SLO)$/Test-BigPtrArray.obj \
     $(SLO)$/bparr.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
-   
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-# .IF "$(OS)" == "SOLARIS"
-# SHL1STDLIBS += -lrt -laio
-# .ENDIF
-.ENDIF
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index 9154e6ce2578..de0be1f9a5c1 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-interface BaseTextDocument : OfficeDocument
+interface BaseTextDocument
 [
     Automation = FALSE;
 ]
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 7623da2c3ff0..5fa9dab613af 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 
-interface BaseTextEditView : View
+interface BaseTextEditView
 [
     Automation = FALSE;
 ]
diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi
index 2901795a0c9a..d1619df2f1ff 100644
--- a/sw/sdi/docsh.sdi
+++ b/sw/sdi/docsh.sdi
@@ -68,7 +68,7 @@ interface TextDocument : BaseTextDocument
     ]
 }
 
-shell SwDocShell : SfxObjectShell
+shell SwDocShell
 {
     import TextDocument[Automation];
 }
diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk
index 25b75feea040..016b0df6cbb8 100644
--- a/sw/sdi/makefile.mk
+++ b/sw/sdi/makefile.mk
@@ -53,7 +53,12 @@ SDI1EXPORT=swriter
 
 # --- Files --------------------------------------------------------
 SVSDI1DEPEND= \
-        switems.sdi\
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+                switems.sdi\
         swriter.sdi\
         _docsh.sdi\
         docsh.sdi\
@@ -97,8 +102,7 @@ SVSDI1DEPEND= \
         annotsh.sdi\
         swslots.hrc \
         $(INC)$/globals.hrc \
-                $(INC)$/cmdid.h \
-                $(SOLARINCXDIR)$/svxslots.ilb
+                $(INC)$/cmdid.h 
 .ENDIF
 
 # --- Targets -------------------------------------------------------
diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi
index 0cfa6bd8277e..8eea2b690396 100644
--- a/sw/sdi/swslots.sdi
+++ b/sw/sdi/swslots.sdi
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "9F76B581-23DD-101C-80B6-000024021835"
 "A1810F00-23DE-101C-80B6-000024021835"
@@ -37,10 +35,15 @@ StarWriter
 [
 HelpText( "StarWriter Application" )
 SlotIdFile( "swslots.hrc" )
-TypeLibFile( "swslots.tlb" )
 ModulePrefix( "Sw" )
 ]
 {
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
+
     item String TbxDummyItem;
 /*
     item String XFillAttrSetItem;
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 05b41e6e7482..053c81b856aa 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -145,7 +145,7 @@ interface TextEditView : BaseTextEditView
 }
  //=========================================================================
 
-shell SwView : SfxViewShell
+shell SwView
 
 {
     import TextEditView [Automation];
@@ -155,7 +155,7 @@ shell SwView : SfxViewShell
 //  import ReplaceAttributes;
 }
 
-interface TextPrintPreview : View
+interface TextPrintPreview
 [ uuid = "1622A480-111A-101D-9757-6E74207A7520" ]
 {
     SID_BROWSER_MODE
@@ -325,7 +325,7 @@ interface TextPrintPreview : View
 
  //=========================================================================
 
-shell SwPagePreView : SfxViewShell
+shell SwPagePreView
 {
     import TextPrintPreview[Automation];
 }
diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi
index e2efd025c1df..711bb4620f03 100644
--- a/sw/sdi/wdocsh.sdi
+++ b/sw/sdi/wdocsh.sdi
@@ -47,7 +47,7 @@ interface WebDocument : BaseTextDocument
     ]
 }
 
-shell SwWebDocShell : SfxObjectShell
+shell SwWebDocShell
 {
         import WebDocument[Automation];
 }
diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi
index 3eff3db1f4a0..31e5d791aeba 100644
--- a/sw/sdi/wviewsh.sdi
+++ b/sw/sdi/wviewsh.sdi
@@ -63,7 +63,7 @@ interface WebEditView : BaseTextEditView
     ]
 }
 
-shell SwWebView : SfxViewShell
+shell SwWebView
 {
     import WebEditView [Automation];
 //  import SearchSettings;
@@ -73,7 +73,7 @@ shell SwWebView : SfxViewShell
 
 }
 
-interface WebSourceView : View
+interface WebSourceView
 [ uuid = "95069CE0-69D8-101D-9757-C667E8298000"]
 {
     SID_TABLE_CELL // status()
@@ -195,7 +195,7 @@ interface WebSourceView : View
     ]
 }
 
-shell SwSrcView : SfxViewShell
+shell SwSrcView
 
 {
         import WebSourceView [Automation];
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 0c6106461f49..8f9caf5f022b 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -39,7 +39,7 @@
 using std::vector;
 using std::find;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 unsigned long SwNumberTreeNode::nInstances = 0;
 #endif
 
@@ -55,7 +55,7 @@ SwNumberTreeNode::SwNumberTreeNode()
 {
     mItLastValid = mChildren.end();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     mnSerial = nInstances;
     nInstances++;
 #endif
@@ -80,7 +80,7 @@ SwNumberTreeNode::~SwNumberTreeNode()
 
     ASSERT( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nInstances--;
 #endif
 
@@ -1108,7 +1108,7 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
 //  return aStr;
 //}
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 unsigned long SwNumberTreeNode::GetInstances()
 {
     return nInstances;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index a9ec7b047da8..a0d8053574ae 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -100,12 +100,12 @@ class SwAccessibleContextMap_Impl: public _SwAccessibleContextMap_Impl
 {
 public:
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool mbLocked;
 #endif
 
     SwAccessibleContextMap_Impl()
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         : mbLocked( sal_False )
 #endif
     {}
@@ -227,11 +227,11 @@ class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl
 
 public:
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool mbLocked;
 #endif
     SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         : mbLocked( sal_False )
 #endif
     {
@@ -1009,7 +1009,7 @@ SwAccessibleMap::~SwAccessibleMap()
 
     {
         vos::OGuard aGuard( maMutex );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( !mpFrmMap || mpFrmMap->empty(),
                 "Frame map should be empty after disposing the root frame" );
         if( mpFrmMap )
@@ -1062,7 +1062,7 @@ SwAccessibleMap::~SwAccessibleMap()
 
     {
         vos::OGuard aGuard( maEventMutex );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( !(mpEvents || mpEventMap), "pending events" );
         if( mpEvents )
         {
@@ -1101,12 +1101,12 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
         if( !mpFrmMap )
         {
             mpFrmMap = new SwAccessibleContextMap_Impl;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             mpFrmMap->mbLocked = sal_False;
 #endif
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( !mpFrmMap->mbLocked, "Map is locked" );
         mpFrmMap->mbLocked = sal_True;
 #endif
@@ -1138,7 +1138,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
             }
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         mpFrmMap->mbLocked = sal_False;
 #endif
     }
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index e4410c26e8bb..5827fb55c29e 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -38,7 +38,7 @@
 #include <swcache.hxx>
 #include <swfntcch.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include <unotextmarkup.hxx>
 #endif
 
@@ -211,7 +211,7 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
 
     LockModify();
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     bInModify = TRUE;
 #else
     if( !pOldValue )
@@ -287,7 +287,7 @@ void SwModify::Add(SwClient *pDepend)
     // nur wenn das hier noch nicht eingetragen ist einfuegen
     if(pDepend->pRegisteredIn != this )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         SwClientIter* pTmp = pClientIters;
         while( pTmp )
         {
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 6fce2c4a59f5..8d71c70cf58f 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -47,12 +47,6 @@ SwFmtChg::SwFmtChg( SwFmt *pFmt )
 {}
 
 
-SwInsChr::SwInsChr( xub_StrLen nP )
-    : SwMsgPoolItem( RES_INS_CHR ),
-    nPos( nP )
-{}
-
-
 
 SwInsTxt::SwInsTxt( xub_StrLen nP, xub_StrLen nL )
     : SwMsgPoolItem( RES_INS_TXT ),
@@ -147,7 +141,7 @@ SwAttrSetChg::~SwAttrSetChg()
 }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwAttrSetChg::ClearItem( USHORT nWhch )
 {
@@ -183,7 +177,7 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
  * Ist keines vorhanden, returnt ein 0-Pointer !!!
  * Used to be inlined (hintids.hxx) in PRODUCT.
  ******************************************************************************/
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 const SfxPoolItem* GetDfltAttr( USHORT nWhich )
 {
     return aAttrTab[ nWhich - POOLATTR_BEGIN ];
@@ -227,12 +221,6 @@ SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrm *pPg ) :
 //    aList.Insert(rNd.GetIndex(), &rNd);
 //}
 
-SwNRuleLowerLevel::SwNRuleLowerLevel( const String& rRuleName, BYTE nSrchLvl )
-    : SwMsgPoolItem( RES_GETLOWERNUMLEVEL ), rName( rRuleName ),
-    nLvl(nSrchLvl)
-{
-}
-
 
 SwFindNearestNode::SwFindNearestNode( const SwNode& rNd )
     : SwMsgPoolItem( RES_FINDNEARESTNODE ), pNd( &rNd ), pFnd( 0 )
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 4f9d3c3b77cc..9a4b14a53866 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -33,7 +33,7 @@
 
 
 #include <hintids.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/colritem.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/bolnitem.hxx>
@@ -387,7 +387,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             // <--
         }
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( !this, "weder Format noch ContentNode - keine Attribute kopiert");
 #endif
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index fd91c3529f52..9158dffe96dd 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -41,7 +41,7 @@
 // immer ~ 20 * MAXENTRY == 20000 Eintraege
 const USHORT nBlockGrowSize = 20;
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 
 #define CHECKIDX( p, n, i, c )
 
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index aba5dbc74283..7193bb31eb9c 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -49,9 +49,9 @@
 #include <unotools/charclass.hxx>
 #include <svx/unolingu.hxx>
 #include <svx/scripttypeitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/datetime.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <swmodule.hxx>
 #include <doc.hxx>
 #include <viewsh.hxx>
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index cecbb7308f49..93939b9b7940 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -39,7 +39,7 @@
 #include "index.hxx"
 #include "error.h"              // fuers ASSERT
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 int SwIndex::nSerial = 0;
 #endif
 
@@ -103,7 +103,7 @@ SwIndex::SwIndex( SwIndexReg* pArr, xub_StrLen nIdx )
     else
         ChgValue( *pArray->pFirst, nIdx );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -115,7 +115,7 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx )
 {
     ChgValue( rIdx, rIdx.nIndex + nIdx );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -126,7 +126,7 @@ SwIndex::SwIndex( const SwIndex& rIdx )
     : nIndex( rIdx.nIndex ), pArray( rIdx.pArray ), pNext( 0 ), pPrev( 0 )
 {
     ChgValue( rIdx, rIdx.nIndex );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -371,7 +371,7 @@ void SwIndexReg::Update( SwIndex const & rIdx, const xub_StrLen nDiff,
 ARR_CHK_ARRAY
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef CFRONT
 
 /*************************************************************************
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 9f275aa09ed3..9e2b5efced77 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -34,7 +34,7 @@
 #include <tools/globname.hxx>
 #include <vcl/mapmod.hxx>
 #include <svx/xmlcnitm.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <svx/pbinitem.hxx>
 #include <svx/keepitem.hxx>
 #include <svx/nlbkitem.hxx>
@@ -83,7 +83,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <unotools/transliterationwrapper.hxx>
 #include <svx/acorrcfg.hxx>
@@ -780,7 +780,7 @@ void _FinitCore()
 
     delete SwEditShell::pAutoFmtFlags;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Defaultattribut freigeben lassen um asserts zu vermeiden.
     if ( aAttrTab[0]->GetRefCount() )
         SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, FALSE);
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 0e9ed9fd3720..ea2513d6237e 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -38,7 +38,7 @@
 
 SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define INCREMENT( nVar )
 #else
 #define INCREMENT( nVar )   ++nVar
@@ -53,7 +53,7 @@ SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
 |*
 |*************************************************************************/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwCache::Check()
 {
@@ -90,7 +90,7 @@ void SwCache::Check()
 }
 #endif
 
-#if !defined(PRODUCT) && defined(MADEBUG)
+#if defined(DBG_UTIL) && defined(MADEBUG)
 #define CHECK Check();
 #else
 #define CHECK
@@ -107,7 +107,7 @@ void SwCache::Check()
 
 
 SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , const ByteString &rNm
 #endif
     ) :
@@ -118,7 +118,7 @@ SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
     pLast( 0 ),
     nMax( nInitSize ),
     nCurMax( nInitSize )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , aName( rNm ),
     nAppend( 0 ),
     nInsertFree( 0 ),
@@ -137,7 +137,7 @@ SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
 {
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 
 SwCache::~SwCache()
@@ -197,7 +197,7 @@ void SwCache::Flush( const BYTE )
     SwCacheObj *pTmp;
     while ( pObj )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( pObj->IsLocked() )
         {
             ASSERT( TRUE, "Flushing locked objects." );
@@ -322,7 +322,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const USHORT nIndex,
             ToTop( pRet );
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( pRet )
             ++nGetSuccess;
         else
@@ -346,7 +346,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const BOOL bToTop )
     if ( bToTop && pRet && pRet != pFirst )
         ToTop( pRet );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( pRet )
         ++nGetSuccess;
     else
@@ -588,7 +588,7 @@ SwCacheObj::~SwCacheObj()
 |*
 |*************************************************************************/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 
 
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index b92047dbb39a..e156c71aa5fb 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _STREAM_HXX //autogen
 #include <tools/stream.hxx>
 #endif
@@ -321,7 +321,7 @@ void SwRect::SetUpperRightCorner(  const Point& rNew )
 void SwRect::SetLowerLeftCorner(  const Point& rNew )
     { m_Point = Point(rNew.nA, rNew.nB - m_Size.getHeight()); }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*************************************************************************
  *                  operator<<( ostream&, SwRect&)
  *************************************************************************/
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8a82e66c4c7b..3637cc19354d 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -332,7 +332,7 @@ if( GetWin() )
 }
 
 
-#if !defined( PRODUCT )
+#if defined(DBG_UTIL)
 
 void SwCrsrShell::SttCrsrMove()
 {
@@ -1459,7 +1459,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
                 Point aCentrPt( aCharRect.Center() );
                 aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
                 pTblFrm->GetCrsrOfst( pTblCrsr->GetPoint(), aCentrPt, &aTmpState );
-#ifdef PRODUCT
+#ifndef DBG_UTIL
                 pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() );
 #else
                 if ( !pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() ) )
@@ -2014,7 +2014,7 @@ void SwCrsrShell::Combine()
     SwCrsrSaveState aSaveState( *pCurCrsr );
     if( pCrsrStk->HasMark() )           // nur wenn GetMark gesetzt wurde
     {
-#ifdef PRODUCT
+#ifndef DBG_UTIL
         CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, TRUE );
 #else
         if( !CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, TRUE ))
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 23a9bf139ef1..b315e31bae48 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -33,7 +33,7 @@
 
 
 #include <hintids.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/brkitem.hxx>
@@ -1337,7 +1337,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
 
             if( !bRet && (
                 SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 || SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos
 #endif
                 ))
@@ -1349,7 +1349,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                 if( pSttNd && 0 != ( pTblNd = pTxtNd->FindTableNode()) &&
                     0 != ( pBox = pTblNd->GetTable().GetTblBox(
                                     pSttNd->GetIndex() )) &&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
                         RES_BOXATR_FORMULA, FALSE, &pItem ) ||
                       SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
@@ -1383,7 +1383,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                         // erzeuge aus der internen (fuer CORE)
                         // die externe (fuer UI) Formel
                         rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                         if( RES_BOXATR_VALUE == pItem->Which() )
                             rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
                         else
@@ -1417,7 +1417,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                 }
             }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rCntntAtPos.eCntntAtPos )
             {
                 xub_StrLen n = aPos.nContent.GetIndex();
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 5697912b21fe..28a79a3471de 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -38,8 +38,8 @@
 #include <i18npool/mslangid.hxx>
 #include <hintids.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/colritem.hxx>
 #include <svx/fontitem.hxx>
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index e5e87a33bc5d..996f377fda43 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -37,7 +37,7 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/svapp.hxx>
 #include <txatritr.hxx>
 #include <fldbas.hxx>
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 4b2f9332fb78..36bff61e57bf 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -550,7 +550,7 @@ void SwPaM::SetMark()
     (*m_pMark) = (*m_pPoint);
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwPaM::Exchange()
 {
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index ea5853916b8c..45e72963eb0f 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/i18n/CharType.hdl>
 
 #include <unotools/charclass.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <swmodule.hxx>
 #include <fmtcntnt.hxx>
 #include <swtblfmt.hxx>
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 4546a108b2ec..108da63d9b17 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -307,7 +307,7 @@ BOOL SwCrsrShell::SelTblBox()
     const SwStartNode* pStartNode =
         pCurCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // the old code checks whether we're in a table by asking the
     // frame. This should yield the same result as searching for the
     // table box start node, right?
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index a6019057df5e..8a9dc3c0a458 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -34,7 +34,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include <vcl/dialog.hxx>
@@ -862,7 +862,7 @@ BOOL SwShellCrsr::UpDown( BOOL bUp, USHORT nCnt )
                             &GetPtPos(), GetShell()->GetUpDownX() );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
@@ -1001,7 +1001,7 @@ BOOL SwShellTableCrsr::IsInside( const Point& rPt ) const
     return FALSE;
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 6084b53abc5b..2cfb515bff59 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -34,7 +34,7 @@
 
 #include <SwStyleNameMapper.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <tools/resmgr.hxx>
 #include <poolfmt.hxx>
 #ifndef _RDIC_HRC
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 9fda3564a400..d35c340975cb 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -33,8 +33,8 @@
 #ifdef DEBUG
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemiter.hxx>
 #include <string>
 #include <map>
 #include <node.hxx>
@@ -551,7 +551,7 @@ String lcl_dbg_out(const SwNode & rNode)
     aTmpStr += String::CreateFromInt32(rNode.GetIndex());
     aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US);
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aTmpStr += String(" serial=\"", RTL_TEXTENCODING_ASCII_US);
     aTmpStr += String::CreateFromInt32(rNode.GetSerial());
     aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US);
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 0c18b725d9f7..bac7d6f7ea0d 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -47,7 +47,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/poly.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <sfx2/printer.hxx>
 #include <svx/keepitem.hxx>
 #include <svx/cscoitem.hxx>
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 36c23b14b8a0..468ab59146de 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -41,7 +41,7 @@
 #include <tools/urlobj.hxx>
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/linkmgr.hxx>          // LinkManager
 #include <unotools/charclass.hxx>
 #include <fmtcntnt.hxx>
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 12e5d597a7c4..0aff3b40fc8a 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -70,7 +70,7 @@
 #include <fldbas.hxx>
 #include <swwait.hxx>
 #include <GetMetricVal.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #ifndef _STATSTR_HRC
 #include <statstr.hrc>
 #endif
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 95e18a7e78af..364c664d0bea 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -258,7 +258,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
             SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
 
             // --> OD 2005-08-16 #i53320#
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             SwAnchoredDrawObject* pAnchoredDrawObj =
                 static_cast<SwAnchoredDrawObject*>(pContact->GetAnchoredObj( pObj ));
             ASSERT( bGroupMembersNotPositioned == pAnchoredDrawObj->NotYetPositioned(),
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index fba401974a5b..551fcc41c2ee 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -39,7 +39,7 @@
 #include <tools/datetime.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_ULONGS
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #endif
 #ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
@@ -601,7 +601,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
                     {
                         if( aPara.CalcWithStackOverflow() )
                             pFld->CalcField( aPara );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                         else
                         {
                             // mind. ein ASSERT
@@ -669,7 +669,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
                     {
                         if( aPara.CalcWithStackOverflow() )
                             pFml->Calc( aPara, nValue );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                         else
                         {
                             // mind. ein ASSERT
@@ -907,7 +907,7 @@ void _SetGetExpFld::SetBodyPos( const SwCntntFrm& rFrm )
         SwNodeIndex aIdx( *rFrm.GetNode() );
         SwDoc& rDoc = *aIdx.GetNodes().GetDoc();
         SwPosition aPos( aIdx );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( ::GetBodyTxtNode( rDoc, aPos, rFrm ), "wo steht das Feld" );
 #else
         ::GetBodyTxtNode( rDoc, aPos, rFrm );
@@ -2551,7 +2551,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich )
     {
         // einen Index fuers bestimmen vom TextNode anlegen
         SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
 #else
         GetBodyTxtNode( rDoc, aPos, *pFrm );
@@ -2599,7 +2599,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
             if( !pFrm )
                 break;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
 #else
             GetBodyTxtNode( rDoc, aPos, *pFrm );
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 507e63ba7a47..9935842e6800 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -33,7 +33,7 @@
 
 
 #include <hintids.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
@@ -677,7 +677,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             // Continue with next selected object and assert, if this isn't excepted.
             if ( !pContact )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 bool bNoUserCallExcepted =
                         pObj->ISA(SwDrawVirtObj) &&
                         !static_cast<SwDrawVirtObj*>(pObj)->IsConnected();
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index cb6d637933f5..312f8fb7b00f 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -37,20 +37,20 @@
 #define _SVSTDARR_USHORTS
 #include <hintids.hxx>
 #include <rtl/logfile.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/misccfg.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/brkitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #ifndef _ZFORLIST_HXX //autogen
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #endif
 #include <comphelper/processfactory.hxx>
+#include <unotools/misccfg.hxx>
 #include <com/sun/star/i18n/WordType.hdl>
 #include <fmtpdsc.hxx>
 #include <fmthdft.hxx>
@@ -2453,7 +2453,7 @@ void SwDoc::_CreateNumberFormatter()
     Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
     pNumberFormatter = new SvNumberFormatter( xMSF, eLang );
     pNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL );
-    pNumberFormatter->SetYear2000(static_cast<USHORT>(SFX_APP()->GetMiscConfig()->GetYear2000()));
+    pNumberFormatter->SetYear2000(static_cast<USHORT>(::utl::MiscCfg().GetYear2000()));
 
 }
 
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 113319494e03..df5efb6521c8 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -34,9 +34,9 @@
 
 #include <hintids.hxx>
 #include <unotools/tempfile.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 1af12a64bf2f..b97d1fbcd642 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <hintids.hxx>
 #include <com/sun/star/util/XCloseable.hpp>
@@ -212,7 +212,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
         }
         break;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     case FLY_PAGE:
     case FLY_AUTO_CNTNT:
     case FLY_AT_FLY:
@@ -1693,7 +1693,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
         SwTxtAttr * const pHnt =
             pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
         ASSERT( pHnt && ((SwFmtFlyCnt&)pHnt->GetFlyCnt()).
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 2a36ce970615..57d017bd050e 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -47,14 +47,14 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdogrp.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/forbiddencharacterstable.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/compatibility.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/zforlist.hxx>
+#include <unotools/compatibility.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/svdpage.hxx>
 #include <paratr.hxx>
 #include <fchrfmt.hxx>
@@ -319,7 +319,7 @@ SwDoc::SwDoc() :
     mbInsOnlyTxtGlssry =
     mbContains_MSVBasic =
     mbKernAsianPunctuation =
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     mbXMLExport =
 #endif
     // --> OD 2006-03-21 #b6375613#
@@ -1353,6 +1353,7 @@ SwDoc* SwDoc::CreateCopy() const
     ResetModified();
 
 */
+    pRet->ReplaceStyles( *(SwDoc*)this );
     //copy content
     pRet->Paste( *this );
     return pRet;
@@ -1417,7 +1418,7 @@ void SwDoc::Paste( const SwDoc& rSource )
                     SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
                     if( FLY_PAGE == aAnchor.GetAnchorId() )
                     {
-                        aAnchor.SetPageNum( aAnchor.GetPageNum() + /*nStartPageNumber - */1 );
+                        aAnchor.SetPageNum( aAnchor.GetPageNum() /*+ nStartPageNumber - */);
                     }
                     else
                         continue;
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 5f0170c1947f..dddf027647c1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -35,7 +35,7 @@
 #include <hintids.hxx>
 #include <tools/shl.hxx>
 #ifndef _SFX_ITEMITER_HXX //autogen
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #endif
 #include <sfx2/app.hxx>
 #include <svx/colritem.hxx>
@@ -59,7 +59,7 @@ using namespace com::sun::star;
 
 TYPEINIT1(SwRedlineHint, SfxHint);
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 
     #define _CHECK_REDLINE( pDoc )
     #define _DEBUG_REDLINE( pDoc )
@@ -310,7 +310,7 @@ Verhalten von Delete-Redline:
 bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
 {
 #if 0
-// #i93179# disabled: ASSERT in ~SwIndexReg     #ifndef PRODUCT
+// #i93179# disabled: ASSERT in ~SwIndexReg     #ifdef DBG_UTIL
     SwRedline aCopy( *pNewRedl );
 #endif
     bool bError = true;
@@ -3698,7 +3698,7 @@ void SwRedline::SetContentIdx( const SwNodeIndex* pIdx )
         delete pCntntSect, pCntntSect = 0;
         bIsVisible = FALSE;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( !this, "das ist keine gueltige Operation" );
 #endif
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 783c7ac65139..4433d3b5e7e2 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -36,7 +36,7 @@
 #include <hintids.hxx>
 
 #define _SVSTDARR_STRINGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/langitem.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/tstpitem.hxx>
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 6ee49a81b4b7..86a4edf2aa87 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -48,7 +48,7 @@
 
 //--> #outlinelevel added by zhaojianwei
 #ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #endif
 //<--end
 
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index e4b7b9e87a88..e3effed7250c 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -397,7 +397,7 @@ USHORT SwHTMLTableLayout::GetBrowseWidth( const SwDoc& rDoc )
 */
             ASSERT( nWidth, "No browse width available" );
         }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         else
         {
             // und wenn das auch nicht klappt, gibt es zur Zeit keine Breite
@@ -1660,13 +1660,13 @@ static BOOL lcl_ResizeBox( const SwTableBox*& rpBox, void* pPara )
 static BOOL lcl_ResizeLine( const SwTableLine*& rpLine, void* pPara )
 {
     USHORT *pWidth = (USHORT *)pPara;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nOldWidth = *pWidth;
 #endif
     *pWidth = 0;
     ((SwTableLine *)rpLine)->GetTabBoxes().ForEach( &lcl_ResizeBox, pWidth );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !nOldWidth || Abs(*pWidth-nOldWidth) < COLFUZZY,
             "Zeilen einer Box sind unterschiedlich lang" );
 #endif
@@ -1777,7 +1777,7 @@ void SwHTMLTableLayout::SetWidths( BOOL bCallPass2, USHORT nAbsAvail,
             }
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         {
             // steht im tblrwcl.cxx
             extern void _CheckBoxWidth( const SwTableLine&, SwTwips );
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 9f464aac5424..54139e06c340 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -39,7 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/imap.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/soerr.hxx>
 #include <sfx2/progress.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 94925f5ffc5e..2fe9b11808ec 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -64,7 +64,7 @@
 #include <algorithm>
 // <--
 // --> OD 2008-06-06 #i89178#
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 // <--
 // --> OD 2008-07-08 #i91400#
 #include <IDocumentListsAccess.hxx>
@@ -478,7 +478,7 @@ const SwFmtVertOrient*      SwNumFmt::GetGraphicOrientation() const
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 long int SwNumRule::nInstances = 0;
 #endif
 
@@ -512,7 +512,7 @@ SwNumRule::SwNumRule( const String& rNm,
     msDefaultListId()
     // <--
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nSerial = nInstances++;
 #endif
 
@@ -632,7 +632,7 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
       msDefaultListId( rNumRule.msDefaultListId )
       // <--
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nSerial = nInstances++;
 #endif
 
@@ -1317,6 +1317,7 @@ namespace numfunc
                 @author OD
             */
             virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames );
+            virtual void Commit();
 
             static SwDefBulletConfig* mpInstance;
 
@@ -1487,6 +1488,10 @@ namespace numfunc
         InitFont();
     }
 
+    void SwDefBulletConfig::Commit()
+    {
+    }
+
     const String& GetDefBulletFontname()
     {
         return SwDefBulletConfig::getInstance()->GetFontname();
@@ -1562,6 +1567,7 @@ namespace numfunc
                 @author OD
             */
             virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames );
+            virtual void Commit();
 
             static SwNumberingUIBehaviorConfig* mpInstance;
 
@@ -1596,6 +1602,8 @@ namespace numfunc
         return aPropNames;
     }
 
+    void SwNumberingUIBehaviorConfig::Commit() {}
+
     void SwNumberingUIBehaviorConfig::LoadConfig()
     {
         com::sun::star::uno::Sequence<rtl::OUString> aPropNames = GetPropNames();
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index bda693e8d6ae..e5394ef11f3f 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -34,7 +34,7 @@
 
 #include "swstylemanager.hxx"
 #include <hash_map>
-#include <svtools/stylepool.hxx>
+#include <svl/stylepool.hxx>
 #include <doc.hxx>
 #include <charfmt.hxx>
 #include <docary.hxx>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 630979ff72ed..cb968231d575 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -37,10 +37,10 @@
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <svx/dialmgr.hxx>
 #ifndef _SVX_DIALOGS_HRC
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 5eea4c33247c..2ef5bf28268e 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -35,7 +35,7 @@
 #include <hintids.hxx>
 
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <frmfmt.hxx>
 #include <doc.hxx>
 #include <cntfrm.hxx>
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 14a3ed87a8d1..a8cf3f819444 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -74,7 +74,7 @@ using namespace com::sun::star::uno;
 
 using namespace ::com::sun::star;
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -197,7 +197,7 @@ BOOL lcl_DelOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
 
 typedef BOOL (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, BOOL );
 
-#if !defined( PRODUCT ) || defined( JP_DEBUG )
+#if defined(DBG_UTIL) || defined( JP_DEBUG )
 
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
 
@@ -3506,7 +3506,7 @@ void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
     }
 }
 
-#if !defined( PRODUCT ) || defined( JP_DEBUG )
+#if defined(DBG_UTIL) || defined( JP_DEBUG )
 
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
 {
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index d5d0832c0a20..6f256bacce2c 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -33,7 +33,7 @@
 
 
 #include <sfx2/docfile.hxx>
-#include <svtools/inethist.hxx>
+#include <svl/inethist.hxx>
 #include <fmtinfmt.hxx>
 #include <txtinet.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index a2263bc3f442..a185fe0299e8 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -59,7 +59,7 @@
 #include <pagedesc.hxx>
 #include <poolfmt.hxx>
 #include <SwNodeNum.hxx>
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -1329,7 +1329,7 @@ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndConte
 
     aRedlRest.Restore();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         //JP 17.06.99: Bug 66973 - check count only if the selection is in
         //              the same (or no) section. Becaus not full selected
diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx
index 54936230228d..d4611aad60d7 100644
--- a/sw/source/core/docnode/ndindex.cxx
+++ b/sw/source/core/docnode/ndindex.cxx
@@ -37,7 +37,7 @@
 #include "error.h"              // fuers ASSERT
 #include "ndindex.hxx"
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 int SwNodeIndex::nSerial = 0;
 #endif
 
@@ -71,7 +71,7 @@ SwNodeIndex::SwNodeIndex( SwNodes& rNds, ULONG nIdx )
 {
     rNds.RegisterIndex( *this );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
@@ -86,7 +86,7 @@ SwNodeIndex::SwNodeIndex( const SwNodeIndex& rIdx, long nDiff )
         pNd = rIdx.pNd;
 
     pNd->GetNodes().RegisterIndex( *this );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
@@ -101,7 +101,7 @@ SwNodeIndex::SwNodeIndex( const SwNode& rNd, long nDiff )
         pNd = (SwNode*)&rNd;
 
     pNd->GetNodes().RegisterIndex( *this );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index 817fa3c257aa..f1cd2abe6e58 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -34,7 +34,7 @@
 
 #include <hintids.hxx>
 #include <tools/poly.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/contdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <docary.hxx>
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index ae70599de061..aaf4814b3577 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -50,7 +50,7 @@ BOOL SwOutlineNodes::Seek_Entry( const SwNodePtr rSrch, USHORT* pFndPos ) const
 //JP 17.03.98: aufgrund des Bug 48592 - wo unter anderem nach Undo/Redo
 //              Nodes aus dem falschen NodesArray im OutlineArray standen,
 //              jetzt mal einen Check eingebaut.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         {
             for( USHORT n = 1; n < nO; ++n )
                 if( &(*this)[ n-1 ]->GetNodes() !=
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 0f44f1f3898a..1ab54e18dbec 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -34,7 +34,7 @@
 
 #include <hintids.hxx>
 #include <svx/linkmgr.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <tools/resid.hxx>
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 6407e505aa0c..08174467da1f 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -104,7 +104,7 @@
 // --> OD 2005-12-05 #i27138#
 #include <rootfrm.hxx>
 // <--
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 61dd90bc509c..3318b2575230 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -341,7 +341,7 @@ USHORT SwNode::GetSectionLevel() const
 |*
 *******************************************************************/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 long SwNode::nSerial = 0;
 #endif
 
@@ -373,7 +373,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const BYTE nNdType )
         pStartOfSection = (SwStartNode*)this;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nMySerial = nSerial;
     nSerial++;
 #endif
@@ -406,7 +406,7 @@ SwNode::SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNdType )
         pStartOfSection = (SwStartNode*)this;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nMySerial = nSerial;
     nSerial++;
 #endif
@@ -1479,7 +1479,6 @@ SwCntntNode *SwCntntNode::JoinPrev()
     // erfrage vom Modify Informationen
 BOOL SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
 {
-    const SwNumRuleItem* pItem;
     switch( rInfo.Which() )
     {
     case RES_AUTOFMT_DOCNODE:
@@ -1509,18 +1508,6 @@ BOOL SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
 //        return TRUE;
     // <--
 
-    case RES_GETLOWERNUMLEVEL:
-        if( IsTxtNode() &&
-            0 != ( pItem = (SwNumRuleItem*)GetNoCondAttr(
-            RES_PARATR_NUMRULE, TRUE )) && pItem->GetValue().Len() &&
-            pItem->GetValue() == ((SwNRuleLowerLevel&)rInfo).GetName() &&
-            ((SwTxtNode*)this)->GetActualListLevel()
-                > ((SwNRuleLowerLevel&)rInfo).GetLevel() )
-        {
-            return FALSE;
-        }
-        break;
-
     case RES_FINDNEARESTNODE:
         if( ((SwFmtPageDesc&)GetAttr( RES_PAGEDESC )).GetPageDesc() )
             ((SwFindNearestNode&)rInfo).CheckNode( *this );
@@ -1572,7 +1559,7 @@ BOOL SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
     }
     return bRet;
 }
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 
 BOOL SwCntntNode::SetAttr( const SfxItemSet& rSet )
 {
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index ce24e4ba06b5..e005326b6732 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -50,7 +50,7 @@
 #include <fmtmeta.hxx>
 
 #include <docsh.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 extern BOOL CheckNodesRange( const SwNodeIndex& rStt,
                             const SwNodeIndex& rEnd, BOOL bChkSection );
@@ -408,7 +408,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
             if( pFrmNd && !((SwCntntNode*)pFrmNd)->GetDepends() )
                 pFrmNd = 0;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if( !pFrmNd )
                 ASSERT( !this, "ChgNode() - kein FrameNode gefunden" );
 #endif
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 1a174d9d54de..f73d22cbd74a 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -34,8 +34,8 @@
 
 #include <stdlib.h>
 #include <hintids.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svx/protitem.hxx>
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index a5d8ccd24e61..e7b3ebd80245 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sw.hxx"
 #include <basic/basmgr.hxx>
 #include <svtools/imapobj.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/securityoptions.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/securityoptions.hxx>
 #include <vcl/help.hxx>
 #include <svx/svdview.hxx>
 #include <fmturl.hxx>
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 78ede2495f78..ddafb796473e 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -35,9 +35,9 @@
 #include <svx/svxids.hrc>
 #endif
 #include <tools/stream.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sot/storage.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 7bacee8fbde4..dd42123a7bc2 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <hintids.hxx>
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <unotools/charclass.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/lrspitem.hxx>
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 5ca8e4f2c3cb..36f4010d0df5 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -60,7 +60,7 @@
 #include <crsskip.hxx>
 #include <txtfrm.hxx>       // SwTxtFrm
 #include <scriptinfo.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <charfmt.hxx>  // #i27615#
 #include <numrule.hxx>
 
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 64ed3068d79c..b58ad492aaed 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -34,7 +34,7 @@
 
 #include <osl/endian.h>
 #include <hintids.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <tools/cachestr.hxx>
 #include <doc.hxx>
 #include <pam.hxx>
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 4d7cbc07e4ad..3b70c1aa4bd6 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -283,7 +283,7 @@ const Graphic* SwEditShell::GetGraphic( BOOL bWait ) const
             if( pGrf->IsSwapOut() ||
                 ( pGrfNode->IsLinkedFile() && GRAPHIC_DEFAULT == pGrf->GetType() ) )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 ASSERT( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
 #else
                 pGrfNode->SwapIn( bWait );
@@ -294,7 +294,7 @@ const Graphic* SwEditShell::GetGraphic( BOOL bWait ) const
         {
             if ( pGrf->IsSwapOut() && !pGrfNode->IsLinkedFile() )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 ASSERT( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
 #else
                 pGrfNode->SwapIn( bWait );
@@ -726,7 +726,7 @@ Graphic SwEditShell::GetIMapGraphic() const
             if( rGrf.IsSwapOut() || ( ((SwGrfNode*)pNd)->IsLinkedFile() &&
                                     GRAPHIC_DEFAULT == rGrf.GetType() ) )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 ASSERT( ((SwGrfNode*)pNd)->SwapIn( TRUE ) || !TRUE, "Grafik konnte nicht geladen werden" );
 #else
                 ((SwGrfNode*)pNd)->SwapIn( TRUE );
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 7dd2000ce9a6..b28764d3e55d 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -585,7 +585,7 @@ BOOL SwEditShell::IsProtectedOutlinePara() const
             }
         }
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         ASSERT(!this, "Cursor not on an outline node" );
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 3bdb011a3d6b..ce6916c7cfca 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -36,7 +36,7 @@
 #include <hints.hxx>
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 0888693eaedc..f86565b6990b 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -38,7 +38,7 @@
 #include <tools/urlobj.hxx>
 #include <svtools/txtcmp.hxx>
 #ifndef SVTOOLS_FSTATHELPER_HXX
-#include <svtools/fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 #endif
 #include <sfx2/docfile.hxx>
 #include "svx/unolingu.hxx"
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
index 2f551d4f7826..a492831df2bf 100644
--- a/sw/source/core/except/dbgloop.cxx
+++ b/sw/source/core/except/dbgloop.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #error Wer fummelt denn an den makefiles rum?
 #endif
 #include <tools/stream.hxx>
diff --git a/sw/source/core/except/makefile.mk b/sw/source/core/except/makefile.mk
index 1000bcaab883..660eb8faf596 100644
--- a/sw/source/core/except/makefile.mk
+++ b/sw/source/core/except/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,7 @@ PRJPCH=
 
 CXXFILES =
 
-.IF "$(product)"==""
-.IF "$(cap)"==""
+.IF "$(dbgutil)"!=""
 CXXFILES += \
         errhdl.cxx			\
         dbgloop.cxx
@@ -59,7 +58,6 @@ SLOFILES +=  \
         $(SLO)$/errhdl.obj 	\
         $(SLO)$/dbgloop.obj
 .ENDIF
-.ENDIF
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 5b6bda70ed4e..bec8e9c2d7cf 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -38,7 +38,7 @@
 #define _SVSTDARR_ULONGS
 #include <hintids.hxx>
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/unolingu.hxx>
 #include <svx/langitem.hxx>
 #include <swtypes.hxx>
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 996f3b092313..7c6b991be535 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -34,7 +34,7 @@
 
 #include <float.h>
 #include <sfx2/app.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 9f1b19db95fa..c4241a33c798 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -47,31 +47,32 @@
 #include <com/sun/star/text/UserFieldFormat.hpp>
 #include <com/sun/star/text/PageNumberType.hpp>
 #include <com/sun/star/text/ReferenceFieldPart.hpp>
-#ifndef _COM_SUN_STAR_TEXT_FilenameDisplayFormat_HPP_
 #include <com/sun/star/text/FilenameDisplayFormat.hpp>
-#endif
 #include <com/sun/star/text/XDependentTextField.hpp>
 #include <com/sun/star/text/DocumentStatistic.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/Duration.hpp>
 #include <unotools/localedatawrapper.hxx>
 #include <svx/unolingu.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/string.hxx>
 #include <tools/urlobj.hxx>
-#ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
-#endif
-#include <svtools/urihelper.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/zforlist.hxx>
 
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/Time.hpp>
 
 #include <tools/shl.hxx>
 #include <swmodule.hxx>
@@ -90,9 +91,7 @@
 #include <cntfrm.hxx>       //
 #include <pam.hxx>
 #include <viewsh.hxx>
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <shellres.hxx>
 #include <docufld.hxx>
 #include <flddat.hxx>
@@ -100,16 +99,10 @@
 #include <ndtxt.hxx>
 #include <expfld.hxx>
 #include <poolfmt.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
-#ifndef _UNOFLDMID_H
 #include <unofldmid.h>
-#endif
 #include <swunohelper.hxx>
-#ifndef _COMCORE_HRC
 #include <comcore.hrc>
-#endif
 
 #include <svx/outliner.hxx>
 #include <svx/outlobj.hxx>
@@ -1114,6 +1107,21 @@ SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const
 /* ---------------------------------------------------------------------------
 
  ---------------------------------------------------------------------------*/
+template<class T>
+double lcl_TimeToDouble( const T& rTime )
+{
+    const double fMilliSecondsPerDay = 86400000.0;
+    return ((rTime.Hours*3600000)+(rTime.Minutes*60000)+(rTime.Seconds*1000)+(rTime.HundredthSeconds*10)) / fMilliSecondsPerDay;
+}
+
+template<class D>
+double lcl_DateToDouble( const D& rDate, const Date& rNullDate )
+{
+    long nDate = Date::DateToDays( rDate.Day, rDate.Month, rDate.Year );
+    long nNullDate = Date::DateToDays( rNullDate.GetDay(), rNullDate.GetMonth(), rNullDate.GetYear() );
+    return double( nDate - nNullDate );
+}
+
 String SwDocInfoField::Expand() const
 {
     if ( ( nSubType & 0xFF ) == DI_CUSTOM )
@@ -1145,9 +1153,41 @@ String SwDocInfoField::Expand() const
                     ::rtl::OUString sVal;
                     uno::Reference < script::XTypeConverter > xConverter( comphelper::getProcessServiceFactory()
                         ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), uno::UNO_QUERY );
-                    uno::Any aNew = xConverter->convertToSimpleType( aAny, uno::TypeClass_STRING );
-                    aNew >>= sVal;
-                    const_cast<SwDocInfoField*>(this)->aContent = sVal;
+                    util::Date aDate;
+                    util::DateTime aDateTime;
+                    util::Duration aDuration;
+                    if( aAny >>= aDate)
+                    {
+                        SvNumberFormatter* pFormatter = pDocShell->GetDoc()->GetNumberFormatter();
+                        Date* pNullDate = pFormatter->GetNullDate();
+                        sVal = ExpandValue( lcl_DateToDouble<util::Date>( aDate, *pNullDate ), GetFormat(), GetLanguage());
+                    }
+                    else if( aAny >>= aDateTime )
+                    {
+                        double fDateTime = lcl_TimeToDouble<util::DateTime>( aDateTime );
+                        SvNumberFormatter* pFormatter = pDocShell->GetDoc()->GetNumberFormatter();
+                        Date* pNullDate = pFormatter->GetNullDate();
+                        fDateTime += lcl_DateToDouble<util::DateTime>( aDateTime, *pNullDate );
+                        sVal = ExpandValue( fDateTime, GetFormat(), GetLanguage());
+                    }
+                    else if( aAny >>= aDuration )
+                    {
+                        String sText(aDuration.Negative ? '-' : '+');
+                        sText += ViewShell::GetShellRes()->sDurationFormat;
+                        sText.SearchAndReplace(String::CreateFromAscii( "%1"), String::CreateFromInt32( aDuration.Years ) );
+                        sText.SearchAndReplace(String::CreateFromAscii( "%2"), String::CreateFromInt32( aDuration.Months ) );
+                        sText.SearchAndReplace(String::CreateFromAscii( "%3"), String::CreateFromInt32( aDuration.Days   ) );
+                        sText.SearchAndReplace(String::CreateFromAscii( "%4"), String::CreateFromInt32( aDuration.Hours  ) );
+                        sText.SearchAndReplace(String::CreateFromAscii( "%5"), String::CreateFromInt32( aDuration.Minutes) );
+                        sText.SearchAndReplace(String::CreateFromAscii( "%6"), String::CreateFromInt32( aDuration.Seconds) );
+                        sVal = sText;
+                    }
+                    else
+                    {
+                        uno::Any aNew = xConverter->convertToSimpleType( aAny, uno::TypeClass_STRING );
+                        aNew >>= sVal;
+                    }
+                    ((SwDocInfoField*)this)->aContent = sVal;
                 }
             }
         }
@@ -2318,7 +2358,7 @@ sal_uInt16 SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
                 {
                     // einen sdbcx::Index fuers bestimmen vom TextNode anlegen
                     SwPosition aPos( pDoc->GetNodes().GetEndOfPostIts() );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ASSERT( GetBodyTxtNode( *pDoc, aPos, *pFrm ),
                             "wo steht das Feld" );
 #else
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index a06f595293aa..07b3d89692c6 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -35,8 +35,8 @@
 // #include <math.h>
 #include <float.h>
 #include <rtl/math.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <svx/unolingu.hxx>
 #ifndef _UNOFLDMID_H
 #include <unofldmid.h>
@@ -167,7 +167,7 @@ SwFieldType::SwFieldType( USHORT nWhichId )
     DBG_CTOR( SwFieldType, 0 );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 SwFieldType::~SwFieldType()
 {
@@ -213,7 +213,7 @@ SwField::~SwField()
     Beschreibung: Statt Umweg ueber den Typ
  --------------------------------------------------------------------*/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 USHORT SwField::Which() const
 {
     ASSERT(pType, "Kein Typ vorhanden");
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 0e86e0307f1c..495d53dba382 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -33,7 +33,7 @@
 
 // #include <math.h>
 #include <tools/datetime.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include <doc.hxx>
 #include <fldbas.hxx>
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index a8cd34834eac..258f78359f91 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -37,7 +37,7 @@
 #include <algorithm>
 #define INCLUDED_ALGORITHM
 #endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 #ifndef _UNOFLDMID_H
 #include <unofldmid.h>
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 372cf878f842..5952d0aba4ea 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -34,7 +34,7 @@
 
 #define _SVSTDARR_USHORTSSORT
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <com/sun/star/text/ReferenceFieldPart.hpp>
 #include <com/sun/star/text/ReferenceFieldSource.hpp>
 #include <unotools/localedatawrapper.hxx>
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index 6a0b0e518147..9b9d888adb8b 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sw.hxx"
 
 
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <svx/svdmodel.hxx>
 
 
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index ccd2d86e4531..c0986ef9185b 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -37,7 +37,7 @@
 #include <vcl/graph.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <svx/xexch.hxx>
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index e8e91ae37621..500fe108dc4b 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -70,7 +70,7 @@ USHORT SwFEShell::GetPageDescCnt() const
 
 void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Die SS veraendert keinen PageDesc, sondern setzt nur das Attribut.
     //Der Pagedesc muss im Dokument vorhanden sein!
     BOOL bFound = FALSE;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 1b18dc178dae..a8a19c95f5ab 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 #include <hintids.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/soerr.hxx>
 #include <svx/protitem.hxx>
@@ -218,7 +218,7 @@ sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet )
 
     SwDoc* pDoc = (SwDoc*)rFmt.GetDoc();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !(nNew == FLY_PAGE &&
         (FLY_AT_CNTNT==nOld || FLY_AUTO_CNTNT==nOld || FLY_IN_CNTNT==nOld ) &&
         pDoc->IsInHeaderFooter( rOldAnch.GetCntntAnchor()->nNode )),
@@ -602,7 +602,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
             SwRect aTmpRect( aRet, rAbsPos );
             if( aTmpRect.HasArea() )
                 MakeVisible( aTmpRect );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             //TODO: That doesn't seem to be intended
             if( Color(COL_TRANSPARENT) != GetOut()->GetLineColor() )
             {
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index 71148c5dc018..69e0edf34b98 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -37,7 +37,7 @@
 #endif
 #include <sfx2/viewsh.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <sot/exchange.hxx>
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 55fbb54bd718..ca89ce8665bc 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -33,9 +33,9 @@
 #include <hintids.hxx>
 #include <vcl/salbtype.hxx>             // FRound
 #include <tools/urlobj.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #ifndef SVTOOLS_FSTATHELPER_HXX
-#include <svtools/fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 #endif
 #include <svtools/imap.hxx>
 #include <svtools/filter.hxx>
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 6fb301c40ab8..7fa3f3b934ed 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -36,7 +36,7 @@
 #ifndef _COM_SUN_STAR_BEANS_XSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #endif
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class SwDoc;
 
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 15c6b2d20099..59ce97ae34cf 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -37,7 +37,7 @@ class SwTxtFrm;
 #include <vcl/timer.hxx>
 #include <tools/gen.hxx>
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SwBlinkPortion
 {
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index aa9d17b2ef1d..3cc41ef12a4c 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -66,7 +66,7 @@
 #define SNAP_FLYFRAMES   0x00000002
 #define SNAP_TABLECONT   0x00000004
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 #include "swtypes.hxx"
 
diff --git a/sw/source/core/inc/dbgloop.hxx b/sw/source/core/inc/dbgloop.hxx
index b45014d088e5..a655bbf26194 100644
--- a/sw/source/core/inc/dbgloop.hxx
+++ b/sw/source/core/inc/dbgloop.hxx
@@ -31,7 +31,7 @@
 #ifndef _DBGLOOP_HXX
 #define _DBGLOOP_HXX
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 19ee562e0ed3..0f2cdc02c1e1 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -30,7 +30,7 @@
 #ifndef _SORT_HXX
 #define _SORT_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <ndindex.hxx>
 
 
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index adaa950fcd9a..f8a0c3ff2402 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -31,7 +31,7 @@
 #define _DOCTXM_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/gen.hxx>
 #include <tox.hxx>
 #include <section.hxx>
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 0c624b41f939..63b829c8fb85 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -97,7 +97,7 @@ class SwDrawTextInfo
     SwDrawTextInfo();       // nicht zulaessig
 public:
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bPos   : 1;            // These flags should control, that the appropriate
     BOOL bWrong : 1;            // Set-function has been called before calling
     BOOL bGrammarCheck : 1;     //  the Get-function of a member
@@ -160,7 +160,7 @@ public:
         bUpper = FALSE;
         bDrawSpace = FALSE;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         // these flags control, whether the matching member variables have
         // been set by using the Set-function before they may be accessed
         // by their Get-function:
@@ -383,7 +383,7 @@ public:
     void SetPos( const Point &rNew )
     {
         pPos = &rNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bPos = TRUE;
 #endif
     }
@@ -391,7 +391,7 @@ public:
     void SetHyphPos( xub_StrLen *pNew )
     {
         pHyphPos = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bHyph = TRUE;
 #endif
     }
@@ -404,7 +404,7 @@ public:
     void SetWrong( const SwWrongList* pNew )
     {
         pWrong = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bWrong = TRUE;
 #endif
     }
@@ -412,7 +412,7 @@ public:
     void SetGrammarCheck( const SwWrongList* pNew )
     {
         pGrammarCheck = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bGrammarCheck = TRUE;
 #endif
     }
@@ -425,7 +425,7 @@ public:
     void SetSize( const Size &rNew )
     {
         pSize = &rNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bSize = TRUE;
 #endif
     }
@@ -433,7 +433,7 @@ public:
     void SetFont( SwFont* pNew )
     {
         pFnt = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bFnt = TRUE;
 #endif
     }
@@ -451,7 +451,7 @@ public:
     void SetOfst( xub_StrLen nNew )
     {
         nOfst = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bOfst = TRUE;
 #endif
     }
@@ -459,7 +459,7 @@ public:
     void SetLeft( long nNew )
     {
         nLeft = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bLeft = TRUE;
 #endif
     }
@@ -467,7 +467,7 @@ public:
     void SetRight( long nNew )
     {
         nRight = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bRight = TRUE;
 #endif
     }
@@ -475,7 +475,7 @@ public:
     void SetKanaDiff( long nNew )
     {
         nKanaDiff = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bKana = TRUE;
 #endif
     }
@@ -488,7 +488,7 @@ public:
     void SetAscent( USHORT nNew )
     {
         nAscent = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bAscent = TRUE;
 #endif
     }
@@ -510,7 +510,7 @@ public:
             nSpace = nNew;
             nSperren = 0;
         }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bSpace = TRUE;
         bSperr = TRUE;
 #endif
@@ -518,7 +518,7 @@ public:
 
     void SetNumberOfBlanks( xub_StrLen nNew )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bNumberOfBlanks = TRUE;
 #endif
         nNumberOfBlanks = nNew;
@@ -547,7 +547,7 @@ public:
     void SetUpper( BOOL bNew )
     {
         bUpper = bNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bUppr = TRUE;
 #endif
     }
@@ -555,7 +555,7 @@ public:
     void SetDrawSpace( BOOL bNew )
     {
         bDrawSpace = bNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bDrawSp = TRUE;
 #endif
     }
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index dc8975f3fd47..4e3c196814c6 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -168,7 +168,7 @@ public:
 
     virtual void  CheckDirection( BOOL bVert );
     virtual void Cut();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 #endif
 
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 5b1dff0a52cb..de68dc28f6c5 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -54,7 +54,7 @@ class SwFntCache : public SwCache
 public:
 
     inline SwFntCache() : SwCache(50,50
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , ByteString( RTL_CONSTASCII_STRINGPARAM(
                         "Globaler Font-Cache pFntCache" ))
 #endif
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 02c8040b83c3..c9bbb72693ce 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 #ifndef _FRAME_HXX
 #define _FRAME_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swtypes.hxx"  // fuer SwTwips
 #include "swrect.hxx"
 #include "calbck.hxx"   // fuer SwClient
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index ee8d2a56d0d1..d135786ee683 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -74,7 +74,7 @@ class SwFtnFrm: public SwLayoutFrm
     // --> OD 2005-05-18 #i49383# - control unlock of position of lower anchored objects.
     bool mbUnlockPosOfLowerObjs : 1;
     // <--
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 protected:
     virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual SwTwips GrowFrm  ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
@@ -89,7 +89,7 @@ public:
 
     BOOL operator<( const SwTxtFtn* pTxtFtn ) const;
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     const SwCntntFrm *GetRef() const    { return pRef; }
          SwCntntFrm  *GetRef()          { return pRef; }
 #else
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 49edc1d28d53..ad4c7730d07c 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -218,13 +218,13 @@ class SwLayIdle
     BOOL        bPageValid;     // Konnte die Seite alles validiert werden?
     BOOL        bAllValid;      // Konnte alles validiert werden?
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bIndicator;
 #endif
 
 #ifdef _LAYACT_CXX
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void ShowIdle( ColorData eName );
 #endif
 
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index 339b0cd5bdfc..336d68083566 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -72,7 +72,7 @@ public:
           return pImpl; }
     void UnlockImpl() { --nLockCount; }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool CompareLayout( const SwDoc& rDoc ) const;
 #endif
 };
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 6cbdd743761d..bdeb9ca256c5 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -35,7 +35,7 @@
 #ifndef _KEYCOD_HXX //autogen
 #include <vcl/keycod.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <IDocumentMarkAccess.hxx>
 #include <vector>
 
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index bc98e5f8c37d..3dd87375b7f8 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -32,7 +32,7 @@
 #define _NOTEURL_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include "swrect.hxx"
 
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 09c19c7d69fd..a16dbb365b0f 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -31,7 +31,7 @@
 #define _PAGEFRM_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include "ftnboss.hxx"
 #include <tools/mempool.hxx>
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index c04b30792b53..be5b8acd22da 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -203,7 +203,7 @@ public:
     virtual void  Paint( const SwRect& ) const;
     virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual SwTwips GrowFrm  ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     virtual void Cut();
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 #endif
@@ -313,7 +313,7 @@ public:
     void InsertEmptySct( SwSectionFrm* pDel );
     void DeleteEmptySct() { if( pDestroy ) _DeleteEmptySct(); }
     void RemoveFromList( SwSectionFrm* pSct ) { if( pDestroy ) _RemoveFromList( pSct ); }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Wird zur Zeit nur fuer ASSERTs benutzt:
     BOOL IsInDelList( SwSectionFrm* pSct ) const; // Ist der SectionFrm in der Liste enthalten?
 #endif
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 39dded3d3257..7564b5fba15a 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -34,7 +34,7 @@
 #define _SVSTDARR_BYTES
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_XUB_STRLEN
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <i18npool/lang.h>
 #include <list>
diff --git a/sw/source/core/inc/scrrect.hxx b/sw/source/core/inc/scrrect.hxx
index 433ca1f180a2..f5e987617c0b 100644
--- a/sw/source/core/inc/scrrect.hxx
+++ b/sw/source/core/inc/scrrect.hxx
@@ -30,7 +30,7 @@
 #ifndef _SCRRECT_HXX
 #define _SCRRECT_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swrect.hxx"
 #include <swtypes.hxx>
 
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 6fcf0a9a625d..5ebc2e7e128f 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -35,7 +35,7 @@
 #ifndef _DATE_HXX //autogen
 #include <tools/datetime.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 
 class SfxMedium;
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index c2348483a49a..c225e1d47d83 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -60,7 +60,7 @@
  *
  */
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _STRING_HXX //autogen
 #include <tools/string.hxx>
 #endif
@@ -68,7 +68,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 class SwCacheObj;
@@ -94,7 +94,7 @@ class SwCache : public SwCacheObjArr
 
     void DeleteObj( SwCacheObj *pObj );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ByteString aName;
     long nAppend;           //Anzahl der Eintragungen durch Erweiterung.
     long nInsertFree;       //Anzahl der Eintragungen auf freie Plaetze.
@@ -116,7 +116,7 @@ class SwCache : public SwCacheObjArr
 public:
 
     //nur BYTE hineinstecken!!!
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SwCache( const USHORT nInitSize, const USHORT nGrowSize,
             const ByteString &rNm );
     ~SwCache();
@@ -197,7 +197,7 @@ public:
 
     inline BOOL IsLocked() const { return 0 != nLock; }
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     inline void Lock() { ++nLock; }
     inline void Unlock() { --nLock; }
 #else
@@ -249,7 +249,7 @@ public:
 inline void SwCache::IncreaseMax( const USHORT nAdd )
 {
     nCurMax = nCurMax + sal::static_int_cast< USHORT >(nAdd);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ++nIncreaseMax;
 #endif
 }
@@ -257,7 +257,7 @@ inline void SwCache::DecreaseMax( const USHORT nSub )
 {
     if ( nCurMax > nSub )
         nCurMax = nCurMax - sal::static_int_cast< USHORT >(nSub);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ++nDecreaseMax;
 #endif
 }
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index bad28cd2a6a0..1b1fd47db7b3 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -49,7 +49,7 @@ class SwFontCache : public SwCache
 public:
 
     inline SwFontCache() : SwCache(50,50
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , "Globaler AttributSet/Font-Cache pSwFontCache"
 #endif
     ) {}
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 7cb8c80b305d..110ed4e4db2c 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -848,7 +848,7 @@ public:
  *                      class SvStatistics
  *************************************************************************/
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define SV_STAT(nWhich)
 #else
 
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index b9a614455edf..529bfbdb575f 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -31,7 +31,7 @@
 #define _TBLRWCL_HXX
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <vector>
 #include <swtypes.hxx>
@@ -69,7 +69,7 @@ BOOL lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* pPara );
 BOOL lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara );
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
 #endif
 
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index b0b2b807ab43..79cd2a1a574c 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -405,7 +405,7 @@ public:
     inline sal_Bool IsSwapped() const { return bIsSwapped; }
 
     // Hat der Frm eine lokale Fussnote (in diesem Frm bzw. Follow)?
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     void CalcFtnFlag();
 #else
     void CalcFtnFlag( xub_StrLen nStop = STRING_LEN );//Fuer den Test von SplitFrm
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index e2a1ef147c7b..f63b537fd81b 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -33,7 +33,7 @@
 
 
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 class SwDoc;
 
 class SwURLStateChanged : public SfxListener
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 7601f4ae370d..5560a5c07309 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -127,7 +127,7 @@
 // --> OD 2006-03-06 #125892#
 #include <HandleAnchorNodeChg.hxx>
 // <--
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 using namespace ::com::sun::star;
 using ::rtl::OUString;
@@ -691,7 +691,7 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
                 //mich also bei meinem Format aus.
                 //Dabei werden ich Deletet!!!
             if( IS_TYPE( SwFmt, pDefinedIn ))
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             {
                 sal_Bool bDel = ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC );
                 ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
@@ -700,7 +700,7 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
                 ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC );
 #endif
             else if( IS_TYPE( SwCntntNode, pDefinedIn ))
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             {
                 sal_Bool bDel = ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
                 ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b24ee7fd78b1..9648eb12dabf 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -851,7 +851,7 @@ void SwPageFrm::MakeAll()
     if ( Frm() != aOldRect && GetUpper() )
         static_cast<SwRootFrm*>(GetUpper())->CheckViewLayout( 0, 0 );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Der Upper (Root) muss mindestens so breit
     //sein, dass er die breiteste Seite aufnehmen kann.
     if ( GetUpper() )
@@ -1139,7 +1139,7 @@ void SwCntntFrm::MakeAll()
     // <--
     PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     const SwDoc *pDoc = GetAttrSet()->GetDoc();
     if( pDoc )
     {
@@ -1695,7 +1695,7 @@ void SwCntntFrm::MakeAll()
                       ( !bSct || !FindSctFrm()->IsColLocked() ) )
                     bMoveOrFit = TRUE;
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
             {
                 ASSERT( FALSE, "+TxtFrm hat WouldFit-Versprechen nicht eingehalten." );
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 5eeaef485d29..0dabddec6b5f 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -106,7 +106,7 @@
  *
  * --------------------------------------------------*/
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #error Wer fummelt denn an den makefiles rum?
 #endif
 
@@ -119,7 +119,7 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include <stdio.h>
@@ -139,7 +139,7 @@ SwImplProtocol* SwProtocol::pImpl = NULL;
 
 ULONG lcl_GetFrameId( const SwFrm* pFrm )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static BOOL bFrameId = FALSE;
     if( bFrameId )
         return pFrm->GetFrmId();
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 9ce3bc237db4..a528f252ecb2 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 #include "hintids.hxx"
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svtools/imap.hxx>
 #ifndef _GRAPH_HXX //autogen
 #include <vcl/graph.hxx>
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 252ea3298531..aff881499c3b 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -277,7 +277,7 @@ void SwFlyFreeFrm::MakeAll()
     }
     Unlock();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SWRECTFN( this )
     ASSERT( bHeightClipped || ( (Frm().*fnRect->fnGetHeight)() > 0 &&
             (Prt().*fnRect->fnGetHeight)() > 0),
@@ -966,7 +966,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
     }
     if ( !pSortedObjs->Insert( _rNewObj ) )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pSortedObjs->Contains( _rNewObj ),
                 "Drawing object not appended into list <pSortedObjs>." );
 #endif
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index f7fa2a0a8e80..648ec971c7a0 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1690,7 +1690,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         delete pPageMaker;
         if( pDoc->GetLayoutCache() )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
             pDoc->GetLayoutCache()->CompareLayout( *pDoc );
 #endif
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 73fdfaabe570..f73457ae5565 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -356,7 +356,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL )
     //moeglich.
     //Wenn die Seite eine spezielle Fussnotenseite ist, so nehmen wir uns auch
     //soviel Platz wie eben moeglich.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( !GetUpper() || !GetUpper()->IsFtnBossFrm() )
     {   ASSERT( !this, "Keine FtnBoss." );
         return 0;
@@ -562,7 +562,7 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage )
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
 {
@@ -711,7 +711,7 @@ void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
         pDel->Cut();
         delete pDel;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SwDoc *pDoc = GetFmt()->GetDoc();
     if ( GetPrev() )
     {
@@ -1142,7 +1142,7 @@ SwFtnContFrm *SwFtnBossFrm::MakeFtnCont()
     //immer direkt hinter dem Bodytext.
     //Sein FrmFmt ist immer das DefaultFrmFmt.
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( FindFtnCont() )
     {   ASSERT( !this, "Fussnotencontainer bereits vorhanden." );
         return 0;
@@ -1171,7 +1171,7 @@ SwFtnContFrm *SwFtnBossFrm::FindFtnCont()
     while( pFrm && !pFrm->IsFtnContFrm() )
         pFrm = pFrm->GetNext();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( pFrm )
     {
         SwFrm *pFtn = pFrm->GetLower();
@@ -1416,7 +1416,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck )
 
 void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
 {
-#if (OSL_DEBUG_LEVEL > 1) && !defined(PRODUCT)
+#if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
     static USHORT nStop = 0;
     if ( nStop == pNew->GetFrmId() )
     {
@@ -3278,7 +3278,7 @@ SwSaveFtnHeight::~SwSaveFtnHeight()
 }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 //JP 15.10.2001: in a non pro version test if the attribute has the same
 //              meaning which his reference is
 
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index fb365e4a5116..18d03bb167d0 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -69,7 +69,7 @@
 #include <SwSmartTagMgr.hxx>
 
 #define _SVSTDARR_BOOLS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #define _LAYACT_CXX
 #include "layact.hxx"
@@ -116,7 +116,7 @@
 
 
 //Sparen von Schreibarbeit um den Zugriff auf zerstoerte Seiten zu vermeiden.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 static void BreakPoint()
 {
@@ -2808,7 +2808,7 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly )
 }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
 
 /*************************************************************************
@@ -2857,7 +2857,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData )
 SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     pRoot( pRt ),
     pImp( pI )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
     , bIndicator( FALSE )
 #endif
@@ -3041,7 +3041,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     if( pImp->IsAccessible() )
         pImp->FireAccessibleEvents();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
     if ( bIndicator && pImp->GetShell()->GetWin() )
     {
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 56995fcfcb26..32c7ea0f54a4 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -348,7 +348,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
 {
     sal_Bool bRet = sal_True;
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 91e5379228d8..8d53429e395b 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -34,7 +34,7 @@
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_BYTES
 #define _SVSTDARR_XUB_STRLEN
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <swrect.hxx>
 
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 1afbe6632d4b..f9a75f01f008 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -201,7 +201,7 @@ void SwLooping::Control( SwPageFrm* pPage )
     }
     else if( ++nCount > LOOP_DETECT )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
         static BOOL bNoLouie = FALSE;
         if( bNoLouie )
diff --git a/sw/source/core/layout/makefile.mk b/sw/source/core/layout/makefile.mk
index e2e8a2c282e8..234ee77c5586 100644
--- a/sw/source/core/layout/makefile.mk
+++ b/sw/source/core/layout/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -105,12 +105,10 @@ SLOFILES =  \
     $(SLO)$/virtoutp.obj \
     $(SLO)$/wsfrm.obj
 
-.IF "$(product)"==""
-.IF "$(cap)"==""
+.IF "$(dbgutil)"!=""
 SLOFILES +=  \
         $(SLO)$/dbg_lay.obj
 .ENDIF
-.ENDIF
 
 
 # --- Targets -------------------------------------------------------
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 82a1ad0690ac..a3e94a8e0f15 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -311,7 +311,7 @@ void _FrmInit()
 {
     SwRootFrm::pVout = new SwLayVout();
     SwCache *pNew = new SwCache( 100, 100
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , "static SwBorderAttrs::pCache"
 #endif
     );
@@ -322,7 +322,7 @@ void _FrmInit()
 
 void _FrmFinit()
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // im Chache duerfen nur noch 0-Pointer stehen
     for( USHORT n = SwFrm::GetCachePtr()->Count(); n; )
         if( (*SwFrm::GetCachePtr())[ --n ] )
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index b73f8b4d1eeb..927308ed3c28 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <ndole.hxx>
 #include <docary.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <fmtfsize.hxx>
 #include <fmthdft.hxx>
 #include <fmtclds.hxx>
@@ -1196,7 +1196,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
                 if ( pPage->GetFmt() != pFmtWish )
                     pPage->SetFrmFmt( pFmtWish );
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
             {
                 ASSERT( FALSE, "CheckPageDescs, missing solution" );
@@ -1239,7 +1239,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
         pDoc->UpdatePageFlds( &aMsgHnt );
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Ein paar Pruefungen muessen schon erlaubt sein.
 
     //1. Keine zwei EmptyPages hintereinander.
@@ -1670,7 +1670,7 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
                     {
                         //Umhaengen kann er sich selbst, indem wir ihm
                         //einfach ein Modify mit seinem AnkerAttr schicken.
-#ifdef PRODUCT
+#ifndef DBG_UTIL
                         rFmt.SwModify::Modify( 0, (SwFmtAnchor*)&rAnch );
 #else
                         const sal_uInt32 nCnt = pPage->GetSortedObjs()->Count();
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 7dcbc4ef80a9..a52423e24bc1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -41,7 +41,7 @@
 #endif
 #include <tools/poly.hxx>
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/xoutbmp.hxx>
 #include <sfx2/progress.hxx>
 #include <svx/brshitem.hxx>
@@ -1366,7 +1366,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
             continue;
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         //Flys, die innerhalb des eigenen verankert sind, muessen eine
         //groessere OrdNum haben oder Zeichengebunden sein.
         if ( pSelfFly && bLowerOfSelf )
@@ -2052,7 +2052,7 @@ void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const OutputDevice &aOut )
 
     io_aSwRect = SwRect( aSizedRect );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     Rectangle aTestOrgPxRect = aOut.LogicToPixel( io_aSwRect.SVRect() );
     Rectangle aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
     ASSERT( aTestOrgPxRect == aTestNewPxRect,
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index f7c615ae640f..96294b27d1ca 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <hints.hxx>
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
@@ -2781,7 +2781,7 @@ void SwRootFrm::_RemoveFromList( SwSectionFrm* pSct )
         pDestroy->Remove( nPos );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 BOOL SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const
 {
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 1efe4c723e7b..4d854cd80273 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -411,7 +411,7 @@ SwFrm::~SwFrm()
             delete pDrawObjs;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // JP 15.10.2001: for detection of access to deleted frames
     pDrawObjs = (SwSortedObjs*)0x33333333;
 #endif
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index f2a507bbd764..61f08281e5f9 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -48,7 +48,7 @@
 #include "dbg_lay.hxx"
 
 #include <ftnidx.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <docary.hxx>
 #include <svx/keepitem.hxx>
 #include <svx/ulspitem.hxx>
@@ -3650,7 +3650,7 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
             // Spalten abklappern, dies erledigt SwSectionFrm::FindLastCntnt
             if( pRet->IsColBodyFrm() )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 SwSectionFrm* pSect = pRet->FindSctFrm();
                 ASSERT( pSect, "Wo kommt denn die Spalte her?")
                 ASSERT( IsAnLower( pSect ), "Gespaltene Zelle?" );
@@ -4617,7 +4617,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
     {
         bValidSize = TRUE;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( HasFixSize() )
         {
             const SwFmtFrmSize &rFrmSize = GetFmt()->GetFrmSize();
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 4cbb6ffaa7b8..73f2b4d7fc42 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1286,7 +1286,7 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
             break;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( pActual, "Keinen Cntnt gefunden." );
     if ( bBodyOnly )
         ASSERT( pActual->IsInDocBody(), "Cnt nicht im Body." );
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index e7d602ae5aba..994a4d9ce625 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -67,7 +67,7 @@ BOOL SwFrm::GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState*  ) const
     return FALSE;
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwRootFrm::Cut()
 {
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index b27b505acf8f..a8b6b2aedad1 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -42,7 +42,7 @@
 // OD 12.11.2002 #96272# - include declaration for <SetMappingForVirtDev>
 #include "setmapvirtdev.hxx"
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                          class DbgRect
@@ -186,7 +186,7 @@ void SwLayVout::Enter(  ViewShell *pShell, SwRect &rRect, BOOL bOn )
 {
     Flush();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( pShell->GetViewOptions()->IsTest3() )
         {
             ++nCount;
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index af97063da6e3..4bf0ba0860a5 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -38,7 +38,7 @@
 #ifndef _OUTDEV_HXX
 #include <vcl/outdev.hxx>
 #endif
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/keepitem.hxx>
 #include <svx/brkitem.hxx>
@@ -102,7 +102,7 @@ SwFrm::SwFrm( SwModify *pMod ) :
     pPrev( 0 ),
     pDrawObjs( 0 )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bFlag01 = bFlag02 = bFlag03 = bFlag04 = bFlag05 = 0;
 #endif
 
@@ -3866,7 +3866,7 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv )
                 if( pLastSctCnt == pCnt )
                     pLastSctCnt = NULL;
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
                 ASSERT( !pLastSctCnt, "Where's the last SctCntnt?" );
 #endif
@@ -3894,7 +3894,7 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv )
                     pLastSctCnt = NULL;
                 }
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
                 ASSERT( !pLastTabCnt, "Where's the last TabCntnt?" );
 #endif
diff --git a/sw/source/core/makefile.mk b/sw/source/core/makefile.mk
index d9ea1102e375..d87e67b21863 100644
--- a/sw/source/core/makefile.mk
+++ b/sw/source/core/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ SUBLIBS3= \
                 $(SLB)$/SwNumberTree.lib \
                 $(SLB)$/tablecore.lib
 
-.IF "$(PRODUCT)" == ""
+.IF "$(dbgutil)"!=""
 SUBLIBS3+= \
         $(SLB)$/except.lib
 .ENDIF
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
index 5dea22089355..e22f66175aa6 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -38,15 +38,15 @@
 #include <stdio.h>
 #include "hintids.hxx"
 #include <tools/resid.hxx>
-#include <svtools/macitem.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/macitem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/linkmgr.hxx>
 
 #ifndef _SVSTDARR_USHORTS_DECL
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <svx/lrspitem.hxx>
 #include <svx/tstpitem.hxx>
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index 33acd99f8760..36a501c482a7 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <SwXMLSectionList.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index f5a5690bbfd0..861867799aee 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <svtools/unoevent.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 5bbe5ecde7b0..c0ebddd3885b 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -36,9 +36,9 @@
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
 #ifndef SVTOOLS_FSTATHELPER_HXX
-#include <svtools/fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 #endif
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <unotools/charclass.hxx>
 #include <frmfmt.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 62634d31d744..3b6cc4fbac36 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -50,7 +50,7 @@
 #include <svx/protitem.hxx>
 #include <swtblfmt.hxx>
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -779,7 +779,7 @@ BOOL SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
 
     aFndBox.MakeFrms( *this );
 //  aFndBox.RestoreChartData( *this );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         const SwTableBoxes &rTabBoxes = aLines[0]->GetTabBoxes();
         long nNewWidth = 0;
@@ -2147,7 +2147,7 @@ void SwTable::CleanUpBottomRowSpan( USHORT nDelLines )
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 struct RowSpanCheck
 {
@@ -2181,7 +2181,7 @@ void SwTable::CheckConsistency() const
             if( nRowSp < 0 )
             {
                 ASSERT( aIter != aRowSpanCells.end(), "Missing master box" )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 //RowSpanCheck &rCheck = *aIter;
 #endif
                 ASSERT( aIter->nLeft == nWidth && aIter->nRight == nNewWidth,
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 070e8eb625f9..4683c866e6a7 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -74,7 +74,7 @@
 #include <redline.hxx>
 #include <list>
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -1090,7 +1090,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
 // steht im tblrwcl.cxx
 extern void _CheckBoxWidth( const SwTableLine&, SwTwips );
@@ -1197,7 +1197,7 @@ static void lcl_CalcNewWidths( std::list<USHORT> &rSpanPos, ChangeList& rChanges
         USHORT nPos = (USHORT)nSum;
         while( pCurr != rChanges.end() && pCurr->first < nPos )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             USHORT nTemp = pCurr->first;
             nTemp = pCurr->second;
 #endif
@@ -1297,7 +1297,7 @@ static void lcl_CalcNewWidths( std::list<USHORT> &rSpanPos, ChangeList& rChanges
 void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
     const SwTabCols &rOld, const SwTableBox *pStart, BOOL bCurRowOnly )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static int nCallCount = 0;
     ++nCallCount;
 #endif
@@ -2013,7 +2013,7 @@ BOOL SwTableBox::IsInHeadline( const SwTable* pTbl ) const
     return pTbl->GetTabLines()[ 0 ] == pLine;
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 ULONG SwTableBox::GetSttIdx() const
 {
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 1784ad946e41..84698050f12a 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -46,7 +46,7 @@
 #include <svx/langitem.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <swatrset.hxx>
 #include <frmatr.hxx>
 #include <paratr.hxx>
@@ -106,7 +106,7 @@ FrmTagIdMap SwEnhancedPDFExportHelper::aFrmTagIdMap;
 
 LanguageType SwEnhancedPDFExportHelper::eLanguageDefault = 0;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 static std::vector< USHORT > aStructStack;
 
@@ -295,7 +295,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
 
     if ( mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportTaggedPDF() )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         sal_Int32 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -308,7 +308,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
         else
             BeginTag( vcl::PDFWriter::NonStructElement, aEmptyString );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -323,13 +323,13 @@ SwTaggedPDFHelper::~SwTaggedPDFHelper()
 {
     if ( mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportTaggedPDF() )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         sal_Int32 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
         EndStructureElements();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -398,7 +398,7 @@ bool SwTaggedPDFHelper::CheckReopenTag()
         const bool bSuccess = mpPDFExtOutDevData->SetCurrentStructureElement( nReopenTag );
         ASSERT( bSuccess, "Failed to reopen tag" )
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         aStructStack.push_back( 99 );
 #endif
 
@@ -421,7 +421,7 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
         (void)bSuccess;
         ASSERT( bSuccess, "Failed to restore reopened tag" )
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         aStructStack.pop_back();
 #endif
 
@@ -441,7 +441,7 @@ void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const Str
     const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, rtl::OUString( rString ) );
     ++nEndStructureElement;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aStructStack.push_back( static_cast<USHORT>(eType) );
 #endif
 
@@ -501,7 +501,7 @@ void SwTaggedPDFHelper::EndTag()
 {
     mpPDFExtOutDevData->EndStructureElement();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aStructStack.pop_back();
 #endif
 }
@@ -977,7 +977,7 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
             nRestoreCurrentTag = mpPDFExtOutDevData->GetCurrentStructureElement();
             mpPDFExtOutDevData->SetCurrentStructureElement( nReopenTag );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             aStructStack.push_back( 99 );
 #endif
         }
@@ -1529,7 +1529,7 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh,
     aNumListBodyIdMap.clear();
     aFrmTagIdMap.clear();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aStructStack.clear();
 #endif
 
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 7db8ec2e2506..31040d9665c5 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -34,7 +34,7 @@
 
 #include <errhdl.hxx>   // ASSERT
 #include <atrhndl.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <vcl/outdev.hxx>
 #include <svx/cmapitem.hxx>
 #include <svx/colritem.hxx>
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 8e5bf1bfc25c..5fc45ef66953 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -887,7 +887,7 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                 aCharBox.Pos().X() = aCharBox.Pos().X() - 150;
 
                 // siehe Kommentar in SwTxtFrm::GetCrsrOfst()
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 const ULONG nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
                 // Der Node soll nicht gewechselt werden
@@ -1253,7 +1253,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
             if( pNextLine || bFirstOfDouble )
             {
                 aCharBox.SSize().Width() /= 2;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 // siehe Kommentar in SwTxtFrm::GetCrsrOfst()
                 const ULONG nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index b5a3dff475ae..f86a767dcec2 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -248,7 +248,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
         ( pMyFollow->IsVertical() && !pMyFollow->Prt().Width() ) ||
         ( ! pMyFollow->IsVertical() && !pMyFollow->Prt().Height() ) )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const SwFrm *pOldUp = GetUpper();
 #endif
 
@@ -377,7 +377,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
                 pPage->ValidateCntnt();
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pOldUp == GetUpper(), "SwTxtFrm::CalcFollow: heavy follow" );
 #endif
 
@@ -667,7 +667,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else if ( pFoll->GetValidPrtAreaFlag() ||
               pFoll->GetValidSizeFlag() )
     {
@@ -767,7 +767,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         CalcFtnFlag( nTxtPos-1 );
@@ -1843,7 +1843,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
     const SwFrm *pDbgFtnCont = (const SwFrm*)(FindPageFrm()->FindFtnCont());
     (void)pDbgFtnCont;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // nStopAt laesst sich vom CV bearbeiten.
     static MSHORT nStopAt = 0;
     if( nStopAt == GetFrmId() )
@@ -2089,7 +2089,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
     const XubString aXXX = GetTxtNode()->GetTxt();
     const SwTwips nDbgY = Frm().Top();
     (void)nDbgY;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // nStopAt laesst sich vom CV bearbeiten.
     static MSHORT nStopAt = 0;
     if( nStopAt == GetFrmId() )
@@ -2135,7 +2135,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
         //DBG_LOOP; shadows declaration above.
         //resolved into:
 #if OSL_DEBUG_LEVEL > 1
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         DbgLoop aDbgLoop2( (const void*) this );
 #endif
 #endif
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 5a88599c6e35..05c142e1fd84 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -728,7 +728,7 @@ void SwTxtFrm::Paint( const SwRect &rRect ) const
                 //DBG_LOOP; shadows declaration above.
                 //resolved into:
 #if  OSL_DEBUG_LEVEL > 1
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 DbgLoop aDbgLoop2( (const void*) this );
 #endif
 #endif
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index a5eba7301052..2413133dc378 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -176,7 +176,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     {
         nCutPos = rInf.GetTxtBreak( nLineWidth, nMaxLen, nMaxComp );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( STRING_LEN != nCutPos )
         {
             rInf.GetTxtSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index fea63bf2dca0..2448b061bc1d 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -33,8 +33,8 @@
 
 
 #include <com/sun/star/uno/Sequence.h>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <hintids.hxx>
 #include <sfx2/printer.hxx>
 #include <svx/hyznitem.hxx>
@@ -114,13 +114,13 @@ namespace numfunc
 }
 // <--
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // Test2: WYSIWYG++
 // Test4: WYSIWYG debug
 static sal_Bool bDbgLow = sal_False;
 #endif
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 sal_Bool SwTxtSizeInfo::IsOptCalm() const { return !GetOpt().IsTest3(); }
 
@@ -236,7 +236,7 @@ SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf )
 { }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*************************************************************************
  *                      ChkOutDev()
  *************************************************************************/
@@ -288,7 +288,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
       bSnapToGrid( rNew.SnapToGrid() ),
       nDirection( rNew.GetDirection() )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkOutDev( *this );
 #endif
 }
@@ -325,7 +325,7 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
         pRef = pOut;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkOutDev( *this );
 #endif
 
@@ -412,7 +412,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt,
       bSnapToGrid( rNew.SnapToGrid() ),
       nDirection( rNew.GetDirection() )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkOutDev( *this );
 #endif
     SetLen( GetMinLen( *this ) );
@@ -570,7 +570,7 @@ void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPain
     pGrammarCheckList = NULL;
     pSmartTags = NULL;  // SMARTTAGS
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     pBrushItem = 0;
 #else
     pBrushItem = ((SvxBrushItem*)-1);
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 42873bf67ff2..77b6e03d4f26 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -79,7 +79,7 @@ class SwWrongList;
 #define DIR_RIGHT2LEFT 2
 #define DIR_TOP2BOTTOM 3
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define OPTCALM( rInf )  (rInf).IsOptCalm()
 #define OPTLOW( rInf )   (rInf).IsOptLow()
 #define OPTDBG( rInf )   (rInf).IsOptDbg()
@@ -380,7 +380,7 @@ public:
         { return ( pKanaComp && nKanaIdx < pKanaComp->Count() )
                    ? (*pKanaComp)[nKanaIdx] : 0; }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool IsOptCalm() const;
     sal_Bool IsOptLow() const;
     sal_Bool IsOptDbg() const;
@@ -423,7 +423,7 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
     void _DrawBackBrush( const SwLinePortion &rPor ) const;
 
 protected:
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pWrongList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = 0;}
 #else
     SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pSmartTags = 0; pSpaceAdd = 0;
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 18b2fec04609..3966057ced80 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -37,7 +37,7 @@
 
 #define _SVSTDARR_XUB_STRLEN
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class OutputDevice;
 class SwFont;
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index cb54872d19e2..22f454033929 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -66,7 +66,7 @@
 #include <doc.hxx>          // SwDoc
 #include <pormulti.hxx>     // SwMultiPortion
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <unotools/charclass.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 7cfb941545a8..852b5661e3f8 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -103,7 +103,7 @@ void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewIn
     pInf = pNewInf;
     SwFont *pMyFnt = GetFnt();
     GetInfo().SetFont( pMyFnt );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( ALIGN_BASELINE != pMyFnt->GetAlign() )
     {
         ASSERT( ALIGN_BASELINE == pMyFnt->GetAlign(),
diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk
index fbc000002ee1..d710c9797997 100644
--- a/sw/source/core/text/makefile.mk
+++ b/sw/source/core/text/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -50,13 +50,6 @@ CFLAGS+=-DENABLE_GRAPHITE
 .ENDIF
 # --- Files --------------------------------------------------------
 
-.IF "$(product)$(cap)" == ""
-CXXFILES += \
-        txtio.cxx
-.ENDIF
-
-
-
 SLOFILES =  \
                 $(SLO)$/atrstck.obj \
                 $(SLO)$/EnhancedPDFExportHelper.obj \
@@ -100,7 +93,7 @@ SLOFILES =  \
         $(SLO)$/SwGrammarMarkUp.obj \
         $(SLO)$/wrong.obj
 
-.IF "$(product)$(cap)" == ""
+.IF "$(dbgutil)"!=""
 SLOFILES +=  \
         $(SLO)$/txtio.obj
 .ENDIF
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 6dec3c790283..6a656bef5451 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -114,7 +114,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
 
     if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const xub_Unicode cChar = rInf.GetChar( rInf.GetIdx() );
         ASSERT( CH_BLANK  == cChar || CH_BULLET == cChar,
                 "SwGluePortion::Paint: blank expected" );
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 76eba6b1e77b..7b3d381929e2 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1293,7 +1293,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         nLastKashida = nChg;
     };
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // check kashida data
     long nTmpKashidaPos = -1;
     sal_Bool bWrongKash = sal_False;
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index db21e72d04ec..540c7bad3a4d 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -258,7 +258,7 @@ public:
                            const SwLinePortion* _pDontConsiderPortion = NULL,
                            const bool _bNoFlyCntPorAndLinePor = false ) const;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void DebugPortions( SvStream &rOs, const XubString &rTxt,
                         const xub_StrLen nStart ); //$ ostream
 #endif
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 08561df3f3b6..f05a4677a592 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -47,7 +47,7 @@
 #include "porglue.hxx"
 #include "inftxt.hxx"
 #include "blink.hxx"
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 sal_Bool ChkChain( SwLinePortion *pStart )
 {
@@ -216,7 +216,7 @@ SwLinePortion *SwLinePortion::Insert( SwLinePortion *pIns )
 {
     pIns->FindLastPortion()->SetPortion( pPortion );
     SetPortion( pIns );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkChain( this );
 #endif
     return pIns;
@@ -247,7 +247,7 @@ SwLinePortion *SwLinePortion::Append( SwLinePortion *pIns )
     SwLinePortion *pPos = FindLastPortion();
     pPos->SetPortion( pIns );
     pIns->SetPortion( 0 );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkChain( this );
 #endif
     return pIns;
@@ -307,7 +307,7 @@ SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
     return SwPosSize();
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                virtual SwLinePortion::Check()
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 7777e5968969..89887d2b4955 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -42,7 +42,7 @@ class SwPortionHandler;
 // Das CLASSIO-Makro implementiert die 'freischwebende' Funktion.
 // Auf diese Weise erhaelt man beide Vorteile: virtuelle Ausgabeoperatoren
 // und allgemeine Verwendbarkeit.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define OUTPUT_OPERATOR  virtual SvStream &operator<<( SvStream & aOs ) const;
 #else
 #define OUTPUT_OPERATOR
@@ -177,7 +177,7 @@ public:
     virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0;
     void PrePaint( const SwTxtPaintInfo &rInf, const SwLinePortion *pLast ) const;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     virtual sal_Bool Check( SvStream &rOs, SwTxtSizeInfo &rInfo ); //$ ostream
 #endif
 
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 3ecc266865ed..a2ad2083b9b4 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -33,7 +33,7 @@
 
 
 #include "hintids.hxx"
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <tools/shl.hxx>
 #ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
 #include <com/sun/star/i18n/ScriptType.hdl>
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 67588e976ee3..08b630b133d0 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -39,7 +39,7 @@
 #include "swfont.hxx"
 #ifndef _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 class SwTxtNode;
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 706eca2ec52e..561c1abf2923 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -98,7 +98,7 @@
 #include <svx/svdoedge.hxx>
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include "viewopt.hxx"  // SwViewOptions, nur zum Testen (Test2)
 #endif
 #include "doc.hxx"
@@ -1817,7 +1817,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
 
         delete pPolyPolygon;
         // UPPER_LOWER_TEST
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const SwRootFrm* pTmpRootFrm = pFmt->getIDocumentLayoutAccess()->GetRootFrm();
         if( pTmpRootFrm->GetCurrShell() )
         {
@@ -1890,7 +1890,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
  *                      SwContourCache::ShowContour()
  * zeichnet die PolyPolygone des Caches zu Debugzwecken.
  *************************************************************************/
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
     const Color& rClosedColor, const Color& rOpenColor )
@@ -1941,7 +1941,7 @@ void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
  *                      SwTxtFly::ShowContour()
  * zeichnet die PolyPolygone des Caches zu Debugzwecken.
  *************************************************************************/
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwTxtFly::ShowContour( OutputDevice* pOut )
 {
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index f7dd3e1c592e..611e628eb8e4 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 #ifndef _TXTFLY_HXX
 #define _TXTFLY_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include "swtypes.hxx"
 #include "swrect.hxx"
@@ -102,7 +102,7 @@ public:
                                        const long nXPos,
                                        const sal_Bool bRight );
     // <--
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void ShowContour( OutputDevice* pOut, const SdrObject* pObj,
                       const Color& rClosedColor, const Color& rOpenColor );
 #endif
@@ -235,7 +235,7 @@ public:
     }
     // <--
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void ShowContour( OutputDevice* pOut );
 #endif
 };
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 14944264d39e..7df571159c38 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 #include <hintids.hxx>
 #include <hints.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <svx/langitem.hxx>
@@ -940,17 +940,6 @@ void SwTxtFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
             InvalidateLineNum();
         }
         break;
-        case RES_INS_CHR:
-        {
-            nPos = ((SwInsChr*)pNew)->nPos;
-            InvalidateRange( SwCharRange( nPos, 1 ), 1 );
-            SET_WRONG( nPos, 1, true )
-            SET_SCRIPT_INVAL( nPos )
-            bSetFldsDirty = sal_True;
-            if( HasFollow() )
-                lcl_ModifyOfst( this, nPos, 1 );
-        }
-        break;
         case RES_INS_TXT:
         {
             nPos = ((SwInsTxt*)pNew)->nPos;
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 6981ca472419..61c4110a6761 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -106,7 +106,7 @@ SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
  *                              CalcFtnFlag()
  *************************************************************************/
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 void SwTxtFrm::CalcFtnFlag()
 #else
 void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm
@@ -120,7 +120,7 @@ void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm
 
     const USHORT nSize = pHints->Count();
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     const xub_StrLen nEnd = GetFollow() ? GetFollow()->GetOfst() : STRING_LEN;
 #else
     const xub_StrLen nEnd = nStop != STRING_LEN ? nStop
@@ -364,7 +364,7 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
         SwTwips nTmp = (*fnRect->fnYDiff)( (pCont->*fnRect->fnGetPrtBottom)(),
                                            (Frm().*fnRect->fnGetTop)() );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( nTmp < 0 )
         {
             sal_Bool bInvalidPos = sal_False;
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 81a5c98e1913..87b3e2b01a07 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -47,7 +47,7 @@
 #include <guess.hxx>    //
 #include <splargs.hxx>  // SwInterHyphInfo
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 extern const sal_Char *GetLangName( const MSHORT nLang );
 #endif
 
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index 5bfad43be0b9..03dda0aad402 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -79,7 +79,7 @@ void _TextInit()
     pFntCache = new SwFntCache;                     // Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... }
     pSwFontCache = new SwFontCache;                 // Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray }
     SwCache *pTxtCache = new SwCache( 250, 100      // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , "static SwTxtFrm::pTxtCache"
 #endif
     );
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 854d252afed8..1d77783bfdc6 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #error Wer fummelt denn an den makefiles?
 #endif
 
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index b756567d8106..fab41e155639 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -122,7 +122,7 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
 #endif
         }
 #if OSL_DEBUG_LEVEL > 1
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         static sal_Bool bDbg = sal_False;
         if( bDbg )
         {
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index da1c14121b4a..73ab5d16f788 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -71,7 +71,7 @@ inline SwSaveClip::~SwSaveClip()
     Reset();
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                          class SwDbgOut
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 64bb8be5fc12..434239c12b30 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -328,7 +328,7 @@ SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const xub_Unicode cFillCh
     : SwFixPortion( 0, 0 ), nTabPos(nTabPosition), cFill(cFillChar)
 {
     nLineLength = 1;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( IsFilled() )
     {
         ASSERT( ' ' != cFill, "SwTabPortion::CTOR: blanks ?!" );
@@ -563,7 +563,7 @@ sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
 
 void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Wir wollen uns die Fixbreite anzeigen
     if( rInf.OnWin() && OPTDBG( rInf ) &&
         !rInf.GetOpt().IsPagePreview() && \
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 95805c8203c1..daa2ed84d386 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -62,12 +62,12 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
         }
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "IndexEntrySupplierWrapper: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -88,12 +88,12 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
         sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getIndexKey: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -109,12 +109,12 @@ String IndexEntrySupplierWrapper::GetFollowingText( BOOL bMorePages ) const
         sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getIndexFollowPageWord: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -132,12 +132,12 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
         sRet = xIES->getAlgorithmList( rLcl );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getAlgorithmList: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -155,12 +155,12 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
         bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "loadAlgorithm: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -181,12 +181,12 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
                                         rTxt2, rTxtReading2, rLocale2 );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "compareIndexEntry: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index b51ffb862f3c..94aed72e90ae 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -191,7 +191,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
                 {
                     SwPosition aPos( *pNd );
                     const SwDoc& rDoc = *pNd->GetDoc();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ),
                             "wo steht der Absatz" );
 #else
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 9c54bc60e239..68c779f9914b 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -46,7 +46,7 @@
 #include "hints.hxx"
 #include <IDocumentFieldsAccess.hxx>
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 TYPEINIT3( SwFmtFld, SfxPoolItem, SwClient,SfxBroadcaster)
 TYPEINIT1(SwFmtFldHint, SfxHint);
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index fd35ccd1477c..906d6ff8cebb 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -35,7 +35,7 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <doc.hxx>
 #include <cntfrm.hxx>       // ASSERT in ~SwTxtFtn()
 #include <pagefrm.hxx>      // RemoveFtn()
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 8093a84dbbd9..14f31f277078 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -35,9 +35,9 @@
 #include "unomid.h"
 
 #include <basic/sbxvar.hxx>
-#include <svtools/macitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/stylepool.hxx>
+#include <svl/macitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/stylepool.hxx>
 #include <fmtautofmt.hxx>
 #include <fchrfmt.hxx>
 #include <fmtinfmt.hxx>
@@ -59,7 +59,7 @@
 #include <unometa.hxx>
 #include <unoobj.hxx> // SwXTextRange
 #include <docsh.hxx>
-#include <svtools/zforlist.hxx> // GetNumberFormat
+#include <svl/zforlist.hxx> // GetNumberFormat
 
 #include <boost/bind.hpp>
 #include <algorithm>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 6f98bd371ead..7aec6d4e9884 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1044,7 +1044,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     // a window. Therefore bUseSrcFont is always 0 in this case.
     //
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
     const BOOL bNoAdjust = bPrt ||
             (  pWin &&
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 160758d861b2..4b7dc35a6484 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -707,7 +707,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
         ASSERT( nPos, "nextCharBlock not implemented?" );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( !nPos )
             nPos = nMaxPos;
 #endif
@@ -821,7 +821,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
         ASSERT( nPos, "endOfCharBlock not implemented?" );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( !nPos )
             nPos = nMaxPos;
 #endif
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index 54be1b261655..ef165b010aea 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -2,6 +2,8 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ *
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +52,7 @@ _SV_IMPL_SORTAR_ALG( SwpHtEnd, SwTxtAttr* )
 void DumpHints( const SwpHtStart &rHtStart,
                 const SwpHtEnd &rHtEnd )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aDbstream << "DumpHints:" << endl;
     (aDbstream << "\tStarts:" ).WriteNumber(rHtStart.Count()) << endl;
     for( USHORT i = 0; i < rHtStart.Count(); ++i )
@@ -247,7 +249,7 @@ BOOL SwpHtEnd::Seek_Entry( const SwTxtAttr *pElement, USHORT *pPos ) const
 void SwpHintsArray::Insert( const SwTxtAttr *pHt )
 {
     Resort();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nPos;
     ASSERT(!m_HintStarts.Seek_Entry( pHt, &nPos ),
             "Insert: hint already in HtStart");
@@ -256,7 +258,7 @@ void SwpHintsArray::Insert( const SwTxtAttr *pHt )
 #endif
     m_HintStarts.Insert( pHt );
     m_HintEnds.Insert( pHt );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifdef NIE
     (aDbstream << "Insert: " ).WriteNumber( long( pHt ) ) << endl;
     DumpHints( m_HintStarts, m_HintEnds );
@@ -275,7 +277,7 @@ void SwpHintsArray::DeleteAtPos( const USHORT nPos )
     USHORT nEndPos;
     m_HintEnds.Seek_Entry( pHt, &nEndPos );
     m_HintEnds.Remove( nEndPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifdef NIE
     (aDbstream << "DeleteAtPos: " ).WriteNumber( long( pHt ) ) << endl;
     DumpHints( m_HintStarts, m_HintEnds );
@@ -283,7 +285,7 @@ void SwpHintsArray::DeleteAtPos( const USHORT nPos )
 #endif
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                      SwpHintsArray::Check()
@@ -441,7 +443,7 @@ bool SwpHintsArray::Resort()
         if( pLast && !lcl_IsLessStart( *pLast, *pHt ) )
         {
 #ifdef NIE
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 //            ASSERT( bResort, "!Resort/Start: correcting hints-array" );
             aDbstream << "Resort: Starts" << endl;
             DumpHints( m_HintStarts, m_HintEnds );
@@ -464,7 +466,7 @@ bool SwpHintsArray::Resort()
         if( pLast && !lcl_IsLessEnd( *pLast, *pHt ) )
         {
 #ifdef NIE
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             aDbstream << "Resort: Ends" << endl;
             DumpHints( m_HintStarts, m_HintEnds );
 #endif
@@ -480,7 +482,7 @@ bool SwpHintsArray::Resort()
         }
         pLast = pHt;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifdef NIE
     aDbstream << "Resorted:" << endl;
     DumpHints( m_HintStarts, m_HintEnds );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index eb1f5c3e94fc..a779898d4aaa 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -40,12 +40,12 @@
 // --> OD 2008-01-17 #newlistlevelattrs#
 #include <svx/tstpitem.hxx>
 // <--
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <swmodule.hxx>
 #include <txtfld.hxx>
 #include <txtinet.hxx>
@@ -92,13 +92,13 @@
 #include <numrule.hxx>
 
 //--> #outlinelevel added by zhaojianwei
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 //<--end
 #include <swtable.hxx>
 #include <docsh.hxx>
 #include <SwNodeNum.hxx>
 // --> OD 2008-02-25 #refactorlists#
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <list.hxx>
 // <--
 
@@ -111,7 +111,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
 // Leider ist das SwpHints nicht ganz wasserdicht:
 // Jeder darf an den Hints rumfummeln, ohne die Sortierreihenfolge
 // und Verkettung sicherstellen zu muessen.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define CHECK_SWPHINTS(pNd)  { if( pNd->GetpSwpHints() && \
                                    !pNd->GetDoc()->IsInReading() ) \
                                   pNd->GetpSwpHints()->Check(); }
@@ -372,7 +372,7 @@ void lcl_ChangeFtnRef( SwTxtNode &rNode )
                             ((SwTxtFrm*)pFrm)->SetFtn( TRUE );
                         }
                     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     while( 0 != (pCntnt = (SwCntntFrm*)aIter.Next()) )
                     {
                         SwFtnFrm *pDbgFtn = pCntnt->FindFtnFrm();
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 3c2a643099cb..7213c1e60efd 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -88,7 +88,7 @@
 #define FNT_ATM_HACK
 #endif
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // globale Variable
 SvStatistics aSvStat;
 #endif
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 1222d6f2eeed..b0d23e7ca4ee 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -35,9 +35,9 @@
 #include <hintids.hxx>
 #include <sot/factory.hxx>
 #include <svx/xmlcnitm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/stylepool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/stylepool.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/emphitem.hxx>
@@ -84,11 +84,11 @@
 // OD 26.06.2003 #108784#
 #include <dcontact.hxx>
 #include <docsh.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <algorithm>
 #include <map>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define CHECK    Check();
 #else
 #define CHECK
@@ -660,7 +660,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
@@ -1412,11 +1412,11 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                 // FussNote im Redline-Bereich NICHT ins FtnArray einfuegen!
                 if( StartOfSectionIndex() > rNodes.GetEndOfRedlines().GetIndex() )
                 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     const BOOL bSuccess =
 #endif
                         pDoc->GetFtnIdxs().Insert( pTxtFtn );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ASSERT( bSuccess, "FtnIdx nicht eingetragen." );
 #endif
                 }
@@ -2616,7 +2616,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
     {
         SwpHintsArray::Insert( pHint );
         CalcFlags();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( !rNode.GetDoc()->IsInReading() )
             CHECK;
 #endif
@@ -2709,7 +2709,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
         rNode.Modify( 0, &aHint );
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( !bNoHintAdjustMode && !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
diff --git a/sw/source/core/txtnode/txatbase.cxx b/sw/source/core/txtnode/txatbase.cxx
index 0ce234483f40..0269b9697892 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <txatbase.hxx>
 #include <fmtfld.hxx>
 #include <docufld.hxx>
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 03efd19df3e8..1b931ad68fd5 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -41,7 +41,7 @@
 #endif
 #include <hintids.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/splwrap.hxx>
 #include <svx/langitem.hxx>
 #include <svx/fontitem.hxx>
@@ -368,7 +368,6 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
     return bRet;
 }
 
-
 inline BOOL InRange(xub_StrLen nIdx, xub_StrLen nStart, xub_StrLen nEnd) {
     return ((nIdx >=nStart) && (nIdx <= nEnd));
 }
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 1eeb9246dffe..b0d8a486b1ae 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -203,7 +203,7 @@ void SwDoc::AppendUndo( SwUndo* pUndo )
     USHORT nEnde = UNDO_ACTION_LIMIT;
 
 // nur zum Testen der neuen DOC-Member
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 {
     SwUndoId nId = UNDO_EMPTY;
     USHORT nUndosCnt = 0, nSttEndCnt = 0;
@@ -551,7 +551,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter)
     pUndoEnd->SetSttOffset( nSize );
 
 // nur zum Testen der Start/End-Verpointerung vom Start/End Undo
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         USHORT nEndCnt = 1, nCnt = pUndos->Count();
         SwUndoId nTmpId = UNDO_EMPTY;
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 908fc480fe66..7f868d770100 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -33,7 +33,7 @@
 
 
 #include <hintids.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <fmtftn.hxx>
 #include <fchrfmt.hxx>
 #include <fmtflcnt.hxx>
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index e5312b3cefdd..87e0531dd893 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/svdpage.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 
 
 #include <fmtflcnt.hxx>
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 3b090e875ea8..6a9b61c7aeb8 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -68,7 +68,7 @@ public:
     SwNodeIndex* GetMvSttIdx() const
         { return SwUndoSaveSection::GetMvSttIdx(); }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nRedlineCount;
 #endif
 };
@@ -1089,7 +1089,7 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos,
         ASSERT( !this, "keine gueltigen Daten!" )
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nRedlineCount = rSttPos.nNode.GetNode().GetDoc()->GetRedlineTbl().Count();
 #endif
 }
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index dd261282e5c7..10bcae715f28 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -33,7 +33,7 @@
 
 
 #include <hintids.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <fmtflcnt.hxx>
 #include <fmtanchr.hxx>
 #include <fmtcntnt.hxx>
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 3d5dbd429e49..a90807e53877 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -66,8 +66,7 @@
 #include <comcore.hrc>
 #include <unochart.hxx>
 
-
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -77,7 +76,7 @@
 #endif
 #endif
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     #define _DEBUG_REDLINE( pDoc )
 #else
     void lcl_DebugRedline( const SwDoc* pDoc );
@@ -195,7 +194,7 @@ public:
 void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 );
 void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos = 0 );
 
-#if defined( JP_DEBUG ) && !defined( PRODUCT )
+#if defined( JP_DEBUG ) && defined(DBG_UTIL)
 #include "shellio.hxx"
 void DumpDoc( SwDoc* pDoc, const String& rFileNm );
 void CheckTable( const SwTable& );
@@ -3253,7 +3252,7 @@ void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos )
         *pInsPos = nU;
 }
 
-#if defined( JP_DEBUG ) && !defined( PRODUCT )
+#if defined( JP_DEBUG ) && defined(DBG_UTIL)
 
 
 void DumpDoc( SwDoc* pDoc, const String& rFileNm )
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index a3a044295e0d..ae275ea50e92 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -52,7 +52,7 @@
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/content.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <swunohelper.hxx>
 #include <swunodef.hxx>
 #include <errhdl.hxx>
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 8103b924ae98..411bc33a82ce 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -41,7 +41,7 @@
 #include <vos/mutex.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>     // SvNumberFormatter
+#include <svl/zforlist.hxx>     // SvNumberFormatter
 #include <svtools/chartprettypainter.hxx>
 
 #include <tools/link.hxx>
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 0a95eee00bcd..78afe3987d61 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -59,7 +59,7 @@
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/text/TableColumnSeparator.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/PasswordHelper.hxx>
 #include <svtools/unoimap.hxx>
 #include <svtools/unoevent.hxx>
 #include <unotbl.hxx>
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 194200bfad0c..4f4c7c2658b5 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -59,7 +59,7 @@
 #include <swundo.hxx>
 #include <cntfrm.hxx>
 #include <pagefrm.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/urlobj.hxx>
 #include <docary.hxx>
 #include <swtable.hxx>
@@ -70,11 +70,11 @@
 #include <svtools/ctrltool.hxx>
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <SwStyleNameMapper.hxx>
 #include <redline.hxx>
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 26486cb255dc..c721f6f0cad5 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -43,7 +43,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include "fmtinfmt.hxx"
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <rtl/ustrbuf.hxx>
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index f8de0eb39691..b010b329287d 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -88,7 +88,7 @@
 #include <tools/urlobj.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <textapi.hxx>
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index f2f48e382508..1ce2d6bc3792 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -2250,6 +2250,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     {SW_PROP_NMID(UNO_NAME_NAME),   FIELD_PROP_PAR4,    CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
                     {SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING),  PROPERTY_NONE, 0},
                     {SW_PROP_NMID(UNO_NAME_IS_FIXED),   FIELD_PROP_BOOL1,   CPPU_E2T(CPPUTYPE_BOOLEAN)  , PROPERTY_NONE,0},
+                    {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT,   CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,    0},
+                    {SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
                     {0,0,0,0,0,0}
                 };
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 3f07ccf66b62..72d5b02c769a 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -112,7 +112,7 @@
 #include <fmtflcnt.hxx>
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/brshitem.hxx>
 #include <fmtclds.hxx>
 #include <dcontact.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 0d606ab2f50d..23e868ee5065 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -112,7 +112,7 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
 #define _SVSTDARR_XUB_STRLEN
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/brshitem.hxx>
 #include <fmtclds.hxx>
 #include <dcontact.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index fe750469fade..6fc184e2a50f 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -48,7 +48,7 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <com/sun/star/beans/SetPropertyTolerantFailed.hpp>
 #include <com/sun/star/beans/GetPropertyTolerantResult.hpp>
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 7071eb59731d..808884e207a8 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -35,7 +35,7 @@
 #include <cmdid.h>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <unocrsrhelper.hxx>
 #include <unoport.hxx>
 #include <unoobj.hxx>
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index edd0721d5b63..bafe4be0598d 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 #include <tools/debug.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <unoprnms.hxx>
 
 
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 1308c6ad7d3e..690118cb81b3 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -36,7 +36,7 @@
 
 #include <cmdid.h>
 #include <hintids.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/brshitem.hxx>
 #ifndef _SVX_XMLCNITEM_HXX
 #include <svx/xmlcnitm.hxx>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 722235e3c391..4f40e12c2326 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -35,10 +35,10 @@
 #include <hintids.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/style.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/style.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/ulspitem.hxx>
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 20dde56ead7d..36a8808fd351 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -63,7 +63,7 @@
 #include <fmtpdsc.hxx>
 #include <pagedesc.hxx>
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <viewsh.hxx>
 #include <tabfrm.hxx>
 #include <redline.hxx>
@@ -87,7 +87,7 @@
 #include <com/sun/star/table/CellContentType.hpp>
 #include <unotbl.hxx>
 #include <unoobj.hxx>
-#include <svtools/zforlist.hxx>     // SvNumberFormatter
+#include <svl/zforlist.hxx>     // SvNumberFormatter
 #include <svx/brkitem.hxx>
 #include <svx/shaditem.hxx>
 #include <svx/lrspitem.hxx>
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 7429eb5c444d..da9800c9068a 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -45,7 +45,7 @@
 /// include <svx/svdoutl.hxx>
 #include <svx/svdoutl.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _SVX_FMGLOB_HXX
 #include <svx/fmglob.hxx>
 #endif
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 920c2d809f51..cd80439877f6 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -376,6 +376,37 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
                         // #i75172# end DrawingLayer paint
                         DLPostPaint2(true);
                     }
+
+                    // --> OD 2009-12-03 #i107365#
+                    // Direct paint has been performed. Thus, take care of
+                    // transparent child windows.
+                    if ( GetWin() )
+                    {
+                        Window& rWindow = *(GetWin());
+                        if(rWindow.IsChildTransparentModeEnabled() && rWindow.GetChildCount())
+                        {
+                            const Rectangle aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect()));
+
+                            for ( sal_uInt16 a(0); a < rWindow.GetChildCount(); a++ )
+                            {
+                                Window* pCandidate = rWindow.GetChild(a);
+
+                                if ( pCandidate && pCandidate->IsPaintTransparent() )
+                                {
+                                    const Rectangle aCandidatePosSizePixel(
+                                                    pCandidate->GetPosPixel(),
+                                                    pCandidate->GetSizePixel());
+
+                                    if ( aCandidatePosSizePixel.IsOver(aRectanglePixel) )
+                                    {
+                                        pCandidate->Invalidate( INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+                                        pCandidate->Update();
+                }
+                                }
+                            }
+                        }
+                    }
+                    // <--
                 }
 
                 delete pVout;
@@ -407,7 +438,7 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
     UISizeNotify();
     ++nStartAction;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // test option 'No Scroll' suppresses the automatic repair of the scrolled area
     if ( !GetViewOptions()->IsTest8() )
 #endif
@@ -589,7 +620,7 @@ void ViewShell::MakeVisible( const SwRect &rRect )
                     EndAction();
                 } while( nOldH != pRoot->Frm().Height() && nLoopCnt-- );
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
             {
                 //MA: 04. Nov. 94, braucht doch keiner oder??
@@ -746,7 +777,7 @@ void ViewShell::LayoutIdle()
 
     SET_CURR_SHELL( this );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Wenn Test5 gedrueckt ist, wird der IdleFormatierer abgeknipst.
     if( pOpt->IsTest5() )
         return;
@@ -1146,7 +1177,7 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
     if ( rRect == VisArea() )
         return;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( bInEndAction )
     {
         //Da Rescheduled doch schon wieder irgendwo einer?
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index cf72af66d0a8..e64a3f58eba2 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -45,7 +45,7 @@
 #include <svx/pbinitem.hxx>
 #include <svx/svdview.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <txtfld.hxx>
 #include <fmtfld.hxx>
 #include <fmtfsize.hxx>
@@ -776,16 +776,32 @@ SwDoc * ViewShell::CreatePrtDoc( SfxPrinter* pPrt, SfxObjectShellRef &rDocShellR
         pActCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetPrev());
     }
 
-    // Die Y-Position der ersten Selektion
-    const Point aSelPoint = pFESh->IsTableMode() ?
-                            pFESh->GetTableCrsr()->GetSttPos() :
-                            pFirstCrsr->GetSttPos();
+    Point aSelPoint;
+    if( pFESh->IsTableMode() )
+    {
+        SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
+
+        const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode()->GetCntntNode();
+        const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->GetFrm( 0, pShellTblCrsr->Start() ) : 0;
+        if( pCntntFrm )
+        {
+            SwRect aCharRect;
+            SwCrsrMoveState aTmpState( MV_NONE );
+            pCntntFrm->GetCharRect( aCharRect, *pShellTblCrsr->Start(), &aTmpState );
+            aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
+        }
+    }
+    else
+    {
+       aSelPoint = pFirstCrsr->GetSttPos();
+    }
 
     const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
+    ASSERT( pPage, "no page found!" );
 
-    // und ihren Seitendescribtor
-    const SwPageDesc* pPageDesc = pPrtDoc->FindPageDescByName(
-                                        pPage->GetPageDesc()->GetName() );
+    // get page descriptor - fall back to the first one if pPage could not be found
+    const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
+        pPage->GetPageDesc()->GetName() ) : &pPrtDoc->_GetPageDesc( (sal_uInt16)0 );
 
     if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
     {   // Am letzten Absatz die Absatzattribute richten:
@@ -868,15 +884,32 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
 
     // Die Y-Position der ersten Selektion
     // Die Y-Position der ersten Selektion
-    const Point aSelPoint = pFESh->IsTableMode() ?
-                            pFESh->GetTableCrsr()->GetSttPos() :
-                            pFirstCrsr->GetSttPos();
+    Point aSelPoint;
+    if( pFESh->IsTableMode() )
+    {
+        SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
+
+        const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode()->GetCntntNode();
+        const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->GetFrm( 0, pShellTblCrsr->Start() ) : 0;
+        if( pCntntFrm )
+        {
+            SwRect aCharRect;
+            SwCrsrMoveState aTmpState( MV_NONE );
+            pCntntFrm->GetCharRect( aCharRect, *pShellTblCrsr->Start(), &aTmpState );
+            aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
+        }
+    }
+    else
+    {
+       aSelPoint = pFirstCrsr->GetSttPos();
+    }
 
     const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
+    ASSERT( pPage, "no page found!" );
 
-    // und ihren Seitendescribtor
-    const SwPageDesc* pPageDesc = pPrtDoc->FindPageDescByName(
-                                pPage->GetPageDesc()->GetName() );
+    // get page descriptor - fall back to the first one if pPage could not be found
+    const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
+        pPage->GetPageDesc()->GetName() ) : &pPrtDoc->_GetPageDesc( (sal_uInt16)0 );
 
     if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
     {   // Am letzten Absatz die Absatzattribute richten:
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 22957c9434af..02408f971140 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -34,7 +34,7 @@
 #include <tools/stream.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <svx/fontitem.hxx>
 #include <pam.hxx>
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index cb31050b02d3..edac439d05e6 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -39,7 +39,7 @@
 #include <i18npool/mslangid.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/parhtml.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sot/storage.hxx>
 #include <sot/clsids.hxx>
 #include <sfx2/app.hxx>
@@ -418,6 +418,9 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
             pValues[ n ] = 0;
 }
 
+void SwFilterOptions::Commit() {}
+void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 /*  */
 
 
@@ -1008,3 +1011,24 @@ void GetWW8Writer( const String& rFltName, const String& rBaseURL, WriterRef& xR
     else
         xRet = WriterRef(0);
 }
+
+typedef ULONG ( __LOADONCALLAPI *SaveOrDel )( SfxObjectShell&, SotStorage&, BOOL, const String& );
+typedef ULONG ( __LOADONCALLAPI *GetSaveWarning )( SfxObjectShell& );
+
+ULONG SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, BOOL bSaveInto, const String& rStorageName )
+{
+    SaveOrDel pFunction = reinterpret_cast<SaveOrDel>( GetMswordLibSymbol( "SaveOrDelMSVBAStorage_ww8" ) );
+    if( pFunction )
+        return pFunction( rDoc, rStor, bSaveInto, rStorageName );
+    return ERRCODE_NONE;
+}
+
+ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS )
+{
+    GetSaveWarning pFunction = reinterpret_cast<GetSaveWarning>( GetMswordLibSymbol( "GetSaveWarningOfMSVBAStorage_ww8" ) );
+    if( pFunction )
+            return pFunction( rDocS );
+    return ERRCODE_NONE;
+}
+
+
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index e21433271845..7a8b35470da2 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -33,11 +33,11 @@
 #include <hintids.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef SVTOOLS_FSTATHELPER_HXX
-#include <svtools/fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 #endif
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/ulspitem.hxx>
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 2e8d395d72ca..35d38ce9f1f2 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 #include <SwAppletImpl.hxx>
 #include <svtools/htmlkywd.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 01108a0d2567..6945cf677f51 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -38,7 +38,7 @@
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/udlnitem.hxx>
@@ -67,7 +67,7 @@
 #include <svtools/htmlout.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <svx/htmlmode.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/bigint.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index e788dc5da275..acf8a17b4e15 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -43,12 +43,12 @@
 #if !defined _SVSTDARR_XUB_STRLEN_DECL || !defined _SVSTDARR_USHORTS_DECL
 #define _SVSTDARR_XUB_STRLEN
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <svtools/htmlout.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmltokn.h>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/htmlmode.hxx>
 #include <svx/escpitem.hxx>
 #include <svx/brkitem.hxx>
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index e591d2d5e90b..a4c29e078182 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/sfx.hrc>
 
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <basic/sbx.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 7fb4fd8502af..1c270e8c243b 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -34,9 +34,9 @@
 
 
 #include "hintids.hxx"
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
+#include <svl/urihelper.hxx>
 #include <i18npool/mslangid.hxx>
 #include <sfx2/docfile.hxx>
 #ifndef _APP_HXX //autogen
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 474bfe707847..12a5033ad142 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -33,7 +33,7 @@
 
 
 #include "hintids.hxx"
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/brshitem.hxx>
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index 328eb21be526..7debe0e40eec 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -52,8 +52,8 @@
 #include <svx/brshitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/ulspitem.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index c9930c3ca8ef..718776c07042 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -38,8 +38,8 @@
 
 #include "docsh.hxx"
 #include <svtools/htmltokn.h>
-#include <svtools/zformat.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/zformat.hxx>
+#include <unotools/useroptions.hxx>
 #include <fmtfld.hxx>
 #include <ndtxt.hxx>
 #include <doc.hxx>
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 92f9e1adb3d5..597d851722d8 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -38,7 +38,7 @@
 
 #include "hintids.hxx"
 #include <tools/string.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _APP_HXX
 #include <vcl/svapp.hxx>
 #endif
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index a36e09025ba2..ef3b3140e1c2 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -35,7 +35,7 @@
 #include <tools/string.hxx>
 
 #ifndef _SVARRAY_H
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #endif
 
 class SdrObject;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index dd93a4e60b92..68d3a1a85e2b 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -44,7 +44,7 @@
 #endif
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmltokn.h>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfile.hxx>
 #ifndef _SFXAPP_HXX
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 147e736a4353..71a56084c642 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -48,12 +48,12 @@
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 343939bd38d1..f5c62bb612c2 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -354,7 +354,7 @@ void SwHTMLWriter::OutFootEndNotes()
     if( !pFootEndNotes )
         return;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nFtn = nFootNote, nEn = nEndNote;
 #endif
     nFootNote = 0, nEndNote = 0;
@@ -419,7 +419,7 @@ void SwHTMLWriter::OutFootEndNotes()
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( nFtn == nFootNote,
             "SwHTMLWriter::OutFootEndNotes: Anzahl Fussnoten stimmt nicht" );
     ASSERT( nEn == nEndNote,
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index d18a2b762aa0..d172b8894c55 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -37,8 +37,8 @@
 #include <vcl/wrkwin.hxx>
 #endif
 #include <i18npool/mslangid.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/stritem.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/adjitem.hxx>
@@ -53,7 +53,7 @@
 #include <svtools/imap.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
-#include <svtools/eventcfg.hxx>
+#include <unotools/eventcfg.hxx>
 
 #include <fmtornt.hxx>
 #include <fmturl.hxx>
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 24045bdef1e2..4a438fd43bb6 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -37,7 +37,7 @@
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 21e409c48530..dc08bad8d6dc 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -36,9 +36,9 @@
 
 
 #include "hintids.hxx"
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/frmhtml.hxx>
 #include <sfx2/frmhtmlw.hxx>
@@ -59,7 +59,7 @@
 #include <fmtcntnt.hxx>
 #include <frmfmt.hxx>
 
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 #include "pam.hxx"
 #include "doc.hxx"
 #include "ndtxt.hxx"
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index a4fb7f70ff66..8e1c7d3fa8cf 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -72,7 +72,7 @@
 #include "viewsh.hxx"
 #include "swcss1.hxx"
 #include "swhtml.hxx"
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 #define CONTEXT_FLAGS_MULTICOL (HTML_CNTXT_STRIP_PARA |  \
                                 HTML_CNTXT_KEEP_NUMRULE | \
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 3b02546494f8..4715b760163d 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -48,7 +48,7 @@
 #include <svx/spltitem.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 
 #include <fmtornt.hxx>
@@ -912,7 +912,7 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells )
 {
     ASSERT( nCells < pCells->Count(), "Anzahl Zellen falsch" );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
      sal_uInt16 nEnd = pCells->Count();
 #endif
     // The colspan of empty cells at the end has to be fixed to the new
@@ -930,7 +930,7 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells )
         else
             break;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     for( i=nCells; i<nEnd; i++ )
     {
         HTMLTableCell *pCell = (*pCells)[i];
@@ -1790,7 +1790,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
             HTMLTableCell *pCell = GetCell(nTopRow,nCol);
             const sal_Bool bSplit = 1 == pCell->GetColSpan();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if( nCol == nRightCol-1 )
             {
                 ASSERT( bSplit, "Split-Flag falsch" );
@@ -3394,7 +3394,7 @@ void _CellSaveStruct::AddContents( HTMLTableCnts *pNewCnts )
 void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
                                   HTMLTable *pCurTable )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Die Attribute muessen schon beim Auefrauemen des Kontext-Stacks
     // entfernt worden sein, sonst ist etwas schiefgelaufen. Das
     // Checken wir mal eben ...
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 1150b044db5b..c4f625920fd7 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -67,7 +67,7 @@
 #include <htmlnum.hxx>
 #include <wrthtml.hxx>
 #include <wrtswtbl.hxx>
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _VIEWSH_HXX
 #include <viewsh.hxx>
 #endif
@@ -1200,7 +1200,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
 
     const SwHTMLTableLayout *pLayout = rTbl.GetHTMLTableLayout();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ViewShell *pSh;
     rWrt.pDoc->GetEditShell( &pSh );
     if ( pSh && pSh->GetViewOptions()->IsTest1() )
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 50a55d16b6a2..011d1e3dfbd3 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -39,7 +39,7 @@
 #endif
 #include <i18npool/mslangid.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/blnkitem.hxx>
@@ -57,7 +57,7 @@
 #include <svx/ulspitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/spltitem.hxx>
 #include <svx/widwitem.hxx>
 #include <svx/frmdiritem.hxx>
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index c7e811e6d456..613626bcf675 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -31,12 +31,12 @@
 #define _SVXCSS1_HXX
 
 #include <tools/string.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svxenum.hxx>
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <rtl/textenc.h>
 #include "parcss1.hxx"
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 551ebf937be2..c47739b8925f 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -36,19 +36,19 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include <stdlib.h>
 #endif
 #include <hintids.hxx>
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/fcontnr.hxx>
@@ -307,7 +307,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
     // <--
     nOpenParaToken( 0 ),
     eJumpTo( JUMPTO_NONE ),
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nContinue( 0 ),
 #endif
     eParaAdjust( SVX_ADJUST_END ),
@@ -437,7 +437,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
 
 __EXPORT SwHTMLParser::~SwHTMLParser()
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !nContinue, "DTOR im Continue - Das geht schief!!!" );
 #endif
     BOOL bAsync = pDoc->IsInLoadAsynchron();
@@ -588,7 +588,7 @@ SvParserState __EXPORT SwHTMLParser::CallParser()
 
 void __EXPORT SwHTMLParser::Continue( int nToken )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !nContinue, "Continue im Continue - Das sollte doch nicht sein, oder?" );
     nContinue++;
 #endif
@@ -614,7 +614,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
         bViewCreated = TRUE;
         pDoc->SetInLoadAsynchron( TRUE );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         nContinue--;
 #endif
 
@@ -724,7 +724,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
                     pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
                 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // !!! sollte nicht moeglich sein, oder ??
 ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
             "Pam.Bound1 steht noch im Node" );
@@ -922,7 +922,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() )
     // wieder rekonstruieren.
     CallEndAction( TRUE );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nContinue--;
 #endif
 }
@@ -977,7 +977,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
             return ;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( pPendStack )
     {
         switch( nToken )
@@ -2471,12 +2471,12 @@ ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, BOOL bChkPtr )
 
     if( !pVSh || bChkPtr )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ViewShell *pOldVSh = pVSh;
 #endif
         pDoc->GetEditShell( &pVSh );
         ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( pOldVSh && !pVSh )
             pVSh = 0;
 #endif
@@ -3882,7 +3882,7 @@ void SwHTMLParser::EndPara( BOOL bReal )
 {
     if( HTML_LI_ON==nOpenParaToken && pTable )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const SwNumRule *pNumRule = pPam->GetNode()->GetTxtNode()->GetNumRule();
 #endif
         ASSERT( pNumRule, "Wo ist die Numrule geblieben" );
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 61dfb82fc040..8160f5fe7ec5 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -44,11 +44,11 @@
 #ifndef _SVSTDARR_STRINGSDTOR_DECL
 #define _SVSTDARR_STRINGSDTOR
 #endif
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <tools/urlobj.hxx>
 #include <sfx2/sfxhtml.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <svx/svxenum.hxx>
 #include <fmtornt.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -453,7 +453,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
                         JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_uInt16  nContinue;          // Tiefe der Continue-Aufrufe
 #endif
 
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 29a5860e0b2f..d2f3261ee074 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -34,7 +34,7 @@
 
 #include <stdlib.h>
 #include <hintids.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <rtl/tencinfo.h>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/linkmgr.hxx>
@@ -51,7 +51,7 @@
 #include <svx/fontitem.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/frmdiritem.hxx>
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 6118430d28f6..833183d87a50 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -37,7 +37,7 @@
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <i18npool/lang.h>
 #include <tools/stream.hxx>
 
diff --git a/sw/source/filter/inc/fltglbls.hxx b/sw/source/filter/inc/fltglbls.hxx
index 48b72e123500..f23f3841e380 100644
--- a/sw/source/filter/inc/fltglbls.hxx
+++ b/sw/source/filter/inc/fltglbls.hxx
@@ -32,7 +32,7 @@
 
 #include <tools/string.hxx>
 #include <i18npool/lang.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 
 class SfxPoolItem;
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index cb2c5dda9635..cb5a5880ee5a 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -45,7 +45,7 @@
 #include <fltshell.hxx>         // fuer den Attribut Stack
 #include <redline.hxx>
 #include <shellio.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
 #define CREATE_CONST_ASC(s) String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(s))
 
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index fa747d9872e5..a1279f89e3a5 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -32,7 +32,7 @@
 
 #include <tools/solar.h>
 #include <tools/color.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include <swdllapi.h>
 
@@ -262,7 +262,7 @@ protected:
 
     BOOL bRelWidths : 1;        // Breiten relativ ausgeben?
     BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bGetLineHeightCalled : 1;
 #endif
 
diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx
index fc60c857aedb..50cec6322339 100644
--- a/sw/source/filter/rtf/rtfatr.cxx
+++ b/sw/source/filter/rtf/rtfatr.cxx
@@ -42,12 +42,12 @@
 #include <com/sun/star/i18n/ScriptType.hdl>
 #endif
 #include <vcl/cvtgrf.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/rtfkeywd.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svtools/rtfout.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/hyznitem.hxx>
 #ifndef _SVX_TSTPITEM_HXX //autogen
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index 8985d58429c3..b23b9f5e1338 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -41,9 +41,9 @@
 #ifndef _GRAPH_HXX //autogen
 #include <vcl/graph.hxx>
 #endif
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/rtftoken.h>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/langitem.hxx>
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index e4043f2e8529..329ff8fedb41 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -35,7 +35,7 @@
 #include <tools/list.hxx>
 #include <tools/cachestr.hxx>
 #include <svtools/rtftoken.h>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/prntitem.hxx>
 #include <svx/opaqitem.hxx>
 #include <svx/protitem.hxx>
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 2cab705fa8e0..249b6bd0f09e 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -34,7 +34,7 @@
 #include <tools/stream.hxx>
 #include <svtools/rtftoken.h>
 #include <svtools/rtfkeywd.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/rtfout.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/fontitem.hxx>
@@ -734,7 +734,7 @@ void SwRTFParser::RemoveUnusedNumRule( SwNumRule* pRule )
         }
         pDoc->DelNumRule( pRule->GetName() );
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         ASSERT( pRule, "NumRulePointer 0 kann nicht geloescht werden" );
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 9b5b90a01641..0b2bd344ccc4 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -39,9 +39,9 @@
 #include <tools/errinf.hxx>
 #endif
 #include <tools/stream.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svtools/rtftoken.h>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/ulspitem.hxx>
 #ifndef _SVX_TSTPITEM_HXX //autogen
@@ -387,7 +387,7 @@ void SwRTFParser::Continue( int nToken )
                 pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
             }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // !!! sollte nicht moeglich sein, oder ??
 ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
             "Pam.Bound1 steht noch im Node" );
@@ -2214,7 +2214,7 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
 
     SwPaM aPam( *pPam->GetPoint() );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( nSNd <= nENd, "Start groesser als Ende" );
     SwNode* pDebugNd = pDoc->GetNodes()[ nSNd ];
     ASSERT( pDebugNd->IsCntntNode(), "Start kein ContentNode" );
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
index f693acdb1433..0769f7623ae8 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -44,7 +44,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_BOOLS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <svx/svxrtf.hxx>
 #include <svx/numitem.hxx>
diff --git a/sw/source/filter/rtf/wrtrtf.cxx b/sw/source/filter/rtf/wrtrtf.cxx
index d0129f29380f..9975ee3abf23 100644
--- a/sw/source/filter/rtf/wrtrtf.cxx
+++ b/sw/source/filter/rtf/wrtrtf.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/string.hxx>
 #include <tools/stream.hxx>
 #include <tools/datetime.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <rtl/tencinfo.h>
 #include <svtools/rtfkeywd.hxx>
 #include <svtools/rtfout.hxx>
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 4b2ab6e086a2..2ed742255173 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -33,11 +33,11 @@
 #include <hintids.hxx>
 
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sot/storage.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/filter.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/fontitem.hxx>
@@ -250,7 +250,7 @@ SwPaM* Writer::NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx,
 /////////////////////////////////////////////////////////////////////////////
 
 // Stream-spezifisches
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 SvStream& Writer::Strm()
 {
     ASSERT( pStrm, "Oh-oh. Dies ist ein Storage-Writer. Gleich knallts!" );
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 5dbf81b4484a..40136a45f645 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -30,8 +30,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
 
 
 #include "shellio.hxx"
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 4c019f0bfdcc..89beab1f0c3a 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -114,7 +114,7 @@ long SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
 
 long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bOldGetLineHeightCalled = bGetLineHeightCalled;
     bGetLineHeightCalled = TRUE;
 #endif
@@ -135,7 +135,7 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
         // <--
         bUseLayoutHeights = bLayoutAvailable; /*FALSE;*/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( bLayoutAvailable || !bOldGetLineHeightCalled, "Layout ungueltig?" );
 #endif
     }
@@ -431,7 +431,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
     BOOL bSubExpanded = FALSE;
     USHORT nLines = rLines.Count();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nEndCPos = 0;
 #endif
 
@@ -467,11 +467,11 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
         }
         else
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             long nCheckPos = nRPos + GetLineHeight( pLine );
 #endif
             nRPos = nStartRPos + nParentLineHeight;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             SwWriteTableRow aRow( nStartRPos + nParentLineHeight, bUseLayoutHeights );
             ASSERT( aRows.Seek_Entry(&aRow),
                     "Parent-Zeile nicht gefunden" );
@@ -514,7 +514,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
             }
             else
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 USHORT nCheckPos = nCPos + (USHORT)GetBoxWidth( pBox );
                 if( !nEndCPos )
                 {
@@ -528,7 +528,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
                 }
 #endif
                 nCPos = nStartCPos + nParentLineWidth;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 SwWriteTableCol aCol( nStartCPos + nParentLineWidth );
                 ASSERT( aCols.Seek_Entry(&aCol),
                         "Parent-Zelle nicht gefunden" );
@@ -594,7 +594,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
         // Und ihren Index
         USHORT nOldRow = nRow;
         SwWriteTableRow aRow( nRPos,bUseLayoutHeights );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         BOOL bFound =
 #endif
             aRows.Seek_Entry( &aRow, &nRow );
@@ -679,7 +679,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
             // Und ihren Index
             USHORT nOldCol = nCol;
             SwWriteTableCol aCol( nCPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             BOOL bFound2 =
 #endif
                 aCols.Seek_Entry( &aCol, &nCol );
@@ -776,7 +776,7 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth,
     nInnerBorder(0), nBaseWidth(nBWidth), nHeadEndRow(USHRT_MAX),
      nLeftSub(nLSub), nRightSub(nRSub), nTabWidth(nWidth), bRelWidths(bRel),
     bUseLayoutHeights(true),
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bGetLineHeightCalled(false),
 #endif
     bColsOption(false), bColTags(true), bLayoutExport(false),
@@ -803,7 +803,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo )
     nInnerBorder(0), nBaseWidth(pLayoutInfo->GetWidthOption()), nHeadEndRow(0),
     nLeftSub(0), nRightSub(0), nTabWidth(pLayoutInfo->GetWidthOption()),
     bRelWidths(pLayoutInfo->HasPrcWidthOption()), bUseLayoutHeights(false),
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bGetLineHeightCalled(false),
 #endif
     bColsOption(pLayoutInfo->HasColsOption()),
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 822091cec765..6086d7f9230e 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -38,7 +38,7 @@
 #ifndef _GRAPH_HXX //autogen
 #include <vcl/graph.hxx>
 #endif
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/boxitem.hxx>
@@ -47,7 +47,7 @@
 #include <svx/cntritem.hxx>
 #include <svx/postitem.hxx>
 #include <svx/crsditem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <unotools/charclass.hxx>
 #include <txtftn.hxx>
 #include <fmtpdsc.hxx>
@@ -1685,7 +1685,7 @@ SfxItemSet* SwFltOutBase::NewFlyDefaults()
 BOOL SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_CNTNT*/,
                            BOOL bAbsolutePos /*= FALSE*/,
                            const SfxItemSet*
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                                pMoreAttrs /*= 0*/
 #endif
                             )
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 9f177765a4f7..1b069f44a0e9 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -58,7 +58,7 @@
 #ifndef _SVX_TSTPITEM_HXX //autogen
 #include <svx/tstpitem.hxx>
 #endif
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <fmtfsize.hxx>
 #include <doc.hxx>
 #include <pam.hxx>
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 6aac7b226289..316f31a8d5d5 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -267,7 +267,7 @@ void Ww1SingleSprmPBrc::Start(
     Ww1Shell& rOut, BYTE,
     W1_BRC10* pBrc,
     USHORT
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nSize
 #endif
     ,
@@ -467,7 +467,7 @@ void Ww1SingleSprmPFInTable::Start(
 
 void Ww1SingleSprmPFInTable::Stop(
     Ww1Shell&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     rOut
 #endif
     ,
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0eb0284a701e..747f8eb67752 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -44,7 +44,7 @@
 
 #include <hintids.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 #include <svx/fontitem.hxx>
 #include <svx/tstpitem.hxx>
diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx
index 6df865fbfced..e4ecb410e7c1 100644
--- a/sw/source/filter/ww8/dump/ww8scan.hxx
+++ b/sw/source/filter/ww8/dump/ww8scan.hxx
@@ -48,7 +48,7 @@
 
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef WW8STRUC_HXX
 #include <ww8struc.hxx>     // FIB, STSHI, STD
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 0fb39dcc7a02..880a70903206 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -34,7 +34,7 @@
 #define _ESCHER_HXX
 
 #ifndef _ESCHEREX_HXX
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 #endif
 
 const sal_uInt32 nInlineHack = 0x00010001;
diff --git a/sw/source/filter/ww8/tracer.cxx b/sw/source/filter/ww8/tracer.cxx
index 522d8194633d..374eee8f1af7 100644
--- a/sw/source/filter/ww8/tracer.cxx
+++ b/sw/source/filter/ww8/tracer.cxx
@@ -34,7 +34,7 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <tools/urlobj.hxx>         //INetURLObject
 #include <sfx2/docfile.hxx>         //SfxMedium
-#include <svx/msfiltertracer.hxx>   //MSFilterTracer
+#include <filter/msfilter/msfiltertracer.hxx>   //MSFilterTracer
 #include "tracer.hxx"               //sw::log::Tracer
 
 using rtl::OUString;
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 2ad32c7be689..b68f321d35b6 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -42,7 +42,7 @@
 
 #include <algorithm>                //std::swap
 #include <functional>               //std::binary_function
-#   include <svtools/itemiter.hxx>  //SfxItemIter
+#   include <svl/itemiter.hxx>  //SfxItemIter
 #   include <svx/svdobj.hxx>        //SdrObject
 #   include <svx/svdoole2.hxx>      //SdrOle2Obj
 #   include <svx/fmglob.hxx>        //FmFormInventor
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 18e73b1e2d56..68a474b227d5 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -40,8 +40,8 @@
 
 #include <sfx2/objsh.hxx>
 #include "types.hxx"
-#include <svtools/itempool.hxx>     //SfxItemPool
-#include <svtools/itemset.hxx>      //SfxItemSet
+#include <svl/itempool.hxx>     //SfxItemPool
+#include <svl/itemset.hxx>      //SfxItemSet
 #include <format.hxx>               //SwFmt
 #include <node.hxx>                 //SwCntntNode
 #include <pam.hxx>                  //SwPaM
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index fb197163e226..9213547dbe6e 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -48,7 +48,7 @@
 #endif
 
 #ifndef SV_FONTCVT_HXX
-#   include <vcl/fontcvt.hxx>   //GetSubsFontName
+#   include <unotools/fontcvt.hxx>   //GetSubsFontName
 #endif
 #   include <svx/paperinf.hxx>      //lA0Width...
 #   include <svx/lrspitem.hxx>      //SvxLRSpaceItem
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 5bb1ffc557b7..33c6725e1221 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2,6 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,14 +39,14 @@
 
 #define _SVSTDARR_ULONGSSORT
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/virdev.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <vcl/svapp.hxx>
 #include <sot/storage.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdmodel.hxx>
@@ -2018,7 +2019,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
                         if (bSwapInPage)
                             (const_cast<SdrObject*>(pSdrObj))->SetPage(0);
                     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     else
                         ASSERT( !this, "Where is the SDR-Object?" );
 #endif
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2cbbb7943f37..554f128b361e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -53,8 +53,8 @@
 #include <svx/brkitem.hxx>
 #include <svx/frmdiritem.hxx>
 #include <svx/tstpitem.hxx>
-#include "svtools/urihelper.hxx"
-#include <svtools/whiter.hxx>
+#include "svl/urihelper.hxx"
+#include <svl/whiter.hxx>
 #include <fmtpdsc.hxx>
 #include <fmtfsize.hxx>
 #include <fmtornt.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index dcef287a1537..fb121eb322f7 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -46,20 +46,20 @@
 #include <docsh.hxx>
 
 #define _SVSTDARR_BOOLS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <vcl/salbtype.hxx>
 #include <sot/storage.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <sfx2/docinf.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/hyznitem.hxx>
 #include <svx/langitem.hxx>
-#include <svx/msoleexp.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msoleexp.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/brshitem.hxx>
@@ -112,9 +112,10 @@
 #include "dbgoutsw.hxx"
 
 #include <sfx2/docfile.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <unotools/tempfile.hxx>
-#include <svx/mscodec.hxx>
+#include <filter/msfilter/mscodec.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <osl/time.h>
 #include <rtl/random.h>
 #include "WW8Sttbf.hxx"
@@ -741,7 +742,7 @@ ULONG SwWW8Writer::FillUntil( SvStream& rStrm, ULONG nEndPos )
 
     if( nEndPos > nCurPos )
         SwWW8Writer::FillCount( rStrm, nEndPos - nCurPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( nEndPos == nCurPos, "Falsches FillUntil()" );
 #endif
@@ -2371,7 +2372,6 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
     if ( m_rWW8Export.bWrtWW8 )
     {
         sal_uInt32 aSprmIds[] = {NS_sprm::LN_TCellShd, NS_sprm::LN_TCellShadow};
-
         sal_uInt8 nBoxes0 = rTabBoxes.Count();
         if (nBoxes0 > 21)
             nBoxes0 = 21;
@@ -2390,8 +2390,8 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
                 Color aColor;
 
                 if ( SFX_ITEM_ON ==
-                     pFrmFmt->GetAttrSet().
-                     GetItemState( RES_BACKGROUND, false, &pI ) )
+                         pFrmFmt->GetAttrSet().
+                         GetItemState( RES_BACKGROUND, false, &pI ) )
                 {
                     aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
                 }
@@ -2713,7 +2713,6 @@ void WW8Export::WriteFkpPlcUsw()
         // <--
         {
             ::std::vector<String> aStrings;
-
             ::ww8::StringVector_t & aSttbStrings = pSttbfAssoc->getStrings();
             ::ww8::StringVector_t::const_iterator aItEnd = aSttbStrings.end();
             for (::ww8::StringVector_t::const_iterator aIt = aSttbStrings.begin();
@@ -2726,14 +2725,12 @@ void WW8Export::WriteFkpPlcUsw()
             WriteAsStringTable(aStrings, pFib->fcSttbfAssoc,
                                pFib->lcbSttbfAssoc);
         }
-
     }
     Strm().Seek( 0 );
 
     // Reclaim stored FIB data from document.
     ::ww8::WW8FibData * pFibData = dynamic_cast<ww8::WW8FibData *>
           (pDoc->getExternalData(::sw::FIB).get());
-
     // --> OD 2009-10-19 #i106057#
     if ( pFibData )
     // <--
@@ -2745,6 +2742,7 @@ void WW8Export::WriteFkpPlcUsw()
     }
 
     pFib->Write( Strm() );  // FIB
+
 }
 
 void WW8Export::StoreDoc1()
@@ -2867,7 +2865,7 @@ namespace
 {
     const ULONG WW_BLOCKSIZE = 0x200;
 
-    void EncryptRC4(svx::MSCodec_Std97& rCtx, SvStream &rIn, SvStream &rOut)
+    void EncryptRC4(msfilter::MSCodec_Std97& rCtx, SvStream &rIn, SvStream &rOut)
     {
         rIn.Seek(STREAM_SEEK_TO_END);
         ULONG nLen = rIn.Tell();
@@ -3103,7 +3101,7 @@ void WW8Export::ExportDocument_Impl()
         for (xub_StrLen nChar = 0; nChar < nLen; ++nChar )
             aPassword[nChar] = sUniPassword.GetChar(nChar);
 
-        svx::MSCodec_Std97 aCtx;
+        msfilter::MSCodec_Std97 aCtx;
         aCtx.InitKey(aPassword, aDocId);
 
         SvStream *pStrmTemp, *pTableStrmTemp, *pDataStrmTemp;
@@ -3397,11 +3395,23 @@ SwWW8Writer::~SwWW8Writer()
 {
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ULONG SAL_CALL SaveOrDelMSVBAStorage_ww8( SfxObjectShell& rDoc, SotStorage& rStor, BOOL bSaveInto, const String& rStorageName )
+{
+    SvxImportMSVBasic aTmp( rDoc, rStor );
+    return aTmp.SaveOrDelMSVBAStorage( bSaveInto, rStorageName );
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportDOC( const String& rFltName, const String& rBaseURL, WriterRef& xRet )
 {
     xRet = new SwWW8Writer( rFltName, rBaseURL );
 }
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ULONG SAL_CALL GetSaveWarningOfMSVBAStorage_ww8(  SfxObjectShell &rDocS )
+{
+    return SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( rDocS );
+}
+
 bool WW8_WrPlcFtnEdn::WriteTxt( WW8Export& rWrt )
 {
     bool bRet = false;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 75b59638ccde..2e0b4ab7d778 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -36,7 +36,7 @@
 #include <tools/gen.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #include <map>
@@ -44,7 +44,7 @@
 
 #include <shellio.hxx>
 #include <wrt_fn.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msocximex.hxx>
 
 #include "ww8struc.hxx"
 #include "ww8scan.hxx"
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index aaafe0ee49fc..c4ad0735d5d4 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -37,8 +37,8 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <rtl/math.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/itemiter.hxx>
-#include "svtools/urihelper.hxx"
+#include <svl/itemiter.hxx>
+#include "svl/urihelper.hxx"
 
 #include <svtools/embedhlp.hxx>
 
@@ -49,7 +49,7 @@
 #include <svx/boxitem.hxx>
 #include <svx/shaditem.hxx>
 #include <svx/shaditem.hxx>
-#include <svx/msoleexp.hxx>
+#include <filter/msfilter/msoleexp.hxx>
 #include <svx/lrspitem.hxx> // SvxLRSpaceItem
 #include <svx/ulspitem.hxx>
 #include <svx/fhgtitem.hxx>
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 3b91de937668..54ebd5c5a9ba 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -41,9 +41,9 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/salbtype.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/zformat.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/adjitem.hxx>
@@ -3582,7 +3582,7 @@ ULONG WW8Export::ReplaceCr( BYTE nChar )
         pChpPlc->AppendFkpEntry(rStrm.Tell());
         nRetPos = rStrm.Tell();
     }
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     else
     {
         ASSERT( nRetPos || nPos == (ULONG)pFib->fcMin,
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index b0dabff56b2f..eca0e0d77c21 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -33,7 +33,7 @@
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <rtl/tencinfo.h>
 #include <swerror.h>
 #ifndef _NDTXT
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 4948ac5eddae..0553267d12ed 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <hintids.hxx>
 #include <osl/endian.h>
 #include <svx/fmglob.hxx>
@@ -75,7 +75,7 @@
 #include <svx/outliner.hxx>         // #79453#
 #include <svx/frmdiritem.hxx>
 #include <svx/xfltrit.hxx>
-#include <svx/msdffimp.hxx>
+#include <filter/msfilter/msdffimp.hxx>
 #include <grfatr.hxx>           // class SwCropGrf
 #include <fmtornt.hxx>
 #include <fmtcntnt.hxx>
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index dc653c5738e6..68d3e87c475c 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -37,14 +37,14 @@
 #include <iterator>
 #endif
 #include <hintids.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/opaqitem.hxx>
-#include <svx/msdffimp.hxx>
+#include <filter/msfilter/msdffimp.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 599c6b3ea1b6..b92f80c85290 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -60,18 +60,18 @@
 // --> OD 2005-02-28 #i43427#
 #include <svx/opaqitem.hxx>
 // <--
-#include <svx/svxmsbas.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/msdffimp.hxx>
+#include <filter/msfilter/msdffimp.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svxerr.hxx>
-#include <svx/mscodec.hxx>
+#include <filter/msfilter/mscodec.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/xflclit.hxx>
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <fmtfld.hxx>
 #include <fmturl.hxx>
 #include <fmtinfmt.hxx>
@@ -129,7 +129,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
-#include <svtools/itemiter.hxx>  //SfxItemIter
+#include <svl/itemiter.hxx>  //SfxItemIter
 
 #include <stdio.h>
 
@@ -4216,7 +4216,7 @@ namespace
 
 #define WW_BLOCKSIZE 0x200
 
-    void DecryptRC4(svx::MSCodec_Std97& rCtx, SvStream &rIn, SvStream &rOut)
+    void DecryptRC4(msfilter::MSCodec_Std97& rCtx, SvStream &rIn, SvStream &rOut)
     {
         rIn.Seek(STREAM_SEEK_TO_END);
         ULONG nLen = rIn.Tell();
@@ -4233,7 +4233,7 @@ namespace
         }
     }
 
-    void DecryptXOR(svx::MSCodec_XorWord95 &rCtx, SvStream &rIn, SvStream &rOut)
+    void DecryptXOR(msfilter::MSCodec_XorWord95 &rCtx, SvStream &rIn, SvStream &rOut)
     {
         ULONG nSt = rIn.Tell();
         rIn.Seek(STREAM_SEEK_TO_END);
@@ -4366,7 +4366,7 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss)
                     for (xub_StrLen nChar = 0; nChar < sPassword.Len(); ++nChar )
                         aPassword[nChar] = sPassword.GetChar(nChar);
 
-                    svx::MSCodec_XorWord95 aCtx;
+                    msfilter::MSCodec_XorWord95 aCtx;
                     aCtx.InitKey(aPassword);
                     if (aCtx.VerifyKey(pWwFib->nKey, pWwFib->nHash))
                     {
@@ -4424,7 +4424,7 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss)
                     sal_uInt8 aSaltHash[ 16 ];
                     pTableStream->Read(aSaltHash, 16);
 
-                    svx::MSCodec_Std97 aCtx;
+                    msfilter::MSCodec_Std97 aCtx;
                     aCtx.InitKey(aPassword, aDocId);
                     if (aCtx.VerifyKey(aSaltData, aSaltHash))
                     {
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 93a20df1576c..98006fb5d267 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -33,8 +33,8 @@
 #define _WW8PAR_HXX
 
 #include <tools/string.hxx>
-#include <svx/msdffimp.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msdffimp.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <svx/frmdir.hxx>
 #include <fltshell.hxx>         // fuer den Attribut Stack
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 5cb19358f385..795cfb749531 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -285,7 +285,7 @@ void sw::util::RedlineStack::close( const SwPosition& rPos,
     {
         if( pTabDesc && pTabDesc->getOldRedlineStack() )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             ASSERT( pTabDesc->getOldRedlineStack()->close(rPos, eType), "close without open!");
 #else
             pTabDesc->getOldRedlineStack()->close( rPos, eType );
@@ -1502,7 +1502,7 @@ void WW8TabBandDesc::ProcessSpacing(const BYTE* pParams)
     if (nLen != 6)
         return;
     mbHasSpacing=true;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BYTE nWhichCell =
 #endif
             *pParams++;
@@ -1556,7 +1556,7 @@ void WW8TabBandDesc::ProcessSpecificSpacing(const BYTE* pParams)
 
     ASSERT(nOverrideSpacing[nWhichCell] < 0x10,
         "Unexpected value for nSideBits");
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BYTE nUnknown2 =
 #endif
             *pParams++;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index aa2737da1fa4..b6b91459fc10 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -33,7 +33,7 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
 
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 
@@ -75,7 +75,7 @@
 #include <svx/crsditem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/postitem.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <errhdl.hxx>
 #include <unoobj.hxx>
 #include <doc.hxx>
@@ -95,7 +95,7 @@
 #include "ww8par2.hxx"  // wg. Listen-Attributen in Styles
 
 #include <IMark.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 
 #include <stdio.h>
 
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index ccabdcf8cac1..a0c70239c604 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -46,10 +46,10 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <hintids.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/msdffimp.hxx>
+#include <filter/msfilter/msdffimp.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/unoapi.hxx>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msocximex.hxx>
 
 #include <sot/exchange.hxx>
 #include <swtypes.hxx>
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index f5f82d879aac..9f4cba28a4db 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -40,9 +40,9 @@
 #include <tools/solar.h>
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <svtools/urihelper.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <sfx2/linkmgr.hxx>
 
 #ifndef _UCBHELPER_CONTENT_HXX_
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 978834f3345e..82e2192b52ed 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <stdlib.h>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <rtl/tencinfo.h>
 
 
@@ -4673,7 +4673,7 @@ void SwWW8ImplReader::Read_ParaBackColor(USHORT, const BYTE* pData, short nLen)
 
 sal_uInt32 SwWW8ImplReader::ExtractColour(const BYTE* &rpData,
     bool
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bVer67
 #endif
     )
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 7e3187a4a948..9b653c5eb33d 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -686,7 +686,7 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
             if( nPoint < pRedlineInfo->pContentIndex->GetIndex() ||
                 nPoint > pRedlineInfo->pContentIndex->GetNode().EndOfSectionIndex() )
                 pRedline->SetContentIdx(pRedlineInfo->pContentIndex);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
                 ASSERT( false, "Recursive change tracking" );
 #endif
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index a99e719e3fe0..667ae829edb8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -55,10 +55,10 @@
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sfx2/docfile.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <unotools/streamwrap.hxx>
 #include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 09b7bdd8ed30..f0a1b32c74ba 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -46,9 +46,9 @@
 #include <unotools/streamwrap.hxx>
 #include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
 #include <pam.hxx>
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 7832661d8799..041e3a4eb260 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -34,9 +34,9 @@
 
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
@@ -45,7 +45,7 @@
 
 #ifndef _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 357546259777..ad86a2d8cf26 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -37,7 +37,7 @@
 
 #ifndef _SVSTDARR_STRINGSSORT_DECL
 #define _SVSTDARR_STRINGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
 #include <format.hxx>
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 8a2586392a30..3136f7b2fdf1 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -83,7 +83,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
     if( eFamily != XML_TOKEN_INVALID )
         AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // style:parent-style-name="..." (if its not the default only)
     const SwFmt* pParent = rFmt.DerivedFrom();
     // Parent-Namen nur uebernehmen, wenn kein Default
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 44744f0d18a2..17b95cd310af 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -65,7 +65,7 @@
 #include <sfx2/printer.hxx>
 #include <ForbiddenCharactersEnum.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <tools/diagnose_ex.h>
 #include <hash_set>
 #include <stringhash.hxx>
@@ -842,7 +842,7 @@ void SwXMLImport::endDocument( void )
                                             pTxtNode->GetTxt().Len() );
                 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 // !!! This should be impossible !!!!
                 ASSERT( pSttNdIdx->GetIndex()+1 !=
                                         pPaM->GetBound( sal_True ).nNode.GetIndex(),
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 78f391b3840f..836d02b9e4f0 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -32,9 +32,9 @@
 #include "precompiled_sw.hxx"
 #include "xmlimpit.hxx"
 #include <xmloff/xmluconv.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 360f8349142e..13cb894d6e1f 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -39,8 +39,8 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/numehelp.hxx>
-#include <svtools/cntnrsrt.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/cntnrsrt.hxx>
+#include <svl/zforlist.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/boxitem.hxx>
 #include <fmtrowsplt.hxx>
@@ -142,7 +142,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
     pLines( &rLines ),
     nWidth( 0UL )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_uInt16 nEndCPos = 0U;
 #endif
     sal_uInt16 nLines = rLines.Count();
@@ -176,7 +176,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
             }
             else
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 sal_uInt16 nCheckPos =
                     nCPos + (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
                 if( !nEndCPos )
@@ -193,7 +193,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
                 }
 #endif
                 nCPos = (sal_uInt16)nWidth;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 SwXMLTableColumn_Impl aCol( (sal_uInt16)nWidth );
                 ASSERT( aCols.Seek_Entry(&aCol), "couldn't find last column" );
                 ASSERT( SwXMLTableColumn_Impl(nCheckPos) ==
@@ -699,7 +699,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
             // Und ihren Index
             sal_uInt16 nOldCol = nCol;
             SwXMLTableColumn_Impl aCol( nCPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             sal_Bool bFound =
 #endif
                 pLines->GetColumns().Seek_Entry( &aCol, &nCol );
@@ -989,7 +989,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
             const sal_uInt16 nOldCol = nCol;
             {
                 SwXMLTableColumn_Impl aCol( nCPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 const sal_Bool bFound =
 #endif
                     rLines.GetColumns().Seek_Entry( &aCol, &nCol );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index b71812df6774..07c09631b531 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -39,8 +39,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
-#include <svtools/itemset.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/itemset.hxx>
+#include <svl/zformat.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -2315,7 +2315,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                 bSplit = 1UL == pCell->GetColSpan();
             }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if( nCol == nRightCol-1UL )
             {
                 ASSERT( bSplit, "Split-Flag falsch" );
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index b9f903ba14a9..3e224b1c46cb 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -40,7 +40,7 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_BOOLS
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 class SwXMLImport;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 018ca0c0b5bb..c6ca53c00cb1 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -60,8 +60,8 @@
 #include <SwAppletImpl.hxx>
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
-#include "svtools/urihelper.hxx"
+#include <svl/svstdarr.hxx>
+#include "svl/urihelper.hxx"
 #include <sfx2/frmdescr.hxx>
 #include <SwStyleNameMapper.hxx>
 
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 6953e065c82a..47a1957ee41b 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -74,7 +74,7 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/embedhlp.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 961e8bdc57a0..e217bd06bf67 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -30,7 +30,7 @@
 
 
 
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #include <sfx2/sfx.hrc>
 #include <svx/dialogs.hrc>
 #include <svx/globlmn.hrc>
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 7fe0d349e8a7..2d4615bba585 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -37,10 +37,10 @@
 #include <tools/link.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/event.hxx>
@@ -48,15 +48,15 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/srchitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/isethint.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/isethint.hxx>
 #include <svx/hyprlink.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/ctloptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/ctloptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/insctrl.hxx>
@@ -753,82 +753,8 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     }
     else if(rHint.ISA(SfxSimpleHint))
     {
-        ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
-        if(SFX_HINT_COLORS_CHANGED == nHintId ||
-           SFX_HINT_ACCESSIBILITY_CHANGED == nHintId )
-        {
-            sal_Bool bAccessibility = sal_False;
-            if(SFX_HINT_COLORS_CHANGED == nHintId)
-                SwViewOption::ApplyColorConfigValues(*pColorConfig);
-            else
-                bAccessibility = sal_True;
-
-            //invalidate all edit windows
-            const TypeId aSwViewTypeId = TYPE(SwView);
-            const TypeId aSwPreViewTypeId = TYPE(SwPagePreView);
-            const TypeId aSwSrcViewTypeId = TYPE(SwSrcView);
-            SfxViewShell* pViewShell = SfxViewShell::GetFirst();
-            while(pViewShell)
-            {
-                if(pViewShell->GetWindow())
-                {
-                    if((pViewShell->IsA(aSwViewTypeId) ||
-                        pViewShell->IsA(aSwPreViewTypeId) ||
-                        pViewShell->IsA(aSwSrcViewTypeId)))
-                    {
-                        if(bAccessibility)
-                        {
-                            if(pViewShell->IsA(aSwViewTypeId))
-                                ((SwView*)pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions);
-                            else if(pViewShell->IsA(aSwPreViewTypeId))
-                                ((SwPagePreView*)pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions);
-                        }
-                        pViewShell->GetWindow()->Invalidate();
-                    }
-                }
-                pViewShell = SfxViewShell::GetNext( *pViewShell );
-            }
-        }
-        else if( SFX_HINT_CTL_SETTINGS_CHANGED == nHintId )
-        {
-            const SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
-            while( pObjSh )
-            {
-                if( pObjSh->IsA(TYPE(SwDocShell)) )
-                {
-                    const SwDoc* pDoc = ((SwDocShell*)pObjSh)->GetDoc();
-                    ViewShell* pVSh = 0;
-                    pDoc->GetEditShell( &pVSh );
-                    if ( pVSh )
-                        pVSh->ChgNumberDigits();
-                }
-                pObjSh = SfxObjectShell::GetNext(*pObjSh);
-            }
-        }
-        else if(SFX_HINT_USER_OPTIONS_CHANGED == nHintId)
-        {
-            bAuthorInitialised = FALSE;
-        }
-        else if(SFX_HINT_UNDO_OPTIONS_CHANGED == nHintId)
-        {
-            const int nNew = GetUndoOptions().GetUndoCount();
-            const int nOld = SwEditShell::GetUndoActionCount();
-            if(!nNew || !nOld)
-            {
-                sal_Bool bUndo = nNew != 0;
-                //ueber DocShells iterieren und Undo umschalten
-
-                TypeId aType(TYPE(SwDocShell));
-                SwDocShell* pDocShell = (SwDocShell*)SfxObjectShell::GetFirst(&aType);
-                while( pDocShell )
-                {
-                    pDocShell->GetDoc()->DoUndo( bUndo );
-                    pDocShell = (SwDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
-                }
-            }
-            SwEditShell::SetUndoActionCount( static_cast< USHORT >(nNew));
-        }
-        else if(SFX_HINT_DEINITIALIZING == nHintId)
+        USHORT nHintId = ((SfxSimpleHint&)rHint).GetId();
+        if(SFX_HINT_DEINITIALIZING == nHintId)
         {
             DELETEZ(pWebUsrPref);
             DELETEZ(pUsrPref)   ;
@@ -842,20 +768,98 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
             DELETEZ(pWebToolbarConfig)  ;
             DELETEZ(pAuthorNames)       ;
             DELETEZ(pDBConfig);
-            EndListening(*pColorConfig);
+            pColorConfig->RemoveListener(this);
             DELETEZ(pColorConfig);
-            EndListening(*pAccessibilityOptions);
+            pAccessibilityOptions->RemoveListener(this);
             DELETEZ(pAccessibilityOptions);
-            EndListening(*pCTLOptions);
+            pCTLOptions->RemoveListener(this);
             DELETEZ(pCTLOptions);
-            EndListening(*pUserOptions);
+            pUserOptions->RemoveListener(this);
             DELETEZ(pUserOptions);
-            EndListening(*pUndoOptions);
+            pUndoOptions->RemoveListener(this);
             DELETEZ(pUndoOptions);
         }
     }
 }
 
+void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal_uInt32 )
+{
+    if( pBrdCst == pUserOptions )
+    {
+        bAuthorInitialised = FALSE;
+    }
+    else if( pBrdCst == pUndoOptions )
+    {
+        const int nNew = GetUndoOptions().GetUndoCount();
+        const int nOld = SwEditShell::GetUndoActionCount();
+        if(!nNew || !nOld)
+        {
+            sal_Bool bUndo = nNew != 0;
+            //ueber DocShells iterieren und Undo umschalten
+
+            TypeId aType(TYPE(SwDocShell));
+            SwDocShell* pDocShell = (SwDocShell*)SfxObjectShell::GetFirst(&aType);
+            while( pDocShell )
+            {
+                pDocShell->GetDoc()->DoUndo( bUndo );
+                pDocShell = (SwDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
+            }
+        }
+        SwEditShell::SetUndoActionCount( static_cast< USHORT >(nNew));
+    }
+    else if ( pBrdCst == pColorConfig || pBrdCst == pAccessibilityOptions )
+    {
+        sal_Bool bAccessibility = sal_False;
+        if( pBrdCst == pColorConfig )
+            SwViewOption::ApplyColorConfigValues(*pColorConfig);
+        else
+            bAccessibility = sal_True;
+
+        //invalidate all edit windows
+        const TypeId aSwViewTypeId = TYPE(SwView);
+        const TypeId aSwPreViewTypeId = TYPE(SwPagePreView);
+        const TypeId aSwSrcViewTypeId = TYPE(SwSrcView);
+        SfxViewShell* pViewShell = SfxViewShell::GetFirst();
+        while(pViewShell)
+        {
+            if(pViewShell->GetWindow())
+            {
+                if((pViewShell->IsA(aSwViewTypeId) ||
+                    pViewShell->IsA(aSwPreViewTypeId) ||
+                    pViewShell->IsA(aSwSrcViewTypeId)))
+                {
+                    if(bAccessibility)
+                    {
+                        if(pViewShell->IsA(aSwViewTypeId))
+                            ((SwView*)pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions);
+                        else if(pViewShell->IsA(aSwPreViewTypeId))
+                            ((SwPagePreView*)pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions);
+                    }
+                    pViewShell->GetWindow()->Invalidate();
+                }
+            }
+            pViewShell = SfxViewShell::GetNext( *pViewShell );
+        }
+    }
+    else if( pBrdCst == pCTLOptions )
+    {
+        const SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
+        while( pObjSh )
+        {
+            if( pObjSh->IsA(TYPE(SwDocShell)) )
+            {
+                const SwDoc* pDoc = ((SwDocShell*)pObjSh)->GetDoc();
+                ViewShell* pVSh = 0;
+                pDoc->GetEditShell( &pVSh );
+                if ( pVSh )
+                    pVSh->ChgNumberDigits();
+            }
+            pObjSh = SfxObjectShell::GetNext(*pObjSh);
+        }
+    }
+
+}
+
 /* -----------------------------20.02.01 12:43--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -874,7 +878,7 @@ svtools::ColorConfig& SwModule::GetColorConfig()
     {
         pColorConfig = new svtools::ColorConfig;
         SwViewOption::ApplyColorConfigValues(*pColorConfig);
-        StartListening(*pColorConfig);
+        pColorConfig->AddListener(this);
     }
     return *pColorConfig;
 }
@@ -886,7 +890,7 @@ SvtAccessibilityOptions& SwModule::GetAccessibilityOptions()
     if(!pAccessibilityOptions)
     {
         pAccessibilityOptions = new SvtAccessibilityOptions;
-        StartListening(*pAccessibilityOptions);
+        pAccessibilityOptions->AddListener(this);
     }
     return *pAccessibilityOptions;
 }
@@ -898,7 +902,7 @@ SvtCTLOptions& SwModule::GetCTLOptions()
     if(!pCTLOptions)
     {
         pCTLOptions = new SvtCTLOptions;
-        StartListening(*pCTLOptions);
+        pCTLOptions->AddListener(this);
     }
     return *pCTLOptions;
 }
@@ -910,7 +914,7 @@ SvtUserOptions& SwModule::GetUserOptions()
     if(!pUserOptions)
     {
         pUserOptions = new SvtUserOptions;
-        StartListening(*pUserOptions);
+        pUserOptions->AddListener(this);
     }
     return *pUserOptions;
 }
@@ -922,7 +926,7 @@ SvtUndoOptions& SwModule::GetUndoOptions()
     if(!pUndoOptions)
     {
         pUndoOptions = new SvtUndoOptions;
-        StartListening(*pUndoOptions);
+        pUndoOptions->AddListener(this);
     }
     return *pUndoOptions;
 }
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 7698fe58c580..9f04942e04bf 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -38,12 +38,12 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/printer.hxx>
@@ -87,14 +87,14 @@
 #include <glosdoc.hxx>
 #include <uiitems.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/unolingu.hxx>
 
 #ifndef _GLOBALS_HRC
 #include <globals.hrc>
 #endif
 #include <globals.h>        // globale Konstanten z.B.
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include "swabstdlg.hxx"
 #include <swwrtshitem.hxx>
 
@@ -151,7 +151,7 @@ SfxItemSet*  SwModule::CreateItemSet( USHORT nId )
                                     SID_ATTR_LANGUAGE,      SID_ATTR_LANGUAGE,
                                     SID_ATTR_CHAR_CJK_LANGUAGE,   SID_ATTR_CHAR_CJK_LANGUAGE,
                                     SID_ATTR_CHAR_CTL_LANGUAGE, SID_ATTR_CHAR_CTL_LANGUAGE,
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                                     FN_PARAM_SWTEST,        FN_PARAM_SWTEST,
 #endif
                                     0);
@@ -285,7 +285,7 @@ SfxItemSet*  SwModule::CreateItemSet( USHORT nId )
         pRet->Put(SvxBrushItem(aViewOpt.GetRetoucheColor(), RES_BACKGROUND));
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     /*-----------------01.02.97 13.02-------------------
         Test-Optionen
     --------------------------------------------------*/
@@ -491,7 +491,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
     }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     /*--------------------------------------------------------------------------
                 Writer Testseite auswerten
     ----------------------------------------------------------------------------*/
@@ -614,7 +614,7 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
             }
         }
         break;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         case  RID_SW_TP_OPTTEST_PAGE:
         {
             SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 06289c10f38a..8a119ddd5140 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -38,16 +38,15 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/jobset.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/adjitem.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <sfx2/app.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/misccfg.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/misccfg.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
@@ -58,7 +57,6 @@
 #include <svx/srchitem.hxx>
 #include <svx/flstitem.hxx>
 #include <svx/htmlmode.hxx>
-#include <svx/svxmsbas.hxx>
 #include <svtools/soerr.hxx>
 #include <sot/clsids.hxx>
 #include <basic/basmgr.hxx>
@@ -111,8 +109,8 @@
 #include "warnpassword.hxx"
 
 #include <cfgid.h>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <svx/htmlcfg.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/objface.hxx>
@@ -382,8 +380,7 @@ BOOL SwDocShell::Save()
                     //SvxImportMSVBasic aTmp( *this, pIo->GetStorage() );
                     //aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr );
                     if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
-                        nVBWarning = SvxImportMSVBasic::
-                                        GetSaveWarningOfMSVBAStorage( *this );
+                        nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) (*this) );
                     pDoc->SetContainsMSVBasic( FALSE );
                 }
 
@@ -501,8 +498,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
             //SvxImportMSVBasic aTmp( *this, pIo->GetStorage() );
             //aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr );
             if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
-                nVBWarning = SvxImportMSVBasic::
-                                GetSaveWarningOfMSVBAStorage( *this );
+                nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) *this );
             pDoc->SetContainsMSVBasic( FALSE );
         }
 
@@ -599,8 +595,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
             DBG_ASSERT( !xStg->GetError(), "No storage available for storing VBA macros!" );
             if ( !xStg->GetError() )
             {
-                SvxImportMSVBasic aTmp( *this, *xStg );
-                nVBWarning = aTmp.SaveOrDelMSVBAStorage( bSave, String::CreateFromAscii("Macros") );
+                nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, String::CreateFromAscii("Macros") );
                 xStg->Commit();
                 pDoc->SetContainsMSVBasic( TRUE );
             }
@@ -1134,7 +1129,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
                 rSet.Put( SfxUInt16Item( nWhich,
                         static_cast< sal_uInt16 >(
                         pFmtr ? pFmtr->GetYear2000()
-                              : SFX_APP()->GetMiscConfig()->GetYear2000() )));
+                              : ::utl::MiscCfg().GetYear2000() )));
             }
             break;
         case SID_ATTR_CHAR_FONTLIST:
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 3fd1e879b063..84c2ae9b9a95 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -49,14 +49,14 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/lckbitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/eitem.hxx>
 /*
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 */
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/transfer.hxx>
 #ifndef _SFXSIDS_HRC //autogen
 #include <sfx2/dialogs.hrc>
@@ -180,8 +180,6 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
                                 Window *pParent, const SfxItemSet &rSet)
 {
     SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog(pParent, rSet);
-//  const SfxDocumentInfoItem& rItem = (const SfxDocumentInfoItem&)rSet.Get(SID_DOCINFO);
-//  if(rItem.IsOwnFormat())
     //nur mit Statistik, wenn dieses Doc auch angezeigt wird, nicht
     //aus dem Doc-Manager
     SwDocShell* pDocSh = (SwDocShell*) SfxObjectShell::Current();
diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx
index 25c9f5113d6f..acaf15c45501 100644
--- a/sw/source/ui/app/docshdrw.cxx
+++ b/sw/source/ui/app/docshdrw.cxx
@@ -45,7 +45,7 @@
 
 
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 630d836c785b..5f0f0db7dbfd 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -40,19 +40,16 @@
 #include <i18npool/mslangid.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <sfx2/docfile.hxx>
-#ifndef _OFA_MISCCFG_HXX //autogen
-#include <svtools/misccfg.hxx>
-#endif
 #include <sfx2/printer.hxx>
 #include <sfx2/bindings.hxx>
 #include <svx/asiancfg.hxx>
 #include <svx/unolingu.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/adjitem.hxx>
 #ifndef _SVX_AKRNTEM_HXX
 #include <svx/akrnitem.hxx>
@@ -655,7 +652,7 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
                             pDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
                     }
                 }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 else
                     ASSERT( !this, "ohne Sw3Reader geht nichts" );
 #endif
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index cd98bb0cb554..953ab1b8b8f7 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -36,16 +36,16 @@
 
 #include <hintids.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/newstyle.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <svx/brshitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 7841176d47e1..a69a7f921c13 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -33,11 +33,11 @@
 
 #define _SVSTDARR_USHORTS
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <hintids.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/eitem.hxx>
+#include <unotools/syslocale.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/numitem.hxx>
 // --> OD 2008-02-13 #newlistlevelattrs#
@@ -68,7 +68,7 @@
 #endif
 #include <paratr.hxx>
 #include <SwStyleNameMapper.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/intlwrapper.hxx>
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index 815269e82044..d20c60df78cd 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -37,7 +37,7 @@
 #include <tools/shl.hxx>
 #include <tools/string.hxx>
 #ifndef _SVARRAY_HXX
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <sfx2/progress.hxx>
 #ifndef _RESID_HXX //autogen
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx
index 57f983a3852d..965708ca1579 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/ui/app/swdll.cxx
@@ -51,7 +51,7 @@
 #include <dobjfac.hxx>
 #include <cfgid.h>
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #ifndef _FM_FMOBJFAC_HXX
 #include <svx/fmobjfac.hxx>
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 863ef3c22f76..13bef2aa4cc2 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/childwin.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index c84273770667..d5b54c1ca846 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -154,7 +154,7 @@
 #include <svtools/colorcfg.hxx>
 
 #include <svx/acorrcfg.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #ifndef _AVMEDIA_MEDIAPPLAYER_HXX
 #include <avmedia/mediaplayer.hxx>
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index d2d07d81e368..6b3882bf7860 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -37,7 +37,7 @@
 
 
 #include <sfx2/request.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 2aff6e0cf4d1..8c7fd302df81 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -41,11 +41,11 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/urihelper.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/stritem.hxx>
 #include <svx/flstitem.hxx>
 #include <svx/htmlmode.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 #ifndef _CMDID_H
 #include <cmdid.h>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index cc4d15664cf7..4a7803d88cf2 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -39,7 +39,7 @@
 #include <hintids.hxx>
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSISORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "cmdid.h"
 #include "swmodule.hxx"
@@ -51,7 +51,7 @@
 #ifndef _METRIC_HXX //autogen
 #include <vcl/metric.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <sfx2/objsh.hxx>
@@ -68,7 +68,7 @@
 #define _SVSTDARR_XUB_STRLEN
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "charatr.hxx"
 #include "viewopt.hxx"
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 26f146e628f0..2039c997097d 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -47,9 +47,9 @@
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <fmtline.hxx>
 #include <numpara.hxx>
 #include <numpara.hrc>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index e095c7b79085..19bed390802a 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -38,15 +38,15 @@
 
 #include "hintids.hxx"
 #include <svx/htmlmode.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/htmlcfg.hxx>
 
 #ifndef _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include "docsh.hxx"
 #include "wrtsh.hxx"
 #include "frmatr.hxx"
@@ -62,8 +62,8 @@
 #include "chrdlg.hrc"
 #include "poolfmt.hrc"
 #include <svx/svxids.hrc>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/flagsdef.hxx>
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index 1024c8a6bff6..2ffc9e8a8ae5 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -51,7 +51,7 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/tabdlg.hxx>
 
 SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet)
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx
index 4859c59499e3..3222852f33ce 100644
--- a/sw/source/ui/config/barcfg.cxx
+++ b/sw/source/ui/config/barcfg.cxx
@@ -151,3 +151,5 @@ void SwToolbarConfigItem::Commit()
     PutProperties(aNames, aValues);
 }
 
+void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx
index 1ca465678def..cf74d3eaec52 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/ui/config/cfgitems.cxx
@@ -407,7 +407,7 @@ void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const
     rVOpt.SetShdwCrsrFillMode( eMode );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx
index 52a06b389643..cc0f24d8442b 100644
--- a/sw/source/ui/config/dbconfig.cxx
+++ b/sw/source/ui/config/dbconfig.cxx
@@ -140,5 +140,7 @@ const SwDBData& SwDBConfig::GetBibliographySource()
     return *pBibImpl;
 }
 
+void SwDBConfig::Commit() {}
+void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
 
 
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 34ffa8f215b9..af185d53e58b 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -35,7 +35,7 @@
 #include <fontcfg.hxx>
 #include <i18npool/mslangid.hxx>
 #include <vcl/outdev.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
@@ -358,3 +358,5 @@ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType
     return nRet;
 }
 
+void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index dab5e97cc2e8..a89684ccee98 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -50,7 +50,7 @@
 #include <modcfg.hxx>
 #endif
 #include <fldupde.hxx>
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include <caption.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
@@ -336,6 +336,8 @@ sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
     return nRet;
 }
 //-----------------------------------------------------------------------------
+void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 void SwRevisionConfig::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
@@ -691,6 +693,8 @@ void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nProp, sal_
     }
 }
 //-----------------------------------------------------------------------------
+void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 void SwInsertConfig::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
@@ -1207,6 +1211,8 @@ SwTableConfig::~SwTableConfig()
 /*-- 10.10.00 16:22:56---------------------------------------------------
 
   -----------------------------------------------------------------------*/
+void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 void SwTableConfig::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
@@ -1318,6 +1324,8 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
 /*-- 18.01.01 17:02:47---------------------------------------------------
 
   -----------------------------------------------------------------------*/
+void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 void SwMiscConfig::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 70db2cdf008b..e836790b5d50 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -76,7 +76,7 @@
 #include <SwNodeNum.hxx>
 
 #include <doc.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 114a57215d10..b206bce741fd 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -42,11 +42,11 @@
 #include <vcl/svapp.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/bindings.hxx>
@@ -97,10 +97,10 @@
 #include <optdlg.hrc>
 #endif
 #include <svx/strarray.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/request.hxx>
 #include <swwrtshitem.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 
 #include <unomid.h>
 
@@ -2445,7 +2445,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
 }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*******************************************************
  ******************************************************/
 /*----------------- OS 11.01.95  -----------------------
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx
index 41a118614b95..31f3dde739c7 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/ui/config/prtopt.cxx
@@ -143,6 +143,9 @@ SwPrintOptions::~SwPrintOptions()
 /* -----------------------------06.09.00 16:43--------------------------------
 
  ---------------------------------------------------------------------------*/
+
+void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 void    SwPrintOptions::Commit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index bfe68b3d6b3a..8dbfceb0e9c8 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -35,13 +35,13 @@
 
 
 #include <hintids.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
 #ifndef _SFX_INIMGR_HXX
 #endif
 #include <sfx2/docfile.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/brshitem.hxx>
 
 
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 1170f3506b31..21abc0f60090 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -33,7 +33,7 @@
 
 
 #include <tools/stream.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "swtypes.hxx"
 #include "hintids.hxx"
@@ -427,6 +427,9 @@ void SwLayoutViewConfig::Load()
         }
     }
 }
+
+void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 /* -----------------------------19.01.01 13:07--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -531,6 +534,8 @@ void SwGridConfig::Load()
     }
 }
 
+void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 /* -----------------------------19.01.01 13:07--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -621,6 +626,9 @@ void SwCursorConfig::Load()
 
     }
 }
+
+void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 /*-- 28.09.00 09:55:33---------------------------------------------------
 
   -----------------------------------------------------------------------*/
@@ -654,6 +662,9 @@ void SwWebColorConfig::Commit()
     }
     PutProperties(aPropNames, aValues);
 }
+
+void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 /*-- 28.09.00 09:55:34---------------------------------------------------
 
   -----------------------------------------------------------------------*/
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 661a73f312ad..1c3e6b2aafc6 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -58,11 +58,11 @@
 #include <crstate.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/accessibilityoptions.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include <svx/acorrcfg.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 BOOL   SwViewOption::bTest9 = FALSE;        //DrawingLayerNotLoading
 #endif
 Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY);
@@ -115,7 +115,7 @@ BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
             && bFormView == rOpt.IsFormView()
             && mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode
             && bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             // korrespondieren zu den Angaben in ui/config/cfgvw.src
             && bTest1 == rOpt.IsTest1()
             && bTest2 == rOpt.IsTest2()
@@ -246,7 +246,7 @@ SwViewOption::SwViewOption() :
 
     bSelectionInReadonly = SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // korrespondieren zu den Angaben in ui/config/cfgvw.src
     bTest1 = bTest2 = bTest3 = bTest4 =
              bTest5 = bTest6 = bTest7 = bTest8 = bTest10 = FALSE;
@@ -281,7 +281,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt)
     mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
     bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bTest1          = rVOpt.bTest1      ;
     bTest2          = rVOpt.bTest2      ;
     bTest3          = rVOpt.bTest3      ;
@@ -321,7 +321,7 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt )
     mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
     bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bTest1          = rVOpt.bTest1      ;
     bTest2          = rVOpt.bTest2      ;
     bTest3          = rVOpt.bTest3      ;
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 91248fa1e422..ec8ad0dc1473 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -67,8 +67,8 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <swunohelper.hxx>
 #include <vcl/waitobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/urihelper.hxx>
 #include <addresslistdialog.hrc>
 #include <dbui.hrc>
 
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 3f7484932010..dc96002db759 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -42,7 +42,7 @@
 #ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index cb815a93f1a6..30e886008da7 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -64,19 +64,19 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/numuno.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/numuno.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #ifndef __SV_MNEMONIC_HXX
 #include <vcl/mnemonic.hxx>
 #endif
-#include <svtools/style.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/style.hxx>
+#include <svl/zformat.hxx>
 #include <svx/htmlmode.hxx>
 #include <svx/unolingu.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/rulritem.hxx>
@@ -1651,6 +1651,8 @@ static rtl::OUString lcl_CreateUniqueName(const Sequence<rtl::OUString>& aNames)
 /* -----------------------------05.12.00 15:00--------------------------------
 
  ---------------------------------------------------------------------------*/
+void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >&  ) {}
+
 void SwInsertDBColAutoPilot::Commit()
 {
     Sequence <rtl::OUString> aNames = GetNodeNames(rtl::OUString());
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 09d6330e263b..329316dcb21a 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -63,16 +63,16 @@
 #include <pagedesc.hxx>
 #include <vcl/lstbox.hxx>
 #include <unotools/tempfile.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/progress.hxx>
@@ -120,7 +120,7 @@
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <svx/langitem.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 
 #include <unomailmerge.hxx>
 #include <sfx2/event.hxx>
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx
index e49c5c68fccb..81dabd052042 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -110,8 +110,7 @@ namespace /* private */
 MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) :
     mailserver_ (mailserver),
     run_(false),
-    shutdown_requested_(false),
-    bIsInRun(false)
+    shutdown_requested_(false)
 {
     wakening_call_.reset();
     mail_dispatcher_active_.reset();
@@ -206,12 +205,6 @@ bool MailDispatcher::isStarted() const
     return run_;
 }
 
-bool MailDispatcher::isRunning() const
-{
-    return bIsInRun;
-}
-
-
 void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener)
 {
     OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
@@ -267,7 +260,6 @@ void MailDispatcher::run()
     // signal that the mail dispatcher thread is now alive
     mail_dispatcher_active_.set();
 
-    bIsInRun = true;
     for(;;)
     {
         wakening_call_.wait();
@@ -295,7 +287,6 @@ void MailDispatcher::run()
             std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this));
         }
     } // end for        SSH ALI
-    bIsInRun = false;
 }
 /*-- 27.08.2004 12:04:46---------------------------------------------------
 
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 7d6c3ae81718..c56b5535bfa4 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -43,7 +43,7 @@
 #include <svtools/headbar.hxx>
 #include <svtools/svtreebx.hxx>
 #include <vcl/combobox.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 class SwMailMergeWizard;
 class SwMailMergeConfigItem;
 /*-- 13.04.2004 15:50:37---------------------------------------------------
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 7438988a88fd..b4e4eb06e75e 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -63,7 +63,7 @@
 #include <unomid.h>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using namespace utl;
 using ::rtl::OUString;
@@ -183,8 +183,8 @@ public:
     SwMailMergeConfigItem_Impl();
     ~SwMailMergeConfigItem_Impl();
 
-    virtual void        Commit();
-
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     const           Sequence< ::rtl::OUString>
                         GetAddressBlocks(sal_Bool bConvertToConfig = sal_False) const;
     void                SetAddressBlocks(
@@ -538,6 +538,8 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
 /*-- 15.04.2004 08:48:39---------------------------------------------------
 
   -----------------------------------------------------------------------*/
+void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 void  SwMailMergeConfigItem_Impl::Commit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 7bef5c752be6..423185fb0ba3 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -35,7 +35,7 @@
 #endif
 
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/new.hxx>
 #include <sfx2/docfilt.hxx>
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index ddb37e3c8eeb..958b9497a08a 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -47,7 +47,7 @@
 #endif
 #include <swundo.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfilt.hxx>
 #include <com/sun/star/text/XParagraphCursor.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
@@ -67,7 +67,7 @@
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
 #include <svx/boxitem.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <shellio.hxx>
 #include <osl/file.hxx>
 #include <unoprnms.hxx>
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index d6083d1fc712..74a647f755bd 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -44,7 +44,7 @@
 #include <mmmergepage.hrc>
 #include <svx/srchitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <swabstdlg.hxx>
 
 /*-- 02.04.2004 16:38:45---------------------------------------------------
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index eb1f75d57979..1106a1ac62fe 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -53,8 +53,8 @@
 #include <hintids.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
 #include <vcl/msgbox.hxx>
@@ -68,7 +68,7 @@
 //#include <sfx2/docfilt.hxx>
 //#endif
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _VCL_PRINT_HXX
 #include <vcl/print.hxx>
 #endif
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index 8dca8ef1abf0..ae783c991799 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -47,8 +47,8 @@
 #include <svx/svdview.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdogrp.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <doc.hxx>
 #ifndef _DOCSH_HXX
 #include <docsh.hxx>
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 585151383893..e2313d54c87f 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -37,7 +37,7 @@
 #include <rtl/textenc.h>
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <fontcfg.hxx>
 #include <swmodule.hxx>
 #include <svx/unolingu.hxx>
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 0c052223abcf..b1e24df519c0 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -39,7 +39,7 @@
 #include "hintids.hxx"
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/htmlmode.hxx>
 #ifndef _SVX_SVXIDS_HRC //autogen
 #include <svx/svxids.hrc>
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index 47936697a20d..7d387a2f5943 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -34,13 +34,13 @@
 
 #include <hintids.hxx>
 #include <uitool.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/PasswordHelper.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sot/formats.hxx>
 #ifndef _PASSWD_HXX //autogen
 #include <sfx2/passwd.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index ab2a1d8e3d3c..25581e6a3110 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -36,7 +36,7 @@
 #endif
 
 #include "swdlgfact.hxx"
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
@@ -1698,7 +1698,7 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
             break;
         case RID_SW_TP_OPTTEST_PAGE :
         case TP_OPTTEST_PAGE :
-#ifndef  PRODUCT
+#ifdef DBG_UTIL
             pRet = SwTestTabPage::Create;
 #endif
             break;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 9626f5104db9..2a37f6911b02 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -36,12 +36,12 @@
 
 #include <hintids.hxx>
 #include <regionsw.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/PasswordHelper.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/PasswordHelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/request.hxx>
@@ -1480,14 +1480,16 @@ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox )
     uno::Reference < embed::XStorage > xStg;
     if( rMedium.IsStorage() && (xStg = rMedium.GetStorage()).is() )
     {
-        SvStringsDtor aArr( 10, 10 );
+        SvStrings aArr( 10, 10 );
         sal_uInt32 nFormat = SotStorage::GetFormatID( xStg );
         if ( nFormat == SOT_FORMATSTR_ID_STARWRITER_60 || nFormat == SOT_FORMATSTR_ID_STARWRITERGLOB_60 ||
             nFormat == SOT_FORMATSTR_ID_STARWRITER_8 || nFormat == SOT_FORMATSTR_ID_STARWRITERGLOB_8)
-            SwGetReaderXML()->GetSectionList( rMedium, (SvStrings&) aArr );
+            SwGetReaderXML()->GetSectionList( rMedium, aArr );
 
         for( USHORT n = 0; n < aArr.Count(); ++n )
             rBox.InsertEntry( *aArr[ n ] );
+
+        aArr.DeleteAndDestroy(0, aArr.Count());
     }
 }
 /* -----------------21.05.99 10:16-------------------
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 8d716d6420a9..95e5dea9b9c9 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -44,12 +44,12 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfile.hxx>
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <poolfmt.hxx>
 #include <fmtcol.hxx>
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index f3dc55f26f4d..64d894acfdb2 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -60,13 +60,13 @@
 #include <vcl/msgbox.hxx>
 #endif
 #include <sfx2/dispatch.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/imap.hxx>
 #include <sot/storage.hxx>
 #ifndef _GRAPH_HXX
 #include <vcl/graph.hxx>
 #endif
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xexch.hxx>
 #include <svx/xmlexchg.hxx>
@@ -75,7 +75,7 @@
 #include <sfx2/mieclip.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/xoutbmp.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svtools/htmlout.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svtools/inetimg.hxx>
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 3c32ef04e9e1..8b275c0a6447 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -70,9 +70,9 @@
 #include <sfx2/srchitem.hxx>
 
 
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/langtab.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <svx/svdview.hxx>
 #include <svx/eeitem.hxx>
@@ -1948,3 +1948,7 @@ void SwPostItMgr::AssureStdModeAtShell()
                 mpView->StopShellTimer();
         }
 }
+
+void SwNoteProps::Commit() {}
+void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 7d8e38443ca0..5bef2edb398f 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -48,15 +48,15 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/cmdevt.h>
 #include <sot/storage.hxx>
-#include <svtools/macitem.hxx>
-#include <svtools/securityoptions.hxx>
+#include <svl/macitem.hxx>
+#include <unotools/securityoptions.hxx>
 #ifndef __SBX_SBXVARIABLE_HXX //autogen
 #include <basic/sbxvar.hxx>
 #endif
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _SFX_CLIENTSH_HXX
 #include <sfx2/ipclient.hxx>
 #endif
@@ -64,7 +64,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/htmlmode.hxx>
@@ -156,7 +156,7 @@
 #include "postit.hxx"
 
 //JP 11.10.2001: enable test code for bug fix 91313
-#if !defined( PRODUCT ) && (OSL_DEBUG_LEVEL > 1)
+#if defined(DBG_UTIL) && (OSL_DEBUG_LEVEL > 1)
 //#define TEST_FOR_BUG91313
 #endif
 
@@ -1503,7 +1503,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
         case KS_CheckKey:
             eKeyState = KS_KeyToView;       // default weiter zur View
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
             // JP 19.01.99: zum Umschalten des Cursor Verhaltens in ReadOnly
             //              Bereichen
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 13f832acfccf..5562932956e8 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -34,26 +34,26 @@
 #include <hintids.hxx>
 
 #include <doc.hxx>
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include <stdio.h>
 #endif
 
 #ifndef _HELP_HXX //autogen
 #include <vcl/help.hxx>
 #endif
-#include <svtools/stritem.hxx>
-#include <svtools/securityoptions.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/securityoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <txtrfmrk.hxx>
 #include <fmtrfmrk.hxx>
 #include <svx/flditem.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/svdotext.hxx>
 #ifndef _OUTLINER_HXX //autogen
 #define _EEITEMID_HXX
 #include <svx/outliner.hxx>
 #endif
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <swmodule.hxx>
@@ -162,7 +162,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                                     SwContentAtPos::SW_TOXMARK |
                                     SwContentAtPos::SW_REFMARK |
                                     SwContentAtPos::SW_SMARTTAG |
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                                     SwContentAtPos::SW_TABLEBOXVALUE |
                         ( bBalloon ? SwContentAtPos::SW_CURR_ATTRS : 0) |
 #endif
@@ -176,7 +176,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 sTxt.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "= " ));
                 sTxt += ((SwTblBoxFormula*)aCntntAtPos.aFnd.pAttr)->GetFormula();
                 break;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             case SwContentAtPos::SW_TABLEBOXVALUE:
             {
                 sTxt = UniString(
diff --git a/sw/source/ui/docvw/postit.cxx b/sw/source/ui/docvw/postit.cxx
index e693f87e7a35..3079cc855c50 100644
--- a/sw/source/ui/docvw/postit.cxx
+++ b/sw/source/ui/docvw/postit.cxx
@@ -68,11 +68,11 @@
 #include <svx/unolingu.hxx>
 
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/slstitm.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
 
 #include <linguistic/lngprops.hxx>
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 50776ef80f11..313604be962e 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -37,9 +37,9 @@
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
 #include <sot/formats.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/filter.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/inetimg.hxx>
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 19ba5aefdf25..12288d1e8619 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -49,7 +49,7 @@
 #include <sfx2/app.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/txtattr.hxx>
-#include <svtools/sourceviewconfig.hxx>
+#include <unotools/sourceviewconfig.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svx/flstitem.hxx>
 #include <vcl/metric.hxx>
@@ -248,7 +248,7 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
     pVScrollbar(0),
 
     pSrcView(pParentView),
-    pSourceViewConfig(new svt::SourceViewConfig),
+    pSourceViewConfig(new utl::SourceViewConfig),
 
     nCurTextWidth(0),
     nStartLine(USHRT_MAX),
@@ -258,14 +258,14 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
 {
     SetHelpId(HID_SOURCE_EDITWIN);
     CreateTextEngine();
-    StartListening(*pSourceViewConfig);
+    pSourceViewConfig->AddListener(this);
 }
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
  SwSrcEditWindow::~SwSrcEditWindow()
 {
-    EndListening(*pSourceViewConfig);
+    pSourceViewConfig->RemoveListener(this);
     delete pSourceViewConfig;
     aSyntaxIdleTimer.Stop();
     if ( pTextEngine )
@@ -819,7 +819,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
 
 --------------------------------------------------*/
 
-void SwSrcEditWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SwSrcEditWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if ( rHint.ISA( TextHint ) )
     {
@@ -842,7 +842,11 @@ void SwSrcEditWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             DoDelayedSyntaxHighlight( (USHORT)rTextHint.GetValue() );
         }
     }
-    else if(&rBC == pSourceViewConfig)
+}
+
+void SwSrcEditWindow::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal_uInt32 )
+{
+    if( pBrdCst == pSourceViewConfig)
         SetFont();
 }
 
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index f6fb3f596a35..379a0f4f7004 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -44,7 +44,7 @@
 
 #define _SVSTDARR_LONGSSORT
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svx/paperinf.hxx>
 #ifndef _SVX_TSTPITEM_HXX //autogen
 #include <svx/tstpitem.hxx>
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 16d77e4bccd2..fcb449839d53 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -33,7 +33,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <svtools/stdctrl.hxx>
 #ifndef _FIELD_HXX //autogen
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index fa1744ca1ae5..0bbc713d145c 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/app.hxx>
 #include <svx/paperinf.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/shl.hxx>
 #include <swmodule.hxx>
 #include <errhdl.hxx>
@@ -293,6 +293,9 @@ void    SwEnvCfgItem::Commit()
     }
     PutProperties(aNames, aValues);
 }
+
+void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 /* -----------------------------26.09.00 14:04--------------------------------
 
  ---------------------------------------------------------------------------*/
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 76a971c60db6..e0731a0836f4 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -65,6 +65,9 @@ void    SwLabelConfig::Commit()
 {
     // the config item is not writable yet
 }
+
+void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 /* -----------------------------15.01.01 11:42--------------------------------
 
  ---------------------------------------------------------------------------*/
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 6406861f114b..7ebb06bf5e8b 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -38,7 +38,7 @@
 #endif
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/shl.hxx>
 #include <swmodule.hxx>
 #include "labimg.hxx"
@@ -410,6 +410,8 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
 /* -----------------------------25.09.00 16:26--------------------------------
 
  ---------------------------------------------------------------------------*/
+void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
 void    SwLabCfgItem::Commit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index de5197af2622..75afb901425a 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -37,7 +37,7 @@
 
 
 #include <svtools/prnsetup.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <vcl/print.hxx>
 #include <wrtsh.hxx>
 #include <label.hxx>
@@ -137,7 +137,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
 
     if ( bEnable )
         aColField.GrabFocus();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( pButton == &aPageButton, "NewButton?" );
 #endif
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index fd9caec98c24..537a39dad8cf 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -38,8 +38,8 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
 #include <goodies/mailenum.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
@@ -872,7 +872,7 @@ IMPL_LINK( SwMailMergeDlg, AttachFileHdl, PushButton *, EMPTYARG )
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
-        AbstractSvxMultiFileDialog* pFileDlg = pFact->CreateSvxMultiFileDialog( this, RID_SVXDLG_MULTIPATH);
+        AbstractSvxMultiFileDialog* pFileDlg = pFact->CreateSvxMultiFileDialog( this );
         DBG_ASSERT(pFileDlg, "Dialogdiet fail!");
         pFileDlg->SetFiles(aAttachED.GetText());
         pFileDlg->SetHelpId(HID_FILEDLG_MAILMRGE2);
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index e368340314fc..4bdb5dc005db 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -38,15 +38,12 @@
 #include <sfx2/request.hxx>
 #include <sfx2/frame.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
 #include <swtypes.hxx>
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
 #include <fldbas.hxx>
 #include <docufld.hxx>
 #include <wrtsh.hxx>
@@ -63,13 +60,16 @@
 #ifndef _VIEW_HXX
 #include <view.hxx>
 #endif
-#include <svtools/zformat.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/Date.hpp>
 
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
 using namespace nsSwDocInfoSubType;
-
+using namespace com::sun::star;
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
@@ -103,7 +103,7 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) :
 
     SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, FALSE );
     if ( pItem )
-        pItem->GetValue() >>= aPropertyNames;
+        pItem->GetValue() >>= xCustomPropertySet;
 }
 
 /*--------------------------------------------------------------------
@@ -168,24 +168,31 @@ void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& )
         {
             if (DI_CUSTOM == i)
             {
-                if (aPropertyNames.getLength() )
+                if(xCustomPropertySet.is() )
                 {
+                    uno::Reference< beans::XPropertySetInfo > xSetInfo = xCustomPropertySet->getPropertySetInfo();
+                    const uno::Sequence< beans::Property > rProperties = xSetInfo->getProperties();
+//                    uno::Sequence< ::rtl::OUString > aPropertyNames(rProperties.getLength());
+//                    for (sal_Int32 i = 0; i < rProperties.getLength(); ++i) {
+//                        aPropertyNames[i] = rProperties[i].Name;
+//                    }
                     //if ( !IsFldEdit() )
+                    if( rProperties.getLength() )
                     {
                         pInfo = aTypeTLB.InsertEntry( String(SW_RES( STR_CUSTOM )) );
                         pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX));
-                    }
 
-                    for (sal_Int32 n=0; n<aPropertyNames.getLength(); n++)
-                    {
-                        rtl::OUString sEntry = aPropertyNames[n];
-                        pEntry = aTypeTLB.InsertEntry(sEntry, pInfo);
-                        if(m_sOldCustomFieldName.equals( sEntry ))
+                        for (sal_Int32 n=0; n < rProperties.getLength(); n++)
                         {
-                            pSelEntry = pEntry;
-                            aTypeTLB.Expand( pInfo );
+                            rtl::OUString sEntry = rProperties[n].Name;
+                            pEntry = aTypeTLB.InsertEntry(sEntry, pInfo);
+                            if(m_sOldCustomFieldName.equals( sEntry ))
+                            {
+                                pSelEntry = pEntry;
+                                aTypeTLB.Expand( pInfo );
+                            }
+                            pEntry->SetUserData(reinterpret_cast<void*>(i));
                         }
-                        pEntry->SetUserData(reinterpret_cast<void*>(i));
                     }
                 }
             }
@@ -263,12 +270,12 @@ IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG )
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
-
 IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
 {
     USHORT nSubType = (USHORT)(ULONG)pSelEntry->GetUserData();
     USHORT nPos = aSelectionLB.GetSelectEntryPos();
     USHORT nExtSubType;
+    USHORT nNewType = 0;
 
     if (nSubType != DI_EDIT)
     {
@@ -279,7 +286,33 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
                 aFormatLB.Clear();
                 aFormatLB.Enable(FALSE);
                 aFormatFT.Enable(FALSE);
-                return 0;
+                if( nSubType == DI_CUSTOM )
+                {
+                    //find out which type the custom field has - for a start set to DATE format
+                    ::rtl::OUString sName = aTypeTLB.GetEntryText(pSelEntry);
+                    try
+                    {
+                        uno::Any aVal = xCustomPropertySet->getPropertyValue( sName );
+                        const uno::Type& rValueType = aVal.getValueType();
+                        if( rValueType == ::getCppuType( (util::DateTime*)0 ))
+                        {
+                            nNewType = NUMBERFORMAT_DATETIME;
+                        }
+                        else if( rValueType == ::getCppuType( (util::Date*)0 ))
+                        {
+                            nNewType = NUMBERFORMAT_DATE;
+                        }
+                        else if( rValueType == ::getCppuType( (util::Time*)0 ))
+                        {
+                            nNewType = NUMBERFORMAT_TIME;
+                        }
+                    }
+                    catch( const uno::Exception& )
+                    {
+                    }
+                }
+                else
+                    return 0;
             }
             nPos = 0;
         }
@@ -290,7 +323,6 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
         nExtSubType = DI_SUB_TIME;
 
     USHORT nOldType = 0;
-    USHORT nNewType = 0;
     BOOL bEnable = FALSE;
     BOOL bOneArea = FALSE;
 
@@ -312,7 +344,6 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
             bOneArea = TRUE;
             break;
     }
-
     if (!nNewType)
     {
         aFormatLB.Clear();
@@ -334,7 +365,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
     if (IsFldEdit())
     {
         nPos = aSelectionLB.GetSelectEntryPos();
-        if (nPos != LISTBOX_ENTRY_NOTFOUND)
+        if (nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             nSubType = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos);
 
@@ -346,7 +377,6 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
                     SwWrtShell *pSh = GetWrtShell();
                     if(pSh)
                     {
-
                         SvNumberFormatter* pFormatter = pSh->GetNumberFormatter();
                         LanguageType eLang = aFormatLB.GetCurLanguage();
                         if (nNewType == NUMBERFORMAT_DATE)
@@ -358,6 +388,10 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
                 aFormatLB.SetDefFormat(nFormat);
             }
         }
+        else if( (nSubType == DI_CUSTOM)  && (nNewType != 0) )
+        {
+            aFormatLB.SetDefFormat(nFormat);
+        }
     }
 
     aFormatLB.Enable(bEnable);
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 2b72b1aec33a..0d46c873f342 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -33,15 +33,16 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/group.hxx>
 #include <svtools/svtreebx.hxx>
 
 #include "numfmtlb.hxx"
 #include "fldpage.hxx"
 
+namespace com{namespace sun{ namespace star{ namespace beans{
+    class XPropertySet;
+}}}}
 /*--------------------------------------------------------------------
    Beschreibung:
  --------------------------------------------------------------------*/
@@ -57,7 +58,7 @@ class SwFldDokInfPage : public SwFldPage
     CheckBox            aFixedCB;
 
     SvLBoxEntry*        pSelEntry;
-    com::sun::star::uno::Sequence < ::rtl::OUString > aPropertyNames;
+    com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet;
 
     String              aInfoStr;
 
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index f2c22682690a..8c35fb55823e 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -56,7 +56,7 @@
 #include <view.hxx>
 #endif
 #include <wrtsh.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 
 #include <index.hrc>
 
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index c0ee8f2e0a98..318ca160c670 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -226,15 +226,15 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
                 uno::Reference< beans::XPropertySet > xUDProps(
                     xDocProps->getUserDefinedProperties(),
                     uno::UNO_QUERY_THROW);
-                uno::Reference< beans::XPropertySetInfo > xSetInfo
-                    = xUDProps->getPropertySetInfo();
-                const uno::Sequence< beans::Property > props
-                    = xSetInfo->getProperties();
-                uno::Sequence< ::rtl::OUString > names(props.getLength());
-                for (sal_Int32 i = 0; i < props.getLength(); ++i) {
-                    names[i] = props[i].Name;
-                }
-                pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(names) ) );
+//                uno::Reference< beans::XPropertySetInfo > xSetInfo
+//                    = xUDProps->getPropertySetInfo();
+//                const uno::Sequence< beans::Property > props
+//                    = xSetInfo->getProperties();
+//                uno::Sequence< ::rtl::OUString > names(props.getLength());
+//                for (sal_Int32 i = 0; i < props.getLength(); ++i) {
+//                    names[i] = props[i].Name;
+//                }
+                pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
                 pTabPage = SwFldDokInfPage::Create(this, *pSet);
                 nHelpId = HID_EDIT_FLD_DOKINF;
                 break;
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index dfb7823a1216..d55a77294c75 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -33,7 +33,7 @@
 
 #include <cmdid.h>
 #include <hintids.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
@@ -53,13 +53,13 @@
 #include <sfx2/app.hxx>
 #include <basic/basmgr.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <basic/sbmod.hxx>
 #include <fmtrfmrk.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
 #include <vcl/mnemonic.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>        // Actives Fenster
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index a13f2d6b5806..b44c1deb2209 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -37,7 +37,7 @@
 
 
 #include <vcl/lstbox.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/htmlmode.hxx>
 #include <dbfld.hxx>
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 0de17286fcad..31388cd2e51e 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -48,47 +48,23 @@
 #include <vcl/msgbox.hxx>
 #include <svx/htmlmode.hxx>
 #include <viewopt.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <fldwrap.hxx>
-#ifndef _FLDDB_HXX
 #include <flddb.hxx>
-#endif
-#ifndef _FLDDINF_HXX
 #include <flddinf.hxx>
-#endif
-#ifndef _FLDVAR_HXX
 #include <fldvar.hxx>
-#endif
-#ifndef _FLDDOK_HXX
 #include <flddok.hxx>
-#endif
-#ifndef _FLDFUNC_HXX
 #include <fldfunc.hxx>
-#endif
-#ifndef _FLDREF_HXX
 #include <fldref.hxx>
-#endif
 #include <wrtsh.hxx>
 #include <view.hxx>
-#ifndef _FLDTDLG_HXX
 #include <fldtdlg.hxx>
-#endif
 #include <swmodule.hxx>
 
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
-#ifndef _FLDUI_HRC
 #include <fldui.hrc>
-#endif
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _FLDTDLG_HRC
 #include <fldtdlg.hrc>
-#endif
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -245,15 +221,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( USHORT nID  )
         uno::Reference< beans::XPropertySet > xUDProps(
             xDocProps->getUserDefinedProperties(),
             uno::UNO_QUERY_THROW);
-        uno::Reference< beans::XPropertySetInfo > xSetInfo
-            = xUDProps->getPropertySetInfo();
-        const uno::Sequence< beans::Property > props
-            = xSetInfo->getProperties();
-        uno::Sequence< ::rtl::OUString > names(props.getLength());
-        for (sal_Int32 i = 0; i < props.getLength(); ++i) {
-            names[i] = props[i].Name;
-        }
-        pISet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(names) ) );
+        pISet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
         return pISet;
     }
     else
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index fac8f7943317..a54257e683cf 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -52,7 +52,7 @@
 #include <fldvar.hxx>
 #endif
 #include <calc.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #ifndef _GLOBALS_HRC
 #include <globals.hrc>
 #endif
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 14cc6e4f540e..545a7aa77033 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -46,7 +46,7 @@
 #include <vcl/msgbox.hxx>
 #endif
 #include <vcl/svapp.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _VIEW_HXX
 #include <view.hxx>
 #endif
diff --git a/sw/source/ui/fldui/makefile.mk b/sw/source/ui/fldui/makefile.mk
index a94fdaef17e7..23160cf80fb8 100644
--- a/sw/source/ui/fldui/makefile.mk
+++ b/sw/source/ui/fldui/makefile.mk
@@ -80,6 +80,7 @@ SLOFILES =  \
 EXCEPTIONSFILES =  \
         $(SLO)$/fldtdlg.obj \
         $(SLO)$/fldedt.obj \
+        $(SLO)$/flddinf.obj \
         $(SLO)$/xfldui.obj
 
 LIB1TARGET = $(SLB)$/$(TARGET).lib
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 4c6f35341e30..ef33935f1b6f 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -40,7 +40,7 @@
 
 #ifndef _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -48,7 +48,7 @@
 #include <svx/flstitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <svx/htmlcfg.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <numpara.hxx>
 #include <fmtclds.hxx>
 #include <swtypes.hxx>
@@ -95,11 +95,11 @@
 #endif
 #include <SwStyleNameMapper.hxx>
 #include <svx/svxids.hrc>
-#include <svtools/stritem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/flagsdef.hxx>
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx
index 4b7a12868328..a382edf1aa5c 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/ui/frmdlg/colex.cxx
@@ -39,7 +39,7 @@
 #include <algorithm>
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/sizeitem.hxx>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index a9df9762ad92..44eb80358ac6 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -44,7 +44,7 @@
 #include <svx/lrspitem.hxx>
 #include <svx/sizeitem.hxx>
 #include "svx/frmdiritem.hxx"
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index bd1e98b37b9e..0443074c2cd5 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -37,7 +37,7 @@
 #include "hintids.hxx"
 
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/protitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/opaqitem.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index dc9fe2d1bf2e..eeb58d83c7fd 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -46,8 +46,8 @@
 #include <hintids.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/stritem.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/htmlmode.hxx>
 #include <svx/sizeitem.hxx>
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index fe1733b34fcc..a6baebe4d366 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -38,10 +38,10 @@
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/flagsdef.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include "swtypes.hxx"
 #include "uiborder.hxx"
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index b3828797fc07..3dfad685f732 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -41,7 +41,7 @@
 #include <vcl/graph.hxx>
 #include <svx/htmlmode.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/opaqitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/lrspitem.hxx>
diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx
index ae2c98507bbe..993c65d5d7b7 100644
--- a/sw/source/ui/globdoc/globdoc.cxx
+++ b/sw/source/ui/globdoc/globdoc.cxx
@@ -34,7 +34,7 @@
 
 
 #include <sot/clsids.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <unomid.h>
 
diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx
index 05b92671ba77..96d8f76d4b92 100644
--- a/sw/source/ui/inc/barcfg.hxx
+++ b/sw/source/ui/inc/barcfg.hxx
@@ -41,7 +41,8 @@ public:
     SwToolbarConfigItem( sal_Bool bWeb );
     ~SwToolbarConfigItem();
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
     void        SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId );
 };
diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx
index b5ecd678d380..ffca3315acbd 100644
--- a/sw/source/ui/inc/basesh.hxx
+++ b/sw/source/ui/inc/basesh.hxx
@@ -39,7 +39,7 @@
 #include <vcl/timer.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/shell.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <mdiexp.hxx>
 
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 620d3ac52b23..3adfa962b9d7 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -31,7 +31,7 @@
 #define _CFGITEMS_HXX
 
 #include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <printdata.hxx>
 
@@ -39,7 +39,7 @@
 
 class SwWriterApp;
 class SwModule;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 class SwTestTabPage;
 #endif
 class SwAddPrinterTabPage;
@@ -207,7 +207,7 @@ public:
     void SetOn( BOOL bFlag )            { bOn = bFlag; }
 };
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*--------OS 12.01.95 -----------------------------------
 Item fuer Einstellungsdialog - Testeinstellungen
 --------------------------------------------------------- */
diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx
index 9661472115f3..86fcc17b5595 100644
--- a/sw/source/ui/inc/dbconfig.hxx
+++ b/sw/source/ui/inc/dbconfig.hxx
@@ -49,6 +49,8 @@ public:
     void                    Load();
     const SwDBData&         GetAddressSource();
     const SwDBData&         GetBibliographySource();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 #endif
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index 20a3e9f5e51a..709866681f51 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -47,7 +47,7 @@
 #include <vcl/lstbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <unotools/configitem.hxx>
 #include <numfmtlb.hxx>
 #include <swdbdata.hxx>
@@ -165,8 +165,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     DECL_LINK( HeaderHdl, Button* );
 
     BOOL SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, BOOL bInsField );
-
-
+        using SfxModalDialog::Notify;
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     virtual void            Commit();
     void                    Load();
 
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 2b39b928bca6..fe6589dc1521 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -38,7 +38,7 @@
 #include <swevent.hxx>
 
 #define _SVSTDARR_STRINGSISORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class   SwWrtShell;
 class   SwView;
diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx
index ce7d3ffcc927..c864d05d41aa 100644
--- a/sw/source/ui/inc/envimg.hxx
+++ b/sw/source/ui/inc/envimg.hxx
@@ -30,7 +30,7 @@
 #ifndef _ENVIMG_HXX
 #define _ENVIMG_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
 #include "swdllapi.h"
 
@@ -97,6 +97,7 @@ public:
     SwEnvItem& GetItem() {return aEnvItem;}
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 #endif
 
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index 6919e636fc58..a9cd07224cd9 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -31,7 +31,7 @@
 #define _FLDMGR_HXX
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <tools/string.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 1f5eed01b371..58e8d46b0845 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -87,6 +87,7 @@ public:
     ~SwStdFontConfig();
 
     virtual void    Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
     const String&   GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
     const String&   GetFontOutline(sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx
index 4eabd66b606c..b9009f2e88c7 100644
--- a/sw/source/ui/inc/formatclipboard.hxx
+++ b/sw/source/ui/inc/formatclipboard.hxx
@@ -34,9 +34,9 @@
 // header for class SwWrtShell
 #include <wrtsh.hxx>
 // header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 // header for class SfxStyleSheetBasePool
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 //-----------------------------------------------------------------------------
 /** This class acts as data container and execution class for the format paintbrush feature in writer.
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx
index eef305546754..4ae564ace5d0 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/ui/inc/glosdoc.hxx
@@ -31,7 +31,7 @@
 #define _GLOSDOC_HXX
 
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/text/XAutoTextGroup.hpp>
 
 class SwTextBlocks;
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx
index 085b5fa703fd..b968573348a5 100644
--- a/sw/source/ui/inc/gloslst.hxx
+++ b/sw/source/ui/inc/gloslst.hxx
@@ -35,7 +35,7 @@
 #include <tools/datetime.hxx>
 #include <tools/string.hxx>
 #include <vcl/timer.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SwGlossaries;
 class SvStringsISortDtor;
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx
index 2fecfbf4dcb2..72575620231d 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/ui/inc/label.hxx
@@ -33,7 +33,7 @@
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <sfx2/tabdlg.hxx>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/ui/inc/labelcfg.hxx
index 10b55fca21e4..60c1d7a37ae4 100644
--- a/sw/source/ui/inc/labelcfg.hxx
+++ b/sw/source/ui/inc/labelcfg.hxx
@@ -46,7 +46,8 @@ public:
     SwLabelConfig();
     virtual ~SwLabelConfig();
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
     void    FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr);
     const com::sun::star::uno::Sequence<rtl::OUString>&
diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx
index 1a0adf19d735..e45b2a0d3403 100644
--- a/sw/source/ui/inc/labimg.hxx
+++ b/sw/source/ui/inc/labimg.hxx
@@ -31,7 +31,7 @@
 #ifndef _LABIMG_HXX
 #define _LABIMG_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
 #include "swdllapi.h"
 
@@ -126,7 +126,8 @@ public:
 
     SwLabItem&              GetItem() {return aItem;}
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 #endif
diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/ui/inc/maildispatcher.hxx
index 4a0ad7239116..44cb3b2a4707 100644
--- a/sw/source/ui/inc/maildispatcher.hxx
+++ b/sw/source/ui/inc/maildispatcher.hxx
@@ -131,7 +131,6 @@ public:
     /** returns if the thread is still running
     */
     using osl::Thread::isRunning;
-    bool isRunning() const;
 
     /** returns if shutdown has already been called
     */
@@ -167,7 +166,6 @@ private:
     ::rtl::Reference<MailDispatcher> m_xSelfReference;
     bool run_;
     bool shutdown_requested_;
-    bool bIsInRun;
 };
 
 #endif // INCLUDED_MAILDISPATCHER_HXX
diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx
index 124758a773b1..a1c5beb6007b 100644
--- a/sw/source/ui/inc/navicfg.hxx
+++ b/sw/source/ui/inc/navicfg.hxx
@@ -50,7 +50,8 @@ public:
     SwNavigationConfig();
     ~SwNavigationConfig();
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
     sal_Int32   GetRootType()const {return nRootType;}
     void        SetRootType(sal_Int32 nSet){
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 479ed1329ea8..70e03b4570ad 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -35,7 +35,7 @@
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/transfer.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx
index 1a768d98fac2..891b6dc9009c 100644
--- a/sw/source/ui/inc/numfmtlb.hxx
+++ b/sw/source/ui/inc/numfmtlb.hxx
@@ -31,7 +31,7 @@
 #define _SWNUMFMTLB_HXX
 
 #include <vcl/lstbox.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include "swdllapi.h"
 
 class SwView;
diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx
index b72f9f8d21e9..2742a97efd85 100644
--- a/sw/source/ui/inc/optcomp.hxx
+++ b/sw/source/ui/inc/optcomp.hxx
@@ -33,7 +33,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/compatibility.hxx>
+#include <unotools/compatibility.hxx>
 #include <svx/checklbx.hxx>
 
 // class SwCompatibilityOptPage ------------------------------------------
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 592c581f4aa3..959c4dc4fdd6 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -466,7 +466,7 @@ public:
  TabPage Testeinstellungen fuer SW
 --------------------------------------------------------- */
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 class SwTestTabPage : public SfxTabPage
 {
diff --git a/sw/source/ui/inc/prtopt.hxx b/sw/source/ui/inc/prtopt.hxx
index 7fa3d66dd6cc..f6abda7f3df6 100644
--- a/sw/source/ui/inc/prtopt.hxx
+++ b/sw/source/ui/inc/prtopt.hxx
@@ -42,7 +42,8 @@ public:
     SwPrintOptions(sal_Bool bWeb);
     virtual ~SwPrintOptions();
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     virtual void            doSetModified( ) { bModified = sal_True; SetModified();}
 
     SwPrintOptions& operator=(const SwPrintData& rData)
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 9325aa7ae640..2edc9583d523 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -35,9 +35,9 @@
 #include <tools/datetime.hxx>
 #include <vcl/msgbox.hxx>
 #ifndef _SVSTDARR_HXX
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx
index 9dbb5ba6fe31..66d3af9b902a 100644
--- a/sw/source/ui/inc/srcedtw.hxx
+++ b/sw/source/ui/inc/srcedtw.hxx
@@ -31,7 +31,8 @@
 #define _SRCEDTW_HXX
 
 #include <vcl/window.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/options.hxx>
 #include <vcl/timer.hxx>
 
 #ifndef _TABLE_HXX //autogen
@@ -46,6 +47,11 @@ class TextEngine;
 class ExtTextView;
 class DataChangedEvent;
 
+namespace utl
+{
+    class SourceViewConfig;
+}
+
 class TextViewOutWin : public Window
 {
     ExtTextView*    pTextView;
@@ -69,7 +75,7 @@ public:
 
 //------------------------------------------------------------
 namespace svt{ class SourceViewConfig;}
-class SwSrcEditWindow : public Window, public SfxListener
+class SwSrcEditWindow : public Window, public SfxListener, public utl::ConfigurationListener
 {
 private:
     ExtTextView*    pTextView;
@@ -80,7 +86,7 @@ private:
                     *pVScrollbar;
 
     SwSrcView*      pSrcView;
-    svt::SourceViewConfig* pSourceViewConfig;
+    utl::SourceViewConfig* pSourceViewConfig;
 
     long            nCurTextWidth;
     USHORT          nStartLine;
@@ -114,6 +120,7 @@ protected:
     void            DoSyntaxHighlight( USHORT nPara );
 
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void    ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     DECL_LINK(ScrollHdl, ScrollBar*);
 
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index c774faca9d79..492f6559cdfb 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -30,7 +30,7 @@
 #ifndef _SWLBOX_HXX
 #define _SWLBOX_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx
index cf46f3ea6ef3..625d78c81a52 100644
--- a/sw/source/ui/inc/swwrtshitem.hxx
+++ b/sw/source/ui/inc/swwrtshitem.hxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 #ifndef _SW_WRTSHELLITEM_HXX
 #define _SW_WRTSHELLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 
 class SwWrtShell;
diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx
index 1f94219fa71d..3ecbfd49f5d3 100644
--- a/sw/source/ui/inc/uiitems.hxx
+++ b/sw/source/ui/inc/uiitems.hxx
@@ -30,7 +30,7 @@
 #ifndef _UIITEMS_HXX
 #define _UIITEMS_HXX
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include "swdllapi.h"
 #include "cmdid.h"
 #include "pagedesc.hxx"
diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx
index 72b30c753cc3..a6dba21205cb 100644
--- a/sw/source/ui/inc/uinums.hxx
+++ b/sw/source/ui/inc/uinums.hxx
@@ -30,7 +30,7 @@
 #ifndef _UINUMS_HXX
 #define _UINUMS_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <numrule.hxx>
 #include "swdllapi.h"
 
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 4db18720cf87..43dc420915ef 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
 #include <cppuhelper/implbase8.hxx> // helper for implementations
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include "calbck.hxx"
 #include "TextCursorHelper.hxx"
 #include <comphelper/uno3.hxx>
diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx
index 812873626ced..8c8f949bf803 100644
--- a/sw/source/ui/inc/usrpref.hxx
+++ b/sw/source/ui/inc/usrpref.hxx
@@ -71,6 +71,7 @@ class SwLayoutViewConfig : public utl::ConfigItem
         SwLayoutViewConfig(BOOL bWeb, SwMasterUsrPref& rParent);
         ~SwLayoutViewConfig();
 
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     virtual void            Commit();
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
@@ -88,7 +89,8 @@ class SwGridConfig : public utl::ConfigItem
         SwGridConfig(BOOL bWeb, SwMasterUsrPref& rParent);
         ~SwGridConfig();
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -104,7 +106,8 @@ class SwCursorConfig : public utl::ConfigItem
         SwCursorConfig(SwMasterUsrPref& rParent);
         ~SwCursorConfig();
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -120,7 +123,8 @@ class SwWebColorConfig : public utl::ConfigItem
         SwWebColorConfig(SwMasterUsrPref& rParent);
         ~SwWebColorConfig();
 
-    virtual void            Commit();
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 9eeaa42ccaa4..a670139687e5 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -38,9 +38,9 @@
 #include <rsc/rscsfx.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/urihelper.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 866ecd82ee4e..259110a888d8 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -37,7 +37,7 @@
 #include <helpid.h>
 #endif
 #define _SVSTDARR_STRINGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -45,15 +45,15 @@
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
 #include <sfx2/dispatch.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/txtcmp.hxx>
 #include <svx/scripttypeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/langitem.hxx>
 #include <swtypes.hxx>
 #include <idxmrk.hxx>
@@ -78,7 +78,7 @@
 #include <fldbas.hxx>
 #include <utlui.hrc>
 #include <swcont.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <ndtxt.hxx>
 #include <breakit.hxx>
 
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 9b26818d028f..b5082f14c485 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -40,7 +40,7 @@
 #include <helpid.h>
 #endif
 #define _SVSTDARR_STRINGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -48,15 +48,15 @@
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
 #include <sfx2/dispatch.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/txtcmp.hxx>
 #include <svx/scripttypeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/langitem.hxx>
 #include "svx/unolingu.hxx"
 #include <swtypes.hxx>
@@ -82,7 +82,7 @@
 #include <fldbas.hxx>
 #include <utlui.hrc>
 #include <swcont.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <ndtxt.hxx>
 #include <breakit.hxx>
 #include <SwRewriter.hxx>
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 771836c6ccd5..be469f14db1b 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -35,10 +35,10 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 #include <svtools/filter.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/svxacorr.hxx>
@@ -64,12 +64,12 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/dlgutil.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/langitem.hxx>
 #include <svx/splwrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/acorrcfg.hxx>
 #include <swmodule.hxx>
 #include <cmdid.h>
@@ -92,7 +92,7 @@
 // <- #111827#
 
 #include <unomid.h>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <map>
 #include <svtools/langtab.hxx>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
@@ -101,7 +101,7 @@
 #include "swabstdlg.hxx"
 #include "chrdlg.hrc"
 #include <svx/brshitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <viewopt.hxx>
 #include <uitool.hxx>
 
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index f7eace73f06e..3915d6918f33 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -37,7 +37,7 @@
 
 
 #include <sfx2/request.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 
 
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 44a3e0750890..d56ac7c593b6 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -36,7 +36,7 @@
 #endif
 
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <errhdl.hxx>
 #include <wrtsh.hxx>
 #ifndef _VIEW_HXX
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index e5269a6f7dd7..206c4ea900d7 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -46,8 +46,8 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/tempfile.hxx>
 
-#include <svtools/svstdarr.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/svstdarr.hxx>
+#include <unotools/pathoptions.hxx>
 #include <swtypes.hxx>
 #include <glosbib.hxx>
 #include <gloshdl.hxx>
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 94d2f04a9b0e..f9db3c82fcba 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -38,17 +38,17 @@
 #define _SVSTDARR_STRINGS
 #include <unotools/transliterationwrapper.hxx>
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #ifndef __RSC //autogen
 #include <tools/errinf.hxx>
 #endif
 #include <tools/debug.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef SVTOOLS_FSTATHELPER_HXX
-#include <svtools/fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/tempfile.hxx>
 #include <swtypes.hxx>
 #include <errhdl.hxx>       // ASSERT
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index ef368f680378..17afbfb31578 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -50,11 +50,11 @@
 #include <vcl/help.hxx>
 #endif
 #ifndef _SVSTDARR_HXX
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/lingucfg.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/fcontnr.hxx>
 
@@ -70,7 +70,7 @@
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/charclass.hxx>
 #include <swwait.hxx>
 #include <swtypes.hxx>
@@ -1216,7 +1216,7 @@ IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn )
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
-        AbstractSvxMultiPathDialog* pDlg = pFact->CreateSvxMultiPathDialog( pBtn, RID_SVXDLG_MULTIPATH);
+        AbstractSvxMultiPathDialog* pDlg = pFact->CreateSvxMultiPathDialog( pBtn );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");
         SvtPathOptions aPathOpt;
         String sGlosPath( aPathOpt.GetAutoTextPath() );
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index a79e67eec31c..12befeaeb194 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -34,13 +34,13 @@
 #include <com/sun/star/frame/XTitle.hpp>
 
 #include <tools/list.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svx/srchitem.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <gloshdl.hxx>
 
 #include <svx/acorrcfg.hxx>
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index d659ceb0b6f1..a91953e24148 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -36,8 +36,8 @@
 #endif
 
 #include <hintids.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/fontitem.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
index b2d38797222f..117590728c88 100644
--- a/sw/source/ui/misc/insrule.cxx
+++ b/sw/source/ui/misc/insrule.cxx
@@ -43,7 +43,7 @@
 #include <vcl/msgbox.hxx>
 #endif
 #include <svx/brshitem.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <vcl/graph.hxx>
 
 #include "swtypes.hxx"
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 58babb639807..8707cac36fb6 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -37,7 +37,7 @@
 
 
 #include <sfx2/viewfrm.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <vcl/msgbox.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index c1e46a1b4dfb..94a8ea847781 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -93,9 +93,9 @@
 #include <SwStyleNameMapper.hxx>
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
-#include <svtools/stritem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/slstitm.hxx>
 
 static BOOL bLastRelative = FALSE;
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 9fd448fcb210..27eabd673750 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -65,7 +65,7 @@
 #include <uinums.hxx>
 #include <poolfmt.hxx>
 #include <shellres.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <charfmt.hxx>
 #include <docstyle.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 3f0c634f2b24..75c72d6b3f66 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -48,10 +48,10 @@
 #include <vcl/field.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <uitool.hxx>
 #include <pagedesc.hxx>
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index a0da69f942e5..483340b63585 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -41,9 +41,9 @@
 #include <tools/datetime.hxx>
 #include <vcl/msgbox.hxx>
 #ifndef _SVSTDARR_HXX
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/ctredlin.hxx>
@@ -1281,7 +1281,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
                                     rRedline.GetRedlineData().GetTimeStamp() ),
                                     SID_ATTR_POSTIT_DATE ));
 
-                        AbstractSvxPostItDialog* pDlg = pFact->CreateSvxPostItDialog( pParentDlg, aSet, RID_SVXDLG_POSTIT, FALSE );
+                        AbstractSvxPostItDialog* pDlg = pFact->CreateSvxPostItDialog( pParentDlg, aSet, FALSE );
                         DBG_ASSERT(pDlg, "Dialogdiet fail!");
 
                         pDlg->HideAuthor();
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 0b2ff55c7c41..6000632ef3f8 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -39,8 +39,8 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
 #include <svx/unolingu.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 6039600d037c..6a6dff99c9bc 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -45,9 +45,9 @@
 #include <tools/datetime.hxx>
 #include <vcl/msgbox.hxx>
 #ifndef _SVSTDARR_HXX
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/ctredlin.hxx>
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx
index 809b593dec0c..3fc2ff816dfe 100644
--- a/sw/source/ui/ribbar/concustomshape.cxx
+++ b/sw/source/ui/ribbar/concustomshape.cxx
@@ -61,7 +61,7 @@
 #ifndef _FM_FMMODEL_HXX
 #include <svx/fmmodel.hxx>
 #endif
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/adjitem.hxx>
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index f6a48d36cd68..764090080aeb 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -34,7 +34,7 @@
 #include <tools/list.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdobj.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 764d83a8e8e7..005f9e019cf3 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -37,8 +37,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/ruler.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/stritem.hxx>
 
 #include "swtypes.hxx"
 #include "cmdid.h"
diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/ui/ribbar/tblctrl.cxx
index 5441943c126f..741fd4509b81 100644
--- a/sw/source/ui/ribbar/tblctrl.cxx
+++ b/sw/source/ui/ribbar/tblctrl.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <vcl/toolbox.hxx>
 #include <sfx2/app.hxx>
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index fc086a1143c2..5ca8c504229a 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -37,7 +37,7 @@
 #include <vcl/timer.hxx>
 #include <sfx2/app.hxx>
 #include <svx/htmlmode.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #ifndef _TOOLBOX_HXX //autogen
 #include <vcl/toolbox.hxx>
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 51e818604dae..dea86994f2d3 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -34,7 +34,7 @@
 
 
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
@@ -65,7 +65,7 @@
 #include <helpid.h>
 #endif
 #include <wrtsh.hxx>
-#include <svtools/imageitm.hxx>
+#include <svl/imageitm.hxx>
 #include <vcl/lstbox.hxx>
 #include <rtl/ustring.hxx>
 #include "swabstdlg.hxx"
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 1a34e2972956..023936ffa5d6 100755
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -57,18 +57,18 @@
 #include <svx/fontitem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/clipfmtitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/slstitm.hxx>
 #include <svx/colritem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/cntritem.hxx>
 #include <svx/postitem.hxx>
 #include <svx/frmdiritem.hxx>
 #include <svx/svdoutl.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/ctloptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/whiter.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/flditem.hxx>
 #include <svx/editstat.hxx>
@@ -108,18 +108,18 @@
 #include <svx/dialogs.hrc>
 
 #include <svx/svxids.hrc>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/outliner.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editview.hxx>
 
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/langitem.hxx>
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 
 #include <docsh.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "swabstdlg.hxx" //CHINA001
 #include "chrdlg.hrc" //CHINA001
 #include "misc.hrc"
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 6bb599e44867..9b38981abbb3 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sw.hxx"
 #include <sot/factory.hxx>
 #include <hintids.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/languageoptions.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
@@ -45,8 +45,8 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/visitem.hxx>
 #include <sfx2/objitem.hxx>
 #include <svtools/filter.hxx>
 #include <svx/gallery.hxx>
@@ -55,11 +55,11 @@
 #include <svx/contdlg.hxx>
 #include <vcl/graph.hxx>
 #include <svx/impgrf.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/stritem.hxx>
 #include <svx/colritem.hxx>
 #include <svx/shaditem.hxx>
 #include <svx/boxitem.hxx>
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index cc3493fe5120..919531e84fb7 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -35,8 +35,8 @@
 #include "cmdid.h"
 #include <svx/svdview.hxx>
 #include <svx/srchitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
 #include <svx/svdopath.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx
index 8cad5be21ccb..329465421dd4 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/ui/shells/drawdlg.cxx
@@ -83,7 +83,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if ( pFact )
             {
-                SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, RID_SVXDLG_TEXT, pView );
+                SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, pView );
                 USHORT nResult = pDlg->Execute();
 
                 if (nResult == RET_OK)
@@ -111,7 +111,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
             AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( NULL,
                                                                             &aNewAttr,
                                                                             pDoc,
-                                                                            RID_SVXDLG_AREA,
                                                                             pView);
             DBG_ASSERT(pDlg, "Dialogdiet fail!");
             const SvxColorTableItem* pColorItem = (const SvxColorTableItem*)
@@ -154,7 +153,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
             SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( NULL,
                     &aNewAttr,
                 pDoc,
-                RID_SVXDLG_LINE,
                 pObj,
                 bHasMarked);
             DBG_ASSERT(pDlg, "Dialogdiet fail!");
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 4da015e2d586..8e5b20c67dd2 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -35,12 +35,12 @@
 #include <tools/shl.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdotext.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/fontwork.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objface.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <svx/srchitem.hxx>
 #include <svx/xftsfit.hxx>
 #include <svx/extrusionbar.hxx>
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index 97cac7006b98..d15c0b697e12 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -36,7 +36,7 @@
 #include <hintids.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/svdview.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/app.hxx>
@@ -59,7 +59,7 @@
 #include "shells.hrc"
 #include "drwbassh.hxx"
 #include "drformsh.hxx"
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <view.hxx>
 #include <sfx2/docfile.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index 339c332c9135..3f5bb4fe6d77 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -39,11 +39,11 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdview.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/srchitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/swframevalidation.hxx>
 #include <svx/anchorid.hxx>
 #include <svx/htmlmode.hxx>
@@ -238,7 +238,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                             if ( pFact )
                             {
                                 AbstractSvxCaptionDialog* pCaptionDlg =
-                                        pFact->CreateCaptionDialog( NULL, pSdrView, RID_SVXDLG_CAPTION, nAllowedAnchors );
+                                        pFact->CreateCaptionDialog( NULL, pSdrView, nAllowedAnchors );
                                 pCaptionDlg->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) );
                                 pDlg = pCaptionDlg;
                                 DBG_ASSERT(pDlg, "Dialogdiet fail!");
@@ -251,7 +251,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                             {
 
                                 AbstractSvxTransformTabDialog* pTransform =
-                                            pFact->CreateSvxTransformTabDialog( NULL, NULL, pSdrView, RID_SVXDLG_TRANSFORM, nAllowedAnchors );
+                                            pFact->CreateSvxTransformTabDialog( NULL, NULL, pSdrView, nAllowedAnchors );
                                 pTransform->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) );
                                 pDlg = pTransform;
                                 DBG_ASSERT(pDlg, "Dialogdiet fail!");
@@ -567,7 +567,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
-                AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME);
+                AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                 pDlg->SetCheckNameHdl(LINK(this, SwDrawBaseShell, CheckGroupShapeNameHdl));
@@ -599,7 +599,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
-                AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC);
+                AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                 if(RET_OK == pDlg->Execute())
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 11874ca5b151..da71d364f6a3 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -59,9 +59,9 @@
 #include <svx/frmdiritem.hxx>
 #include <svx/svdoutl.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/whiter.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/dispatch.hxx>
@@ -99,10 +99,10 @@
 #include "misc.hrc"
 
 //modified on Jul. 30th
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/langitem.hxx>
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <string.h>
 
 #include <svx/eeitem.hxx>
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 9f1d49ebe067..59e4bc01c5e3 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sw.hxx"
 #include <hintids.hxx>
 #include <i18npool/lang.h>
-#include <svtools/slstitm.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/cjkoptions.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/svdview.hxx>
@@ -49,7 +49,7 @@
 #include <sfx2/bindings.hxx>
 #include <svx/fontwork.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/outliner.hxx>
 #include <svx/editstat.hxx>
 #include <svx/svdoutl.hxx>
@@ -577,7 +577,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
                 {
                     SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog(
                                 &(GetView().GetViewFrame()->GetWindow()),
-                                &aNewAttr, RID_SVXDLG_TEXT, pSdrView );
+                                &aNewAttr, pSdrView );
                     USHORT nResult = pDlg->Execute();
 
                     if (nResult == RET_OK)
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index f7957a66077a..4bd22a2c5822 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -33,15 +33,15 @@
 
 
 #include <hintids.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svtools/imapobj.hxx>
 #include <svx/srchitem.hxx>
 #include <svtools/imap.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <basic/sbstar.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/colritem.hxx>
 #include <svx/bolnitem.hxx>
 #include <svx/boxitem.hxx>
@@ -618,8 +618,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 AbstractSvxObjectTitleDescDialog* pDlg =
                     pFact->CreateSvxObjectTitleDescDialog( NULL,
                                                            aTitle,
-                                                           aDescription,
-                                                           RID_SVXDLG_OBJECT_TITLE_DESC );
+                                                           aDescription );
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                 if ( pDlg->Execute() == RET_OK )
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 7203d9c91ebb..4a34d39588fe 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -40,9 +40,9 @@
 #include <hintids.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
 
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index ccf9d006c26f..9ee02b74e591 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -51,7 +51,7 @@
 #endif
 #include <caption.hxx>
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/filter.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/htmlmode.hxx>
@@ -81,7 +81,7 @@
 
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index e5e4dbe81b29..fa27f72b36d7 100755
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -48,11 +48,11 @@
 #include <svx/scripttypeitem.hxx>
 #include <svx/langitem.hxx>
 
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/svstdarr.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/stritem.hxx>
 
 #include <ndtxt.hxx>
 #include <pam.hxx>
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 34f349befbc9..e0d6bdcc4228 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -40,11 +40,11 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/intitem.hxx>
 #include <tools/shl.hxx>
 #include <svx/srchitem.hxx>
 
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index ae1ed883cb8b..d0e3a94c970e 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -40,9 +40,9 @@
 #include <hintids.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/protitem.hxx>
diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx
index 333128a18db9..94c74122bdec 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/ui/shells/slotadd.cxx
@@ -35,12 +35,12 @@
 #include "uiitems.hxx"
 #include "cmdid.h"
 
-#include <svtools/globalnameitem.hxx>
+#include <svl/globalnameitem.hxx>
 
 
-#include <svtools/imageitm.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/imageitm.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/rectitem.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/rulritem.hxx>
@@ -49,7 +49,7 @@
 #include <svx/zoomslideritem.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/SmartTagItem.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/srchitem.hxx>
 #include <sfx2/tplpitem.hxx>
@@ -130,7 +130,7 @@
 #include "fmtline.hxx"
 #include <svx/clipfmtitem.hxx>
 #include <svx/blnkitem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <svx/paravertalignitem.hxx>
 #include <svx/charreliefitem.hxx>
 #include <svx/charrotateitem.hxx>
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 7ba4d0b8e954..20b548efaf91 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -34,11 +34,11 @@
 
 #ifndef _ZFORLIST_HXX
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #endif
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svx/rulritem.hxx>
 #include <svx/srchitem.hxx>
 #include <svx/lrspitem.hxx>
@@ -55,7 +55,7 @@
 #include <svx/numinf.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svxdlg.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/request.hxx>
diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx
index 1d10c885bc17..ee714ee6ff55 100644
--- a/sw/source/ui/shells/textdrw.cxx
+++ b/sw/source/ui/shells/textdrw.cxx
@@ -57,7 +57,7 @@
 #include <docsh.hxx>
 #endif
 #include <sfx2/docfile.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <avmedia/mediawindow.hxx>
 
 #include <unomid.h>
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 0dedb918aaf5..2e65b5a5ce48 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -38,11 +38,11 @@
 #include <fmtfld.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/useroptions.hxx>
+#include <svl/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/macitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 #include <svx/postattr.hxx>
@@ -463,7 +463,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
 
                     SvxAbstractDialogFactory* pFact2 = SvxAbstractDialogFactory::Create();
                     DBG_ASSERT(pFact2, "Dialogdiet fail!");
-                    AbstractSvxPostItDialog* pDlg = pFact2->CreateSvxPostItDialog( pMDI, aSet, RID_SVXDLG_POSTIT, bTravel, TRUE );
+                    AbstractSvxPostItDialog* pDlg = pFact2->CreateSvxPostItDialog( pMDI, aSet, bTravel, TRUE );
                     DBG_ASSERT(pDlg, "Dialogdiet fail!");
                     pDlg->HideAuthor();
 
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index 076697ac08ff..6eab16a31141 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -33,8 +33,8 @@
 
 
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 
 #include "errhdl.hxx"
 #include "view.hxx"
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index 3eb67f725acd..62eeb00dcb20 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -37,8 +37,8 @@
 #endif
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/sizeitem.hxx>
 #include <fmtfsize.hxx>
 #include <fldbas.hxx>
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 7e38c1297d0b..9dd27b760064 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -35,7 +35,7 @@
 #define _SW_FRMVALID_HXX
 #include <hintids.hxx>
 
-#include <svtools/globalnameitem.hxx>
+#include <svl/globalnameitem.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/lnkbase.hxx>
 
@@ -43,18 +43,18 @@
 #include <tools/errinf.hxx>
 #endif
 #include <svx/svdview.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/srchitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <basic/sbxvar.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/request.hxx>
 #include <svx/opaqitem.hxx>
 #include <svx/fontitem.hxx>
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 977dc77c98d3..0dac20c78933 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -38,30 +38,30 @@
 #include <helpid.h>
 
 #include <i18npool/mslangid.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/langitem.hxx>
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <string.h>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/htmlmode.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/unohelp2.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/macitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/colritem.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/svxacorr.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <charfmt.hxx>
 #include <svx/fontitem.hxx>
@@ -116,13 +116,13 @@
 #include <IDocumentStatistics.hxx>
 
 #include <sfx2/sfxdlg.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/languageoptions.hxx>
+#include <unotools/lingucfg.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include <doc.hxx>
 #include <view.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index e3ba958d9e1a..417f235c190d 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -38,16 +38,16 @@
 #endif
 
 #include <svtools/svmedit.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/stritem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/request.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 8e30123a192b..a88f5c996f65 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -37,10 +37,10 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/whiter.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/whiter.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/ctloptions.hxx>
 #include <swmodule.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx
index 19b36367d49f..9c3a95e2006b 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/ui/shells/txtcrsr.cxx
@@ -33,7 +33,7 @@
 
 
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef __SBX_SBXVARIABLE_HXX //autogen
 #include <basic/sbxvar.hxx>
 #endif
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index 3bbee6762431..6b4be8da6e14 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -37,8 +37,8 @@
 #include <vcl/msgbox.hxx>
 #endif
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/numitem.hxx>
 #include <svx/brshitem.hxx>
 #include <numrule.hxx>
diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx
index a2f37ac801f9..977f63681410 100644
--- a/sw/source/ui/smartmenu/stmenu.cxx
+++ b/sw/source/ui/smartmenu/stmenu.cxx
@@ -34,7 +34,7 @@
 #include "precompiled_sw.hxx"
 #include <stmenu.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 
 #include <SwSmartTagMgr.hxx>
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 63f8ac8a2e00..ce8e62e3990d 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -38,7 +38,7 @@
 
 
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <modcfg.hxx>
 #include <svx/htmlmode.hxx>
diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src
index 44a8923d9e48..983cf90dac08 100644
--- a/sw/source/ui/table/convert.src
+++ b/sw/source/ui/table/convert.src
@@ -177,7 +177,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     PushButton BT_AUTOFORMAT
     {
         Pos = MAP_APPFONT ( 12 , 152 ) ;
-        Size = MAP_APPFONT ( 66 , 14 ) ;
+        Size = MAP_APPFONT ( 86 , 14 ) ;
         TabStop = TRUE ;
         Hide = TRUE ;
         Text [ en-US ] = "Auto~Format..." ;
diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src
index ca5680ebf494..ebe03f5f364b 100644
--- a/sw/source/ui/table/instable.src
+++ b/sw/source/ui/table/instable.src
@@ -159,7 +159,7 @@ ModalDialog DLG_INSERT_TABLE
     PushButton BT_AUTOFORMAT
     {
         Pos = MAP_APPFONT ( 12 , 146 ) ;
-        Size = MAP_APPFONT ( 66 , 14 ) ;
+        Size = MAP_APPFONT ( 86 , 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Auto~Format..." ;
     };
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 46e0a1828538..95c9fb5db81c 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -36,8 +36,8 @@
 #endif
 
 
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/dlgutil.hxx>
 
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index c6a2d93cf423..dea9ae75e021 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -35,14 +35,14 @@
 #include <hintids.hxx>
 #include <tools/list.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <svx/keepitem.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/frmdiritem.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <swmodule.hxx>
 #include <fmtornt.hxx>
 #include <fmtpdsc.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index c18d7b6f7d07..8a831a60d9ff 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -39,14 +39,14 @@
 #include <hintids.hxx>
 #include <tools/list.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/htmlmode.hxx>
 #include <svx/keepitem.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/frmdiritem.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <swmodule.hxx>
 #include <fmtornt.hxx>
 #include <fmtpdsc.hxx>
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index de8ea6e3e62b..7b8fac2526c0 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -45,7 +45,7 @@
 #include <vcl/msgbox.hxx>
 #endif
 #include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 93ae56fbca73..d7cc7936958b 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -41,9 +41,9 @@
 #include <vcl/cmdevt.hxx>
 #include <vcl/button.hxx>
 #include <svtools/printdlg.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/topfrm.hxx>
@@ -1376,7 +1376,7 @@ void  SwPagePreView::Execute( SfxRequest &rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aCoreSet, RID_SVXDLG_ZOOM);
+                    pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aCoreSet);
                     DBG_ASSERT(pDlg, "Dialogdiet fail!");
                 }
 
@@ -2531,7 +2531,7 @@ USHORT  SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool )
             SID_ATTR_LONG_ULSPACE, SID_ATTR_LONG_LRSPACE,
             SID_RULER_BORDERS, SID_RULER_PAGE_POS, 0
         };
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         const USHORT* pPtr = aInval + 1;
         do {
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index d30e85c5ee71..92467fe455d0 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -43,14 +43,14 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/metric.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/undo.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/undo.hxx>
 #include <svtools/txtcmp.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/saveopt.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
+#include <unotools/saveopt.hxx>
 #include <svtools/transfer.hxx>
 
 #include <svx/htmlcfg.hxx>
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index a13f25d8933e..d823f2e6c63b 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -40,11 +40,11 @@
 #include <vcl/graph.hxx>
 #include <vcl/inputctx.hxx>
 #include <basic/sbxobj.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/eitem.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svtools/printdlg.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 38f885657450..73c401f2bcb6 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -38,14 +38,14 @@
 #include <svx/galbrws.hxx>
 #include <svx/srchitem.hxx>
 #include <SwSpellDialogChildWindow.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/eitem.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <viewopt.hxx>
 #include <globals.h>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/srchdlg.hxx>
 #include <sfx2/templdlg.hxx>
 #include <uivwimp.hxx>
@@ -99,7 +99,7 @@
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <IDocumentSettingAccess.hxx>
 
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 77c06f44c494..33acb232821a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -46,8 +46,8 @@
 
 
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/aeitem.hxx>
 
 // #ifndef _FILTER_HXX
 // #include <svtools/filter.hxx>
@@ -59,8 +59,8 @@
 #include <undobj.hxx>
 #include <swundo.hxx>
 #include <caption.hxx>
-#include <svtools/PasswordHelper.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/PasswordHelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -91,8 +91,8 @@
 #include <svx/sizeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/topfrm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/ptitem.hxx>
 #include <svx/linkmgr.hxx>
 #ifndef __RSC //autogen
 #include <tools/errinf.hxx>
@@ -1624,7 +1624,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
-                        pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aCoreSet, RID_SVXDLG_ZOOM);
+                        pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aCoreSet);
                         DBG_ASSERT(pDlg, "Dialogdiet fail!");
                     }
 
diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx
index d1bd291e917c..92937b2f1746 100644
--- a/sw/source/ui/uiview/viewcoll.cxx
+++ b/sw/source/ui/uiview/viewcoll.cxx
@@ -39,7 +39,7 @@
 #include <vcl/window.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <rsc/rscsfx.hxx>
 
 
diff --git a/sw/source/ui/uiview/viewdlg.cxx b/sw/source/ui/uiview/viewdlg.cxx
index c7f3f2373c8f..04370478c796 100644
--- a/sw/source/ui/uiview/viewdlg.cxx
+++ b/sw/source/ui/uiview/viewdlg.cxx
@@ -36,7 +36,7 @@
 #include "hintids.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <svx/tstpitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 
 
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 4fb7746db4d7..328b5a3d06ca 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -33,8 +33,8 @@
 
 
 #include "hintids.hxx"
-#include <svtools/aeitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpage.hxx>
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 588c30a9844d..09014ea3afcf 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -36,7 +36,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
@@ -47,7 +47,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/ehdl.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 #include <svx/dlgutil.hxx>
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 5e45f9a9a48c..c53f6efbc3fc 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -43,25 +43,25 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <sfx2/request.hxx>
 
 #include <sfx2/app.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/printdlg.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/prnmon.hxx>
 #include <svx/paperinf.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
 #include <svx/prtqry.hxx>
 #include <svx/svdview.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/flagitem.hxx>
 #include <svx/linkmgr.hxx>
 
 #include <modcfg.hxx>
@@ -85,10 +85,10 @@
 #include <globals.hrc>
 #include <view.hrc>
 #include <app.hrc>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <swwrtshitem.hxx>
 #include "swabstdlg.hxx"
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 
 #include <unomid.h>
 
@@ -252,7 +252,10 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, BOOL bSilent,
             QueryBox aBox( &GetEditWin(), SW_RES( DLG_PRT_FIELDNAME ) );
             USHORT nRet = aBox.Execute();
             if( RET_CANCEL == nRet)
+            {
+                   delete pProgress;
                 return ERRCODE_IO_ABORT;
+            }
             // disable field commands
             if( RET_NO != nRet )
             {
@@ -618,17 +621,17 @@ void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb )
                     SID_PRINTER_CHANGESTODOC,   SID_PRINTER_CHANGESTODOC,
                     0 );
 
-            SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig();
+        utl::MiscCfg aMisc;
 
         if(bWeb)
             aSet.Put(SfxUInt16Item(SID_HTML_MODE,
                     ::GetHtmlMode(((SwWrtShell*)pSh)->GetView().GetDocShell())));
         aSet.Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN,
-                        pMisc->IsNotFoundWarning() ));
+                        aMisc.IsNotFoundWarning() ));
         aSet.Put(aAddPrinterItem);
         aSet.Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC,
-            (pMisc->IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0)   |
-            (pMisc->IsPaperOrientationWarning()  ? SFX_PRINTER_CHG_ORIENTATION : 0 )));
+            (aMisc.IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0)   |
+            (aMisc.IsPaperOrientationWarning()  ? SFX_PRINTER_CHG_ORIENTATION : 0 )));
 
         pIDDA->getPrinter( true )->SetOptions( aSet );
     }
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 690a1900749e..d55975eaa190 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -35,17 +35,17 @@
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <hintids.hxx>
 #include <com/sun/star/util/SearchOptions.hpp>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <svx/pageitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _T2XTCMP_HXX //autogen
 #include <svtools/txtcmp.hxx>
 #endif
-#include <svtools/itempool.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/eitem.hxx>
 #include <svx/srchitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/srchdlg.hxx>
@@ -428,7 +428,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
         }
         break;
         default:
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if(nSlot)
             {
                 ByteString sStr( "nSlot: " );
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index 7563a7b5e779..3824f5f10723 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -33,14 +33,14 @@
 #include <hintids.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/cjkoptions.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objitem.hxx>
-#include <svtools/imageitm.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/imageitm.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/protitem.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/langitem.hxx>
@@ -67,9 +67,9 @@
 #include <wview.hxx>
 #endif
 #include <globdoc.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/visitem.hxx>
 
 #ifndef _CMDID_H
 #include <cmdid.h>
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 6223d1d0234a..316156d0112d 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -44,11 +44,11 @@
 #include <svx/ulspitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/frmdiritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
 #include <svx/ruler.hxx>
 #include <svx/protitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/rectitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <fmtfsize.hxx>
 #include <fmthdft.hxx>
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 055dfab0c7f0..c850f77b6011 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -49,7 +49,7 @@
 #include <sfx2/printer.hxx>
 #include <editsh.hxx>
 #include <drawdoc.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <unoobj.hxx>
 #include <unotxdoc.hxx>
 #include <cmdid.h>
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 3b066a66ce08..c883a03f23ee 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp>
 
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index aedd6e0f6c68..4d369d2b7ee2 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -49,7 +49,7 @@
 #include <web.hrc>
 #include <globdoc.hrc>
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <unomid.h>
 
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 82da0914124a..d0fcf366ee15 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -53,10 +53,10 @@
 #include <ucbhelper/simpleinteractionrequest.hxx>
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
@@ -72,7 +72,7 @@
 #include <sfx2/brokenpackageint.hxx>
 #include <svx/impgrf.hxx>
 #include <svtools/FilterConfigItem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <com/sun/star/util/XArchiver.hpp>
 #include <comphelper/ihwrapnofilter.hxx>
 
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 2b302245f53b..b877b9aac7f5 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -41,9 +41,9 @@
 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/unoevent.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/event.hxx>
 #include <swtypes.hxx>
 #include <glosdoc.hxx>
@@ -61,8 +61,8 @@
 #include <docsh.hxx>
 #include <swunodef.hxx>
 #include <swmodule.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/macitem.hxx>
 
 #include <svx/acorrcfg.hxx>
 
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index fed4c2b201cf..b47f599a9120 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -35,8 +35,8 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <osl/mutex.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <tools/shl.hxx>    // GetAppData
 #include <tools/tempfile.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index fe3d8639bf84..aa2712225703 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -46,9 +46,9 @@
 #include <viewsh.hxx>
 #include <pvprtdat.hxx>
 #include <swprtopt.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <unotxdoc.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <unoobj.hxx>
 #include <unosett.hxx>
 #include <unocoll.hxx>
@@ -61,7 +61,7 @@
 #include <unoprnms.hxx>
 #include <unostyle.hxx>
 #include <unodraw.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <pagedesc.hxx>
 #include <svtools/txtcmp.hxx>
 #include <unocrsr.hxx>
@@ -103,7 +103,7 @@
 #include <SwXPrintPreviewSettings.hxx>
 #include <doc.hxx>
 #include <svx/forbiddencharacterstable.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <drawdoc.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <osl/file.hxx>
@@ -127,7 +127,7 @@
 #include <unostyle.hxx>   //SwAutoStyleFamily
 #include <istyleaccess.hxx> // handling of automatic styles
 
-#include <svtools/stylepool.hxx>
+#include <svl/stylepool.hxx>
 #include <swatrset.hxx>
 
 //#include <com/sun/star/i18n/ScriptType.hpp>
@@ -138,7 +138,7 @@
 #include <svx/eeitem.hxx>
 #include <svx/editeng.hxx>
 #include <svx/svdoutl.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/svdview.hxx>
 
 //
diff --git a/sw/source/ui/uno/warnpassword.cxx b/sw/source/ui/uno/warnpassword.cxx
index 8523d69de823..600256cf05db 100644
--- a/sw/source/ui/uno/warnpassword.cxx
+++ b/sw/source/ui/uno/warnpassword.cxx
@@ -33,7 +33,7 @@
 // ============================================================================
 #include "warnpassword.hxx"
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <ucbhelper/simpleinteractionrequest.hxx>
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 14c27c19b137..076f7aa7bdb8 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/itemtype.hxx>
 #include <goodies/grfmgr.hxx>
diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx
index 1de7b99a2b66..b4fb0d6e1b5c 100644
--- a/sw/source/ui/utlui/bookctrl.cxx
+++ b/sw/source/ui/utlui/bookctrl.cxx
@@ -35,10 +35,10 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 #ifndef _EVENT_HXX //autogen
 #include <vcl/event.hxx>
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 1660f7da38c5..28c340b63cd3 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -33,9 +33,9 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index eca568ca60a2..20bb340218b2 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -33,23 +33,23 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svx/linkmgr.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/docfile.hxx>
 #ifndef _HELP_HXX //autogen
 #include <vcl/help.hxx>
 #endif
 #include <sot/filelist.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/eitem.hxx>
+#include <svl/urlbmk.hxx>
 #include <svtools/filter.hxx>
 #include <sfx2/docinsert.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index 7072cb254274..5430c783acc7 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -36,7 +36,7 @@
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
@@ -48,9 +48,9 @@
 #endif
 #include <vcl/lstbox.hxx>
 #ifndef SVTOOLS_FSTATHELPER_HXX
-#include <svtools/fstathelper.hxx>
+#include <svl/fstathelper.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <swtypes.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 275b49a4c9e4..ec3328676d2b 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -54,7 +54,7 @@
 #ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
 #endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include <unomid.h>
 
@@ -169,6 +169,7 @@ ShellResource::ShellResource()
     aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ),
     aStrNone( SW_RES( STR_TEMPLATE_NONE )),
     aFixedStr( SW_RES( STR_FIELD_FIXED )),
+    sDurationFormat( SW_RES( STR_DURATION_FORMAT )),
 
     aTOXIndexName(          SW_RES(STR_TOI)),
     aTOXUserName(           SW_RES(STR_TOU)),
diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc
index 5e0c5092d6f6..6c3c0302dbbd 100644
--- a/sw/source/ui/utlui/initui.hrc
+++ b/sw/source/ui/utlui/initui.hrc
@@ -64,5 +64,6 @@
 #define STR_PAGEDESC_FOLLOWNAME     27
 #define STR_HYPERLINK_CLICK         28
 #define STR_GETREFFLD_REFITEMNOTFOUND   29
+#define STR_DURATION_FORMAT             30
 #endif
 
diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src
index d8ebdfc7e64e..26b10dcd0804 100644
--- a/sw/source/ui/utlui/initui.src
+++ b/sw/source/ui/utlui/initui.src
@@ -112,6 +112,10 @@ Resource RID_SW_SHELLRES
     {
         Text [ en-US ] = "(fixed)" ;
     };
+    String STR_DURATION_FORMAT
+    {
+        Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
+    };
     String STR_TOI
     {
         Text [ en-US ] = "Alphabetical Index" ;
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx
index 68383d7d28c2..e9ad48b6d6ea 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/ui/utlui/navicfg.cxx
@@ -139,3 +139,6 @@ void SwNavigationConfig::Commit()
     PutProperties(aNames, aValues);
 }
 
+void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
+
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 4776ae5b6bdc..96fe31edd500 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -37,10 +37,10 @@
 
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <tools/list.hxx>
-#include <svtools/urlbmk.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/urlbmk.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sot/formats.hxx>
 #include <sot/filelist.hxx>
 #include <sfx2/event.hxx>
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 5a0030d9dd85..4581330ab393 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -40,14 +40,14 @@
 #include <i18npool/lang.h>
 #ifndef _ZFORMAT_HXX //autogen
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxids.hrc>
 #include <svx/numinf.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/flagsdef.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <docsh.hxx>
 #include <swtypes.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 85d8aa2cf7a6..283da9eaa129 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -57,7 +57,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <shellio.hxx>
 #include <docsh.hxx>
 #include <view.hxx>
diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx
index 0ba8740fb5b2..af89104265b3 100644
--- a/sw/source/ui/utlui/tmplctrl.cxx
+++ b/sw/source/ui/utlui/tmplctrl.cxx
@@ -34,11 +34,11 @@
 // include ---------------------------------------------------------------
 
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 #ifndef _STATUS_HXX //autogen
 #include <vcl/status.hxx>
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index cb6a3888d45f..4bd54affeed9 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -37,9 +37,9 @@
 #include <tools/datetime.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/stritem.hxx>
+#include <unotools/syslocale.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -51,7 +51,7 @@
 #include <svx/sizeitem.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/lrspitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #ifndef _VCL_LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index f2efc1d85a00..a7d06416b443 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <shellio.hxx>
 #include <docsh.hxx>
 #include <view.hxx>
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 9a8526c941b5..b7a4fdb033d6 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -38,7 +38,7 @@
 #include <vcl/status.hxx>
 #endif
 #include <vcl/image.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/viewlayoutitem.hxx>
 #ifndef _UTLUI_HRC
 #include <utlui.hrc>
diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx
index 1a76e5bc5ecc..08e552efee7f 100644
--- a/sw/source/ui/utlui/zoomctrl.cxx
+++ b/sw/source/ui/utlui/zoomctrl.cxx
@@ -39,7 +39,7 @@
 #include <vcl/status.hxx>
 #endif
 #include <sfx2/app.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/zoomitem.hxx>
 
 #include "swtypes.hxx"
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index 8d84600555c9..0457388af1de 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -30,7 +30,7 @@
 #include "vbaaddins.hxx"
 #include "vbaaddin.hxx"
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index 44a854a7ad4d..c1dd4e2b332c 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -35,8 +35,8 @@
 #include <limits.h>
 #include <hintids.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/macitem.hxx>
 #include <unotools/charclass.hxx>
 #include <svx/scripttypeitem.hxx>
 #ifndef _CMDID_H
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index cd6bb82739ca..2b924933f1cc 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -44,7 +44,7 @@
 #include <hintids.hxx>
 #include <svx/svdview.hxx>
 #include <sot/factory.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 #ifndef _SOUND_HXX //autogen
 #include <vcl/sound.hxx>
 #endif
@@ -56,7 +56,7 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/soerr.hxx>
 #include <tools/cachestr.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/svxacorr.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 9141279f141b..eb12e1219f58 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -32,12 +32,12 @@
 #include "precompiled_sw.hxx"
 
 #include <hintids.hxx>      // define ITEMIDs
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <sfx2/frame.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx
index 9c85b08c2993..8a1a011988b3 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/ui/wrtsh/wrtundo.cxx
@@ -36,7 +36,7 @@
 #define _SVSTDARR_STRINGSDTOR
 #include <tools/resid.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <wrtsh.hxx>
 #include <swundo.hxx>                   // fuer Undo-Ids
 #include <swdtflvr.hxx>
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 013dd4a09ae8..fc1ff731b4c4 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -149,6 +149,7 @@ DEF2NAME=       $(SHL2TARGET)
 SHL2STDLIBS= \
             $(SFX2LIB) \
             $(SVTOOLLIB) \
+    $(UNOTOOLSLIB) \
             $(SVLLIB) \
             $(VCLLIB) \
             $(SOTLIB) \
@@ -164,7 +165,7 @@ SHL2OBJS=   $(SLO)$/swdetect.obj \
         $(SLO)$/detreg.obj \
         $(SLO)$/iodetect.obj
 
-.IF "$(product)"==""
+.IF "$(dbgutil)"!=""
 SHL2OBJS+=  \
         $(SLO)$/errhdl.obj
 .ENDIF
@@ -322,7 +323,7 @@ DEF4NAME=$(SHL4TARGET)
 SHL4STDLIBS= \
     $(ISWLIB) \
     $(SVXCORELIB) \
-    $(SVXMSFILTERLIB) \
+    $(MSFILTERLIB) \
     $(SFXLIB) \
     $(GOODIESLIB) \
     $(BASEGFXLIB) \
diff --git a/sw/util/msword.map b/sw/util/msword.map
index 53c3eaf213eb..db60fc5ce8c8 100644..100755
--- a/sw/util/msword.map
+++ b/sw/util/msword.map
@@ -4,7 +4,8 @@ MSWORD_1_0 {
                 ExportRTF;
                 ImportDOC;
                 ExportDOC;
-
+                                SaveOrDelMSVBAStorage_ww8;
+                                GetSaveWarningOfMSVBAStorage_ww8;
         local:
                 *;
 };
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index eb815b6df762..85cee3089555 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -147,8 +147,8 @@
             <file file="${commons-httpclient-jar}"/>
             <file file="${commons-lang-jar}"/>
             <file file="${commons-logging-jar}"/>
-            <zipfileset file="${solar.bin}/xslt/export/wiki/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
-            <zipfileset file="${solar.bin}/xslt/export/wiki/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
+            <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
+            <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
             <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
             <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
@@ -170,6 +170,8 @@
             <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
          -->
             <fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
+            <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
+            <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
             <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/>
             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
             <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
diff --git a/filter/source/xslt/export/wiki/mediawiki.ott b/swext/mediawiki/src/filter/mediawiki.ott
index eb94e9607bc0..eb94e9607bc0 100644
--- a/filter/source/xslt/export/wiki/mediawiki.ott
+++ b/swext/mediawiki/src/filter/mediawiki.ott
diff --git a/filter/source/xslt/export/wiki/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 8d21a1cda1fd..8d21a1cda1fd 100755
--- a/filter/source/xslt/export/wiki/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index 6b8c4dd96f20..eb1aaca61422 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,4 +1,4 @@
-swext swext :   l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons officecfg readlicense_oo xsltml filter NULL
+swext swext :   officecfg l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml NULL
 swext swext             usr1    -    all    swext_mkout NULL
 swext swext\mediawiki\help                                              nmake   -    all    swext_mwhelp NULL
 swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom  nmake   -    all    swext_mwschema NULL
diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc
index d873830df760..794e1bf44596 100755
--- a/testautomation/extensions/optional/includes/extensions.inc
+++ b/testautomation/extensions/optional/includes/extensions.inc
@@ -371,11 +371,18 @@ testcase tExtensionsFunction
             kontext
             if active.exists(5) then
                 sTemp = active.getText
-                try
-                    active.yes
-                catch
-                    warnlog( "Try...catch: Failed to click Yes-button" )
-                endcatch
+                printlog "Messagebox: " + sTemp
+                ' We only want to handle the installation target here which only 
+                ' pops up if we have the choice (rights to write to shared layer)
+                if active.getButtonCount = 3 then 
+                    try
+                        active.yes
+                    catch
+                        warnlog( "Try...catch: Failed to click Yes-button" )
+                    endcatch
+                else
+                    printlog "No installation target message (this is probably a root-installation)" 
+                endif
             endif
 
             '/// Progress dialog comes up ///'
diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 9af9abb7b69d..aa6fe69e2617 100755
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -56,15 +56,16 @@ testcase tExtensionPublisher
         cBasePath = convertpath( cBasePath )
     
     ' Modify this file to add test cases or attributes
-    dim cInfoFile as string
-        cinfoFile = cBasePath & "extension.info"
+    dim cInfoFile as string : cinfoFile = cBasePath & "extension.info"
         
     ' The number of files to test. Information about this is stored in the file
     ' specified by cInfoFile
     dim iFileCount as integer
     dim iCurrentFile as integer
-    dim iExitCounter as integer
     dim iExtensionCount as integer
+    dim iExitCounter as integer
+    dim iCurrentExtensionCount as integer : iCurrentExtensionCount = 0
+    dim iTry as integer
     
     ' This is the data we get from the configuration file
     dim cCurrentFileName as string
@@ -78,6 +79,7 @@ testcase tExtensionPublisher
     dim cConfigArray( 60 ) as string
     
     dim cTestString as string
+    dim bInstallationComplete as boolean : bInstallationComplete = false
     
     iExtensionCount = hGetExtensionCount()
     
@@ -85,6 +87,9 @@ testcase tExtensionPublisher
     hGetDataFileSection( cInfoFile, cConfigArray(), "info", "", "" )
     iFileCount = int( hGetValueForKeyAsString( cConfigArray() , "filecount" ) )
     printlog( cInfoFile & " specifies " & iFileCount & " documents to load" )
+    
+    iExtensionCount = iExtensionCount + iFileCount
+    printlog( "Expected number of extensions after installation: " & iExtensionCount )
 
     printlog( "Installing extensions" )
     for iCurrentFile = 1 to iFileCount
@@ -93,41 +98,51 @@ testcase tExtensionPublisher
         cCurrentFileName = hGetValueForKeyAsString( cConfigArray() , "file" )
         cCurrentFileName = cBasePath & cCurrentFileName
         sExtensionCLI( "add" , cCurrentFileName )
-        WaitSlot( 5000 )
+        wait 1000 ' This is required, sExtensionCLI is asynchronous.
         
     next iCurrentFile
-    printlog( "Finished installing extensions" )
-
+    printlog( "Finished installing extensions, now verifying..." )
+    
+    hNewDocument()
+    ToolsPackageManager
+   
     kontext "PackageManager"
-    if ( not PackageManager.exists() ) then
-        ToolsPackageManager
-        kontext "PackageManager"
-        if ( PackageManager.exists( 2 ) ) then
-            printlog( "Extension Manager UI has been opened" )
-        else
-            warnlog( "Failed to open Extension Manager UI" )
+    if ( PackageManager.exists( 3 ) ) then
+    
+        for iTry = 1 to 30 
+        
+            iCurrentExtensionCount = BrowsePackages.getItemCount()
+            
+            if ( iCurrentExtensionCount = iExtensionCount ) then
+                printlog( "All extensions have been installed, good." )
+                bInstallationComplete = true
+                exit for
+            endif
+            
+            printlog( "Waiting for listbox: Number of extensions: " & iCurrentExtensionCount )
+            
+        next iTry
+        
+        ' If one or more extensions have not been added to the list we better abort the
+        ' test as the remaining parts need all extensions to be installed causing
+        ' lots of cryptig errors to appear in the log.
+        if ( not bInstallationComplete ) then
+            warnlog( "Not all extensions have been installed. Aborting test." )
+            kontext "PackageManager" 
+            if ( PackageManager.exists() ) then
+                PackageManager.cancel()
+                PackageManager.notExists( 2 ) 
+            endif
             goto endsub
         endif
     else
-        warnlog( "#i84786# Unopkg processes block UI" )
+        warnlog( "The Extension Manager did not open, Aborting test" )
         goto endsub
     endif
+            
     
-    iExitCounter = 0
-    kontext "PackageManager"
-    WaitSlot()
-    do while ( BrowsePackages.getItemCount() < ( iExtensionCount + iFileCount ) )
-        printlog( "Waiting for Extensions List to populate..." )
-        Wait( 1000 )
-        iExitCounter = iExitCounter + 1
-        if ( iExitCounter = 30 ) then
-            kontext "PackageManager"
-            PackageManager.cancel()
-            goto endsub
-        endif
-    loop
- 
     kontext "PackageManager"
+    printlog( "Going for the update-dialog" )
     if ( Updates.isEnabled() ) then
     
         printlog( "Updates-button is enabled" )
@@ -142,11 +157,14 @@ testcase tExtensionPublisher
                 wait( 1000 )
                 iExitCounter = iExitCounter + 1
                 if ( iExitCounter = 200 ) then 
-                    warnlog( "Update list for extensions is stalled (expected: 7), found: " & AvailableUpdatesList.getItemCount() )
+                    warnlog( "Update list for extensions is stalled (expected: 7), " & _
+                             "found: " & AvailableUpdatesList.getItemCount() )
                     kontext "ExtensionUpdate"
                     ExtensionUpdate.cancel()
+                    ExtensionUpdate.notExists( 2 )
                     kontext "PackageManager"
                     PackageManager.cancel()
+                    PackageManager.notExists( 2 )
                     goto endsub
                 endif
             loop
@@ -246,6 +264,7 @@ testcase tExtensionPublisher
 
             kontext "ExtensionUpdate"
             ExtensionUpdate.cancel()
+            ExtensionUpdate.notExists( 2 )
         else
             warnlog( "Extension Update dialog is not open" )
         endif
@@ -256,6 +275,7 @@ testcase tExtensionPublisher
     
     kontext "PackageManager"
     PackageManager.close()
+    PackageManager.notExists( 2 )
     
     printlog( "Removing extensions" )
     for iCurrentFile = 1 to iFileCount
@@ -264,6 +284,8 @@ testcase tExtensionPublisher
         sExtensionCLI( "remove" , cCurrentFileName )
     next iCurrentFile
     printlog( "Finished removing extensions" )
+    
+    hFileCloseAll()
 
 endcase
 
diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt
index ccc067cf2f09..870b4cc97a9a 100644
--- a/testautomation/extensions/optional/input/dependencies/version31.oxt
+++ b/testautomation/extensions/optional/input/dependencies/version31.oxt
diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt
index f4ba428cb2ce..5e37bbd64659 100755
--- a/testautomation/extensions/optional/input/files.txt
+++ b/testautomation/extensions/optional/input/files.txt
@@ -26,11 +26,11 @@ dependencies\version10000.oxt;1,0,0,0,0
 dependencies\version21ns.oxt;0,0,1,0,0
 dependencies\version21other.oxt;1,0,0,0,0
 dependencies\version25.oxt;0,0,1,0,0
-dependencies\version30b.oxt;0,0,1,0,0
+dependencies\version30.oxt;0,0,1,0,0
 dependencies\version300.oxt;0,0,1,0,0
 dependencies\version301.oxt;0,0,1,0,0
 dependencies\versionempty.oxt;0,0,1,0,0
-dependencies\version31b.oxt;1,0,0,0,0
+dependencies\version31.oxt;1,0,0,0,0
 dependencies\version937.oxt;1,0,0,0,0
 dependencies\versionnone.oxt;0,0,1,0,0
 versions/plain.oxt;0,0,1,0,0
diff --git a/testautomation/framework/optional/f_CJK_GridLayout.bas b/testautomation/framework/optional/f_CJK_GridLayout.bas
index fb33fa326802..d131afc451ba 100755
--- a/testautomation/framework/optional/f_CJK_GridLayout.bas
+++ b/testautomation/framework/optional/f_CJK_GridLayout.bas
@@ -60,17 +60,12 @@ sub main
 
        Call tGridDisplay_1            'Printgrid: The grid lines will be printed. (vice versa)
 
-       Call tUserDefineLayout_1       'Decrease characters per line will cause lines per page decrease accordingly
-
        Call tFontSizeChanges_1        'Change the font size to bigger enough will change the layout 
      
        Call tRubyText_1               'If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself.
 
        Call tIndentsTest_1            'Indents should work and always indenting as close as possible to their measurements by snapping to the appropriate grid cell. Tabs therefore will be ignored.
 
-       'Excluded until errors resolved by HLI.
-       'Call tObjectsTest_1            'If objects are anchored to text they will "wander" with its surrounding text. If they are anchored as character they will snap to the appropriate grid cell (since they are a character).
-    
     Call hStatusOut
 
     if sAsianLanguageFlag = "Off" Then  
@@ -81,16 +76,11 @@ sub main
 end sub
 
 sub LoadIncludeFiles
-
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    
     use "global\tools\includes\required\t_doc1.inc"
     use "global\tools\includes\required\t_tools1.inc"
-   
     use "framework\tools\includes\CJK_tools.inc"    
-
     gApplication   = "WRITER"
     Call GetUseFiles
-    
-End sub
+end sub
diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
index 13dac6822d0b..8e6f85afac01 100755
--- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
+++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
@@ -381,10 +381,6 @@ endcase
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest9
-
-    qaerrorlog( "#i105756# - Test case outdated, needs adjustments" )
-    goto endsub
-    
   call  hNewDocument
 
   Call CheckAsianLanguageSupport("On")
@@ -463,10 +459,6 @@ endcase
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest11
-
-    qaerrorlog( "#i105756# - Test case outdated, needs adjustments" )
-    goto endsub
-
  Dim iHopeNumber1 , iHopeNumber2 as Integer
  dim i as integer
  dim iCount as integer
diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc
index 19784c25883f..7126ca5b9031 100755
--- a/testautomation/framework/optional/includes/basic_package_export.inc
+++ b/testautomation/framework/optional/includes/basic_package_export.inc
@@ -45,7 +45,7 @@ testcase tBasicPackageExport
     const PACKAGE_NAME = "tBasicExport.oxt"
     const LIBRARY_NAME = "tBasicExport"
     const DOCUMENT_POSITION = 4
-    const PACKAGE_SIZE = 2000
+    const PACKAGE_SIZE = 1325
     
     dim cDocumentName as string
     dim cLibraryName as string
@@ -162,16 +162,17 @@ testcase tBasicPackageExport
             Export.click()
             
             kontext "ExportBasicLibraryDlg"
-            if ( ExportBasicLibraryDlg.exists( 1 ) ) then
-                printlog( "Select to export as package" )
+            if ( ExportBasicLibraryDlg.exists( 3 ) ) then
+                printlog( "Select to export as extension" )
                 ExportAsPackage.check()
                 ExportBasicLibraryDlg.ok()
                 
                 kontext "SpeichernDlg"
-                if ( SpeichernDlg.exists( 1 ) ) then
-                    printlog( "Save the file, automatic filename extension must be checked" )
-                    DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default
+                if ( SpeichernDlg.exists( 3 ) ) then
+                    printlog( "Save the file, suffix will be added automatically." )
+                    DateiName.setText( hGetWorkPath() & LIBRARY_NAME )
                     Speichern.click()
+                    Speichern.notExists( 1 )
                 else
                     warnlog( "Dialog <File Save> did not open" )
                 endif
@@ -182,6 +183,7 @@ testcase tBasicPackageExport
             kontext "TabBibliotheken"
             printlog( "Close libraires tabpage" )
             TabBibliotheken.cancel()
+            TabBibliotheken.notExists( 1 )
         else
             warnlog( "Dialog <TabBibliotheken> is not available" )
         endif
@@ -189,6 +191,7 @@ testcase tBasicPackageExport
         kontext "Makro"
         printlog( "Close BASIC organizer" )
         Makro.cancel()
+        Makro.notExists( 1 )
     else
         warnlog( "Dialog <Makro> did not open" )
     endif
@@ -197,6 +200,7 @@ testcase tBasicPackageExport
     hFileCloseAll()   
     
     printlog( "Verify automatic filename extension (dialog should append .oxt)" )
+    printlog( "Checking for file: " & cFile )
     if ( FileExists( cFile ) ) then
         printlog( "The test-package was saved with .oxt extension, good." )
         cPackageFileName = cFile
@@ -211,17 +215,11 @@ testcase tBasicPackageExport
     endif
     
     printlog( "Verify file size" )
-'    if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
-'        warnlog( "#i105719# - The exported test-package has an incorrect file size." )
-        if ( FileLen( cPackageFileName ) = 0 ) then
-            printlog( "File has zero bytes, it is empty." )
-        else
-            printlog( "Size is.: " & FileLen( cPackageFileName ) )
-            printlog( "Expected: " & PACKAGE_SIZE )
-        endif
-'    else
-'        printlog( "File has correct size" )
-'    endif
+    if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
+        warnlog( "#i105719# - The exported test-package has an incorrect file size." )
+    else
+        printlog( "File has correct size." )
+    endif
     
 endcase
 
diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc
index 69301789294c..8909045f288b 100755
--- a/testautomation/framework/optional/includes/w_grid_layout1.inc
+++ b/testautomation/framework/optional/includes/w_grid_layout1.inc
@@ -299,44 +299,6 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase tUserDefineLayout_1
-   Dim sLinesPerPage       , sCharsPerLine          as String
-   Dim sExpectLinesPerPage , sExpectLinesPerPage1   as String
-
-   sLinesPerPage  = "20"
-   sCharsPerLine  = "2"
-   sExpectLinesPerPage   = "2"
-   sExpectLinesPerPage1  = "3"
-
-  Call hNewDocument
-
-   FormatPageWriter
-   Kontext
-   if active.exists(5) then
-       Active.SetPage TabGrid
-   endif
-   Kontext "TabGrid"
-   CharsGrid.Check
-
-    LinesPerPage.SetText sLinesPerPage
-    Sleep 2
-    CharsPerLine.SetText sCharsPerLine
-    Sleep 2
-
-   'This step is no use, just let the LinesPerPage change the number
-    CharsGrid.Check
-
-    if LinesPerPage.GetText <> sExpectLinesPerPage AND LinesPerPage.GetText <> sExpectLinesPerPage1 then
-         Warnlog "The lines per page should be"  + sExpectLinesPerPage + " OR " + sExpectLinesPerPage1 +" but get " +LinesPerPage.GetText
-    end if
-
-   TabGrid.Cancel
-
-  Call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
 testcase tFontSizeChanges_1
     Dim testFile      , sCorrectResult as String
     Dim sLinesPerPage , sCharsPerLine  as String
@@ -488,51 +450,3 @@ testcase tIndentsTest_1
 endcase
 
 '-------------------------------------------------------------------------
-
-testcase tObjectsTest_1
-   Dim testFile , sCorrectPage1 , sCorrectPage2 as String
-
-   testFile       = "objectsTest.sxw"
-   sCorrectPage1  = "1"
-   sCorrectPage2  = "2"
-
-   Call hNewDocument
-
-   Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-
-    fStartupNavigator( "OLEObject" , 1 )
-    Sleep 1
-    Auswahlliste.TypeKeys "<Return>"
-    Sleep 1
-    fCloseNavigator
-    Sleep 2
-
-    Kontext
-    FormatAnchorAsCharacter
-    Sleep 1
-
-    ViewNavigator
-     Kontext "NavigatorWriter"
-     Seitennummer.SetText   sCorrectPage2
-     Sleep 5
-     if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!"
-    fCloseNavigator
-
-    fStartupNavigator( "OLEObject" , 1 )
-    Auswahlliste.TypeKeys "<Return>"
-    fCloseNavigator
-
-    Kontext
-    FormatAnchorToCharacter
-
-    ViewNavigator
-     Kontext "NavigatorWriter"
-     Seitennummer.SetText   sCorrectPage2
-     Sleep 5
-     if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!"
-    fCloseNavigator
-   Kontext
-
-   Call hCloseDocument
-endcase
-
diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index a661ed5cfa7d..0b278ed80d60 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -39,7 +39,6 @@
 
 
 sub main
-
     ' Disable sleep() calls. If you encounter unexpected test interruptions
     ' you should try to outcomment this or set the value to FALSE.
     GLOBAL_USE_NEW_SLEEP = TRUE
@@ -58,22 +57,14 @@ sub main
     
     gApplication = "WRITER"
     call tToolsOptionsTestFirst
-    call tToolsOptionsImprovementProgram
     call tDatabaseCheck
     call tHelpRegistration
     call hStatusOut   
-    
 end sub
 
-'*******************************************************************************
-
 sub LoadIncludeFiles
-
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    
-    use "global\required\includes\g_option.inc"
-    
     use "global\tools\includes\optional\t_ui_filters.inc"
     use "global\tools\includes\optional\t_filetools.inc"
     use "global\tools\includes\optional\t_docfuncs.inc"
@@ -81,8 +72,5 @@ sub LoadIncludeFiles
 
     gApplication = "WRITER"
     call GetUseFiles()
-    
 end sub
 
-'-------------------------------------------------------------------------
-
diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc
index 6749601393ad..90b74049344c 100755
--- a/testautomation/framework/required/includes/wizard_documentconverter.inc
+++ b/testautomation/framework/required/includes/wizard_documentconverter.inc
@@ -46,7 +46,6 @@ testcase tUpdtWizardDocumentConverter
     dim iDialog as integer
     dim iDocumentType as integer
     dim iWait as integer
-    dim sKeys as string
     dim sSourcePathWriter as string
         sSourcePathWriter = gTesttoolpath & "framework\required\input\document_converter\"
         sSourcePathWriter = convertpath( sSourcePathWriter )
@@ -132,12 +131,14 @@ testcase tUpdtWizardDocumentConverter
     Kontext "DocumentConverter"
     printlog( "Page 7" )
     
-    sKeys = hGetAccel( "DocumentConverter_ShowLog" )
     qaerrorlog( "#i54265# Show Logfile button has no HID, using accelerator instead" )
     
     iWait = 0
     do while ( DocumentConverter.exists() )
-        DocumentConverter.TypeKeys( sKeys )
+        try
+            ContinueButton.click()
+        catch
+        endcatch
         Wait( 1 )
         iWait = iWait + 1
         if ( iWait = 20000 ) then
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 515f37a83215..d590016bc8ba 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -699,6 +699,12 @@ testcase tToolsOptionsImprovementProgram
 
     printlog( "Update test for the tools/options dialog of the OOo Improvement Program" )
 
+    if (gOOO AND NOT gOOoImprovementIsEnabled) then
+        'In StarOffice this test should always work - but on OOo contributet builds the function is not available - only on OOo builds provided by Sun Microsystems
+        qaErrorlog ("This build does not participate in the OOo Improvement Program - test exit")
+        goto endsub
+    endif
+
     dim cLogFile as string
         cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
         cLogFile = convertpath( cLogFile )
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index b8895c7fa637..718a7cf066cc 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -335,6 +335,13 @@ end sub
 sub FirstOfficeStart
 '/// First start-routine.
     Dim i as integer
+    ' To nail down a possible culprint on test runs, the availability of existing user settings is checked.
+    ' In some environments the deleting of the settings might fail before the test is started - this will log it:
+    if (fileExists(gOfficePath)) then
+        qaErrorLog ("QA_DEBUG: User settings directory was not deleted before test start!: '" + gOfficePath + "'")
+    else
+        printlog ("QA_DEBUG: User settings directory is unavailable before soffice is started - this is good. '" + gOfficePath + "'")
+    endif
     caselog ""                   '///+<ul><li>Stop the first default-output into the resultfile</li>
     Call hStartTheOffice         '///+<li>Start the office</li>
     ResetApplication             '///+<li>Make the first recovering without an error output.</li></ul>
diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc
index f1bc0f538722..e85c321e2b7b 100755
--- a/testautomation/global/tools/includes/required/t_doc1.inc
+++ b/testautomation/global/tools/includes/required/t_doc1.inc
@@ -189,6 +189,7 @@ sub hNewDocument ( optional bANewDoc )
     case else             : WarnLog "hNewDocument: No Applikation named '" + gApplication + "' exists in this routine!"
     end select
     Sleep 2
+
 end sub
 '
 '-------------------------------------------------------------------------------
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index db3205e58de0..ffcc0d4045df 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -64,7 +64,7 @@ function hGrafikEinfuegen  ( Grafik$ ) as Boolean
     if ( GrafikEinfuegenDlg.exists( 2 ) ) then
 
         Vorschau.Uncheck
-        if gApplication <> "HTML" AND gApplication <> "HTML" then
+        if gApplication <> "HTML" then
             Verknuepfen.UnCheck
         end if
 
@@ -87,13 +87,15 @@ function hGrafikEinfuegen  ( Grafik$ ) as Boolean
             Kontext "GrafikEinfuegenDlg"
             if GrafikEinfuegenDlg.Exists then
                 GrafikEinfuegenDlg.Cancel
+                GarfikEinfuegenDlg.notExists( 4 )
             endif
         else
             hGrafikEinfuegen = IsImageLoaded
         end if
     else
-        'GrafikEinfuegeDlg not open
+        warnlog( "Insert graphics dialog not open" )
     endif
+    
 end function
 '
 '-------------------------------------------------------------------------------
diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win
index b353eb0622a5..dfb4686ad750 100755
--- a/testautomation/global/win/dial_a_c.win
+++ b/testautomation/global/win/dial_a_c.win
@@ -1,8 +1,8 @@
 *Aehnlichkeitssuche HID_SEARCHSIMILARITY
-ZeichenHinzufuegen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER
-ZeichenTauschen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER
-Kombinieren svx:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX
-ZeichenEntfernen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER
+ZeichenHinzufuegen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER
+ZeichenTauschen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER
+Kombinieren cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX
+ZeichenEntfernen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER
 
 *Aenderungenanzeigen FID_CHG_ACCEPT
 TabControl HID_REDLINING_TABCONTROL
@@ -54,10 +54,10 @@ Abspielen sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY
 LetztesBild sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST
 
 *AppletEinfuegen SID_INSERT_APPLET
-Klasse svx:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE
-ClassLocation svx:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION
-Suchen svx:PUSHBUTTON:MD_INSERT_OBJECT_APPLET:BTN_CLASS
-Optionen svx:MULTILINEEDIT:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS
+Klasse cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE
+ClassLocation cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION
+Suchen cui:PUSHBUTTON:MD_INSERT_OBJECT_APPLET:BTN_CLASS
+Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS
 
 *AsciiFilterOptionen HID_ASCII_FILTER
 Zeichensatz sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET
@@ -158,36 +158,36 @@ Minimieren32 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2
 NewStyle3 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW
 
 *Bemassung HID_PAGE_MEASURE
-Liniendistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
-HLUeberhang svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
-HLDistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
-LinkeHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
-RechteHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
-AnzeigeUnterhalb svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
-AnzeigeParallel svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
-MetrikAnzeigen svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
-MetrikList svx:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT
+Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
+HLUeberhang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
+HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
+LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
+RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
+AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
+AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
+MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
+MetrikList cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT
 Textposition HID_MEASURE_CTL_POSITION
-AutomatischVertikal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
-AutomatischHorizontal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
+AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
+AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
 Preview HID_MEASURE_CTL_PREVIEW
-DecimalPlaces svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES
+DecimalPlaces cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES
 
 *BenutzerwoerterbuchAnlegen HID_OPTIONS_DICT_NEW
-WoerterbuchName svx:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME
-Sprache svx:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG
-Ausnahme svx:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT
+WoerterbuchName cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME
+Sprache cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG
+Ausnahme cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT
 
 *BenutzerwoerterbuchBearbeiten HID_OPTIONS_DICT_EDIT
-Buch svx:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS
-Sprache svx:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG
-Inhalt svx:Edit:RID_SFXDLG_EDITDICT:ED_WORD
-Wort   svx:Edit:RID_SFXDLG_EDITDICT:ED_WORD
-Aufnehmen svx:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
-Neu       svx:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
-Entfernen svx:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
-Loeschen  svx:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
-ReplaceBy svx:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE
+Buch cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS
+Sprache cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG
+Inhalt cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD
+Wort   cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD
+Aufnehmen cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
+Neu       cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
+Entfernen cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
+Loeschen  cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
+ReplaceBy cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE
 WordList HID_OPTIONS_DICT_EDIT_ENTRIES_LIST
 
 *BenutzerverzeichnisDefinieren HID_DLG_NEW_USER_IDX
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 0d64547f5e0a..2917c20d27d6 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -20,9 +20,9 @@ HideItems HID_SC_DPSUBT_HIDE
 Hierarchy sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY
 
 *DateienAuswaehlen HID_FILEDLG_MAILMRGE2
-Hinzufuegen svx:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
-Loeschen svx:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
-Pfade svx:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH
+Hinzufuegen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
+Loeschen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
+Pfade cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH
 
 *Datenpilot SID_OPENDLG_PIVOTTABLE
 Zusaetze sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE
@@ -253,14 +253,14 @@ PopuplisteRechts sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP
 AddressBook sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE
 
 *EinfuegenSpalten FN_TABLE_INSERT_COL_DLG
-Anzahl svx:NumericField:DLG_INS_ROW_COL:ED_COUNT
-Davor svx:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
-Dahinter svx:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
+Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT
+Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
+Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
 
 *EinfuegenZeilen FN_TABLE_INSERT_ROW_DLG
-Anzahl svx:NumericField:DLG_INS_ROW_COL:ED_COUNT
-Davor svx:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
-Dahinter svx:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
+Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT
+Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
+Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
 
 *EbeneEinfuegenDlg SID_INSERTLAYER
 EbenenName sd:Edit:DLG_INSERT_LAYER:EDT_NAME
@@ -326,7 +326,7 @@ Kennwort sc:Edit:RID_SCDLG_DAPISERVICE:ED_PASSWD
 
 *ExtrasOptionenDlg HID_OFADLG_OPTIONS_TREE
 Optionsliste HID_OFADLG_TREELISTBOX
-Zurueck svx:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK
+Zurueck cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK
 
 *FeldAuswahl HID_FIELD_SEL_WIN
 Liste HID_FIELD_SEL
diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win
index 78f203f1ffc5..629da180900d 100755
--- a/testautomation/global/win/dial_i_o.win
+++ b/testautomation/global/win/dial_i_o.win
@@ -23,12 +23,12 @@ Dokument HID_IMAPDLG_GRAPHWND
 Adresse SID_OPENURL
 BearbeitenText svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT
 
-*ImageMapHyperlink svx:ModalDialog:RID_SVXDLG_IMAPURL
-URL svx:Edit:RID_SVXDLG_IMAPURL:EDT_URL
-Alternativetext svx:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION
-Frame svx:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS
-Name svx:Edit:RID_SVXDLG_IMAPURL:EDT_NAME
-Description svx:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION
+*ImageMapHyperlink cui:ModalDialog:RID_SVXDLG_IMAPURL
+URL cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL
+Alternativetext cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION
+Frame cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS
+Name cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME
+Description cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION
 
 *IndividuellePraesentation SID_CUSTOMSHOW_DLG
 Neu SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_NEW
@@ -59,11 +59,11 @@ Namen3 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3
 Namen4 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4
 
 *InhaltEinfuegen HID_PASTE_DLG
-AlsSymbol svx:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON
-AndersSymbol svx:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON
-VerknuepfungMit svx:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK
-Auswahl svx:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST
-EinfuegenAls svx:RadioButton:MD_PASTE_OBJECT:RB_PASTE
+AlsSymbol cui:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON
+AndersSymbol cui:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON
+VerknuepfungMit cui:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK
+Auswahl cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST
+EinfuegenAls cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE
 
 *InhalteEinfuegenCalc FID_INS_CELL_CONTENTS
 AllesEinfuegen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL
@@ -154,8 +154,8 @@ Toleranz svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE
 Auswahl HID_POPUP_LINEEND_CTRL
 
 *Linienstil HID_DLG_MESSBOX
-Aendern svx:PushButton:RID_SVXDLG_MESSBOX:BTN_1
-Hinzufuegen svx:PushButton:RID_SVXDLG_MESSBOX:BTN_2
+Aendern cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1
+Hinzufuegen cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2
 
 *LinksFuellen FID_FILL_TO_LEFT
 
@@ -226,26 +226,26 @@ Beschreibung basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR
 HilfeIdentifikation basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID
 HilfeDateiname basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME
 
-*MakroZuweisen svx:TabPage:RID_SVXPAGE_EVENTASSIGN
+*MakroZuweisen cui:TabPage:RID_SVXPAGE_EVENTASSIGN
 Ereignis HID_MACRO_LB_EVENT
 Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP
 Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS
-Zuweisen svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
-Aufheben svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
-Scripttyp svx:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
+Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
+Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
+Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
 
 *Massstab SID_ATTR_ZOOM
-Optimal svx:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL
-GanzeSeite svx:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE
-Seitenbreite svx:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH
-Vergroesserung100 svx:RadioButton:RID_SVXDLG_ZOOM:BTN_100
-VergroesserungStufenlos svx:RadioButton:RID_SVXDLG_ZOOM:BTN_USER
-Stufenlos svx:MetricField:RID_SVXDLG_ZOOM:ED_USER
-Automatic svx:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC
-Singlepage svx:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE
-Columns svx:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS
-Columnsfield svx:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS
-Bookmode svx:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK
+Optimal cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL
+GanzeSeite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE
+Seitenbreite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH
+Vergroesserung100 cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100
+VergroesserungStufenlos cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER
+Stufenlos cui:MetricField:RID_SVXDLG_ZOOM:ED_USER
+Automatic cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC
+Singlepage cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE
+Columns cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS
+Columnsfield cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS
+Bookmode cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK
 
 *MassstabSeitenansicht HID_PPREV_ZOOM
 Spalten sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL
@@ -266,24 +266,24 @@ Breite GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX
 Hoehe GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY
 
 *ModuleBearbeiten HID_EDIT_MODULES
-Sprache svx:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE
+Sprache cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE
 Module HID_CLB_EDIT_MODULES_MODULES
-PrioPLus svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP
-PrioMinus svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN
-Zurueck svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK
+PrioPLus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP
+PrioMinus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN
+Zurueck cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK
 Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS
 
 *DescriptionObject   HID_DLG_OBJECT_TITLE_DESC
-DescriptionTitle svx:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE
-DescriptionText svx:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC
+DescriptionTitle cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE
+DescriptionText cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC
 
 *NameDlg HID_DLG_NAME
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
 
 +LinieName NameDlg
 
 *NameDlgObject HID_DLG_OBJECT_NAME
-NameField svx:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME
+NameField cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME
 
 +NameDlgGroup NameDlg
 NameField HID_FORMAT_NAME_OBJECT_NAME
@@ -420,10 +420,10 @@ Y sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y
 Modulname basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME
 
 *NotizBearbeiten SID_POSTIT
-Texteingabe svx:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sw:MultiLineEdit:DLG_POSTIT:ED_EDIT
-Autor svx:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sw:PushButton:DLG_POSTIT:BTN_AUTHOR
-Vor SVX:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT
-Zurueck SVX:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV
+Texteingabe cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sw:MultiLineEdit:DLG_POSTIT:ED_EDIT
+Autor cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sw:PushButton:DLG_POSTIT:BTN_AUTHOR
+Vor cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT
+Zurueck cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV
 
 *NummernkreisOptionen HID_DLG_SEQUENCE_OPTION
 Ebene sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL
@@ -432,7 +432,7 @@ Trenner sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR
 +NotizEinfuegen NotizBearbeiten
 
 +NotizEinfuegenCalc NotizBearbeiten
-Text svx:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT
+Text cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT
 
 *ObenFuellen FID_FILL_TO_TOP
 
@@ -445,11 +445,11 @@ ObjektListe HID_BASICIDE_OBJECTCAT
 Objektname sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME
 
 *OLEObjektEinfuegen SID_INSERT_OBJECT
-NeuErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
-AusDateiErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
-Objekttyp svx:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
-OleDatei svx:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
-Verknuepfen svx:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
-Durchsuchen svx:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
+NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
+AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
+Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
+OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
+Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
+Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
 
 +OptionenDlg ExtrasOptionenDlg
diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win
index 9db53f313aaf..30e5ae62e6e4 100755
--- a/testautomation/global/win/dial_p_s.win
+++ b/testautomation/global/win/dial_p_s.win
@@ -21,8 +21,8 @@ Ascii goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII
 
 *PfadeAuswaehlen HID_MULTIPATH
 Pfade HID_OPTIONS_MULTIPATH_LIST
-Hinzufuegen SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
-Loeschen SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
+Hinzufuegen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
+Loeschen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
 
 *PGMOptionen goodies:ModalDialog:DLG_EXPORT_EPGM
 Binaer goodies:RadioButton:DLG_EXPORT_EPGM:RB_RAW
@@ -71,9 +71,9 @@ RegularExpression sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP
 NoDuplication sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE
 
 *PlugInEinfuegen SID_INSERT_PLUGIN
-DateiUrl svx:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL
-Durchsuchen svx:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL
-Optionen svx:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS
+DateiUrl cui:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL
+Durchsuchen cui:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL
+Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS
 
 *PNGOptionen svtools:ModalDialog:DLG_EXPORT_EPNG
 Kompression svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION
@@ -83,8 +83,8 @@ Interlaced svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED
 Binaer goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW
 Ascii goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII
 
-*ProxyWarnung svx:ModalDialog:RID_OFADLG_OPTIONS_TREE_HINT
-NichtMehrAnzeigen svx:CheckBox:RID_OFADLG_OPTIONS_TREE_HINT:CB_DISABLE
+*ProxyWarnung cui:ModalDialog:RID_OFADLG_OPTIONS_TREE_HINT
+NichtMehrAnzeigen cui:CheckBox:RID_OFADLG_OPTIONS_TREE_HINT:CB_DISABLE
 
 *QuelleAuswaehlen HID_DATAPILOT_TYPE
 AktuelleSelektion sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION
@@ -93,12 +93,11 @@ ExterneQuelle sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL
 
 *Rechtschreibung HID_SPELLCHECK
 Original HID_SPELLDLG_SETWORD
-Wort HID_SPLDLG_EDIT_NEWWORD
 Ersetzen HID_SPLDLG_BUTTON_CHANGE
 AlleErsetzen HID_SPLDLG_BUTTON_CHANGEALL
 Ignorieren HID_SPLDLG_BUTTON_IGNORE
 AlleIgnorieren HID_SPLDLG_BUTTON_IGNOREALL
-Sprache svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
+Sprache cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
 RechtschreibungSchliessen HID_SPLDLG_BUTTON_CLOSE
 
 *Redlining HID_REDLINE_ACCEPT
@@ -112,11 +111,11 @@ Ablehnen HID_REDLINING_VIEW_PB_REJECT
 AlleAblehnen HID_REDLINING_VIEW_PB_REJECTALL
 Undo HID_REDLINING_VIEW_PB_UNDO
 
-TabFilter HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE
-Datum HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE
-DatumListe HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE
-Datum1 HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE
-Zeit1 HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE
+TabFilter HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE
+Datum HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE
+DatumListe HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE
+Datum1 HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE
+Zeit1 HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE
 Aktuell1 HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK
 Datum2 HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2
 Zeit2 HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2
@@ -126,8 +125,6 @@ AutoListe HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AU
 Bereich HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE
 BereichText HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE
 Button HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF
-'Aktion HID_REDLINING_FILTER_CB_RANGE
-'Aktionsliste HID_REDLINING_FILTER_LB_ACTION
 Aktion HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION
 Aktionsliste HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION
 Comment HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT
@@ -245,18 +242,18 @@ Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE
 Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE
 
 *SilbentrennungOptionen HID_LNGDLG_NUM_PREBREAK
-ZeichenVorUmbruch svx:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK
+ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK
 
 *Sonderzeichen SID_CHARMAP
-Schrift svx:ListBox:RID_SVXDLG_CHARMAP:LB_FONT
+Schrift cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT
 SchriftListe HID_CHARMAP_CTL_SHOWSET
-Loeschen svx:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE
+Loeschen cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE
 Zeichenanzeige HID_CHARMAP_CTL_SHOWCHAR
 Textanzeige HID_CHARMAP_CTL_SHOWTEXT
-Subset svx:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET
+Subset cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET
 
-*SonstigesJavaabschaltung  svx:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
-NichtMehrAnzeigen svx:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE
+*SonstigesJavaabschaltung  cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
+NichtMehrAnzeigen cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE
 
 *Sortieren FN_SORTING_DLG
 Schluessel1 sw:CheckBox:DLG_SORTING:CB_KEY1
diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win
index 6016206baeed..5c52f92c1de4 100755
--- a/testautomation/global/win/dial_t_z.win
+++ b/testautomation/global/win/dial_t_z.win
@@ -191,24 +191,24 @@ URL sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL
 URLText sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL
 
 *Verbinder HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION
-Linie1 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
-Linie2 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
-Linie3 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
-Typ SVX:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE
-AnfangHorizontal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
-AnfangVertikal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
-EndeHorizontal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
-EndeVertikal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
+Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
+Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
+Linie3 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
+Typ cui:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE
+AnfangHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
+AnfangVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
+EndeHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
+EndeVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
 Vorschau HID_PAGE_CONNECTION_CTL_PREVIEW
 
-*VerknuepfungenBearbeiten svx:ModalDialog:MD_UPDATE_BASELINKS
+*VerknuepfungenBearbeiten cui:ModalDialog:MD_UPDATE_BASELINKS
 Liste HID_LINKDLG_TABLB
-VerknuepfungBearbeiten svx:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE
-Automatisch svx:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC
-Manuell svx:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL
-Aktualisieren svx:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW
-Aendern svx:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE
-Loesen svx:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK
+VerknuepfungBearbeiten cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE
+Automatisch cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC
+Manuell cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL
+Aktualisieren cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW
+Aendern cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE
+Loesen cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK
 
 *VersendenMonitor HID_MERGE_PRINTMONITOR
 
@@ -225,51 +225,16 @@ Kommentar SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS
 Schliessen SFX2:PUSHBUTTON:DLG_COMMENTS:PB_CLOSE
 
 *VerteilenDlg HID_PAGE_DISTRIBUTE
-KeineHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE
-Links svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT
-MitteHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER
-AbstandHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE
-Rechts svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT
-KeineVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE
-Oben svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP
-MitteVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER
-AbstandVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE
-Unten svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM
-
-
-' *VerzeichnisformBearbeitenStichwort HID_FORMEDT_INDEX
-' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY
-' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY
-' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY
-' Tab sw:PushButton:DLG_FORMEDT:BT_TAB
-' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE
-' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL
-' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY
-' Standard sw:PushButton:DLG_FORMEDT:BT_STD
-' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN
-
-' *VerzeichnisformBearbeitenBenutzer HID_FORMEDT_USER
-' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY
-' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY
-' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY
-' Tab sw:PushButton:DLG_FORMEDT:BT_TAB
-' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE
-' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL
-' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY
-' Standard sw:PushButton:DLG_FORMEDT:BT_STD
-' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN
-
-' *VerzeichnisformBearbeitenInhalt HID_FORMEDT_CONTENT
-' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY
-' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY
-' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY
-' Tab sw:PushButton:DLG_FORMEDT:BT_TAB
-' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE
-' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL
-' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY
-' Standard sw:PushButton:DLG_FORMEDT:BT_STD
-' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN
-' Hyperlink sw:PushButton:DLG_FORMEDT:BT_JUMP
+KeineHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE
+Links cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT
+MitteHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER
+AbstandHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE
+Rechts cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT
+KeineVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE
+Oben cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP
+MitteVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER
+AbstandVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE
+Unten cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM
 
 *VerzeichniseintragEinfuegen FN_INSERT_IDX_ENTRY_DLG
 EintragOk HID_INSERT_IDX_MRK_OK
@@ -301,9 +266,6 @@ Vorheriger HID_INSERT_IDX_MRK_PREV
 *VorlageErzeugen SID_STYLE_NEW_BY_EXAMPLE SID_TEMPLATE_NEW_BY_EXAMPLE
 Vorlagenname sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL
 
-' *VorlagenAuswaehlen HID_SEL_TEMPLATE
-' Vorlagenliste SW:LISTBOX:DLG_SEL_TEMPLATE:LB_TEMPLATES
-
 *Vorlagenkatalog SID_STYLE_CATALOG
 Vorlagen sfx2:ListBox:RID_STYLECATALOG:BT_TOOL
 Ansicht HID_TEMPLATE_FMT
@@ -334,17 +296,17 @@ Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC
 Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC
 
 *Zahlenformat HID_NUMBERFORMAT
-Kategorie svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
+Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
 KategorieFormat HID_NUMBERFORMAT_LB_FORMAT
 'FormatZahl
-FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
+FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
 Hinzufuegen HID_NUMBERFORMAT_TBI_ADD
 Entfernen HID_NUMBERFORMAT_TBI_REMOVE
-Sprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
-Nachkommastellen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
-FuehrendeNullen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
-NegativInRot svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
-Tausenderpunkt svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
+Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
+Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
+FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
+NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
+Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
 
 *ZeileAusblenden FID_ROW_HIDE
 
@@ -377,11 +339,11 @@ GanzeSpalten sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS
 Hoehe sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT
 Dynamisch sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT
 
-*ZellenTeilen svx:ModalDialog:RID_SVX_SPLITCELLDLG
-Anzahl svx:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT
-Horizontal svx:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ
-Vertikal svx:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT
-GleichmaessigTeilen svx:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP
+*ZellenTeilen cui:ModalDialog:RID_SVX_SPLITCELLDLG
+Anzahl cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT
+Horizontal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ
+Vertikal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT
+GleichmaessigTeilen cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP
 
 *ZielImDokument HID_HYPERLINK_MARKWND
 'Uebernehmen Kein Eintrag in Hid.Lst
@@ -395,4 +357,4 @@ VariableZelle sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL
 Vorgaben2 sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL
 
 *Zusammenfassen SID_AUTOFORMAT
-Mindestgroesse svx:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN
+Mindestgroesse cui:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN
diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win
index aad530cf36e3..a062d5db9cf0 100755
--- a/testautomation/global/win/edia_a_c.win
+++ b/testautomation/global/win/edia_a_c.win
@@ -66,7 +66,7 @@ CheckRequiredFields HID_DSADMIN_CHECK_REQUIRED_FIELDS
 
 
 *Aging SID_GRFFILTER_SEPIA
-AgingDegree svx:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA
+AgingDegree cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA
 
 *AlienWarning HID_WARNING_ALIENFORMAT
 DoNotShowAgain sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF
@@ -78,14 +78,14 @@ ReplaceExistingLibraries basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL
 
 *ApplyGallery HID_GALLERY_APPLY
 
-*AssingComponent svx:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT
-ComponentMethodName svx:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD
+*AssingComponent cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT
+ComponentMethodName cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD
 
-*AssignMacro svx:TabPage:RID_SVXPAGE_MACROASSIGN
+*AssignMacro cui:TabPage:RID_SVXPAGE_MACROASSIGN
 EventListBox   HID_SVX_MACRO_LB_EVENT
-AssignButton  svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN
-Component svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT
-RemoveButton   svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE
+AssignButton  cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN
+Component cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT
+RemoveButton   cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE
 
 *AutopilotAgenda HID_AGWIZ
 ItemScrollbar HID_AGWIZ_5_SCROLL_BAR
@@ -340,7 +340,7 @@ Pass basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS
 *CellWarning HID_SC_REPLCELLSWARN
 
 *ChangeIcon HID_SVX_CONFIG_ICON_SELECTOR
-Import svx:PushButton:MD_ICONSELECTOR:BTN_IMPORT
+Import cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT
 
 *ChangePassword HID_DLG_PASSWORD
 OldPassword dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD
@@ -468,11 +468,11 @@ MoveUp sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_UP
 MoveDown sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DOWN
 
 *CustomizeMenuName HID_SVX_CONFIG_NAME_SUBMENU
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
 
 *CustomizeMenuReName HID_SVX_CONFIG_RENAME_MENU_ITEM
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
 
 *CustomizeToolbarsReName HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
 
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index ea63881d097d..de1b69ab4429 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -53,10 +53,10 @@ MySQLHostName       HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER
 MySQLPort           HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT
 AdoURL              HID_PAGE_DBWIZARD_ADO_ET_ADOURL
 
-*CreateDatabaseLink svx:ModalDialog:DLG_DOCUMENTLINK
+*CreateDatabaseLink cui:ModalDialog:DLG_DOCUMENTLINK
 DatabaseFile SID_OPENURL
-Browse svx:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE
-RegisteredName svx:Edit:DLG_DOCUMENTLINK:ET_NAME
+Browse cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE
+RegisteredName cui:Edit:DLG_DOCUMENTLINK:ET_NAME
 
 *DigitalSignature HID_XMLSEC_DLG_DIGSIG
 ViewCertificate xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT
@@ -225,11 +225,11 @@ IndexFields HID_DLGINDEX_INDEXDETAILS_FIELD
 DatabaseIndexesClose dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE
 
 *RecordSearch HID_FM_DLG_SEARCH
-SearchForText svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT
-SearchForNull svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL
-SearchForNotNull svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL
+SearchForText cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT
+SearchForNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL
+SearchForNotNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL
 SearchText HID_SEARCH_TEXT
-Formular svx:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM
+Formular cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM
 AllFields HID_SEARCH_ALLFIELDS
 FieldSelection HID_SEARCH_FIELDSELECTION
 Position HID_SEARCH_POSITION
@@ -427,18 +427,18 @@ Title HID_GALLERY_TITLE_EDIT
 *HangulHanjaConversion HID_DIALOG_HANGULHANJA
 Original HID_SPELLDLG_SETWORD
 Word HID_HANGULDLG_EDIT_NEWWORD
-Find svx:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND
+Find cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND
 Suggestions HID_HANGULDLG_SUGGESTIONS_LIST
-HangulAndHanja svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION
-HanjaHangul svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED
-HangulHanja  svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED
-HanjaAsRubyAbove  svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE
-HanjaAsRubyBelow  svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW
-HangulAsRubyAbove  svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE
-HangulAsRubyBelow  svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW
-HangulOnly   svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY
-HanjaOnly   svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY
-ReplaceByCharacter   svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER
+HangulAndHanja cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION
+HanjaHangul cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED
+HangulHanja  cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED
+HanjaAsRubyAbove  cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE
+HanjaAsRubyBelow  cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW
+HangulAsRubyAbove  cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE
+HangulAsRubyBelow  cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW
+HangulOnly   cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY
+HanjaOnly   cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY
+ReplaceByCharacter   cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER
 Ignore HID_HANGULDLG_BUTTON_IGNORE
 AlwaysIgnore HID_HANGULDLG_BUTTON_IGNOREALL
 Replace HID_HANGULDLG_BUTTON_CHANGE
@@ -447,23 +447,23 @@ Options HID_HANGULDLG_BUTTON_OPTIONS
 Grid HID_HANGULDLG_SUGGESTIONS_GRID
 
 *HangulHanjaOptions HID_HANGULHANJA_OPT_DLG
-NewDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW
-EditDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT
-DeleteDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE
+NewDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW
+EditDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT
+DeleteDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE
 UserDefineDictionary HID_HANGULHANJA_OPT_DICTS_LB
-IgnorePostPositionalWord svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST
-ShowEntries svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST
-ReplaceUniqueEntries svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE
+IgnorePostPositionalWord cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST
+ShowEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST
+ReplaceUniqueEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE
 
 *HangulHanjaNewDictionary HID_HANGULHANJA_NEWDICT_DLG
-DictionaryName svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME
+DictionaryName cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME
 
 *HangulHanjaEditDictionary HID_HANGULHANJA_EDIT_DLG
-Book svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK
-Original svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL
-Suggestion1 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1
-Suggestion2 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2
-Suggestion3 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3
-Suggestion4 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4
-NewEntry svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW
-DeleteEntry svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE
+Book cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK
+Original cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL
+Suggestion1 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1
+Suggestion2 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2
+Suggestion3 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3
+Suggestion4 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4
+NewEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW
+DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE
diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win
index 569012019ec0..17e3e286f237 100755
--- a/testautomation/global/win/edia_i_o.win
+++ b/testautomation/global/win/edia_i_o.win
@@ -134,16 +134,16 @@ ConstantValueMinus     HID_SCH_STATISTIK_MINUS_VALUE
 ErrorIndicator         HID_SCH_CT_INDICATE 
  
 *JavaClassPath HID_OPTIONS_JAVA_CLASSPATH
-ClassPath svx:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH
-AddArchive svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE
-AddFolder svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH
-Remove svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH
+ClassPath cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH
+AddArchive cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE
+AddFolder cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH
+Remove cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH
 
 *JavaStartParameter HID_OPTIONS_JAVA_PARAMETER
-StartParameter svx:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER
-Assign svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN
-AssignedStartParameters svx:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED
-Remove svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE
+StartParameter cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER
+Assign cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN
+AssignedStartParameters cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED
+Remove cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE
 
 *JoinProperties HID_DLG_QRY_JOIN
 Type HID_DLG_QRY_JOINTYPE
@@ -247,9 +247,9 @@ mZoomlistbox HID_AVMEDIA_ZOOMLISTBOX
 mTimeedit HID_AVMEDIA_TIMEEDIT
 
 *MenuOrganiser HID_SVX_CONFIG_MENU_ORGANIZER
-MenuName svx:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME
-ButtonUp svx:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP
-ButtonDown svx:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN
+MenuName cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME
+ButtonUp cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP
+ButtonDown cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN
 
 *ModifyLink sfx2:ModalDialog:MD_DDE_LINKEDIT
 ModifyDDEApplication sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP
@@ -257,9 +257,9 @@ ModifyDDEFile sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC
 ModifyDDECategory sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM
 
 *Mosaic SID_GRFFILTER_MOSAIC
-Width svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH
-Height svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT
-EnhanceEdges svx:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES
+Width cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH
+Height cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT
+EnhanceEdges cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES
 
 *NewAddressList HID_MM_CREATEADDRESSLIST
 New sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEW
@@ -283,9 +283,9 @@ MoveRight   sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT
 MoveDown   sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN
 Select  sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD
 
-*NewToolbar svx:ModalDialog:MD_NEW_TOOLBAR
-ToolbarName svx:Edit:MD_NEW_TOOLBAR:EDT_STRING
-SaveIn svx:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN
+*NewToolbar cui:ModalDialog:MD_NEW_TOOLBAR
+ToolbarName cui:Edit:MD_NEW_TOOLBAR:EDT_STRING
+SaveIn cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN
 
 *NewsletterLayout HID_DLGNEWSLTR_DIALOG
 Newsletter HID_DLGNEWSLTR_OPTSTANDARDLAYOUT
@@ -296,15 +296,15 @@ Duplex HID_DLGNEWSLTR_OPTDOUBLESIDED
 OKButton HID_DLGNEWSLTR_CMDGOON
 
 *OLEObjektInsert SID_INSERT_OBJECT
-NeuErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
-AusDateiErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
-Objekttyp svx:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
-OleDatei svx:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
-Verknuepfen svx:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
-Durchsuchen svx:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
-
-*InsertTableImpress svx:ModalDialog:RID_SVX_NEWTABLE_DLG
-NumberOfColumns svx:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS
-NumberOfRows svx:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS
+NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
+AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
+Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
+OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
+Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
+Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
+
+*InsertTableImpress cui:ModalDialog:RID_SVX_NEWTABLE_DLG
+NumberOfColumns cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS
+NumberOfRows cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS
 
 *TableDesign sd:ModalDialog:DLG_TABLEDESIGNPANE
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index ea5e9cf266db..0fd52589b6b5 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -64,7 +64,7 @@ HideToolbar filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR
 HideWindowControls filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL
 
 *Posterize SID_GRFFILTER_POSTER
-PosterColors svx:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER
+PosterColors cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER
 
 *PortfolioCurrency HID_DLGDEPOT_DIALOG_HISTORY
 Currency HID_DLGDEPOT_LSTMARKETS
@@ -166,10 +166,10 @@ LightSource HID_GRFFILTER_EMBOSS_LIGHT
 FieldTitle sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME
 
 *RenameMenu HID_SVX_CONFIG_RENAME_MENU
-NewName svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING
 
 *RenameToolbar HID_SVX_CONFIG_RENAME_TOOLBAR
-NewName svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING
 
 *Registration HID_REGISTRATION_DIALOG
 Now svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW
@@ -248,14 +248,14 @@ Type sw:Edit:DLG_SAVE_LABEL:ED_TYPE
 
 *ScriptOrganizer HID_SCRIPTORG_DIALOG
 ScriptTreeList HID_SCRIPTSBOX
-PBRun svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN
-PBCreate svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE
-PBEdit svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT
-PBRename svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME
-PBDelete svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL
+PBRun cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN
+PBCreate cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE
+PBEdit cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT
+PBRename cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME
+PBDelete cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL
 
-*ScriptNameDlg svx:ModalDialog:RID_DLG_NEWLIB
-EFObjectName svx:Edit:RID_DLG_NEWLIB:ED_LIBNAME
+*ScriptNameDlg cui:ModalDialog:RID_DLG_NEWLIB
+EFObjectName cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME
 
 *ScriptSelector HID_SELECTOR_DIALOG
 LibraryTreeList HID_SELECTOR_CATEGORIES
@@ -336,8 +336,8 @@ Resolution chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION
 DataPointsOrder chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER
 
 *Solarization SID_GRFFILTER_SOLARIZE
-Value svx:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD
-Invert svx:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT
+Value cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD
+Invert cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT
 
 *Solver   SID_OPENDLG_OPTSOLVER
 TargetCell sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL
@@ -401,17 +401,17 @@ ExtendSelection   sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT
 CurrentSelection   sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT
 
 *Spellcheck HID_SPELLCHECK
-NotInDictionary svx:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD
-Suggestions svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION
-DictionaryLanguage svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
+NotInDictionary cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD
+Suggestions cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION
+DictionaryLanguage cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
 IgnoreOnce HID_SPLDLG_BUTTON_IGNORE
 IgnoreAll HID_SPLDLG_BUTTON_IGNOREALL
-AddToDictionary svx:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT
+AddToDictionary cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT
 Change HID_SPLDLG_BUTTON_CHANGE
 ChangeAll HID_SPLDLG_BUTTON_CHANGEALL
-AutoCorrect svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR
-SpellcheckOptions svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS
-SpellcheckUndo svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO
+AutoCorrect cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR
+SpellcheckOptions cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS
+SpellcheckUndo cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO
 SpellcheckClose HID_SPLDLG_BUTTON_CLOSE
 
 *SQLException dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN
@@ -522,7 +522,7 @@ Back HID_DLGHOLIDAYCAL_0_CMDOWNDATA
 Create  HID_DLGHOLIDAYCAL_0_CMDOK
 
 *StoredPasswordsDialog HID_DLG_WEBCONNECTION_INFO
-Remove svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE
-RemoveAll svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL
-changePassword svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE
+Remove cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE
+RemoveAll cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL
+changePassword cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE
 
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 65008b14a2db..f2214f266741 100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -1,13 +1,13 @@
 *TabAccessibility HID_OPTIONS_ACCESSIBILITYCONFIG
-ForPagePreviews svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS
-HelpTips svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP
-After svx:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP
-AllowAnimatedGraphics svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS
-AllowAnimatedText svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS
-AlwaysUseAutomaticFontColor svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR
-SupportAssistiveTechnologyTools svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL
-UseTextSelectionCursor svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION
-AutomaticDetectHC svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC
+ForPagePreviews cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS
+HelpTips cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP
+After cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP
+AllowAnimatedGraphics cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS
+AllowAnimatedText cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS
+AlwaysUseAutomaticFontColor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR
+SupportAssistiveTechnologyTools cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL
+UseTextSelectionCursor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION
+AutomaticDetectHC cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC
 
 *TabAdabas HID_DSADMIN_PAGE_ADABAS
 Hostname dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME
@@ -42,9 +42,9 @@ UserName HID_DSADMIN_USER_ADO
 PasswordRequired HID_DSADMIN_PWDREC_ADO
 
 *TabAppearance HID_OPTIONS_COLORCONFIG
-Scheme svx:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME
-Save svx:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME
-Delete svx:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME
+Scheme cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME
+Save cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME
+Delete cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME
 ColorList HID_OPTIONS_COLORCONFIG_COLORLIST_WIN
 LBGeneralDocBg HID_COLORPAGE_DOCCOLOR_LB
 CBGeneralTextBd HID_COLORPAGE_DOCBOUNDARIES_CB
@@ -93,47 +93,47 @@ LBBasicReservedExpression HID_COLORPAGE_BASICKEYWORD_LB
 LBBasicError HID_COLORPAGE_BASICERROR_LB
 
 *TabArea HID_AREA_AREA
-BackgroundColour svx:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD
-BackgroundColourList svx:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR
-FillOptions svx:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE
-ColourList svx:ListBox:RID_SVXPAGE_AREA:LB_COLOR
-GradientList svx:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT
-HatchingList svx:ListBox:RID_SVXPAGE_AREA:LB_HATCHING
-BitmapList svx:ListBox:RID_SVXPAGE_AREA:LB_BITMAP
-Automatic svx:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT
-Increments svx:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT
-Tile svx:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE
-Stretch svx:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH
-Relative svx:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE
-Original svx:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL
-Width svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE
-Height svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE
-XOffset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET
-YOffset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET
-Row svx:RadioButton:RID_SVXPAGE_AREA:RBT_ROW
-Column svx:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN
-Offset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET
+BackgroundColour cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD
+BackgroundColourList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR
+FillOptions cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE
+ColourList cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR
+GradientList cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT
+HatchingList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING
+BitmapList cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP
+Automatic cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT
+Increments cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT
+Tile cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE
+Stretch cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH
+Relative cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE
+Original cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL
+Width cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE
+Height cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE
+XOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET
+YOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET
+Row cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW
+Column cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN
+Offset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET
 
 *TabAsianLayout HID_SVXPAGE_CHAR_TWOLINES
-TwoLinesEachLine svx:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES
-BeginningCharacter svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET
-EndCharacter svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET
+TwoLinesEachLine cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES
+BeginningCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET
+EndCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET
 
 *TabAsianLayoutOptions HID_OPTIONS_ASIAN_LAYOUT
-WesternCharactersOnly svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING
-WesternTextAndPunctuation svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT
-NoCompression svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP
-CompressPunctuationOnly svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP
-CompressPunctuationAndJapaneseKana svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP
-Language svx:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE
-Standard svx:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD
-NoStartOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START
-NoEndOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END
+WesternCharactersOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING
+WesternTextAndPunctuation cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT
+NoCompression cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP
+CompressPunctuationOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP
+CompressPunctuationAndJapaneseKana cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP
+Language cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE
+Standard cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD
+NoStartOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START
+NoEndOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END
 
 *TabAsianTypography HID_SVXPAGE_PARA_ASIAN
-ApplyList svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN
-AllowHangingPunctuation svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC
-ApplySpacingBetween svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE
+ApplyList cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN
+AllowHangingPunctuation cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC
+ApplySpacingBetween cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE
 
 *TabAutoCaption HID_OPTCAPTION_PAGE
 ObjectList HID_OPTCAPTION_CLB
@@ -169,20 +169,20 @@ Remove HID_NUM_RESET
  TextDirection     chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR 
  
 *TabChartAxisNumbers HID_NUMBERFORMAT
- Category            svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
- FormatCurrency      svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
+ Category            cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
+ FormatCurrency      cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
  FormatString        HID_NUMBERFORMAT_LB_FORMAT
- Language            svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
- Sourceformat        svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
- DecimalPlaces       svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
- LeadingZeroes       svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
- NegativNumbersRed   svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
- ThousandsSeparator  svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
- FormatCode          svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
+ Language            cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
+ Sourceformat        cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
+ DecimalPlaces       cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
+ LeadingZeroes       cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
+ NegativNumbersRed   cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
+ ThousandsSeparator  cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
+ FormatCode          cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
  AddButton           HID_NUMBERFORMAT_TBI_ADD
  EditCommentButton   HID_NUMBERFORMAT_TBI_INFO
  RemoveButton        HID_NUMBERFORMAT_TBI_REMOVE
- Comment             svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT 
+ Comment             cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT 
  
 *TabChartAxisScale          chart2:TabPage:TP_SCALE  
 MinimumValue                chart2:SpinField:TP_SCALE:EDT_MIN
@@ -270,11 +270,11 @@ InsertInSheet             chart2:ListBox:TP_LOCATION:LB_TABLE
 *TabCreateOptionGroup extensions:TabPage:RID_PAGE_OPTIONS_FINAL
 GroupCaption extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT
 
-*TabConnections svx:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS
+*TabConnections cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS
 DriverList HID_OFA_CONNPOOL_DRIVERLIST
-ConnectionPoolingEnabled svx:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS
-EnablePoolingForThisDriver svx:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING
-Timeout svx:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT
+ConnectionPoolingEnabled cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS
+EnablePoolingForThisDriver cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING
+Timeout cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT
 
 *TabConnection dbaccess:TabPage:PAGE_CONNECTION
 dBasePath HID_DSADMIN_DBASE_PATH
@@ -319,40 +319,40 @@ Reset sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET
 Default sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT
 
 *TabComplexTextLayout HID_OPTIONS_CTL
-UseSequenceChecking svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING
-Logical svx:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL
-Visual svx:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL
-Numerals svx:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS
-Restricted svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED
-TypeAndReplace svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE
+UseSequenceChecking cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING
+Logical cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL
+Visual cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL
+Numerals cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS
+Restricted cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED
+TypeAndReplace cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE
 
 *TabCustomizeEvents HID_SVX_CONFIG_EVENT
-SaveIn svx:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN
+SaveIn cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN
 EventListbox HID_SVX_MACRO_LB_EVENT
-AssignMacro svx:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN
-RemoveMacro svx:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE
+AssignMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN
+RemoveMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE
 ResetBtn HID_TABDLG_RESET_BTN
 
 *TabCustomizeMenu HID_SVX_CONFIG_MENU
-Menu svx:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
-BtnNew svx:PushButton:RID_SVXPAGE_MENUS:BTN_NEW
-MenuBtn svx:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE
-AddCommands svx:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS
-Command svx:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY
-BtnUp svx:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
-BtnDown svx:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
-SaveIn svx:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN
+Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
+BtnNew cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW
+MenuBtn cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE
+AddCommands cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS
+Command cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY
+BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
+BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
+SaveIn cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN
 ResetBtn HID_TABDLG_RESET_BTN
 Entries HID_SVX_CONFIG_MENU_CONTENTS
 
 *TabCustomizeToolbars HID_SVX_CONFIG_TOOLBAR
-Menu svx:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
+Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
 BtnNew HID_SVX_NEW_TOOLBAR
 MenuBtn HID_SVX_MODIFY_TOOLBAR
 AddCommands HID_SVX_NEW_TOOLBAR_ITEM
 Command HID_SVX_MODIFY_TOOLBAR_ITEM
-BtnUp svx:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
-BtnDown svx:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
+BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
+BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
 SaveIn HID_SVX_SAVE_IN
 ToolbarContents HID_SVX_CONFIG_TOOLBAR_CONTENTS
 ResetBtn HID_TABDLG_RESET_BTN
diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win
index 69e4782a488e..09fd5e9067b8 100755
--- a/testautomation/global/win/etab_e_g.win
+++ b/testautomation/global/win/etab_e_g.win
@@ -7,8 +7,8 @@ TextAnimation sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM
 DelayBetweenCharacters sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY
 
 *TabEmail HID_OPTIONS_MAIL
-EmailProgram svx:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL
-EmailOpen svx:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL
+EmailProgram cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL
+EmailOpen cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL
 
 *TabEntrance HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE
 Effects sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS
@@ -108,57 +108,57 @@ FathersName desktop:Edit:TP_USER:ED_USER_FATHER
 *TabFirstStartWelcome HID_FIRSTSTART_WELCOME
 
 *TabFont HID_SVXPAGE_CHAR_NAME
-Font svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK
-Style svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK
-Size svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK
-Language svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK
-FontWest svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME
-StyleWest svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE
-SizeWest svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE
-LanguageWest svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG
-FontEast svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME
-StyleEast svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE
-SizeEast svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE
-LanguageEast svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG
-FontCTL svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME
-StyleCTL svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE
-SizeCTL svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE
-LanguageCTL svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG
-Color svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2
+Font cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK
+Style cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK
+Size cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK
+Language cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK
+FontWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME
+StyleWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE
+SizeWest cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE
+LanguageWest cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG
+FontEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME
+StyleEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE
+SizeEast cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE
+LanguageEast cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG
+FontCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME
+StyleCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE
+SizeCTL cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE
+LanguageCTL cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG
+Color cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2
 
 *TabFontEffects HID_SVXPAGE_CHAR_EFFECTS
-Underline svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE
-Color svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR
-Effects svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2
-StrikeThrough svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT
-IndividualWords svx:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS
-Emphasis svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS
-Position svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION
-Outline svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE
-Overline svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE
-OverlineColor svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR
-Shadow svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW
-Blinking svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING
-Relief svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF
-FontColor svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR
-Hidden svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN
+Underline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE
+Color cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR
+Effects cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2
+StrikeThrough cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT
+IndividualWords cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS
+Emphasis cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS
+Position cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION
+Outline cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE
+Overline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE
+OverlineColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR
+Shadow cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW
+Blinking cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING
+Relief cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF
+FontColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR
+Hidden cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN
 
 *TabFontPosition HID_SVXPAGE_CHAR_POSITION
-SuperScript svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
-Normal svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS
-Subscript svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS
-RaiseLower svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW
-RelativeFontSize svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE
-Automatic svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW
-n0Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG
-n90Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG
-n270Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG
-FitToLine svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE
-ScaleWith svx:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH
-Spacing svx:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2
-SpacingBy svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2
-PairKerning svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING
-Super svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
+SuperScript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
+Normal cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS
+Subscript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS
+RaiseLower cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW
+RelativeFontSize cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE
+Automatic cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW
+n0Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG
+n90Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG
+n270Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG
+FitToLine cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE
+ScaleWith cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH
+Spacing cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2
+SpacingBy cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2
+PairKerning cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING
+Super cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
 
 *TabFormat3dViewGeometry SID_3D_VIEW
  AxisRotationXaxis       chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION
@@ -194,22 +194,22 @@ Super svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
  TextDirection2               HID_SCH_TEXTDIRECTION_EQUATION
 
 *TabFormatChartLine HID_LINE_LINE
- Style               svx:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
- Color               svx:ListBox:RID_SVXPAGE_LINE:LB_COLOR
- Width               svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
- Transparency        svx:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
- StyleLeft           svx:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
- WidthLeft           svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
- CenterLeft          svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
- StyleRight          svx:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
- WidthRight          svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
- CenterRight         svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
- SynchroniteEnds     svx:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
- CornerStyle         svx:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
- IconSelect          svx:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP
- IconWidth           svx:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH
- IconHeigth          svx:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT
- KeepRatio           svx:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO
+ Style               cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
+ Color               cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR
+ Width               cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
+ Transparency        cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
+ StyleLeft           cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
+ WidthLeft           cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
+ CenterLeft          cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
+ StyleRight          cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
+ WidthRight          cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
+ CenterRight         cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
+ SynchroniteEnds     cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
+ CornerStyle         cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
+ IconSelect          cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP
+ IconWidth           cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH
+ IconHeigth          cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT
+ KeepRatio           cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO
  
 +TabFormatChartBorders TabFormatChartLine
 
diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win
index 66ce34a2c5a6..60334e1c287d 100755
--- a/testautomation/global/win/etab_h_o.win
+++ b/testautomation/global/win/etab_h_o.win
@@ -11,38 +11,38 @@ URL sfx2:Edit:TP_DOCINFORELOAD:ED_URL
 BrowseURL sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL
 Frame sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME
 
-*TabOOoImprovement svx:TabPage:RID_SVXPAGE_IMPROVEMENT
-ParticipateYes svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES
-ParticipateNo svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO
-ShowData svx:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA
+*TabOOoImprovement cui:TabPage:RID_SVXPAGE_IMPROVEMENT
+ParticipateYes cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES
+ParticipateNo cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO
+ShowData cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA
 
 *TabJava HID_OPTIONS_JAVA
-UseJava svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE
+UseJava cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE
 JavaList HID_OPTIONS_JAVA_LIST
-Add svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD
-Parameters svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER
-ClassPath svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH
+Add cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD
+Parameters cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER
+ClassPath cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH
 
 *TabJapaneseFind HID_SVXPAGE_JSEARCH_OPTIONS
-MatchCase svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE
-MatchFullHalf svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH
-MatchHiraganaKatakana svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA
-MatchContractions svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS
-MatchMinusDashChoOn svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON
-MatchRepeatcharacterMarks svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS
-MatchVariantFormKanji svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI
-MatchOldKanaForms svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS
-MatchDiZiDuZu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU
-MatchBaVaHaFa svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA
-MatchTsiThiChiDhiZi svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI
-MatchHyuFyuByuVyu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU
-MatchDeSheZeJe svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE
-MatchIaIya svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA
-MatchKiKu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU
-PunctuationCharacters svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION
-WhitespaceCharacters svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES
-ProlongedSoundmarks svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK
-MiddleDots svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT
+MatchCase cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE
+MatchFullHalf cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH
+MatchHiraganaKatakana cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA
+MatchContractions cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS
+MatchMinusDashChoOn cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON
+MatchRepeatcharacterMarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS
+MatchVariantFormKanji cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI
+MatchOldKanaForms cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS
+MatchDiZiDuZu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU
+MatchBaVaHaFa cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA
+MatchTsiThiChiDhiZi cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI
+MatchHyuFyuByuVyu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU
+MatchDeSheZeJe cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE
+MatchIaIya cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA
+MatchKiKu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU
+PunctuationCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION
+WhitespaceCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES
+ProlongedSoundmarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK
+MiddleDots cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT
 
 *TabJDBC HID_DSADMIN_PAGE_JDBC
 JDBCDriverClass HID_DSADMIN_DRIVERCLASS
@@ -170,15 +170,15 @@ EditButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT
 
 
 *TabMemory HID_OFA_TP_MEMORY
-UndoSteps svx:NumericField:OFA_TP_MEMORY:ED_UNDO
-StarOffice svx:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE
-MemoryPerObject svx:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE
-RemoveFromMemoryAfter svx:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME
-NumberOfObjects svx:NumericField:OFA_TP_MEMORY:NF_OLECACHE
-LoadQuickstarter svx:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH
+UndoSteps cui:NumericField:OFA_TP_MEMORY:ED_UNDO
+StarOffice cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE
+MemoryPerObject cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE
+RemoveFromMemoryAfter cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME
+NumberOfObjects cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE
+LoadQuickstarter cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH
 
-*TabMozillaPlugin svx:TabPage:RID_SVXPAGE_INET_MOZPLUGIN
-Enable svx:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE
+*TabMozillaPlugin cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN
+Enable cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE
 
 *TabMySQLJDBC dbaccess:TabPage:PAGE_MYSQL_JDBC
 HostName HID_DSADMIN_HOSTNAME
@@ -209,13 +209,13 @@ UseCatalogs HID_DSADMIN_USECATALOG
 +TabOfficeView TabAnsichtAllgemein
 
 *TabOnlineUpdate HID_SVX_OPTIONS_ONLINEUPDATE
-CheckAutomatically svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK
-EveryDay svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY
-EveryWeek svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK
-EveryMonth svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH
-CheckNow svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW
-DownloadAutomatically svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD
-Change svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH
+CheckAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK
+EveryDay cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY
+EveryWeek cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK
+EveryMonth cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH
+CheckNow cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW
+DownloadAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD
+Change cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH
 
 *TabOracleJDBC dbaccess:TabPage:PAGE_ORACLE_JDBC
 HostName HID_DSADMIN_HOSTNAME
diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win
index 7a61877be522..49a253bdb128 100755
--- a/testautomation/global/win/etab_p_s.win
+++ b/testautomation/global/win/etab_p_s.win
@@ -2,39 +2,39 @@
 TransferPersonalData desktop:CheckBox:TP_MIGRATION:CB_MIGRATION
 
 *TabPositionAndSize HID_TRANS_POSITION_SIZE
-PositionX svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X
-PositionY svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y
-Width svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH
-Height svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT
-KeepRatio svx:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE
-ProtectPosition svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT
-ProtectSize svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT
-FitWidthText svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH
-FitHeightText svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT
-AnchorPosition svx:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT
-Anchor svx:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR
+PositionX cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X
+PositionY cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y
+Width cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH
+Height cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT
+KeepRatio cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE
+ProtectPosition cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT
+ProtectSize cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT
+FitWidthText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH
+FitHeightText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT
+AnchorPosition cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT
+Anchor cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR
 PositionPosition HID_TPPOSITION_CTRL
 SizePosition HID_TPSIZE_CTRL
 
 *TabPositionAndSizeWriter HID_SVXPAGE_SWPOSSIZE
-Width svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH
-Height svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT
-KeepRatio svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO
-Topage svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE
-Toparagraph svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA
-Tocharacter svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR
-Ascharacter svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR
-ToFrame svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME
-ProtectPosition svx:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION
-ProtectSize svx:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE
-Horizontal svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI
-Horizontalby svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY
-Horizontalto svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO
-Mirror svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR
-Vertical svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT
-Verticalby svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY
-Verticalto svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO
-Followtextflow svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW
+Width cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH
+Height cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT
+KeepRatio cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO
+Topage cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE
+Toparagraph cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA
+Tocharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR
+Ascharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR
+ToFrame cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME
+ProtectPosition cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION
+ProtectSize cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE
+Horizontal cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI
+Horizontalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY
+Horizontalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO
+Mirror cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR
+Vertical cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT
+Verticalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY
+Verticalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO
+Followtextflow cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW
 
 *TabPrintStarOffice HID_TP_COMMONPRINTOPTIONS
 Printer sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT
@@ -62,41 +62,41 @@ SuppressOutput sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES
 PrintOnly sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS
 
 *TabProxyServer HID_OPTIONS_PROXY
-ProxyServer svx:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE
-HttpProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY
-HttpPort svx:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT
-FtpProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY
-FtpPort svx:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT
-NoProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR
+ProxyServer cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE
+HttpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY
+HttpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT
+FtpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY
+FtpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT
+NoProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR
 
-*TabRegisteredDatabase svx:TabPage:RID_SFXPAGE_DBREGISTER
+*TabRegisteredDatabase cui:TabPage:RID_SFXPAGE_DBREGISTER
 RegisteredDatabases HID_DBPATH_CTL_PATH
-NewBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW
-EditBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT
-DeleteBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE
+NewBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW
+EditBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT
+DeleteBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE
 
 *TabSectionIndent HID_SECTION_INDENTS_PAGE
 IndentBefore sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE
 IndentAfter sw:MetricField:TP_SECTION_INDENTS:MF_AFTER
 
-*TabSecurity svx:TabPage:RID_SVXPAGE_INET_SECURITY
-MacroSecurity svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC
-RecommendToOpenDocumentReadOnly svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECOMMREADONLY
-RecordChanges svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECORDCHANGES
-Protect svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_PROTRECORDS
-PersistentlySavePasswords svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS
-Options svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS
-MasterPassword svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD
-ShowPasswords svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS
+*TabSecurity cui:TabPage:RID_SVXPAGE_INET_SECURITY
+MacroSecurity cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC
+RecommendToOpenDocumentReadOnly cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECOMMREADONLY
+RecordChanges cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECORDCHANGES
+Protect cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_PROTRECORDS
+PersistentlySavePasswords cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS
+Options cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS
+MasterPassword cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD
+ShowPasswords cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS
 
 *TabSecurityOptionsAndWarnings HID_DLG_SECURITY_OPTIONS
-SavingOrSendingDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS
-SigningDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS
-PrintingDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS
-CreatingPDFfiles svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF
-RemovePersonalInformationOnSaving svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO
-RecommendPasswordProtectionOnSaving svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD
-CtrlClickRequiredToFollowHyperlinks svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK
+SavingOrSendingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS
+SigningDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS
+PrintingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS
+CreatingPDFfiles cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF
+RemovePersonalInformationOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO
+RecommendPasswordProtectionOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD
+CtrlClickRequiredToFollowHyperlinks cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK
 
 *TabSecurityLevel HID_XMLSEC_TP_SECLEVEL
 VeryHigh xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH
diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win
index 07bed1592061..aa0155908c5d 100755
--- a/testautomation/global/win/etab_t_z.win
+++ b/testautomation/global/win/etab_t_z.win
@@ -40,17 +40,17 @@ TriggerStart sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE
 Shape sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER
 
 *TabTransparency     HID_AREA_TRANSPARENCE
-NoTransparency      svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
-Transparency        svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
-Gradient            svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
-TransparencyPercent svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
-Type                svx:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
-CenterX             svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
-CenterY             svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
-Angle               svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
-Border              svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
-StartValue          svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
-EndValue            svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
+NoTransparency      cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
+Transparency        cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
+Gradient            cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
+TransparencyPercent cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
+Type                cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
+CenterX             cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
+CenterY             cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
+Angle               cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
+Border              cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
+StartValue          cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
+EndValue            cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
 
 *TabTrendLineType chart2:TabPage:TP_TRENDLINE
 None                        HID_SCH_TRENDLINE_RB_NONE
diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win
index fbcba2599a74..10e2a8b50652 100755
--- a/testautomation/global/win/tab_a_d.win
+++ b/testautomation/global/win/tab_a_d.win
@@ -17,26 +17,26 @@ Einfuegungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT
 Verschiebungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE
 
 *TabAllgemein HID_OPTIONS_GENERAL
-Firma svx:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY
-VorName svx:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME
-ZuName svx:Edit:RID_SFXPAGE_GENERAL:ED_NAME
-NameDesVaters svx:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME
-Strasse svx:Edit:RID_SFXPAGE_GENERAL:ED_STREET
-Apartmentnummer svx:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR
-Land svx:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY
-PLZ svx:Edit:RID_SFXPAGE_GENERAL:ED_PLZ
-Ort svx:Edit:RID_SFXPAGE_GENERAL:ED_CITY
-Kuerzel svx:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME
-TelPriv svx:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT
-TelGe svx:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY
-Fax svx:Edit:RID_SFXPAGE_GENERAL:ED_FAX
-EMail svx:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL
-Titel svx:Edit:RID_SFXPAGE_GENERAL:ED_TITLE
-Position svx:Edit:RID_SFXPAGE_GENERAL:ED_POSITION
-City svx:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY
-Zip svx:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE
-Street svx:Edit:RID_SFXPAGE_GENERAL:ED_STREET
-State SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE
+Firma cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY
+VorName cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME
+ZuName cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME
+NameDesVaters cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME
+Strasse cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET
+Apartmentnummer cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR
+Land cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY
+PLZ cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ
+Ort cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY
+Kuerzel cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME
+TelPriv cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT
+TelGe cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY
+Fax cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX
+EMail cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL
+Titel cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE
+Position cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION
+City cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY
+Zip cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE
+Street cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET
+State cui:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE
 Zurueck HID_TABDLG_RESET_BTN
 
 +TabAllgemeines TabAllgemein
@@ -45,60 +45,60 @@ Zurueck HID_TABDLG_RESET_BTN
 NeuesThema HID_GALLERY_EDIT_MSNAME
 
 *TabAnsichtAllgemein HID_OFA_TP_VIEW
-FontScale svx:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE
-IconStyle svx:ListBox:OFA_TP_VIEW:LB_ICONSTYLE
-IconScale svx:ListBox:OFA_TP_VIEW:LB_ICONSIZE
-FontAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING
-AAPixel svx:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT
-VorschauInSchriftlisten svx:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW
-SchriftenHistorie svx:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY
-UseHardwareAcceleration svx:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL
-UseAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE
-IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
-MausAktion svx:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE
-MousePositioning svx:ListBox:OFA_TP_VIEW:LB_MOUSEPOS
-UseSystemFont svx:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT
-Transparency svx:CheckBox:OFA_TP_VIEW:CB_SELECTION
-SelectionOpacity svx:MetricField:OFA_TP_VIEW:MF_SELECTION
+FontScale cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE
+IconStyle cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE
+IconScale cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE
+FontAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING
+AAPixel cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT
+VorschauInSchriftlisten cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW
+SchriftenHistorie cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY
+UseHardwareAcceleration cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL
+UseAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE
+IconsInMenueAnzeigen cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
+MausAktion cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE
+MousePositioning cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS
+UseSystemFont cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT
+Transparency cui:CheckBox:OFA_TP_VIEW:CB_SELECTION
+SelectionOpacity cui:MetricField:OFA_TP_VIEW:MF_SELECTION
 
 *TabAusnahmen HID_OFAPAGE_AUTOCORR_EXCEPT
-Abkuerzungen svx:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV
-AbkuerzungenListe svx:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV
-AbkuerzungenNeu svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV
-AbkuerzungenLoeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV
-AbkuerzungenAutomatisch svx:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV
-Woerter svx:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS
-WoerterListe svx:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS
-WoerterNeu svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS
-WoerterLoeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS
-WoerterAutomatisch svx:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS
+Abkuerzungen cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV
+AbkuerzungenListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV
+AbkuerzungenNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV
+AbkuerzungenLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV
+AbkuerzungenAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV
+Woerter cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS
+WoerterListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS
+WoerterNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS
+WoerterLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS
+WoerterAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS
 Zurueck HID_TABDLG_RESET_BTN
 WelcheSprache HID_AUTOCORR_LANGUAGE
 
 *TabAusrichtung HID_ALIGNMENT
-ListeHAusrichtung svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN
-ListeVAusrichtung svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN
-Einzug svx:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT
-Zeilenumbruch svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP
-Silbentrennung svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH
-Grad SVX:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES
+ListeHAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN
+ListeVAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN
+Einzug cui:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT
+Zeilenumbruch cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP
+Silbentrennung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH
+Grad cui:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES
 Bezugskante HID_ALIGNMENT_CTR_BORDER_LOCK
-VertikaleAusrichtung svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL
-Gestapelt svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED
-ShrinkToFit svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK
-SetAlignmentOptions svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR
+VertikaleAusrichtung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL
+Gestapelt cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED
+ShrinkToFit cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK
+SetAlignmentOptions cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR
 AlignmentDial HID_ALIGNMENT_CTR_DIAL
 
 *TabAusrichtungAbsatz HID_FORMAT_PARAGRAPH_ALIGN
-Links SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN
-Rechts SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN
-Zentriert SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN
-Blocksatz SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN
-LetzteZeile SVX:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE
-EinzelnesWortAustreiben SVX:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND
-VertikaleTextausrichtung svx:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN
-TextrasterFangen svx:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP
-TextDirection svx:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION
+Links cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN
+Rechts cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN
+Zentriert cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN
+Blocksatz cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN
+LetzteZeile cui:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE
+EinzelnesWortAustreiben cui:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND
+VertikaleTextausrichtung cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN
+TextrasterFangen cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP
+TextDirection cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION
 
 *TabBedingung HID_COND_COLL
 AlsBedingteVorlage sw:CheckBox:TP_CONDCOLL:CB_CONDITION
@@ -117,17 +117,17 @@ Zuweisen sw:PushButton:TP_CONDCOLL:PB_ASSIGN
 'Zurueck HID_TABDLG_RESET_BTN
 
 *TabBemassung HID_PAGE_MEASURE
-Liniendistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
-HLUebergang svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
-HLDistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
-LinkeHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
-RechteHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
-AnzeigeUnterhalb svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
-AnzeigeParallel svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
-MetrikAnzeigen svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
+Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
+HLUebergang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
+HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
+LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
+RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
+AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
+AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
+MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
 Textposition HID_MEASURE_CTL_POSITION
-AutomatischVertikal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
-AutomatischHorizontal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
+AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
+AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
 
 *TabBenutzer HID_DOCINFOUSER
 Info0 sfx2:Edit:TP_DOCINFOUSER:ED_INFO1
@@ -183,24 +183,24 @@ Loeschen basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE
 
 *TabBitmap HID_AREA_BITMAP
 'PixelEditor
-Vordergrund svx:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR
-Hintergrund svx:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR
-Tabelle svx:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS
-Hinzufuegen svx:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD
-Aendern svx:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY
-Import svx:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT
-Loeschen svx:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE
+Vordergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR
+Hintergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR
+Tabelle cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS
+Hinzufuegen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD
+Aendern cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY
+Import cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT
+Loeschen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE
 Zurueck HID_TABDLG_RESET_BTN
 
 *TabDateien HID_GALLERY_BROWSER
-Dateityp svx:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE
-Suche svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH
-Dateiliste svx:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND
-Hinzufuegen svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE
-HinzufuegenAlle svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL
-Vorschau svx:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW
+Dateityp cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE
+Suche cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH
+Dateiliste cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND
+Hinzufuegen cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE
+HinzufuegenAlle cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL
+Vorschau cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW
 
 *TabDatenbank HID_FLD_DB
 Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE
@@ -275,9 +275,9 @@ Einfuegen HID_FIELD_INSERT
 Schliessen HID_FIELD_CLOSE
 
 *TabDrehung HID_TRANS_ANGLE
-PositionX svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X
-PositionY svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y
-Winkel svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE
+PositionX cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X
+PositionY cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y
+Winkel cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE
 Drehpunkt HID_TPROTATION_CTRL1
 Drehwinkel HID_TPROTATION_CTRL2
 
diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win
index f15a2948fddb..d34d387acffc 100755
--- a/testautomation/global/win/tab_e_g.win
+++ b/testautomation/global/win/tab_e_g.win
@@ -1,16 +1,16 @@
 *TabEigenschaften SID_INSERT_FLOATINGFRAME
-FrameName svx:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME
-Inhalt svx:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL
-Oeffnen svx:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN
-An svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON
-Aus svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF
-Automatisch svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO
-UmrandungAn svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON
-UmrandungAus svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF
-Breite svx:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH
-Hoehe svx:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT
-BreiteStandard svx:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
-HoeheStandard svx:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
+FrameName cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME
+Inhalt cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL
+Oeffnen cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN
+An cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON
+Aus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF
+Automatisch cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO
+UmrandungAn cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON
+UmrandungAus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF
+Breite cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH
+Hoehe cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT
+BreiteStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
+HoeheStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
 
 *TabEingabehilfe SC:TABPAGE:TP_VALIDATION_INPUTHELP
 EingabehilfenbeiSelektion SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP
@@ -18,16 +18,16 @@ Titel SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE
 EingabeHilfe SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP
 
 *TabEinzuegeUndAbstaende HID_FORMAT_PARAGRAPH_STD
-Automatisch svx:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO
-Vonlinks svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT
-ErsteZeile svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT
-VonRechts svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT
-Oben svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST
-Unten svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST
-Zeilenabstand svx:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST
-Um svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT
-Von SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC
-Registerhaltigkeit svx:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER
+Automatisch cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO
+Vonlinks cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT
+ErsteZeile cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT
+VonRechts cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT
+Oben cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST
+Unten cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST
+Zeilenabstand cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST
+Um cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT
+Von cui:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC
+Registerhaltigkeit cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER
 
 *TabEndnoten HID_ENDNOTE_OPTIONS
 Numerierung  sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW
@@ -40,12 +40,12 @@ ZeichenvorlageEndnotenbereich sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT
 ZeichenvorlageTextbereich sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT
 
 *TabErsetzung HID_OFAPAGE_AUTOCORR_REPLACE
-NurText svx:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY
-Kuerzel svx:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT
-ErsetzenDurch svx:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE
+NurText cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY
+Kuerzel cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT
+ErsetzenDurch cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE
 Liste HID_OFACTL_AUTOCORR_REPLACE
-Neu svx:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE
-Loeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE
+Neu cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE
+Loeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE
 Zurueck HID_TABDLG_RESET_BTN
 WelcheSprache HID_AUTOCORR_LANGUAGE
 
@@ -74,39 +74,39 @@ Zurueck HID_TABDLG_RESET_BTN
 *TabFangenEinrasten HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW
 
 *TabFarben HID_OPTIONS_COLOR
-FarbName svx:Edit:RID_SVXPAGE_COLOR:EDT_NAME
-Farbe svx:ListBox:RID_SVXPAGE_COLOR:LB_COLOR
-Farbmodell svx:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL
+FarbName cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME
+Farbe cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR
+Farbmodell cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL
 R HID_TPCOLOR_RGB_1
 G HID_TPCOLOR_RGB_2
 B HID_TPCOLOR_RGB_3
 C HID_TPCOLOR_CMYK_1
 M HID_TPCOLOR_CMYK_2
 Y HID_TPCOLOR_CMYK_3
-K svx:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4
-Aendern svx:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY
-Hinzufuegen svx:PushButton:RID_SVXPAGE_COLOR:BTN_ADD
-Loeschen svx:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE
-Bearbeiten svx:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON
+K cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4
+Aendern cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY
+Hinzufuegen cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD
+Loeschen cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE
+Bearbeiten cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON
 
 *TabFarbverlaeufe HID_AREA_GRADIENT
-Typ svx:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES
-ZentrumX svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X
-ZentrumY svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y
-Winkel svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE
-Rand svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER
-Von svx:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM
-Bis svx:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO
-VonWert svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM
-BisWert svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO
-Tabelle svx:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS
-Hinzufuegen svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD
-Aendern svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY
-Loeschen svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE
+Typ cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES
+ZentrumX cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X
+ZentrumY cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y
+Winkel cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE
+Rand cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER
+Von cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM
+Bis cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO
+VonWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM
+BisWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO
+Tabelle cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS
+Hinzufuegen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD
+Aendern cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY
+Loeschen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE
 
 *TabFehlermeldung SC:TABPAGE:TP_VALIDATION_ERROR
 FehlermeldungbeiEingabe SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW
@@ -262,11 +262,11 @@ Durchsuchen sw:PushButton:TP_GRF_EXT:PB_BROWSE
 Auswahl HID_VALUESET_NUMBMP
 Optionen HID_NUM_FORMAT_BTN
 Zurueck HID_TABDLG_RESET_BTN
-LinkGraphics svx:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED
+LinkGraphics cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED
 
 *TabGrundfarben HID_OPTIONS_CHART_DEFCOLORS
-Farbliste svx:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST
-Standard svx:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT
+Farbliste cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST
+Standard cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT
 
 *TabGrundschriften HID_STD_FONT
 StandardSchrift sw:ComboBox:TP_STD_FONT:LB_STANDARD
diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win
index e4335f279385..c31ece1bffe2 100755
--- a/testautomation/global/win/tab_h_o.win
+++ b/testautomation/global/win/tab_h_o.win
@@ -1,36 +1,36 @@
 *TabHintergrund HID_BACKGROUND
-Als svx:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR
-Fuer svx:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX
-FuerAbsatz SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX
+Als cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR
+Fuer cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX
+FuerAbsatz cui:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX
 Hintergrundfarbe HID_BACKGROUND_CTL_BGDCOLORSET
-Verknuepfen svx:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK
-Vorschau svx:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW
-Durchsuchen svx:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE
-Position svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
-Flaeche svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA
-Kachel svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE
+Verknuepfen cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK
+Vorschau cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW
+Durchsuchen cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE
+Position cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
+Flaeche cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA
+Kachel cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE
 ArtPosition HID_BACKGROUND_CTL_POSITION
-'ArtPosition svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
+'ArtPosition cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
 'Muster HID_BACKGROUND_CTL_PATTERNSET
 'Musterfarbe HID_BACKGROUND_CTL_PATCOLORSET
 
-*TabHTML svx:TabPage:RID_OFAPAGE_HTMLOPT
-Groesse1 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1
-Groesse2 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2
-Groesse3 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3
-Groesse4 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4
-Groesse5 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5
-Groesse6 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6
-Groesse7 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7
-UnbekannteHTML svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS
-FontEinstellungen svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES
-Export svx:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT
-StarBasic svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC
-Grafikenkopieren svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF
-Drucklayout svx:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION
-WarnungAnzeigen svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING
-Zeichensatz svx:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET
-UseEnglishLocaleForNumbers svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US
+*TabHTML cui:TabPage:RID_OFAPAGE_HTMLOPT
+Groesse1 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1
+Groesse2 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2
+Groesse3 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3
+Groesse4 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4
+Groesse5 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5
+Groesse6 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6
+Groesse7 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7
+UnbekannteHTML cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS
+FontEinstellungen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES
+Export cui:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT
+StarBasic cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC
+Grafikenkopieren cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF
+Drucklayout cui:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION
+WarnungAnzeigen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING
+Zeichensatz cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET
+UseEnglishLocaleForNumbers cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US
 
 *TabHyperlinkRahmen HID_FRM_URL
 URL sw:Edit:TP_FRM_URL:ED_URL
@@ -57,61 +57,61 @@ Zurueck HID_ICCDIALOG_RESET_BTN
 Uebernehmen HID_ICCDIALOG_OK_BTN
 
 +TabHyperlinkInternet Hyperlink
-Internet svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET
-FTP svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP
-Telnet svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET
+Internet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET
+FTP cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP
+Telnet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET
 ZielUrl HID_HYPERDLG_INET_PATH
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT
-Loginname svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN
-Passwort svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD
-AnonymerBenutzer svx:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS
-WWWBrowser svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE
-Target svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT
+Loginname cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN
+Passwort cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD
+AnonymerBenutzer cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS
+WWWBrowser cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE
+Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET
 
 *TabHyperlinkMailUndNews HID_HYPERLINK_MAIL
-EMail svx:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL
-News svx:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS
+EMail cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL
+News cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS
 Receiver HID_HYPERDLG_MAIL_PATH
-Betreff svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT
-Adressbuch svx:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT
+Betreff cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT
+Adressbuch cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT
 Auswahl HID_ICCDIALOG_CHOICECTRL
 Zurueck HID_ICCDIALOG_RESET_BTN
 Uebernehmen HID_ICCDIALOG_OK_BTN
 
 *TabHyperlinkDokument HID_HYPERLINK_DOCUMENT
 Path HID_HYPERDLG_DOC_PATH
-DateiOeffnen svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN
-Ziel svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC
-Target svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT
+DateiOeffnen cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN
+Ziel cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC
+Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT
 Auswahl HID_ICCDIALOG_CHOICECTRL
 Zurueck HID_ICCDIALOG_RESET_BTN
 Uebernehmen HID_ICCDIALOG_OK_BTN
 
 *TabHyperlinkNeuesDokument HID_HYPERLINK_NEWDOCUMENT
-SofortBearbeiten svx:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW
-SpaeterBearbeiten svx:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER
-Datei svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC
-Dateityp svx:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES
-Pfad svx:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT
+SofortBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW
+SpaeterBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER
+Datei cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC
+Dateityp cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES
+Pfad cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT
 Auswahl HID_ICCDIALOG_CHOICECTRL
 Zurueck HID_ICCDIALOG_RESET_BTN
 Uebernehmen HID_ICCDIALOG_OK_BTN
@@ -270,20 +270,20 @@ Diagramme sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS
 Masseinheit sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC
 Tabulatorenabstand sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB
 
-*TabLauftext svx:TabPage:RID_SVXPAGE_TEXTANIMATION
-Effekt svx:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT
-NachOben svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP
-NachLinks svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT
-NachUnten svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN
-NachRechts svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT
-TextSichtbarBeimStarten svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE
-TextSichtbarBeimBeenden svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE
-Endlos svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS
-Anzahl svx:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT
-Automatisch svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO
-Verzoegerung svx:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY
-Pixel svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL
-Schrittweite svx:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT
+*TabLauftext cui:TabPage:RID_SVXPAGE_TEXTANIMATION .
+Effekt cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT
+NachOben cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP
+NachLinks cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT
+NachUnten cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN
+NachRechts cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT
+TextSichtbarBeimStarten cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE
+TextSichtbarBeimBeenden cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE
+Endlos cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS
+Anzahl cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT
+Automatisch cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO
+Verzoegerung cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY
+Pixel cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL
+Schrittweite cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT
 
 *TabLayoutCalc HID_SCPAGE_LAYOUT
 Masseinheit SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT
@@ -301,95 +301,83 @@ NieAktualisieren sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER
 Druckermasse sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT
 Ueberschreibwarnung sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN
 
-' *TabLayoutDraw HID_SD_OPTIONS_LAYOUT
-' LinealeSichtbar SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_RULER
-' Hilfslinien SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_HELPLINES
-' Handles SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_HANDLES_BEZIER
-' Umriss SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_MOVE_OUTLINE
-' Masseinheit SD:LISTBOX:TP_OPTIONS_LAYOUT:LB_METRIC
-' Tabulator SD:METRICFIELD:TP_OPTIONS_LAYOUT:MTR_FLD_TABSTOP
-
-' *TabLayoutHTML HID_LAYOUT_OPT
-
-' *TabLayoutWriter HID_LAYOUT_OPT
-
 *TabLegende HID_CAPTION
 Art HID_CAPTION_CTL_TYPE
-Abstand SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND
-Ansatz SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ
-Laenge SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE
-Position SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL
-Optimal SVX:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE
+Abstand cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND
+Ansatz cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ
+Laenge cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE
+Position cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL
+Optimal cui:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE
 
 *TabLinguistik HID_OPTIONS_LINGU
 Sprachmodule HID_CLB_LINGU_MODULES
-SprachmoduleBearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT
+SprachmoduleBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT
 Optionen HID_CLB_LINGU_OPTIONS
-OptionenBearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT
+OptionenBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT
 Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS
-Neu svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC
-Bearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC
-Loeschen svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC
+Neu cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC
+Bearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC
+Loeschen cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC
 
 *TabLinie HID_LINE_LINE
-Breite svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
-BreiteLinks svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
-BreiteRechts svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
-EndenSynchronisieren svx:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
-Farbe svx:ListBox:RID_SVXPAGE_LINE:LB_COLOR
-Stil svx:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
-StilLinks svx:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
-StilRechts svx:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
-Transparenz svx:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
-ZentriertLinks svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
-ZentriertRechts svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
-CornerStyle svx:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
+Breite cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
+BreiteLinks cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
+BreiteRechts cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
+EndenSynchronisieren cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
+Farbe cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR
+Stil cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
+StilLinks cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
+StilRechts cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
+Transparenz cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
+ZentriertLinks cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
+ZentriertRechts cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
+CornerStyle cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
 
 *TabLinienenden HID_LINE_ENDDEF
-Aendern svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY
-Hinzufuegen svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD
-Liste svx:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS
-Loeschen svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE
-Textfeld svx:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME
+Aendern cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY
+Hinzufuegen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD
+Liste cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS
+Loeschen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE
+Textfeld cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME
 
 *TabLinienstile HID_LINE_DEF
-Abstand svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE
-Aendern svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY
-AnLinienbreite svx:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE
-AnzahlLinks svx:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1
-AnzahlRechts svx:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2
-Hinzufuegen svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD
-LaengeLinks svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1
-LaengeRechts svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2
-Linienstil svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES
-Loeschen svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE
-TypLinks svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1
-TypRechts svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2
+Abstand cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE
+Aendern cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY
+AnLinienbreite cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE
+AnzahlLinks cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1
+AnzahlRechts cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2
+Hinzufuegen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD
+LaengeLinks cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1
+LaengeRechts cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2
+Linienstil cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES
+Loeschen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE
+TypLinks cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1
+TypRechts cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2
 
 *TabLiteraturAllgemein HID_BIB_CONTROL_PAGE
 
-*TabMakro svx:TabPage:RID_SVXPAGE_EVENTASSIGN
+*TabMakro cui:TabPage:RID_SVXPAGE_EVENTASSIGN
 Ereignis HID_MACRO_LB_EVENT
 Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP
 Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS
-Zuweisen svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
-Aufheben svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
-Scripttyp svx:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
-
-*TabMicrosoftOffice97 svx:TabPage:RID_OFAPAGE_MSFILTEROPT
-WinwordBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE
-WinwordBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG
-ExcelBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE
-ExecutableCode svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL
-ExcelBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG
-PowerpointBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE
-PowerpointBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG
-
-*TabMicrosoftOffice2 svx:TabPage:RID_OFAPAGE_MSFILTEROPT2
+Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
+Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
+Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
+
+*TabMicrosoftOffice97 cui:TabPage:RID_OFAPAGE_MSFILTEROPT
+WinwordBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE
+WinwordBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG
+ExcelBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE
+ExecutableCode cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL
+ExcelBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG
+PowerpointBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE
+PowerpointBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG
+
+*TabMicrosoftOffice2 cui:TabPage:RID_OFAPAGE_MSFILTEROPT2
 Auswahl HID_OFAPAGE_MSFLTR2_CLB
 
 *TabModule basctl:TabPage:RID_TP_MODULS
@@ -437,20 +425,9 @@ OutlineLevel sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL
 *TabOptionen HID_OFAPAGE_AUTOCORR_OPTIONS
 Einstellungen HID_OFAPAGE_AUTOCORR_CLB
 
-*TabOptionenDlgAllgemein HID_OFADLG_TREE_GENERAL
-*TabOptionenDlgBild HID_OFADLG_TREE_IMAGE
-*TabOptionenDlgBrowser HID_OFADLG_TREE_BROWSER
-*TabOptionenDlgFormel HID_OFADLG_TREE_FORMULA
-*TabOptionenDlgHTMLDokument HID_OFADLG_TREE_HTML
-*TabOptionenDlgInternet HID_OFADLG_TREE_INTERNET
-*TabOptionenDlgPraesentation HID_OFADLG_TREE_PRESENTATION
-*TabOptionenDlgTabellendokument HID_OFADLG_TREE_CALC
-*TabOptionenDlgTextdokument HID_OFADLG_TREE_TEXT
-*TabOptionenDlgZeichnung HID_OFADLG_TREE_DRAWING
-
 *TabOptionenAutokorrektur HID_OFAPAGE_AUTOFMT_OPTIONS
 Einstellungen HID_OFAPAGE_AUTOFORMAT_CLB
-Bearbeiten svx:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT
+Bearbeiten cui:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT
 
 *TabOptionenTeilergebnisse HID_SCPAGE_SUBT_OPTIONS
 NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK
@@ -463,20 +440,20 @@ Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING
 Absteigend SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING
 
 *TabOptionenNumerierung HID_SVXPAGE_NUM_OPTIONS
-Ebene svx:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL
-Numerierung svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT
-Davor svx:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX
-Dahinter svx:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX
-Zeichenvorlage svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT
-Vollstaendig svx:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL
-BeginnBei svx:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START
-FortlaufeneNumerierung svx:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL
-Zeichen svx:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET
-Auswahl svx:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP
-Breite svx:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH
-Hoehe svx:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT
-Abgleich svx:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO
-Ausrichtung svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT
+Ebene cui:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL
+Numerierung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT
+Davor cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX
+Dahinter cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX
+Zeichenvorlage cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT
+Vollstaendig cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL
+BeginnBei cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START
+FortlaufeneNumerierung cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL
+Zeichen cui:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET
+Auswahl cui:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP
+Breite cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH
+Hoehe cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT
+Abgleich cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO
+Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT
 
 *TabHeaderFooterSlide HID_SD_TABPAGE_HEADERFOOTER_SLIDE
 DateTime sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME
diff --git a/testautomation/global/win/tab_p_s.win b/testautomation/global/win/tab_p_s.win
index b5d016228785..5a51e737b471 100755
--- a/testautomation/global/win/tab_p_s.win
+++ b/testautomation/global/win/tab_p_s.win
@@ -1,19 +1,19 @@
 *TabPfade HID_OPTIONS_PATH
-Standard svx:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD
-Bearbeiten SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH
+Standard cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD
+Bearbeiten cui:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH
 Typ HID_OPTPATH_CTL_PATH
 
 *TabPositionNumerierung HID_SVXPAGE_NUM_POSITION
-Level svx:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL
-Alignment svx:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2
-NumberFollowedBy svx:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY
-NumberFollowedByAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB
-AlignedAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT
-IndentAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT
-Ausrichtung svx:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN
-AbstandTextNumerierung svx:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST
-Relativ svx:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE
-Standard svx:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD
+Level cui:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL
+Alignment cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2
+NumberFollowedBy cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY
+NumberFollowedByAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB
+AlignedAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT
+IndentAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT
+Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN
+AbstandTextNumerierung cui:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST
+Relativ cui:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE
+Standard cui:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD
 
 *TabPositionKapitelnumerierung HID_NUM_POSITION
 Level sw:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL
@@ -75,69 +75,69 @@ Einfuegen HID_FIELD_INSERT
 Schliessen HID_FIELD_CLOSE
 
 *TabSchatten HID_AREA_SHADOW
-Anzeigen svx:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW
+Anzeigen cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW
 Position HID_TPSHADOW_CTRL
-Entfernung svx:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE
-Farbe svx:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR
-Transparenz svx:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT
+Entfernung cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE
+Farbe cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR
+Transparenz cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT
 
 *TabSchraegstellen HID_TRANS_SLANT
-Radius svx:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS
-Winkel svx:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE
+Radius cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS
+Winkel cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE
 
 *TabSchraffuren HID_AREA_HATCH
-Abstand svx:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE
-Winkel svx:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE
+Abstand cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE
+Winkel cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE
 Definition HID_TPHATCH_CTRL
-Linientyp svx:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE
-Linienfarbe svx:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR
-Tabelle svx:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS
-Hinzufuegen svx:PushButton:RID_SVXPAGE_HATCH:BTN_ADD
-Aendern svx:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY
-Loeschen svx:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE
+Linientyp cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE
+Linienfarbe cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR
+Tabelle cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS
+Hinzufuegen cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD
+Aendern cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY
+Loeschen cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE
 
 *TabSchriftErsetzung HID_OFA_FONT_SUBSTITUTION
-Anwenden svx:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE
-Schriftart svx:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1
+Anwenden cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE
+Schriftart cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1
 Liste HID_OFA_FONT_SUBST_CLB
-ErsetzenDurch svx:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2
+ErsetzenDurch cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2
 Uebernehmen HID_OFA_SUBST_APPLY
 Loeschen HID_OFA_SUBST_DELETE
-Fonts svx:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME
-NonProportional svx:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP
-Size svx:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT
+Fonts cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME
+NonProportional cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP
+Size cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT
 
 *TabSeite HID_FORMAT_PAGE
-Links svx:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN
-Rechts svx:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN
-Oben svx:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN
-Unten svx:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN
-Seitenlayout svx:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT
-Numerierung svx:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT
-Papierformat svx:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE
-Breite svx:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH
-Hoehe svx:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT
-Schacht svx:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY
-Horizontal svx:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ
-Vertikal svx:CheckBox:RID_SVXPAGE_PAGE:CB_VERT
-Hoch svx:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT
-Quer svx:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE
-Einschalten SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER
-AbsatzVorlage SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER
-Textfluss svx:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW
-FitObject svx:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT
+Links cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN
+Rechts cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN
+Oben cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN
+Unten cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN
+Seitenlayout cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT
+Numerierung cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT
+Papierformat cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE
+Breite cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH
+Hoehe cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT
+Schacht cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY
+Horizontal cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ
+Vertikal cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT
+Hoch cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT
+Quer cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE
+Einschalten cui:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER
+AbsatzVorlage cui:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER
+Textfluss cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW
+FitObject cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT
 
 *TabSonstigesAllgemein HID_OFA_TP_MISC
-Zweistellig svx:NumericField:OFA_TP_MISC:NF_YEARVALUE
-Aktivieren svx:CheckBox:OFA_TP_MISC:CB_HELPAGENT
-Zuruecksetzen svx:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET
-Tips svx:CheckBox:OFA_TP_MISC:CB_TOOLTIP
-ExtendedTips svx:CheckBox:OFA_TP_MISC:CB_EXTHELP
-StarOfficeDialogeBenutzen svx:CheckBox:OFA_TP_MISC:CB_FILEDLG
-DruckenStatus svx:CheckBox:OFA_TP_MISC:CB_DOCSTATUS
-StyleSheet svx:ListBox:OFA_TP_MISC:LB_HELPFORMAT
+Zweistellig cui:NumericField:OFA_TP_MISC:NF_YEARVALUE
+Aktivieren cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT
+Zuruecksetzen cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET
+Tips cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP
+ExtendedTips cui:CheckBox:OFA_TP_MISC:CB_EXTHELP
+StarOfficeDialogeBenutzen cui:CheckBox:OFA_TP_MISC:CB_FILEDLG
+DruckenStatus cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS
+StyleSheet cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT
 
 *TabSonstigesDraw HID_SD_OPTIONS_MISC
 Schnellbearbeitung SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT
@@ -240,30 +240,30 @@ Weiter sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP
 Zuruecksetzen HID_TABDLG_RESET_BTN
 
 *TabSpeichern HID_OPTIONS_SAVE
-BenutzerspezifischeEinstellungen svx:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS
-DokumenteigenschaftenBearbeiten SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO
-Sicherungskopie svx:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP
-AutomatischSpeichern svx:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE
-Minuten SVX:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE
-NoPrettyPrinting svx:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING
-URLimDateisystem SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS
-URLimInternet SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET
-Dokumenttyp svx:ListBox:RID_SFXPAGE_SAVE:LB_APP
-Filter svx:ListBox:RID_SFXPAGE_SAVE:LB_FILTER
-WarnWhenSavingAlienFormat svx:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT
-LoadPrinterSettingsWithDocument svx:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER
+BenutzerspezifischeEinstellungen cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS
+DokumenteigenschaftenBearbeiten cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO
+Sicherungskopie cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP
+AutomatischSpeichern cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE
+Minuten cui:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE
+NoPrettyPrinting cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING
+URLimDateisystem cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS
+URLimInternet cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET
+Dokumenttyp cui:ListBox:RID_SFXPAGE_SAVE:LB_APP
+Filter cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER
+WarnWhenSavingAlienFormat cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT
+LoadPrinterSettingsWithDocument cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER
 
 *TabSprachen HID_OFA_TP_LANGUAGES
-UILanguage svx:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE
-Gebietsschema svx:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING
-DecimalSeparator svx:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR
-StandardWaehrung svx:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY
-Westlich svx:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG
-Asiatisch svx:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG
-AktuellesDokument svx:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC
-Aktivieren svx:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT
-LanguageComplexScript svx:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG
-ComplexScriptEnabled svx:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT
+UILanguage cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE
+Gebietsschema cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING
+DecimalSeparator cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR
+StandardWaehrung cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY
+Westlich cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG
+Asiatisch cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG
+AktuellesDokument cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC
+Aktivieren cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT
+LanguageComplexScript cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG
+ComplexScriptEnabled cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT
 
 *TabStatistik HID_DOC_STAT
 Aktualisieren sw:PushButton:TP_DOC_STAT:PB_PDATE
@@ -271,17 +271,17 @@ Aktualisieren sw:PushButton:TP_DOC_STAT:PB_PDATE
 *TabStatistikCalc sc:TabPage:RID_SCPAGE_STAT
 
 *TabSuche HID_OPTIONS_SEARCH
-SuchenIn svx:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH
-DienstName svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME
-Und svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND
-Oder svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR
-Exakt svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT
-Praefix svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL
-Suffix svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX
-Trenner svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR
-Schreibstil svx:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE
-Hinzufuegen svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD
-Aendern svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE
-Loeschen svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE
-Neu svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW
+SuchenIn cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH
+DienstName cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME
+Und cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND
+Oder cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR
+Exakt cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT
+Praefix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL
+Suffix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX
+Trenner cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR
+Schreibstil cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE
+Hinzufuegen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD
+Aendern cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE
+Loeschen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE
+Neu cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW
 
diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win
index 510cef7e6da5..aa054c4b8406 100755
--- a/testautomation/global/win/tab_t_z.win
+++ b/testautomation/global/win/tab_t_z.win
@@ -53,50 +53,50 @@ Zahlenformaterkennung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING
 AutomatischeAusrichtung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT
 
 *TabTabulatoren HID_TABULATOR
-AlleLoeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
-Fuellzeichen1 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
-Fuellzeichen2 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
-Fuellzeichen3 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
-Fuellzeichen4 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
-Fuellzeichen5 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
-FuellzeichenZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
-Loeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
-Neu svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
-Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
-TypLinks svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
-TypRechts svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
-TypZentriert svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
-TypDezimal svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
-TypZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
+AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
+Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
+Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
+Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
+Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
+Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
+FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
+Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
+Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
+Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
+TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
+TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
+TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
+TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
+TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
 
 *TabTabulator HID_TABULATOR
-AlleLoeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
-Fuellzeichen1 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
-Fuellzeichen2 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
-Fuellzeichen3 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
-Fuellzeichen4 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
-Fuellzeichen5 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
-FuellzeichenZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
-Loeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
-Neu svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
-Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
-TypLinks svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
-TypRechts svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
-TypZentriert svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
-TypDezimal svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
-TypZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
+AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
+Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
+Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
+Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
+Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
+Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
+FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
+Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
+Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
+Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
+TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
+TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
+TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
+TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
+TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
 
 *TabTastatur HID_CONFIG_ACCEL
 Tastatur HID_ACCELCONFIG_LISTBOX
 Bereich HID_CONFIGGROUP_ACC_LISTBOX
 Funktion HID_CONFIGFUNCTION_ACC_LISTBOX
-Aendern svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE
-Loeschen svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE
-Zuruecksetzen svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET
-Laden svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD
-Speichern svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE
-StarOffice svx:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE
-Application svx:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE
+Aendern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE
+Loeschen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE
+Zuruecksetzen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET
+Laden cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD
+Speichern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE
+StarOffice cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE
+Application cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE
 
 *TabTeilergebnisseOptionen HID_SCPAGE_SUBT_OPTIONS
 NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK
@@ -109,36 +109,36 @@ Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING
 Absteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING
 
 *TabText HID_PAGE_TEXTATTR
-BreiteAnTextAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH
-HoeheAnTextAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT
-AmRahmenAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE
-Konturfluss svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR
-WordWrap svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT
-ResizeShape svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE
-Links svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT
-Rechts svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT
-Oben svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP
-Unten svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM
+BreiteAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH
+HoeheAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT
+AmRahmenAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE
+Konturfluss cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR
+WordWrap cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT
+ResizeShape cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE
+Links cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT
+Rechts cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT
+Oben cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP
+Unten cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM
 AnchorPosition HID_TEXTATTR_CTL_POSITION
-GanzeBreite svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH
+GanzeBreite cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH
 
 *TabTextfluss HID_FORMAT_PARAGRAPH_EXT
-Automatisch svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN
-AbZeichenende svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE
-AbZeichenAnfang svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER
-Trennstellen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH
-Umbruch svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK
-UmbruchTyp svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE
-UmbruchPosition svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION
-MitSeitenvorlage svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL
-Vorlage svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL
-AbsatzNichtTrennen svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER
-AbsaetzeZusammenhalten svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER
-Schusterjungenregelung svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS
-SchusterZeilen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS
-Hurenkinderregelung svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS
-HurenkinderZeilen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS
-Seitenzahl SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM
+Automatisch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN
+AbZeichenende cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE
+AbZeichenAnfang cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER
+Trennstellen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH
+Umbruch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK
+UmbruchTyp cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE
+UmbruchPosition cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION
+MitSeitenvorlage cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL
+Vorlage cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL
+AbsatzNichtTrennen cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER
+AbsaetzeZusammenhalten cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER
+Schusterjungenregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS
+SchusterZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS
+Hurenkinderregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS
+HurenkinderZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS
+Seitenzahl cui:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM
 
 *TabTextflussTabelle HID_TABLE_TEXTFLOW
 Umbruch SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK
@@ -157,27 +157,27 @@ TextDirection sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION
 VerticalAlignment sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT
 
 *TabTransparenz HID_AREA_TRANSPARENCE
-KeineTransparenz svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
-LineareTransparenz svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
-Transparenzverlauf svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
-MFLinTransparenz svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
-TransparenzverlaufTyp svx:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
-MFZentrumX svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
-MFZentrumY svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
-MFWinkel svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
-MFRand svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
-MFStartwert svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
-MFEndwert svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
+KeineTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
+LineareTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
+Transparenzverlauf cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
+MFLinTransparenz cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
+TransparenzverlaufTyp cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
+MFZentrumX cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
+MFZentrumY cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
+MFWinkel cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
+MFRand cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
+MFStartwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
+MFEndwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
 
 *TabTypografisch HID_OFAPAGE_AUTOCORR_QUOTE
-EinfacheErsetzen svx:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO
-DoppelteErsetzen svx:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO
-EinfachWortanfang svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE
-EinfachWortende svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE
-EinfachStandard svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD
-DoppeltWortanfang svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE
-DoppeltWortende svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE
-DoppeltStandard svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD
+EinfacheErsetzen cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO
+DoppelteErsetzen cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO
+EinfachWortanfang cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE
+EinfachWortende cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE
+EinfachStandard cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD
+DoppeltWortanfang cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE
+DoppeltWortende cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE
+DoppeltStandard cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD
 Zurueck HID_TABDLG_RESET_BTN
 
 *TabUmlauf HID_FRM_EXT
@@ -198,18 +198,18 @@ NurAussen sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE
 
 *TabUmrandung HID_BORDER
 Vorgaben HID_BORDER_CTL_PRESETS
-Stil svx:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE
-StilFarbe svx:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR
+Stil cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE
+StilFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR
 Position HID_BORDER_CTL_SHADOWS
-Groesse svx:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE
-SchattenFarbe svx:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR
+Groesse cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE
+SchattenFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR
 Zurueck HID_TABDLG_RESET_BTN
 Standard HID_TABDLG_STANDARD_BTN
-Links svx:MetricField:RID_SVXPAGE_BORDER:MF_LEFT
-Rechts svx:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT
-Oben svx:MetricField:RID_SVXPAGE_BORDER:MF_TOP
-Unten svx:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM
-Synchronisieren svx:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC
+Links cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT
+Rechts cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT
+Oben cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP
+Unten cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM
+Synchronisieren cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC
 
 +TabUmrandungChart TabLinie
 
@@ -230,14 +230,14 @@ Einfuegen HID_FIELD_INSERT
 Schliessen HID_FIELD_CLOSE
 
 *TabVerbinder HID_PAGE_CONNECTION
-Linie1 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
-Linie2 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
-Linie3 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
-AnfangHorizontal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
-AnfangVertikal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
-EndeHorizontal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
-EndeVertikal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
-Typ svx:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE
+Linie1 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
+Linie2 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
+Linie3 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
+AnfangHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
+AnfangVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
+EndeHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
+EndeVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
+Typ cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE
 
 *TabVerwalten HID_MANAGE_STYLES
 VorlagenName sfx2:Edit:TP_MANAGE_STYLES:ED_NAME
@@ -334,46 +334,35 @@ SourceShrink sc:ImageButton:TP_VALIDATION_VALUES:RB_VALIDITY_REF
 ValidityReset HID_TABDLG_RESET_BTN
 
 *TabWortergaenzung HID_OFAPAGE_AUTOCOMPLETE_OPTIONS
-WoerterErgaenzen svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV
-VorschlaegeSammeln svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT
-AlsTipphilfe svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP
-MinWortlaenge svx:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN
-MaxEintraege svx:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES
-AnnehmenMit svx:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY
-GesammelteWorte svx:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES
-EintragLoeschen svx:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES
-AppendSpace svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE
-KeepList svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST
+WoerterErgaenzen cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV
+VorschlaegeSammeln cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT
+AlsTipphilfe cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP
+MinWortlaenge cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN
+MaxEintraege cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES
+AnnehmenMit cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY
+GesammelteWorte cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES
+EintragLoeschen cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES
+AppendSpace cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE
+KeepList cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST
 
 *TabZahlen HID_NUMBERFORMAT
-Kategorie svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
+Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
 ZahlenFormat HID_NUMBERFORMAT_LB_FORMAT
-Sprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
+Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
 FormatPreview HID_NUMBERFORMAT_WND_NUMBER_PREVIEW
-FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
-FuehrendeNullen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
-Nachkommastellen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
-NegativInRot svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
-Tausenderpunkt svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
+FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
+FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
+Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
+NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
+Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
 PBHinzufuegen HID_NUMBERFORMAT_TBI_ADD
 PBEntfernen HID_NUMBERFORMAT_TBI_REMOVE
 PBInfo HID_NUMBERFORMAT_TBI_INFO
-Kommentar SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT
+Kommentar cui:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT
 Zurueck HID_TABDLG_RESET_BTN
-FormatSprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
+FormatSprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
 Standard HID_TABDLG_STANDARD_BTN
-Standardformat svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
-
-' *TabZeichen HID_FORMAT_CHAR_STD
-' Schriftart svx:ComboBox:RID_SVXPAGE_CHAR_STD:LB_FONT
-' Schriftstil svx:ComboBox:RID_SVXPAGE_CHAR_STD:LB_STYLE
-' Schriftgroesse svx:MetricBox:RID_SVXPAGE_CHAR_STD:LB_SIZE
-' Kontur svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_OUTLINE
-' Schatten svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_SHADOW
-' Unterstreichen svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_UNDERLINE
-' Durchstreichen svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_STRIKEOUT
-' Farbe svx:ListBox:RID_SVXPAGE_CHAR_STD:LB_COLOR
-' Sprache svx:ListBox:RID_SVXPAGE_CHAR_STD:LB_LANGUAGE
+Standardformat cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
 
 *TabZeilennumerierung HID_LINENUMBERING
 Einschalten SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON
@@ -396,24 +385,17 @@ Zurueck HID_TABDLG_RESET_BTN
 Standard HID_TABDLG_STANDARD_BTN
 
 *TabZuschneiden HID_SVXPAGE_GRFCROP
-Links svx:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT
-Rechts svx:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT
-Oben svx:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP
-Unten svx:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM
-GroesseBeibehalten svx:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST
-MassstabBeibehalten svx:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST
-GroesseBreite svx:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH
-GroesseHoehe svx:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT
-MassstabBreite svx:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM
-MassstabHoehe svx:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM
-Originalgroesse svx:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE
-
-'*TabZuweisen sfx2:TabPage:RID_SFX_TP_MACROASSIGN
-'Ereignis sw:ListBox:TP_MACROASSIGN:LB_EVENT
-'Bereich sw:ListBox:TP_MACROASSIGN:LB_GROUP
-'Makroname sw:ListBox:TP_MACROASSIGN:LB_NAME
-'Zuweisen sw:PushButton:TP_MACROASSIGN:PB_ASSIGN
-'Aufheben sw:PushButton:TP_MACROASSIGN:PB_DELETE
+Links cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT
+Rechts cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT
+Oben cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP
+Unten cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM
+GroesseBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST
+MassstabBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST
+GroesseBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH
+GroesseHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT
+MassstabBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM
+MassstabHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM
+Originalgroesse cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE
 
 *TabZusaetze HID_FRM_ADD
 ObjektName sw:Edit:TP_FRM_ADD:ED_NAME
diff --git a/testautomation/math/required/m_updt.bas b/testautomation/math/required/m_updt.bas
index 7472d02e2dfa..61b517b1ba65 100755
--- a/testautomation/math/required/m_updt.bas
+++ b/testautomation/math/required/m_updt.bas
@@ -47,6 +47,7 @@ sub main
    use "math\required\includes\m_007_.inc"   ' help
    use "math\required\includes\m_010_.inc"
    use "math\required\includes\m_020_.inc"   ' toolbars
+   use "global\required\includes\g_009.inc"
 
    Call hStatusIn ( "Math","m_updt.bas" )
 
@@ -75,7 +76,6 @@ sub LoadIncludeFiles
    use "global\required\includes\g_option.inc"
    use "global\required\includes\g_customize.inc"
    use "global\required\includes\g_001.inc"
-   use "global\required\includes\g_009.inc"
    use "global\tools\includes\optional\t_ui_filters.inc" ' for gMathFilter in m_001_.inc
    gApplication = "MATH"
    Call GetUseFiles
diff --git a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc
index 1112d4b62551..3f7d55cb8be7 100755
--- a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc
+++ b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc
@@ -1032,6 +1032,10 @@ testcase tDropDownLB_17
     PrintLog "- Open a word document  which includes 2 entries."
     Call hFileOpen(sTestFile)
     Call sMakeReadOnlyDocumentEditable
+
+    Kontext "EditInputList"
+    if EditInputList.Exists then EditInputList.Cancel
+
     PrintLog "- Set focus in front of first line."
     Call wTypeKeys "<MOD1 Home>"
     PrintLog "- Edit/Fields."
@@ -1085,7 +1089,9 @@ testcase tDropDownLB_17
 
     FeldbefehlBearbeitenFunktionen.Cancel
     
-    Call hCloseDocument ' <- close word document
+    Do Until GetDocumentCount = 0
+        Call hCloseDocument
+    Loop
     
 endcase
 
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc
index 3c0595bdff3f..d6eefcacad1e 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc
@@ -631,116 +631,116 @@ endcase
 
 testcase tInsertGraphic_18
 
-  Dim sGraphicName1 as String
-  Dim sGraphicName2 as String
-  Dim sGraphicName3 as String
-  Dim sWidth as String
-  Dim sHeight as String
-
-  sGraphicName1 = "TEST1"
-  sGraphicName2 = "TEST2"
-  sGraphicName3 = "TEST3"
-
-  sWidth       = "7"+ gSeperator + "00" + gMeasurementUnit
-  sHeight      = "6"+ gSeperator + "00" + gMeasurementUnit
+    Dim sGraphicName1 as String
+    Dim sGraphicName2 as String
+    Dim sGraphicName3 as String
+    Dim sWidth as String
+    Dim sHeight as String
 
-  PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)"
- '/// Test Set different attributes via Contextmenu Arrange (send backward)
+    sGraphicName1 = "TEST1"
+    sGraphicName2 = "TEST2"
+    sGraphicName3 = "TEST3"
 
-   Call hNewDocument
+    sWidth       = "7"+ gSeperator + "00" + gMeasurementUnit
+    sHeight      = "6"+ gSeperator + "00" + gMeasurementUnit
 
-   Call wTypeKeys "<Return>"
+    PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)"
+    '/// Test Set different attributes via Contextmenu Arrange (send backward)
 
-  '/// Insert three Graphics at the same place , and named in series
+    Call hNewDocument
 
-   'the 1st graphic
-   fInsertGraphics("Bughunter.jpg")
+    Call wTypeKeys "<Return>"
 
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   ObjektName.SetText sGraphicName1
-   TabZusaetze.OK
+    '/// Insert three Graphics at the same place , and named in series
 
-   fFormatGraphic("TabType")
-   KeepRatio.UnCheck
-   Sleep 1
-   Width.SetText        sWidth
-   wait 500
-   Height.SetText       sHeight
-   wait 500
-   TabType.OK
+    'the 1st graphic
+    fInsertGraphics("Bughunter.jpg")
 
-   Call wTypeKeys "<ESCape>"
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    ObjektName.SetText sGraphicName1
+    Kontext
+    Active.Setpage TabType
+    Kontext "TabType"
+    KeepRatio.UnCheck
+    Sleep 1
+    Width.SetText        sWidth
+    wait 500
+    Height.SetText       sHeight
+    wait 500
+    TabType.OK
 
-   'the 2nd graphic
-   fInsertGraphics("flowers.gif")
+    Call wTypeKeys "<ESCape>"
 
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   ObjektName.SetText sGraphicName2
-   TabZusaetze.OK
+    'the 2nd graphic
+    fInsertGraphics("flowers.gif")
 
-   fFormatGraphic("TabType")
-   KeepRatio.UnCheck
-   Sleep 1
-   Width.SetText        sWidth
-   wait 500
-   Height.SetText       sHeight
-   wait 500
-   TabType.OK
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    ObjektName.SetText sGraphicName2
+    TabZusaetze.OK
 
-   Call wTypeKeys "<ESCape>"
+    fFormatGraphic("TabType")
+    KeepRatio.UnCheck
+    Sleep 1
+    Width.SetText        sWidth
+    wait 500
+    Height.SetText       sHeight
+    wait 500
+    TabType.OK
 
-   'the 3rd graphic
-   fInsertGraphics("game.bmp")
+    Call wTypeKeys "<ESCape>"
 
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   ObjektName.SetText sGraphicName3
-   TabZusaetze.OK
+    'the 3rd graphic
+    fInsertGraphics("game.bmp")
 
-   fFormatGraphic("TabType")
-   KeepRatio.UnCheck
-   Sleep 1
-   Width.SetText        sWidth
-   wait 500
-   Height.SetText       sHeight
-   wait 500
-   TabType.OK
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    ObjektName.SetText sGraphicName3
+    TabZusaetze.OK
 
-   '/// ContextMenu  Arrange / Send backward
-   Call wOpenContextMenu
+    fFormatGraphic("TabType")
+    KeepRatio.UnCheck
+    Sleep 1
+    Width.SetText        sWidth
+    wait 500
+    Height.SetText       sHeight
+    wait 500
+    TabType.OK
+
+    '/// ContextMenu  Arrange / Send backward
+    Call wOpenContextMenu
     hMenuSelectNr(1)
     Sleep 2
     hMenuSelectNr(3)
     Sleep 1
 
-   Call wTypeKeys "<ESCape>"
-   Sleep 1
+    Call wTypeKeys "<ESCape>"
+    Sleep 1
 
-   '/// Check if the attributes Arrange (send to back) works well
-   Call wNavigatorAuswahl(4,1)
-   Sleep 1
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   if ObjektName.GetText <> sGraphicName1  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
-   TabZusaetze.Cancel
+    '/// Check if the attributes Arrange (send to back) works well
+    Call wNavigatorAuswahl(4,1)
+    Sleep 1
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    if ObjektName.GetText <> sGraphicName1  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
+    TabZusaetze.Cancel
 
-   Call wNavigatorAuswahl(4,2)
-   Sleep 1
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   if ObjektName.GetText <> sGraphicName2  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
-   TabZusaetze.Cancel
+    Call wNavigatorAuswahl(4,2)
+    Sleep 1
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    if ObjektName.GetText <> sGraphicName2  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
+    TabZusaetze.Cancel
 
-   Call wNavigatorAuswahl(4,3)
-   Sleep 1
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   if ObjektName.GetText <> sGraphicName3  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
-   TabZusaetze.Cancel
+    Call wNavigatorAuswahl(4,3)
+    Sleep 1
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    if ObjektName.GetText <> sGraphicName3  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
+    TabZusaetze.Cancel
 
-   Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
@@ -748,120 +748,122 @@ endcase
 
 testcase tInsertGraphic_19
 
-  Dim sGraphicName1 as String
-  Dim sGraphicName2 as String
-  Dim sGraphicName3 as String
-  Dim sWidth as String
-  Dim sHeight as String
+    Dim sGraphicName1 as String
+    Dim sGraphicName2 as String
+    Dim sGraphicName3 as String
+    Dim sWidth as String
+    Dim sHeight as String
 
-  sGraphicName1 = "TEST1"
-  sGraphicName2 = "TEST2"
-  sGraphicName3 = "TEST3"
+    sGraphicName1 = "TEST1"
+    sGraphicName2 = "TEST2"
+    sGraphicName3 = "TEST3"
 
-  sWidth       = "7"+ gSeperator + "00" + gMeasurementUnit
-  sHeight      = "6"+ gSeperator + "00" + gMeasurementUnit
+    sWidth       = "7"+ gSeperator + "00" + gMeasurementUnit
+    sHeight      = "6"+ gSeperator + "00" + gMeasurementUnit
 
-  PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)"
- '/// Test Set different attributes via Contextmenu Arrange (bring to front)
+    PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)"
+    '/// Test Set different attributes via Contextmenu Arrange (bring to front)
 
-  Call hNewDocument
+    Call hNewDocument
 
-  Call wTypeKeys "<Return>"
+    Call wTypeKeys "<Return>"
 
-  '/// Insert three Graphics at the same place , and named in series
+    '/// Insert three Graphics at the same place , and named in series
 
-   'the 1st graphic
-   fInsertGraphics("Bughunter.jpg")
+    'the 1st graphic
+    fInsertGraphics("Bughunter.jpg")
 
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   ObjektName.SetText sGraphicName1
-   TabZusaetze.OK
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    ObjektName.SetText sGraphicName1
 
-   fFormatGraphic("TabType")
-   KeepRatio.UnCheck
-   Sleep 1
-   Width.SetText        sWidth
-   wait 500
-   Height.SetText       sHeight
-   wait 500
-   TabType.OK
+    Kontext
+    Active.Setpage TabType
+    Kontext "TabType"
 
-   Call wTypeKeys "<ESCape>"
+    KeepRatio.UnCheck
+    Sleep 1
+    Width.SetText        sWidth
+    wait 500
+    Height.SetText       sHeight
+    wait 500
+    TabType.OK
 
-   'the 2nd graphic
-   fInsertGraphics("flowers.gif")
+    Call wTypeKeys "<ESCape>"
 
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   ObjektName.SetText sGraphicName2
-   TabZusaetze.OK
+    'the 2nd graphic
+    fInsertGraphics("flowers.gif")
 
-   fFormatGraphic("TabType")
-   KeepRatio.UnCheck
-   Sleep 1
-   Width.SetText        sWidth
-   wait 500
-   Height.SetText       sHeight
-   wait 500
-   TabType.OK
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    ObjektName.SetText sGraphicName2
+    TabZusaetze.OK
 
-   Call wTypeKeys "<ESCape>"
+    fFormatGraphic("TabType")
+    KeepRatio.UnCheck
+    Sleep 1
+    Width.SetText        sWidth
+    wait 500
+    Height.SetText       sHeight
+    wait 500
+    TabType.OK
 
-   'the 3rd graphic
-   fInsertGraphics("game.bmp")
+    Call wTypeKeys "<ESCape>"
 
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   ObjektName.SetText sGraphicName3
-   TabZusaetze.OK
+    'the 3rd graphic
+    fInsertGraphics("game.bmp")
 
-   fFormatGraphic("TabType")
-   KeepRatio.UnCheck
-   Sleep 1
-   Width.SetText        sWidth
-   wait 500
-   Height.SetText       sHeight
-   wait 500
-   TabType.OK
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    ObjektName.SetText sGraphicName3
+    TabZusaetze.OK
 
-   '/// Format / Arrange / Send to back
-   FormatArrangeSendToBack
-   Sleep 2
+    fFormatGraphic("TabType")
+    KeepRatio.UnCheck
+    Sleep 1
+    Width.SetText        sWidth
+    wait 500
+    Height.SetText       sHeight
+    wait 500
+    TabType.OK
+
+    '/// Format / Arrange / Send to back
+    FormatArrangeSendToBack
+    Sleep 2
 
-   '/// ContextMenu Arrange / bring to front
-   Call wOpenContextMenu
+    '/// ContextMenu Arrange / bring to front
+    Call wOpenContextMenu
     hMenuSelectNr(1)
     Sleep 2
     hMenuSelectNr(1)
     Sleep 1
 
-   Call wTypeKeys "<ESCape>"
-   Sleep 1
+    Call wTypeKeys "<ESCape>"
+    Sleep 1
 
-   '/// Check if the attributes Arrange (send to back) works well
-   Call wNavigatorAuswahl(4,1)
-   Sleep 1
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   if ObjektName.GetText <> sGraphicName1  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
-   TabZusaetze.Cancel
+    '/// Check if the attributes Arrange (send to back) works well
+    Call wNavigatorAuswahl(4,1)
+    Sleep 1
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    if ObjektName.GetText <> sGraphicName1  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
+    TabZusaetze.Cancel
 
-   Call wNavigatorAuswahl(4,2)
-   Sleep 1
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   if ObjektName.GetText <> sGraphicName2  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
-   TabZusaetze.Cancel
+    Call wNavigatorAuswahl(4,2)
+    Sleep 1
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    if ObjektName.GetText <> sGraphicName2  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
+    TabZusaetze.Cancel
 
-   Call wNavigatorAuswahl(4,3)
-   Sleep 1
-   fFormatGraphic("TabZusaetze")
-   Sleep 1
-   if ObjektName.GetText <> sGraphicName3  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
-   TabZusaetze.Cancel
+    Call wNavigatorAuswahl(4,3)
+    Sleep 1
+    fFormatGraphic("TabZusaetze")
+    Sleep 1
+    if ObjektName.GetText <> sGraphicName3  then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
+    TabZusaetze.Cancel
 
-   Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
index 9a7c142d0b1d..d7f96d0635f3 100755
--- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
+++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
@@ -451,6 +451,7 @@ testcase i103265
 	Call hNewDocument
     printlog "- Open test document"
 	Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" )
+    Call sMakeReadOnlyDocumentEditable
     printlog "- Update TOC"
 	ToolsUpdateAllIndexes
 	
@@ -483,7 +484,7 @@ testcase i103265
 
 	printlog "- Save as HTML"
 	gApplication = "HTML"	
-	Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML" )
+	Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML (StarWriter)" )
     Call hCloseDocument
 	
     printlog "- Reload"
diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc
index 0e4f8ea17f23..ce7ce264e3b1 100755
--- a/testautomation/writer/required/includes/w_005b_.inc
+++ b/testautomation/writer/required/includes/w_005b_.inc
@@ -892,16 +892,9 @@ testcase tFormatAlignmentArea
     Call hNewDocument
 
     printlog " Paste a rectangle from draw via clipboard"
-    if gPlatgroup = "unx" then
-        Call wZeichenobjektEinfuegen ( "Rechteck", 10, 30, 20, 45 )
-        sleep (1)
-        gMouseClick ( 15, 38 )
-    else
-        Call wZeichenobjektEinfuegen ( "Rechteck", 45, 30, 55, 45 )
-        sleep (1)
-        Call wObjektSelektieren ( 43, 25, 60, 50 )
-    endif
-
+    Call wZeichenobjektEinfuegen ( "Rechteck", 45, 30, 55, 45 )
+    sleep (1)
+    Call wObjektSelektieren ( 43, 25, 60, 50 )
     Sleep 1
     try
         printlog " Format / Anchor / As Character"
@@ -1158,11 +1151,7 @@ testcase tFormatStyleEdit
         printlog " Insert a textobject from toolbar"
         Sleep 2
 
-        if gPlatgroup = "unx" then
-            Call gMouseMove(10, 20, 30, 40)
-        else
-            Call gMouseMove(50, 20, 70, 40)
-        endif
+        Call gMouseMove(50, 20, 70, 40)
         hUseAsyncSlot( "FormatStyleBold" )
 
         printlog " Format / Style / Bold"
@@ -1231,11 +1220,7 @@ testcase tFormatAlignmentEdit
     Textobjekt.Click
     printlog " Insert a textbox via 'Draw functions' toolbar"
 
-    if gPlatgroup = "unx" then
-        Call gMouseMove(10, 20, 30, 40)
-    else
-        Call gMouseMove(50, 20, 70, 40)
-    endif
+    Call gMouseMove(50, 20, 70, 40)
     printlog " Insert some text in document"
 
     Call wTypeKeys ("Ein Wort")
@@ -1274,11 +1259,7 @@ testcase tFormatLineSpacing
     Textobjekt.Click
     printlog " In a textbox via 'Draw Functions' toolbox"
 
-    if gPlatgroup = "unx" then
-        Call gMouseMove(10, 20, 30, 40)
-    else
-        Call gMouseMove(50, 20, 70, 40)
-    endif
+    Call gMouseMove(50, 20, 70, 40)
     Sleep 1
 
     printlog " Format / Spacing / Single line"
@@ -1319,11 +1300,7 @@ testcase tFormatParagraphEdit
     Textobjekt.Click
     printlog " In a textbox via 'Draw Functions' toolbox"
 
-    if gPlatgroup = "unx" then
-        Call gMouseMove(10, 20, 30, 40)
-    else
-        Call gMouseMove(50, 20, 70, 40)
-    endif
+    Call gMouseMove(50, 20, 70, 40)
 
     printlog " Format / Paragraph "
     hUseAsyncSlot( "FormatParagraph" )
diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc
index 05d11681efe7..df888de1b429 100755
--- a/testautomation/writer/required/includes/w_020_.inc
+++ b/testautomation/writer/required/includes/w_020_.inc
@@ -417,15 +417,11 @@ testcase t_TB_Form
         Call sMenufunktionen("-Checkbox-")
 
         Kontext "FormControls"
-        if Ucase(gApplication) <> "HTML" then
+        if gApplication <> "HTML" then
             wait 500
             Label.Click
             printlog " Insert a textbox from toolbox"
-            if gplatgroup = "unx" then
-                Call hMalZeichnenMitSelektion ( 10, 40, 21, 25 )
-            else
-                Call hMalZeichnenMitSelektion ( 57, 20, 68, 25 )
-            endif
+            Call hMalZeichnenMitSelektion ( 57, 20, 68, 25 )
             printlog "+ Open Control Properties"
             Call sMenufunktionen("-Textbox-")
         end if
@@ -454,11 +450,7 @@ testcase t_TB_Form
             Combobox.Click
             printlog " Insert a Combobox from toolbox"
             Wait 500
-            if gPlatgroup = "unx" then
-                Call hMalZeichnenMitSelektion ( 41, 40, 52, 35 )
-            else
-                Call hMalZeichnenMitSelektion ( 57, 30, 68, 35 )
-            endif
+            Call hMalZeichnenMitSelektion ( 57, 30, 68, 35 )
             printlog "+ Step through pages of upcoming Autopilot"
             Call sAutopilot_ListboxCombobox("Combo")
             printlog "+ Open Control Properties"
diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas
index 77c8d5350e00..992a4cc9f194 100755
--- a/testautomation/writer/required/w_updt.bas
+++ b/testautomation/writer/required/w_updt.bas
@@ -61,6 +61,8 @@ sub main
 
     Printlog "******* Ressource-Test Writer Document *******"
 
+    Call wChangeDefaultView()
+
     Call hStatusIn ( "writer", "w_updt.bas" )
     Call w_001_              ' Menu File
     Call w_001a_             ' Menu File
diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc
index 19ef41a711de..4515c86811ec 100755
--- a/testautomation/writer/tools/includes/w_tool1.inc
+++ b/testautomation/writer/tools/includes/w_tool1.inc
@@ -343,17 +343,20 @@ sub sMenufunktionen(Fuer_Was as string)
 
     Kontext
     try
-        FormatControl
-        Sleep 1
+        FormatControl 
+        WaitSlot()
+        
         Kontext "ControlPropertiesDialog"
-        if ControlPropertiesDialog.Exists then
+        if ControlPropertiesDialog.Exists( 2 ) then
             ControlPropertiesDialog.Close
+            ControlPropertiesDialog.notExists( 2 )
         else
             FormatControl
             Wait 500
             Kontext "ControlPropertiesDialog"
-            if ControlPropertiesDialog.Exists then
+            if ControlPropertiesDialog.Exists( 2 ) then
                 ControlPropertiesDialog.Close
+                ControlPropertiesDialog.notExists( 2 )
             else
                 Warnlog "  - Controlfieldproperties "+ Fuer_Was +" from Menu not available!"
             end if
diff --git a/testautomation/writer/tools/includes/w_tool2.inc b/testautomation/writer/tools/includes/w_tool2.inc
index 280d18b51677..a68a5eea9ea4 100755
--- a/testautomation/writer/tools/includes/w_tool2.inc
+++ b/testautomation/writer/tools/includes/w_tool2.inc
@@ -409,3 +409,21 @@ function wDeleteAutotext(vAutotextName as string) as boolean
     next ik
 
 end function
+
+
+sub wChangeDefaultView()
+
+    ' #i107038: This code forces the writer to display one page only which is
+    ' zoomed to pagewidth, filling the entire - previously maximized - window.
+    ' This is required because the VCL Testtool might eventually draw objects
+    ' outside the document window depending on display size
+
+    Call hNewDocument
+    ViewZoom
+    Kontext "Massstab"
+    Vergroesserung100.check
+    Singlepage.check
+    Massstab.Ok
+    Call hCloseDocument
+
+end sub
\ No newline at end of file
diff --git a/testshl2/inc/testshl/additionalfunc.hxx b/testshl2/inc/testshl/additionalfunc.hxx
new file mode 100644
index 000000000000..463d1ae87280
--- /dev/null
+++ b/testshl2/inc/testshl/additionalfunc.hxx
@@ -0,0 +1,61 @@
+#ifndef ADDITIONALFUNC_HXX
+#define ADDITIONALFUNC_HXX
+
+#include "testshl/autoregister/registertestfunction.h"
+#include "sal/types.h"
+
+extern "C" void SAL_CALL RegisterAdditionalFunctions(FktRegFuncPtr _pFunc);
+
+#define NOADDITIONAL \
+void RegisterAdditionalFunctions(FktRegFuncPtr){}
+
+namespace {
+
+enum T2_OSType {
+    T2_OS_WNT32 = 1,
+    T2_OS_UNIX,
+    T2_OS_OS2
+};
+
+inline T2_OSType getOSType()
+{
+#if defined WNT
+    return T2_OS_WNT32;
+#elif defined OS2
+    return T2_OS_OS2;
+#else
+    return T2_OS_UNIX;
+#endif
+}
+
+}
+
+#define TESTSHL2_UNO_BOOTSTRAP(file)                                                    \
+void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)                                  \
+{                                                                                       \
+   com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMS;     \
+   com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext; \
+   try {                                                                                \
+       if (strlen(#file) > 0) {                                                         \
+           ::rtl::OUString iniFile(rtl::OUString::createFromAscii(#file));              \
+           if (getOSType() == T2_OS_WNT32 || getOSType() == T2_OS_OS2) {                \
+               iniFile += ::rtl::OUString::createFromAscii(".ini");                     \
+           } else {                                                                     \
+               iniFile += ::rtl::OUString::createFromAscii("rc");                       \
+           }                                                                            \
+           xComponentContext = cppu::defaultBootstrap_InitialComponentContext(iniFile); \
+       } else {                                                                         \
+           xComponentContext = cppu::defaultBootstrap_InitialComponentContext();        \
+       }                                                                                \
+       xMS.set(xComponentContext->getServiceManager(), com::sun::star::uno::UNO_QUERY); \
+       comphelper::setProcessServiceFactory(xMS);                                       \
+   }                                                                                    \
+   catch (::com::sun::star::uno::Exception e ) {                                        \
+       rtl::OString aError;                                                             \
+       aError = rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);           \
+       printf("Error at UNO bootstrap time caught: %s\nMust quit.\n", aError.getStr()); \
+       exit(1);                                                                         \
+   }                                                                                    \
+}
+
+#endif
diff --git a/testshl2/inc/testshl/autoregister/callbackstructure.h b/testshl2/inc/testshl/autoregister/callbackstructure.h
new file mode 100644
index 000000000000..e71d3d960317
--- /dev/null
+++ b/testshl2/inc/testshl/autoregister/callbackstructure.h
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _callbackstructure_h
+#define _callbackstructure_h
+
+#include <sal/types.h>
+#include <cppunit/callbackfunc_fktptr.h>
+#include <testshl/autoregister/registerfunc.h>
+#include <testshl/autoregister/registertestfunction.h>
+#include <testshl/cmdlinebits.hxx>
+
+// this structure will filled by the testshl tool and hand to the testdll
+
+struct CallbackStructure
+{
+    // a version number, if we want to change/expand this struct
+    sal_Int32 nVersion;
+    sal_Int64 nMagic;
+
+    FktRegFuncPtr                aRegisterFunction;
+
+    FktPtr_CallbackDispatch      aCallbackDispatch;
+
+    //# FktPtr_TestResult_startTest  aStartTest;
+    //# FktPtr_TestResult_addFailure aAddFailure;
+    //# FktPtr_TestResult_addError   aAddError;
+    //# FktPtr_TestResult_endTest    aEndTest;
+    //# FktPtr_TestResult_shouldStop aShouldStop;
+    //#
+    //# FktPtr_TestResult_addInfo    aAddInfo;
+    //# FktPtr_TestResult_enterNode  aEnterNode;
+    //# FktPtr_TestResult_leaveNode  aLeaveNode;
+
+    const char* psForward;
+    CmdLineBits nBits;
+
+    // void* pJobList;
+
+    sal_Int64 nMagic2;
+
+    CallbackStructure()
+            :nVersion(1),
+             nMagic(SAL_CONST_INT64(0x0123456789abcdef)),
+             aRegisterFunction(NULL),
+             aCallbackDispatch(NULL),
+             /* aStartTest(NULL),
+             aAddFailure(NULL),
+             aAddError(NULL),
+             aEndTest(NULL),
+             aShouldStop(NULL),
+             aAddInfo(NULL),
+             aEnterNode(NULL),
+             aLeaveNode(NULL), */
+             psForward(NULL),
+             nBits(0),
+             /* pJobList(NULL), */
+             nMagic2(0)
+        {}
+};
+
+#endif
diff --git a/testshl2/inc/testshl/autoregister/htestresult.h b/testshl2/inc/testshl/autoregister/htestresult.h
new file mode 100644
index 000000000000..46cfbc8b6808
--- /dev/null
+++ b/testshl2/inc/testshl/autoregister/htestresult.h
@@ -0,0 +1,6 @@
+#ifndef _htestresult_h
+#define _htestresult_h
+
+typedef void* hTestResult;
+
+#endif
diff --git a/sandbox/com/sun/star/lib/sandbox/CodeSource.java b/testshl2/inc/testshl/autoregister/registerfunc.h
index c1ce3318f989..9decdfe5c3b7 100644
--- a/sandbox/com/sun/star/lib/sandbox/CodeSource.java
+++ b/testshl2/inc/testshl/autoregister/registerfunc.h
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CodeSource.java,v $
- * $Revision: 1.3 $
+ * $RCSfile$
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -16,7 +16,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
@@ -28,25 +28,23 @@
  *
  ************************************************************************/
 
-package com.sun.star.lib.sandbox;
+#ifndef _registerfunc_h
+#define _registerfunc_h
 
-import java.net.URL;
+#include <sal/types.h>
+#include <testshl/autoregister/htestresult.h>
+#include <cppunit/callbackfunc_fktptr.h>
+#include <testshl/autoregister/testfunc.h>
 
-import java.util.Vector;
+struct CallbackStructure;
 
-public final class CodeSource {
-    URL url;
-    java.security.Identity identities[];
+// this function is used to register one function into a Container in the testshl tool.
+extern "C" void SAL_CALL registerFunction(FktPtr aFunc, const char* aFuncName);
 
-    public CodeSource(URL url) {
-        this(url, new java.security.Identity[0]);
-    }
+// this function is the register function for auto registering
 
-    public CodeSource(URL url, java.security.Identity identities[]) {
-        SecurityManager security = System.getSecurityManager();
-//          if(security != null) security.checkSecurityAccess("CodeSource");
+extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* );
+typedef void (* FktRegAllPtr)(CallbackStructure*);
 
-        this.url = url;
-    }
-}
 
+#endif
diff --git a/testshl2/inc/testshl/autoregister/registertestfunction.h b/testshl2/inc/testshl/autoregister/registertestfunction.h
new file mode 100644
index 000000000000..b87d6c335f48
--- /dev/null
+++ b/testshl2/inc/testshl/autoregister/registertestfunction.h
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _registertestfunction_h
+#define _registertestfunction_h
+
+#include <sal/types.h>
+#include <testshl/autoregister/testfunc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// function ptr, to register a function
+typedef void (* FktRegFuncPtr)(FktPtr aFunc, const char* aFuncName);
+
+// this function is used in the testdll to register the given function
+// into the testshl
+extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr aFunc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
diff --git a/testshl2/inc/testshl/autoregister/testfunc.h b/testshl2/inc/testshl/autoregister/testfunc.h
new file mode 100644
index 000000000000..2e23b7769485
--- /dev/null
+++ b/testshl2/inc/testshl/autoregister/testfunc.h
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _testfunc_h
+#define _testfunc_h
+
+#include <testshl/autoregister/htestresult.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// typedef for a testfunction
+typedef void (* FktPtr)(hTestResult);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/svtools/inc/reqitem.hxx b/testshl2/inc/testshl/autoregisterhelper.hxx
index 32fdf4f066dc..fce509a1e48f 100644
--- a/svtools/inc/reqitem.hxx
+++ b/testshl2/inc/testshl/autoregisterhelper.hxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: reqitem.hxx,v $
- * $Revision: 1.5 $
+ * $RCSfile$
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -16,7 +16,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
@@ -27,42 +27,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _REQITEM_HXX
-#define _REQITEM_HXX
 
-#include <solar.h>
-#include <rtti.hxx>
+#ifndef AUTOREGISTER_HXX
+#define AUTOREGISTER_HXX
 
-#if _SOLAR__PRIVATE
-#include <svtools/poolitem.hxx>
-#else
-#include <sfxipool.hxx>
-#endif
-
-// -----------------------------------------------------------------------
+#include <vector>
+#include <rtl/ustring.hxx>
 
-class SfxRequestItem: public SfxSetItem
+#include <testshl/autoregister/testfunc.h>
 
-/** [Description]
+#include "testshl/dynamicregister.hxx"
+#include "testshl/getopt.hxx"
 
-    Represents a function call with optional arguments.
-*/
+typedef std::vector<FktPtr> FunctionList;
 
+// -----------------------------------------------------------------------------
+class JobList;
+class AutomaticRegisterHelper : public DynamicLibraryHelper
 {
+    FunctionList m_aFunctionList;
+    bool m_bLoadLibraryOK;
+    // GetOpt & m_aOptions; // use getOptions() instead!
+
 public:
-                                TYPEINFO();
-                                SfxRequestItem();
-                                SfxRequestItem( USHORT nWhich, SvStream & );
-                                SfxRequestItem( const SfxRequestItem& );
-                                ~SfxRequestItem();
+    AutomaticRegisterHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions/* , JobList * _pJobList = NULL */ );
 
-    virtual int                 operator==( const SfxPoolItem& ) const;
-    virtual
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*        Create(SvStream &, USHORT nItemVersion) const;
-    virtual SvStream&           Store(SvStream &, USHORT nItemVersion ) const;
-};
+    // FunctionList getFunctions(){return m_aFunctionList;}
+    void CallAll(hTestResult _hResult) const;
+
+    /// @return true, if the given DLLName library could load and initialised.
+    bool isOkToStartTests() const {return m_bLoadLibraryOK;}
 
+    virtual ~AutomaticRegisterHelper();
+};
 
 #endif
 
diff --git a/sandbox/com/sun/star/lib/sandbox/Holder.java b/testshl2/inc/testshl/checkboom.hxx
index 0b90503a94b2..0ead958f28d8 100644
--- a/sandbox/com/sun/star/lib/sandbox/Holder.java
+++ b/testshl2/inc/testshl/checkboom.hxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Holder.java,v $
- * $Revision: 1.3 $
+ * $RCSfile$
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -16,7 +16,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
@@ -28,11 +28,13 @@
  *
  ************************************************************************/
 
-package com.sun.star.lib.sandbox;
+#ifndef CHECKBOOM_HXX
+#define CHECKBOOM_HXX
 
+#include <string>
+#include <rtl/ustring.hxx>
 
-public interface Holder {
-    void addCargo(Object object);
-    void removeCargo(Object object);
-}
+void CheckBoom(bool bCondition, std::string const& msg);
+void CheckBoom(bool bCondition, rtl::OUString const& msg);
 
+#endif
diff --git a/svtools/source/misc/iniman.src b/testshl2/inc/testshl/cmdlinebits.hxx
index afc129318653..92f0e5c1c660 100644
--- a/svtools/source/misc/iniman.src
+++ b/testshl2/inc/testshl/cmdlinebits.hxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iniman.src,v $
- * $Revision: 1.27 $
+ * $RCSfile$
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -16,7 +16,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
@@ -28,41 +28,25 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
-
-ErrorBox ERRBOX_CHECK_PLZ
-{
-    BUTTONS = WB_OK ;
-    Message [ en-US ] = "The ZIP code specified is invalid.\nA ZIP code should begin with a number (or in some cases a letter) and\ncan only contain numbers, letters, spaces and dashes.";
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#ifndef CMDLINEBITS_HXX
+#define CMDLINEBITS_HXX
 
+#include <sal/types.h>
 
+typedef sal_uInt32 CmdLineBits;
+const char* getForwardString();
 
+#include <stdarg.h>
 
+enum T_Print_Params {
+    T_INFO = 1,
+    T_VERBOSE,
+    T_DEBUG,
+    T_ERROR
+};
 
+// void t_print(const char*);
+void t_print(const char*, ...);
+void t_print(T_Print_Params, const char*, ...);
 
+#endif
diff --git a/testshl2/inc/testshl/dynamicregister.hxx b/testshl2/inc/testshl/dynamicregister.hxx
new file mode 100644
index 000000000000..dc263950b430
--- /dev/null
+++ b/testshl2/inc/testshl/dynamicregister.hxx
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DYNAMICREGISTER_HXX
+#define DYNAMICREGISTER_HXX
+
+#include <rtl/ustring.hxx>
+#include <osl/module.hxx>
+
+#include "testshl/getopt.hxx"
+#include "testshl/nocopy.hxx"
+
+// -------------------------------------------------
+
+class DynamicLibraryHelper : NOCOPY
+{
+protected:
+    osl::Module*  m_pModule;
+    rtl::OUString m_suDLLName;
+    GetOpt & m_aOptions;
+
+    GetOpt& getOptions() {return m_aOptions;}
+
+public:
+    DynamicLibraryHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions);
+    virtual ~DynamicLibraryHelper();
+
+private:
+    void showFilenameIfVerbose();
+    void realLoadLibrary(rtl::OUString const& _sLibToLoad);
+    void loadLibraryFromAbsolutePath();
+    void loadLibraryFromLocalPath();
+
+    rtl::OUString m_suAbsolutePathFile;  // file:///D:/foo/bar/library.dll
+    rtl::OUString m_suAbsolutePath;      // file:///D:/foo/bar
+    rtl::OUString m_suFilename;          // library.dll
+};
+
+#endif
+
diff --git a/testshl2/inc/testshl/filehelper.hxx b/testshl2/inc/testshl/filehelper.hxx
new file mode 100644
index 000000000000..b3a8e61d0ed5
--- /dev/null
+++ b/testshl2/inc/testshl/filehelper.hxx
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef FILEHELPER_HXX
+#define FILEHELPER_HXX
+
+#include <string>
+#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
+#include <testshl/cmdlinebits.hxx>
+#include "getopt.hxx"
+
+namespace FileHelper
+{
+
+    std::string getTempPath();
+    rtl::OUString convertPath( rtl::OUString const& _suSysPath );
+    rtl::OUString convertPath( rtl::OString const& sysPth );
+    CmdLineBits createFlags( GetOpt & _aOptions );
+
+}
+#endif
+
diff --git a/testshl2/inc/testshl/getopt.hxx b/testshl2/inc/testshl/getopt.hxx
new file mode 100644
index 000000000000..fe77cd8e6755
--- /dev/null
+++ b/testshl2/inc/testshl/getopt.hxx
@@ -0,0 +1,335 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+/*************************************************************************
+#*    class GetOpt
+#*
+#*
+#*    Implementation    getopt.cxx
+#*
+#*    Description:  class to reflect the commandline options. In addition
+#*                  it provides functinality to get options from an inifile
+#*                  ( getIniOptions()), evaluate, test and get options
+#*                  ( hasOpt(), getOpt() ) and display an usage screen
+#*                  formated in dependance of the given optionset, as well
+#*                  as display a status about activ options
+#*
+#*
+#* further descriptions:
+#*
+#* the constructor is called with two parameters:
+#* char* argv[] and char* optionSet[],
+#* the commandline and the available set of options.
+#* Valid optionstrings have to start with a minus '-', otherwise it will
+#* be ignored. Optionstrings consist of one or two arguments divided by a
+#* comma separator, where the second (optional) argument is a short
+#* description of the option, called hint. It will be automatically
+#* formated and displayed in the usage screen if available.
+#* The first argument of the optionstring can consist of two sections,
+#* the name and the optional necessity and format.
+#* The name of the option will be the starting minus followed by a string
+#* like "-src".
+#* One section options will be treated as flag (see '-v' option in example).
+#* The second section consist of '=' or ':' which defines the necessity,
+#* in combination with a character 's' for string or 'n' for numeric and
+#* an optional '@' standing for 'vector of'.
+#* '=' means this option needs an argument, ':' means can take an argument
+#* followed by 's' is, as mentioned above, a single string paramenter,
+#* followed by a 's' in combination with '@' means this argument consists
+#* of one string or a vector of strings separated by commas
+#*
+#* an example for an optionset:
+#*
+#*  static char* optionSet[] = {
+#*                  "-src=s,    release or version of sources",
+#*                  "-ini=s,    ini file with additional options",
+#*                  "-db=s,     path of type description database",
+#*                  "-inPth=s,  source path of component descriptions",
+#*                  "-outPth=s, destination path for testcases",
+#*                  "-logPth=s, destination path for logging",
+#*                  "-mdl=s@,   name(s) of module(s) to generate",
+#*                  "-v,        enable verbose screen messages",
+#*                  "-dbg,      enable debug messages",
+#*                  "-h:s,      display help or help on option",
+#*                  "-help:s,   see -h",
+#*                  NULL
+#*                  };
+#*
+#*    As seen a GetOpt class object will be created via:
+#*         GetOpt  myOptions( argv, optionSet );
+#*
+*************************************************************************/
+#ifndef __QADEV_REGSCAN_GETOPT_HXX__
+#define __QADEV_REGSCAN_GETOPT_HXX__
+
+#include    <osl/file.hxx>
+#include    <sal/types.h>
+#include    <rtl/strbuf.hxx>
+
+
+#include    <rtl/string.hxx>
+
+// #ifndef __QADEV_REGSCAN_UTIL_HXX__
+// #include "inc/util.hxx"
+// #endif
+
+
+#ifdef SOLARIS
+#include <sys/time.h>
+#endif
+
+#include <iostream>
+#include <hash_map>
+// #include "rsexception.hxx"
+
+// using namespace std;
+
+struct gstr {
+    sal_Bool operator()( const rtl::OString& oStr1,
+                                    const rtl::OString& oStr2 ) const {
+        return( oStr1 == oStr2 );
+    }
+};
+
+struct ghstr
+{
+    sal_uInt32 operator()( const rtl::OString& str ) const {
+        return str.hashCode();
+    }
+};
+
+struct frmt {
+    sal_uInt32 fCol;
+    sal_uInt32 sCol;
+    sal_uInt32 len;
+};
+
+typedef std::hash_map< rtl::OString, std::vector< rtl::OString >, ghstr, gstr >
+                                                                optHashMap;
+
+typedef frmt sFormat;
+typedef sal_uInt16 optType;
+
+#define OT_INVALID          0x0000
+#define OT_BOOL             0x0001
+#define OT_STRING           0x0002
+#define OT_NUMBER           0x0004
+#define OT_SINGLE           0x0010
+#define OT_MULTI            0x0020
+#define OT_OPTIONAL         0x0100
+
+//: Option
+class OptDsc {
+
+    rtl::OString    m_name;
+    rtl::OString    m_hint;
+    rtl::OString    m_legend;
+    optType         m_type;
+
+    /**
+     * analysis of optionstring and creation of option description class
+     * @param const rtl::OString& opt = optionstring to analyse
+     * @return void
+     */
+    void createOptDsc( const rtl::OString& opt );
+
+    /**
+     * splitting of an optionstring and creation of a tokenvector
+     * in dependance of a charset
+     *
+     * @param const rtl::OString& opt  = optionstring to split
+     * @param const rtl::OString& cSet = delimiter charset
+     * @param vector< rtl::OString >& optLine = tokenvector to fill
+     *
+     * @return void
+     */
+    void split( const rtl::OString& opt, const rtl::OString& charSet,
+                    std::vector< rtl::OString >& optLine );
+
+    /**
+     * private default c'tor, copy c'tor and assignment operator
+     * to get compiler errors on dumb effords
+     */
+    OptDsc();
+    OptDsc( OptDsc& );
+    OptDsc& operator = ( OptDsc& );
+
+public:
+
+    //> c'tor
+    OptDsc( const rtl::OString& opt )
+            : m_name(),
+              m_hint(),
+              m_legend(),
+              m_type( 0 ) {
+
+        createOptDsc( opt );
+    } ///< c'tor
+
+    //> d'tor
+    ~OptDsc(){}
+
+    /**
+     * returns the name of this option
+     * @return rtl::OString&
+     */
+    inline rtl::OString& getName() { return m_name; }
+    /**
+     * returns the hint of this option
+     * @return rtl::OString&
+     */
+    inline rtl::OString& getHint() { return m_hint; }
+    /**
+     * returns the legend of this option
+     * @return rtl::OString&
+     */
+    inline rtl::OString& getLegend() { return m_legend; }
+
+    /**
+     * returns the type of this option
+     * @return optType
+     */
+    inline optType getType() { return m_type; }
+
+
+    inline sal_Bool isFlag() {
+        return( ( m_type &~ 0xfffe ) == OT_BOOL ) ? sal_True : sal_False;
+    }
+    inline sal_Bool isString() {
+        return( ( m_type &~ 0xfffd ) == OT_STRING ) ? sal_True : sal_False;
+    }
+    inline sal_Bool isNumber() {
+        return( ( m_type &~ 0xfffb ) == OT_NUMBER ) ? sal_True : sal_False;
+    }
+    inline sal_Bool isSingle() {
+        return( ( m_type &~ 0xffef ) == OT_SINGLE ) ? sal_True : sal_False;
+    }
+    inline sal_Bool isMulti() {
+        return( ( m_type &~ 0xffdf ) == OT_MULTI ) ? sal_True : sal_False;
+    }
+    inline sal_Bool isOptional() {
+        return( ( m_type &~ 0xfeff ) == OT_OPTIONAL ) ? sal_True : sal_False;
+    }
+
+}; ///:~ Option
+
+class Exception
+{
+    rtl::OString m_sAsciiMessage;
+public:
+    Exception();
+    virtual ~Exception(){}
+
+    Exception(char const* sAsciiMessage);
+    Exception(rtl::OString const& sAsciiMessage);
+
+    virtual rtl::OUString message() const;
+    virtual char const* what() const;
+};
+
+class ValueNotFoundException : public Exception
+{
+public:
+    ValueNotFoundException();
+    ValueNotFoundException(char const* sExit);
+};
+
+//: GetOpt
+class GetOpt {
+
+    rtl::OString                m_prgname;
+    rtl::OString                m_vardelim;
+    std::vector< rtl::OString >     m_cmdline;
+    std::vector< rtl::OString >     m_param;
+    std::vector< rtl::OString > m_varvec;
+    std::vector< OptDsc* >          m_optionset;
+      optHashMap                    m_opthash;
+
+    //> private methods
+    void initialize( char* cmdLine[], char const * optSet[] );
+    void createCmdLineOptions();
+    sal_uInt32 getMaxNameLength();
+    sal_uInt32 getMaxLegendLength();
+    const rtl::OString optDsc2Str( OptDsc* optDsc , sFormat frm );
+    void tokenize(  const rtl::OString& opt, const rtl::OString& charSet,
+                std::vector< rtl::OString >& optLine, sal_Bool strip = sal_True );
+    ///< private methods
+
+    GetOpt();
+    GetOpt( GetOpt& );
+    GetOpt& operator = ( GetOpt& );
+
+public:
+
+    //> c'tor
+    GetOpt( char* cmdLine[], char const * optSet[], rtl::OString varDelim =
+                                                        rtl::OString( "$" ) )
+            : m_vardelim( varDelim ) {
+
+        initialize( cmdLine, optSet );
+        createCmdLineOptions();
+    } ///< c'tor
+
+    //> d'tor
+    ~GetOpt();
+    ///< d'tor
+
+    //> inline methods
+    inline std::vector< rtl::OString >* getCmdLine() { return &m_cmdline; }
+    inline optHashMap* getOptions() { return ( &m_opthash ); }
+    inline rtl::OString& getName() { return m_prgname; }
+    inline rtl::OString& getFirstParam() { return *(m_param.begin()); }
+    inline std::vector< rtl::OString >& getParams() { return m_param; }
+    rtl::OString& getOpt( const rtl::OString& opt );
+    void rmvOpt( rtl::OString& opt ) {
+        m_opthash.erase( opt );
+    }
+    inline std::vector< rtl::OString >& getOptVec( const rtl::OString& opt ) {
+        return m_opthash[ opt ];
+    }
+    ///< inline methods
+
+
+    sal_Bool exist( rtl::OString& opt );
+    sal_Bool hasParam( std::vector< rtl::OString >::iterator iter );
+    sal_Bool hasVars( void );
+    sal_Bool evaluateOpt( std::vector< rtl::OString >::iterator iter );
+    OptDsc* getOptDsc( rtl::OString& opt );
+    sal_Bool hasOpt( const rtl::OString& opt ) const;
+    ::osl::FileBase::RC getIniOptions( rtl::OString iniPth );
+    void createOpt( rtl::OString& optdsc );
+    void str2Opt( rtl::OString iOpts );
+    void addOpt( rtl::OString& opt, sal_Bool evaluate = sal_True );
+    void replVars( void );
+    void showUsage( void );
+    void printStatus( void );
+
+}; ///:~ GetOpt
+#endif
diff --git a/testshl2/inc/testshl/joblist.hxx b/testshl2/inc/testshl/joblist.hxx
new file mode 100644
index 000000000000..3c2d0c603528
--- /dev/null
+++ b/testshl2/inc/testshl/joblist.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef CPPUNIT_JOBLIST_HXX
+#define CPPUNIT_JOBLIST_HXX
+
+#include <vector>
+#include <string>
+#include <hash_map>
+#include "sal/types.h"
+
+// #include <testshl/nocopy.hxx>
+
+/*
+  struct eqstr
+  {
+  bool operator()( std::string const & s1, std::string const& s2 ) const
+  {
+  return ( s1 == s2 );
+  }
+  };
+*/
+
+/*
+  struct hashstr
+  {
+  sal_uInt32 operator()( std::string const & str ) const
+  {
+  return str.hashCode();
+  }
+  };
+*/
+typedef std::hash_map< std::string, int > HashMap;
+
+// typedef std::vector<std::string> StringList;
+
+#define JOB_UNKNOWN   0
+#define JOB_NOT_FOUND 1
+#define JOB_PASSED    2
+#define JOB_FAILED    3
+#define JOB_ACCESS    4
+
+#define JOB_EXCLUDE_LIST 0x1000
+#define JOB_ONLY_LIST    0x1001
+
+typedef sal_Int16 JobType;
+
+class JobList /* : NOCOPY */
+{
+    HashMap m_aJobList;
+    char** ppsJobList;
+
+    // returns true if the given List contains unxlngi or unxsols or wntmsci...
+    bool isInCurrentEnvironment(std::string const& _sString);
+    std::string trim(std::string const& _sStringToTrim);
+
+public:
+    JobList();
+    ~JobList();
+
+    bool readfile(std::string const& _sFilename, JobType _nJobType);
+    const char** getList() const {return (const char**)ppsJobList;}
+
+    int getJobListEntry(std::string const& _sIndexName);
+    void setJobListEntry(std::string const& _sIndexName, int _nValue);
+
+    int size() {return m_aJobList.size();}
+    HashMap const& getHashMap() {return m_aJobList;}
+};
+
+#endif
+
diff --git a/testshl2/inc/testshl/log.hxx b/testshl2/inc/testshl/log.hxx
new file mode 100644
index 000000000000..b46ec876c911
--- /dev/null
+++ b/testshl2/inc/testshl/log.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ *************************************************************************
+
+      Source Code Control System - Header
+
+      $Header$
+
+      Source Code Control System - Update
+
+*************************************************************************/
+#ifndef __QADEV_REGSCAN_LOG_HXX__
+#define __QADEV_REGSCAN_LOG_HXX__
+
+#include <time.h>
+#include    <rtl/ustring.hxx>
+#include    <rtl/strbuf.hxx>
+#include    <sal/types.h>
+#include    <osl/thread.h>
+#include    <osl/file.hxx>
+
+//!io #include <iostream>
+#include <vector>
+
+// using namespace std;
+
+
+/**
+ * Log derives the interface of the ::osl::File class ( is-a relation ).
+ * Its members (has-a relation) are the (full qualified)name of the log
+ * and an OStringBuffer which represents the content of the logfile.
+ * It provides the functionality of easy-to-use open and write logs
+ */
+//: Log
+class Log {
+
+    ::osl::File*            m_logfile;          // fileobject
+    rtl::OUString         m_logurl;           // url of log
+    rtl::OStringBuffer  m_buf;              // content of log
+
+    Log();
+
+public:
+
+    //> c'tor
+    /**
+     * constructors argument is a full qualified UNC path
+     * @param OUString logfile ( full qualified UNC path )
+     */
+    Log( const rtl::OUString& logURL )
+            : m_logfile( new ::osl::File( logURL ))
+            , m_logurl(logURL)
+    {} ///< c'tor
+
+    //> d'tor
+    virtual ~Log() {
+        m_logfile->close();
+        delete( m_logfile );
+    } ///< d'tor
+
+    //> inline methods
+    // returns a reference to name instance
+    inline rtl::OUString getLogURL() { return m_logurl; }
+    inline rtl::OString getName() { return rtl::OUStringToOString(
+                                    m_logurl, RTL_TEXTENCODING_ASCII_US  ); }
+    ///< inline methods
+
+    // open logfile for overwrite (default) or append
+    ::osl::FileBase::RC open( sal_Bool append = sal_False );
+    ::osl::FileBase::RC close() { return m_logfile->close(); }
+
+
+    // write methods without (default) or with echo on display
+    ::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False );
+    ::osl::FileBase::RC write( const rtl::OString& buf,
+                                   sal_Bool v = sal_False );
+    // ::osl::FileBase::RC write( rtl::OStringBuffer const& buf,
+    //                                sal_Bool v = sal_False );
+    ::osl::FileBase::RC write( const rtl::OUString& buf,
+                                   rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US,
+                                   sal_Bool v = sal_False   );
+
+}; ///:~ Log
+
+Log &operator <<( Log &_aLog, const sal_Char * _sValue );
+Log &operator <<( Log &_aLog, rtl::OString const& _sValue );
+Log &operator <<( Log &_aLog, rtl::OUString const& _sValue );
+// Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue );
+
+#endif
diff --git a/testshl2/inc/testshl/nocopy.hxx b/testshl2/inc/testshl/nocopy.hxx
new file mode 100644
index 000000000000..660bb1892e46
--- /dev/null
+++ b/testshl2/inc/testshl/nocopy.hxx
@@ -0,0 +1,13 @@
+#ifndef NOCOPY_HXX
+#define NOCOPY_HXX
+
+// prevent illegal copies
+class NOCOPY
+{
+    NOCOPY(NOCOPY const&);
+    NOCOPY& operator=(NOCOPY const&);
+public:
+    NOCOPY(){}
+};
+
+#endif
diff --git a/testshl2/inc/testshl/result/SynchronizedObject.h b/testshl2/inc/testshl/result/SynchronizedObject.h
new file mode 100644
index 000000000000..6994fdb1692e
--- /dev/null
+++ b/testshl2/inc/testshl/result/SynchronizedObject.h
@@ -0,0 +1,82 @@
+#ifndef CPPUNIT_SYNCHRONIZEDOBJECT_H
+#define CPPUNIT_SYNCHRONIZEDOBJECT_H
+
+#include <cppunit/Portability.h>
+#include <testshl/nocopy.hxx>
+
+namespace CppUnit
+{
+
+/*! \brief Base class for synchronized object.
+ *
+ * Synchronized object are object which members are used concurrently by mutiple
+ * threads.
+ *
+ * This class define the class SynchronizationObject which must be subclassed
+ * to implement an actual lock.
+ *
+ * Each instance of this class holds a pointer on a lock object.
+ *
+ * See src/msvc6/MfcSynchronizedObject.h for an example.
+ */
+class CPPUNIT_API SynchronizedObject
+{
+public:
+  /*! \brief Abstract synchronization object (mutex)
+   */
+  class SynchronizationObject
+  {
+    public:
+      SynchronizationObject() {}
+      virtual ~SynchronizationObject() {}
+
+      virtual void lock() {}
+      virtual void unlock() {}
+  };
+
+  /*! Constructs a SynchronizedObject object.
+   */
+  SynchronizedObject( SynchronizationObject *syncObject =0 );
+
+  /// Destructor.
+  virtual ~SynchronizedObject();
+
+protected:
+  /*! \brief Locks a synchronization object in the current scope.
+   */
+    class ExclusiveZone : NOCOPY
+  {
+    SynchronizationObject *m_syncObject;
+
+  public:
+    ExclusiveZone( SynchronizationObject *syncObject )
+        : m_syncObject( syncObject )
+    {
+      m_syncObject->lock();
+    }
+
+    ~ExclusiveZone()
+    {
+      m_syncObject->unlock ();
+    }
+  };
+
+  virtual void setSynchronizationObject( SynchronizationObject *syncObject );
+
+protected:
+  SynchronizationObject *m_syncObject;
+
+private:
+  /// Prevents the use of the copy constructor.
+  SynchronizedObject( const SynchronizedObject &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const SynchronizedObject &copy );
+};
+
+
+
+} //  namespace CppUnit
+
+
+#endif  // CPPUNIT_SYNCHRONIZEDOBJECT_H
diff --git a/testshl2/inc/testshl/result/TestListener.h b/testshl2/inc/testshl/result/TestListener.h
new file mode 100644
index 000000000000..0814f21b7e2f
--- /dev/null
+++ b/testshl2/inc/testshl/result/TestListener.h
@@ -0,0 +1,62 @@
+#ifndef CPPUNIT_TESTLISTENER_H    // -*- C++ -*-
+#define CPPUNIT_TESTLISTENER_H
+
+#include <cppunit/Portability.h>
+
+
+namespace CppUnit {
+
+class Exception;
+class Test;
+class TestFailure;
+
+
+/*! \brief Listener for test progress and result.
+ * \ingroup TrackingTestExecution
+ *
+ * Implementing the Observer pattern a TestListener may be registered
+ * to a TestResult to obtain information on the testing progress. Use
+ * specialized sub classes of TestListener for text output
+ * (TextTestProgressListener). Do not use the Listener for the test
+ * result output, use a subclass of Outputter instead.
+ *
+ * The test framework distinguishes between failures and errors.
+ * A failure is anticipated and checked for with assertions. Errors are
+ * unanticipated problems signified by exceptions that are not generated
+ * by the framework.
+ *
+ * \see TestResult
+ */
+class CPPUNIT_API TestListener
+{
+public:
+  virtual ~TestListener() {}
+
+  /// Called when just before a TestCase is run.
+    virtual void startTest( Test *test ) =0 ;
+
+  /*! Called when a failure occurs while running a test.
+   * \see TestFailure.
+   * \warning \a failure is a temporary object that is destroyed after the
+   *          method call. Use TestFailure::clone() to create a duplicate.
+   */
+    virtual void addFailure( const TestFailure &failure ) =0;
+
+  /// Called just after a TestCase was run (even if a failure occured).
+    virtual void endTest( Test *test ) =0;
+
+    // additional info
+    virtual void addInfo(Test *test, const char*) =0;
+
+    // info in which node we are
+    // helper functions to create tree structures
+    // old: virtual void enterNode( const char* ) =0;
+    // old: virtual void leaveNode( const char* ) =0;
+};
+
+
+} // namespace CppUnit
+
+#endif // CPPUNIT_TESTLISTENER_H
+
+
diff --git a/testshl2/inc/testshl/result/TestResult.h b/testshl2/inc/testshl/result/TestResult.h
new file mode 100644
index 000000000000..22b5d2346664
--- /dev/null
+++ b/testshl2/inc/testshl/result/TestResult.h
@@ -0,0 +1,123 @@
+#ifndef CPPUNIT_TESTRESULT_H
+#define CPPUNIT_TESTRESULT_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+#endif
+
+#include <testshl/result/SynchronizedObject.h>
+#include <vector>
+#include <string>
+#include <deque>
+//!io #include <iostream>
+
+#include "testshl/result/optionhelper.hxx"
+#include "cppunit/TestFailure.h"
+
+class Outputter;
+namespace CppUnit {
+
+class Exception;
+class Test;
+// class TestFailure;
+class TestListener;
+
+#if CPPUNIT_NEED_DLL_DECL
+  template class CPPUNIT_API std::deque<TestListener *>;
+#endif
+
+/*! \brief Manages TestListener.
+ * \ingroup TrackingTestExecution
+ *
+ * A single instance of this class is used when running the test. It is usually
+ * created by the test runner (TestRunner).
+ *
+ * This class shouldn't have to be inherited from. Use a TestListener
+ * or one of its subclasses to be informed of the ongoing tests.
+ * Use a Outputter to receive a test summary once it has finished
+ *
+ * TestResult supplies a template method 'setSynchronizationObject()'
+ * so that subclasses can provide mutual exclusion in the face of multiple
+ * threads.  This can be useful when tests execute in one thread and
+ * they fill a subclass of TestResult which effects change in another
+ * thread.  To have mutual exclusion, override setSynchronizationObject()
+ * and make sure that you create an instance of ExclusiveZone at the
+ * beginning of each method.
+ *
+ * \see Test, TestListener, TestResultCollector, Outputter.
+ */
+class CPPUNIT_API TestResult : protected SynchronizedObject
+{
+protected:
+    OptionHelper m_aOptionHelper;
+
+public:
+  TestResult( GetOpt & _aOptions, SynchronizationObject *syncObject = 0 );
+  virtual ~TestResult();
+
+  virtual void addListener( TestListener *listener );
+  virtual void removeListener( TestListener *listener );
+
+  virtual void reset();
+  virtual void stop();
+
+  virtual bool shouldStop() const;
+
+  virtual void startTest( Test *test );
+  virtual void addError( Test *test, Exception *e, ErrorType::num eType=ErrorType::ET_ERROR);
+  virtual void addFailure( Test *test, Exception *e );
+  virtual void endTest( Test *test );
+
+    // LLA: additionals
+  virtual void addInfo(Test *test, const char *sInfo);
+
+  virtual void enterNode(const char* Node);
+  virtual void leaveNode(const char* Node);
+  virtual std::string getNodeName();
+
+  // if true, execution is allowed.
+  virtual bool isAllowedToExecute(std::string const & sName);
+  bool isOnlyShowJobs() {return m_aOptionHelper.isOnlyShowJobs();}
+  bool isOptionWhereAmI();
+
+  virtual void print(Outputter &);
+  void setExitValue(int _nValue) {m_nExitValue = _nValue;}
+  int getExitValue() {return m_nExitValue;}
+
+protected:
+  void addFailure( const TestFailure &failure );
+
+protected:
+  typedef std::deque<TestListener *> TestListeners;
+  TestListeners m_listeners;
+  bool m_stop;
+
+    // this vector is used to expand the test name with a current node name
+    std::vector<std::string> m_aCurrentNodeNames;
+
+    //# std::vector<std::string> m_aNodes;
+
+private:
+  TestResult( const TestResult &other );
+  TestResult &operator =( const TestResult &other );
+  int m_nExitValue;
+};
+
+
+} // namespace CppUnit
+
+
+#if CPPUNIT_NEED_DLL_DECL
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+#endif
+
+#endif // CPPUNIT_TESTRESULT_H
+
+
diff --git a/testshl2/inc/testshl/result/TestResultCollector.h b/testshl2/inc/testshl/result/TestResultCollector.h
new file mode 100644
index 000000000000..ddbe517f8935
--- /dev/null
+++ b/testshl2/inc/testshl/result/TestResultCollector.h
@@ -0,0 +1,165 @@
+#ifndef CPPUNIT_TESTRESULTCOLLECTOR_H
+#define CPPUNIT_TESTRESULTCOLLECTOR_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+#endif
+
+#include <testshl/result/TestResult.h>
+#include <testshl/result/TestSucessListener.h>
+#include <deque>
+#include <vector>
+
+namespace CppUnit
+{
+
+
+#if CPPUNIT_NEED_DLL_DECL
+  template class CPPUNIT_API std::deque<TestFailure *>;
+  template class CPPUNIT_API std::deque<Test *>;
+#endif
+
+
+/*! \brief Collects test result.
+ * \ingroup WritingTestResult
+ * \ingroup BrowsingCollectedTestResult
+ *
+ * A TestResultCollector is a TestListener which collects the results of executing
+ * a test case. It is an instance of the Collecting Parameter pattern.
+ *
+ * The test framework distinguishes between failures and errors.
+ * A failure is anticipated and checked for with assertions. Errors are
+ * unanticipated problems signified by exceptions that are not generated
+ * by the framework.
+ * \see TestListener, TestFailure.
+ */
+
+class OneStringContainer
+{
+    std::string m_sName;
+protected:
+    OneStringContainer() {}
+public:
+    OneStringContainer(std::string const& _sName)
+            :m_sName(_sName){}
+    std::string getString() const {return m_sName;}
+    virtual ~OneStringContainer(){}
+};
+
+// -----------------------------------------------------------------------------
+class TestEnvelope : public OneStringContainer
+{
+    Test* m_pTest;
+public:
+    TestEnvelope():m_pTest(NULL){}
+
+    TestEnvelope(Test* _pTest, std::string const& _sName)
+            : OneStringContainer(_sName),
+              m_pTest(_pTest)
+        {}
+
+    Test* getTest() {return m_pTest;}
+    virtual ~TestEnvelope(){}
+
+};
+
+// -----------------------------------------------------------------------------
+class TestInfo : public TestEnvelope
+{
+public:
+    TestInfo(Test* _pTest, std::string const& _sName)
+            :TestEnvelope(_pTest, _sName)
+        {}
+};
+
+// -----------------------------------------------------------------------------
+class TestFailureEnvelope : public OneStringContainer
+{
+    TestFailure* m_pTestFailure;
+public:
+    TestFailureEnvelope():m_pTestFailure(NULL){}
+
+    TestFailureEnvelope(TestFailure* _pTestFailure, std::string const& _sName)
+            :OneStringContainer(_sName),
+             m_pTestFailure(_pTestFailure)
+        {}
+
+    TestFailure* getTestFailure() {return m_pTestFailure;}
+    virtual ~TestFailureEnvelope(){}
+
+};
+// -----------------------------------------------------------------------------
+
+class CPPUNIT_API TestResultCollector : public TestSucessListener
+{
+    TestResult* m_pResult;
+public:
+    typedef std::deque<TestFailureEnvelope *> TestFailures;
+    typedef std::deque<TestEnvelope *> Tests;
+    typedef std::vector<TestInfo *> TestInfos;
+
+
+  /*! Constructs a TestResultCollector object.
+   */
+  TestResultCollector( TestResult *_pResult, SynchronizationObject *syncObject = 0 );
+
+  /// Destructor.
+  virtual ~TestResultCollector();
+
+  void startTest( Test *test );
+  void endTest( Test *test );
+
+  void addFailure( const TestFailure &failure );
+
+  virtual void reset();
+
+  virtual int runTests() const;
+  virtual int testErrors() const;
+  virtual int testFailures() const;
+  virtual int testFailuresTotal() const;
+
+  virtual const TestFailures& failures() const;
+  virtual const Tests &tests() const;
+  virtual std::string getInfo(Test*);
+
+  virtual void addInfo(Test *test, const char *sInfo);
+
+    // virtual void enterNode(const char* Node);
+    // virtual void leaveNode(const char* Node);
+
+protected:
+  Tests        m_tests;
+  TestFailures m_failures;
+  TestInfos    m_aInfos;
+
+  int m_testErrors;
+
+    // this vector is used to expand the test name with a current node name
+    // std::vector<std::string> m_aCurrentNodeNames;
+    // std::string getNodeName();
+private:
+  /// Prevents the use of the copy constructor.
+  TestResultCollector( const TestResultCollector &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const TestResultCollector &copy );
+};
+
+
+
+} //  namespace CppUnit
+
+
+#if CPPUNIT_NEED_DLL_DECL
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+#endif
+
+
+#endif  // CPPUNIT_TESTRESULTCOLLECTOR_H
diff --git a/testshl2/inc/testshl/result/TestSucessListener.h b/testshl2/inc/testshl/result/TestSucessListener.h
new file mode 100644
index 000000000000..3eb53b9fc13f
--- /dev/null
+++ b/testshl2/inc/testshl/result/TestSucessListener.h
@@ -0,0 +1,40 @@
+#ifndef CPPUNIT_TESTSUCESSLISTENER_H
+#define CPPUNIT_TESTSUCESSLISTENER_H
+
+#include <testshl/result/SynchronizedObject.h>
+#include <testshl/result/TestListener.h>
+
+
+namespace CppUnit
+{
+
+/*! \brief TestListener that checks if any test case failed.
+ * \ingroup TrackingTestExecution
+ */
+class CPPUNIT_API TestSucessListener : public TestListener,
+                                       public SynchronizedObject
+{
+public:
+  /*! Constructs a TestSucessListener object.
+   */
+  TestSucessListener( SynchronizationObject *syncObject = 0 );
+
+  /// Destructor.
+  virtual ~TestSucessListener();
+
+  virtual void reset();
+
+  void addFailure( const TestFailure &failure );
+
+  /// Returns whether the entire test was successful or not.
+  virtual bool wasSuccessful() const;
+
+private:
+  bool m_sucess;
+};
+
+
+} //  namespace CppUnit
+
+
+#endif  // CPPUNIT_TESTSUCESSLISTENER_H
diff --git a/testshl2/inc/testshl/result/TextTestResult.h b/testshl2/inc/testshl/result/TextTestResult.h
new file mode 100644
index 000000000000..e2ba0ffba427
--- /dev/null
+++ b/testshl2/inc/testshl/result/TextTestResult.h
@@ -0,0 +1,62 @@
+#ifndef CPPUNIT_TEXTTESTRESULT_H
+#define CPPUNIT_TEXTTESTRESULT_H
+
+#include <testshl/result/TestResult.h>
+#include <testshl/result/TestResultCollector.h>
+#include <ostream>
+
+class GetOpt;
+namespace CppUnit {
+
+class SourceLine;
+class Exception;
+class Test;
+
+/*! \brief Holds printable test result (DEPRECATED).
+ * \ingroup TrackingTestExecution
+ *
+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
+ */
+class CPPUNIT_API TextTestResult : public TestResult
+/*                                     public TestResultCollector*/
+{
+    TestResultCollector m_aResulter;
+public:
+  TextTestResult(GetOpt& _aOptions);
+
+  virtual void addFailure( const TestFailure &failure );
+  virtual void startTest( Test *test );
+  virtual void endTest( Test *test );
+
+  virtual void print( std::ostream &stream );
+protected:
+
+  virtual void printFailures( std::ostream &stream );
+  virtual void printHeader( std::ostream &stream );
+
+  virtual void printFailure( TestFailure *failure,
+                             int failureNumber,
+                             std::ostream &stream );
+  virtual void printFailureListMark( int failureNumber,
+                                     std::ostream &stream );
+  virtual void printFailureTestName( TestFailure *failure,
+                                     std::ostream &stream );
+  virtual void printFailureType( TestFailure *failure,
+                                 std::ostream &stream );
+  virtual void printFailureLocation( SourceLine sourceLine,
+                                     std::ostream &stream );
+  virtual void printFailureDetail( Exception *thrownException,
+                                   std::ostream &stream );
+  virtual void printFailureWarning( std::ostream &stream );
+  virtual void printStatistics( std::ostream &stream );
+};
+
+/** insertion operator for easy output */
+std::ostream &operator <<( std::ostream &stream,
+                           TextTestResult &result );
+
+} // namespace CppUnit
+
+#endif // CPPUNIT_TEXTTESTRESULT_H
+
+
diff --git a/testshl2/inc/testshl/result/callbackfunc.h b/testshl2/inc/testshl/result/callbackfunc.h
new file mode 100644
index 000000000000..606bf7179163
--- /dev/null
+++ b/testshl2/inc/testshl/result/callbackfunc.h
@@ -0,0 +1,25 @@
+#ifndef _callbackfunc_h
+#define _callbackfunc_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    // this is the entry point from the DLL back to the executable.
+    long CallbackDispatch(int x, ...);
+
+//# void TestResult_startTest(hTestResult _pResult, hTest _pTest);
+//# void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException );
+//# void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException );
+//# void TestResult_endTest( hTestResult _pResult, hTest _pTest );
+//# bool TestResult_shouldStop(hTestResult _pResult);
+//# void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo );
+//#
+//# void TestResult_enterNode( hTestResult _pResult, const char* _sInfo );
+//# void TestResult_leaveNode( hTestResult _pResult, const char* _sInfo );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/testshl2/inc/testshl/result/emacsTestResult.hxx b/testshl2/inc/testshl/result/emacsTestResult.hxx
new file mode 100644
index 000000000000..7198ad7ce852
--- /dev/null
+++ b/testshl2/inc/testshl/result/emacsTestResult.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef cppunit_emacstestresult_h
+#define cppunit_emacstestresult_h
+
+#include <testshl/result/TestResult.h>
+#include <testshl/result/TestResultCollector.h>
+#include <ostream>
+#include "testshl/getopt.hxx"
+
+class Outputter;
+namespace CppUnit {
+
+class SourceLine;
+class Exception;
+class Test;
+
+/*! \brief Holds printable test result (DEPRECATED).
+ * \ingroup TrackingTestExecution
+ *
+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
+ */
+    class CPPUNIT_API emacsTestResult : public TestResult
+
+/* ,public TestResultCollector*/
+    {
+        GetOpt & m_aOptions;
+        // OptionHelper m_aOptionHelper;
+        TestResultCollector m_aResulter;
+
+    public:
+        emacsTestResult(GetOpt & _aOptions);
+
+        // virtual void addFailure( const TestFailure &failure );
+        // virtual void startTest( Test *test );
+        // virtual void endTest( Test *test );
+
+        virtual void print( Outputter &stream );
+
+    protected:
+        virtual void printHeader( Outputter &stream );
+        // virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo);
+        virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName );
+    };
+
+/** insertion operator for easy output */
+//    std::ostream &operator <<( std::ostream &stream,
+//                               emacsTestResult &result );
+
+} // namespace CppUnit
+
+#endif // CPPUNIT_testshlTESTRESULT_H
+
+
diff --git a/testshl2/inc/testshl/result/log.hxx b/testshl2/inc/testshl/result/log.hxx
new file mode 100644
index 000000000000..fe5816a7cb17
--- /dev/null
+++ b/testshl2/inc/testshl/result/log.hxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __QADEV_REGSCAN_LOG_HXX__
+#define __QADEV_REGSCAN_LOG_HXX__
+
+#include <time.h>
+#include    <rtl/ustring.hxx>
+#include    <rtl/strbuf.hxx>
+#include    <sal/types.h>
+#include    <osl/thread.h>
+#include    <osl/file.hxx>
+
+#include <testshl/nocopy.hxx>
+
+//!io #include <iostream>
+#include <vector>
+
+// using namespace std;
+
+
+/**
+ * Log derives the interface of the ::osl::File class ( is-a relation ).
+ * Its members (has-a relation) are the (full qualified)name of the log
+ * and an OStringBuffer which represents the content of the logfile.
+ * It provides the functionality of easy-to-use open and write logs
+ */
+//: Log
+class Log : NOCOPY {
+
+    ::osl::File*            m_logfile;          // fileobject
+    rtl::OUString         m_logurl;           // url of log
+    rtl::OStringBuffer  m_buf;              // content of log
+
+    Log();
+
+public:
+
+    //> c'tor
+    /**
+     * constructors argument is a full qualified UNC path
+     * @param OUString logfile ( full qualified UNC path )
+     */
+    Log( const rtl::OUString& logURL )
+            : m_logfile( new ::osl::File( logURL ))
+            , m_logurl(logURL)
+    {} ///< c'tor
+
+    //> d'tor
+    virtual ~Log()
+        {
+            m_logfile->close();
+            delete( m_logfile );
+        } ///< d'tor
+
+    //> inline methods
+    // returns a reference to name instance
+    inline rtl::OUString getLogURL() { return m_logurl; }
+    inline rtl::OString getName() { return rtl::OUStringToOString(
+                                    m_logurl, RTL_TEXTENCODING_ASCII_US  ); }
+    ///< inline methods
+
+    // open logfile for overwrite (default) or append
+    ::osl::FileBase::RC open( sal_Bool append = sal_False );
+    ::osl::FileBase::RC close() { return m_logfile->close(); }
+
+
+    // write methods without (default) or with echo on display
+    ::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False );
+    ::osl::FileBase::RC write( const rtl::OString& buf,
+                                                    sal_Bool v = sal_False );
+    //! ::osl::FileBase::RC write( rtl::OStringBuffer& buf,
+    //!                                                 sal_Bool v = sal_False );
+    ::osl::FileBase::RC write( const rtl::OUString& buf,
+                            rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US,
+                                                 sal_Bool v = sal_False   );
+
+}; ///:~ Log
+
+#endif
diff --git a/testshl2/inc/testshl/result/optionhelper.hxx b/testshl2/inc/testshl/result/optionhelper.hxx
new file mode 100644
index 000000000000..a3ae28cc4c81
--- /dev/null
+++ b/testshl2/inc/testshl/result/optionhelper.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef optionhelper_hxx
+#define optionhelper_hxx
+
+#include <string>
+
+#include <sal/types.h>
+
+#include "testshl/nocopy.hxx"
+#include "testshl/getopt.hxx"
+#include "testshl/joblist.hxx"
+
+// -----------------------------------------------------------------------------
+
+typedef std::vector<rtl::OString> OStringList;
+
+//!? Better: OptionHelper
+class OptionHelper : NOCOPY
+{
+    GetOpt & m_aOption;
+    JobList     m_aJobOnlyList;
+    JobList     m_aJobExcludeList;
+    OStringList m_aJobFilter;
+
+    std::string m_sProjectId;
+    std::string m_sBuildId;
+
+    std::string getProjectId() const;
+    std::string getBuildId() const;
+    std::string createDateTag(std::string const& _sProjectId, std::string const& _sBuildId);
+
+    void handleJobs();
+public:
+    OptionHelper(GetOpt & _aOption)
+            :m_aOption(_aOption)
+        {
+            if (m_aOption.hasOpt("-projectid"))
+                m_sProjectId = m_aOption.getOpt("-projectid");
+
+            if (m_aOption.hasOpt("-buildid"))
+                m_sBuildId = m_aOption.getOpt("-buildid");
+
+            handleJobs();
+        }
+
+    static std::string integerToAscii(sal_Int32 nValue);
+    static std::string twoDigits(std::string const& _sValue);
+
+    std::string createDateTag();
+    bool showErrors();
+    bool showTests();
+
+    JobList getJobOnlyList() {return m_aJobOnlyList;}
+    JobList getJobExcludeList() {return m_aJobExcludeList;}
+
+    bool isAllowedToExecute(std::string const& _sNode, std::string const& _sName);
+
+    bool isOnlyShowJobs() {return m_aOption.hasOpt("-onlyshowjobs") == sal_True ? true : false;}
+    GetOpt& getOptions() {return m_aOption;}
+    bool isVerbose() {return m_aOption.hasOpt("-verbose") == sal_True ? true : false;}
+    bool isOptionWhereAmI() {return m_aOption.hasOpt("-whereami") == sal_True ? true : false;}
+};
+
+// -----------------------------------------------------------------------------
+
+
+#endif
+
+
diff --git a/testshl2/inc/testshl/result/outputter.hxx b/testshl2/inc/testshl/result/outputter.hxx
new file mode 100644
index 000000000000..9ae49620201e
--- /dev/null
+++ b/testshl2/inc/testshl/result/outputter.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+//
+
+#ifndef outputter_hxx
+#define outputter_hxx
+
+#include <string>
+#include <ostream>
+#include <memory>
+#include "testshl/log.hxx"
+#include <sal/types.h>
+#include "testshl/nocopy.hxx"
+
+// #include <fstream>
+
+class Outputter : NOCOPY
+{
+    std::auto_ptr<Log> m_pLog;
+    std::ostream* m_pStream;
+
+    void writeToAll(const sal_Char* _pStr);
+public:
+    class endl
+    {
+        char c;
+    public:
+        endl():c('\0'){}
+    };
+public:
+    Outputter(Log * _pLog )
+            :m_pLog(_pLog),
+             m_pStream(NULL) {}
+
+    Outputter(std::ostream& _aStream)
+            :m_pLog(NULL),
+             m_pStream(&_aStream) {}
+
+    ~Outputter();
+
+    void write(const sal_Char*);
+    void write(std::string const&);
+    void write(sal_Int32);
+    // void write(double);
+};
+
+Outputter& operator <<( Outputter &stream, const sal_Char* );
+Outputter& operator <<( Outputter &stream, std::string const& );
+Outputter& operator <<( Outputter &stream, sal_Int32 );
+// Outputter& operator <<( Outputter &stream, double );
+
+Outputter& operator <<( Outputter &stream, Outputter::endl const&);
+
+// Outputter& operator <<( Outputter &stream, const char* );
+
+#endif
+
diff --git a/testshl2/inc/testshl/result/testshlTestResult.h b/testshl2/inc/testshl/result/testshlTestResult.h
new file mode 100644
index 000000000000..22a50a9a841e
--- /dev/null
+++ b/testshl2/inc/testshl/result/testshlTestResult.h
@@ -0,0 +1,72 @@
+#ifndef cppunit_testshltestresult_h
+#define cppunit_testshltestresult_h
+
+#include <map>
+#include <testshl/result/TestResult.h>
+#include <testshl/result/TestResultCollector.h>
+#include <ostream>
+#include "testshl/getopt.hxx"
+
+class Outputter;
+
+namespace CppUnit {
+
+class SourceLine;
+class Exception;
+class Test;
+
+struct ltstr
+{
+    bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const
+        {
+            return p1 < p2;
+        }
+};
+typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList;
+
+
+/*! \brief Holds printable test result (DEPRECATED).
+ * \ingroup TrackingTestExecution
+ *
+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
+ */
+    class CPPUNIT_API testshlTestResult : public TestResult
+
+/* ,public TestResultCollector*/
+    {
+        GetOpt & m_aOptions;
+        // OptionHelper m_aOptionHelper;
+        TestResultCollector m_aResulter;
+
+    public:
+        testshlTestResult(GetOpt & _aOptions);
+        virtual ~testshlTestResult();
+
+        // virtual void addFailure( const TestFailure &failure );
+        // virtual void startTest( Test *test );
+        // virtual void endTest( Test *test );
+
+        virtual void print( Outputter &stream );
+
+    protected:
+        virtual void printHeader( Outputter &stream );
+
+        void printLines(Outputter &stream, HashMap & _aJobList);
+        void printFailedTests(Outputter &stream, TestPtrList &aFailedTests);
+        void printTestLines(Outputter &stream, TestPtrList &aFailedTests);
+        void printUnknownLines(Outputter &stream, HashMap & _aJobList);
+
+        virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo);
+        virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName );
+        virtual void printUnknownLine( Outputter &stream, std::string const& _sTestName);
+    };
+
+/** insertion operator for easy output */
+    Outputter &operator <<( Outputter &stream,
+                            testshlTestResult &result );
+
+} // namespace CppUnit
+
+#endif // CPPUNIT_testshlTESTRESULT_H
+
+
diff --git a/svtools/inc/svtools/options.hxx b/testshl2/inc/testshl/signaltest.h
index 33ba515af67d..7c501bd846c1 100644
--- a/svtools/inc/svtools/options.hxx
+++ b/testshl2/inc/testshl/signaltest.h
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: options.hxx,v $
- * $Revision: 1.3 $
+ * $RCSfile$
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -16,7 +16,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
@@ -28,28 +28,38 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SVTOOLS_OPTIONS_HXX
-#define INCLUDED_SVTOOLS_OPTIONS_HXX
+#ifndef SIGNALTEST_H
+#define SIGNALTEST_H
 
-#include "sal/config.h"
-#include "svtools/svldllapi.h"
+#include <string>
+#include "cppunit/Test.h"
+#include <testshl/autoregister/htestresult.h>
 
-namespace svt { namespace detail {
+namespace CppUnit
+{
 
-// A base class for the various option classes supported by
-// svtools/source/config/itemholderbase.hxx (which must be public, as it is
-// shared between svl and svt):
-class SVL_DLLPUBLIC Options {
+class CPPUNIT_API SignalTest : public Test
+{
 public:
-    Options();
 
-    virtual ~Options() = 0;
+    SignalTest( std::string const& Name );
+
+    ~SignalTest();
+
+    virtual void run(hTestResult pResult);
+    virtual int countTestCases() const;
+    std::string getName() const;
+    std::string toString() const;
 
 private:
-    SVL_DLLPRIVATE Options(Options &); // not defined
-    SVL_DLLPRIVATE void operator =(Options &); // not defined
+    SignalTest( const SignalTest &other );
+    SignalTest &operator=( const SignalTest &other );
+
+private:
+    const std::string m_sName;
 };
 
-} }
+} // namespace CppUnit
+
 
 #endif
diff --git a/testshl2/inc/testshl/simpleheader.hxx b/testshl2/inc/testshl/simpleheader.hxx
new file mode 100644
index 000000000000..5b378acafd02
--- /dev/null
+++ b/testshl2/inc/testshl/simpleheader.hxx
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef CPPUNIT_SIMPLEHEADER_HXX
+#define CPPUNIT_SIMPLEHEADER_HXX
+
+// This file contains only the cppunit header files, for simplification.
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCaller.h>
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestAssert.h>
+#include <testshl/autoregister/registertestfunction.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <testshl/additionalfunc.hxx>
+#include <testshl/cmdlinebits.hxx>
+#include <testshl/checkboom.hxx>
+
+#endif
diff --git a/testshl2/inc/testshl/stringhelper.hxx b/testshl2/inc/testshl/stringhelper.hxx
new file mode 100644
index 000000000000..60809e3d3551
--- /dev/null
+++ b/testshl2/inc/testshl/stringhelper.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef STRINGHELPER_HXX
+#define STRINGHELPER_HXX
+
+#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
+
+inline void operator <<= (rtl::OString& _rAsciiString, const rtl::OUString& _rUnicodeString)
+{
+    _rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
+}
+
+#endif
diff --git a/testshl2/inc/testshl/taghelper.hxx b/testshl2/inc/testshl/taghelper.hxx
new file mode 100644
index 000000000000..0275d0885893
--- /dev/null
+++ b/testshl2/inc/testshl/taghelper.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef TAGHELPER_HXX
+#define TAGHELPER_HXX
+
+#include <map>
+#include <sal/types.h>
+#include <testshl/nocopy.hxx>
+#include <cppunit/tagvalues.hxx>
+
+/* Tags are a general mechanism of extensible data arrays for parameter
+ * specification and property inquiry. In practice, tags are used in arrays,
+ * or chain of arrays.
+ *
+ */
+
+typedef sal_IntPtr TagData;
+
+//# struct TagItem
+//# {
+//#     Tag     ti_Tag;     /* identifies the type of data */
+//#     TagData ti_Data;    /* type-specific data          */
+//# };
+
+/* constants for Tag.ti_Tag, control tag values */
+#define TAG_DONE   (Tag(0L))     /* terminates array of TagItems. ti_Data unused */
+#define TAG_END    (Tag(0L))     /* synonym for TAG_DONE             */
+#define TAG_IGNORE (Tag(1L))     /* ignore this item, not end of array       */
+#define TAG_MORE   (Tag(2L))     /* ti_Data is pointer to another array of TagItems
+               * note that this tag terminates the current array
+               */
+#define TAG_SKIP   (Tag(3L))      /* skip this and the next ti_Data items     */
+
+/* differentiates user tags from control tags */
+#define TAG_USER   (Tag(1L<<31))
+
+// -----------------------------------------------------------------------------
+class TagHelper /* : NOCOPY */
+{
+    typedef std::map<Tag, TagData> TagItems;
+    TagItems m_aTagItems;
+
+public:
+    TagHelper(){}
+    void insert(Tag _nTag, TagData _nData)
+    {
+        m_aTagItems[_nTag] = _nData;
+    }
+    // const TagItems& get() const { return m_aTagItems; }
+
+    TagData GetTagData(Tag _aTagValue, TagData _aDefaultValue = 0 /* NULL */) const
+    {
+        TagItems::const_iterator it = m_aTagItems.find(_aTagValue);
+        if (it != m_aTagItems.end())
+            return (*it).second;
+        else
+            return _aDefaultValue;
+    }
+};
+
+#endif
+
+
diff --git a/svtools/inc/svipcdef.h b/testshl2/inc/testshl/tresstatewrapper.h
index ec944f92d0f0..5730a2126718 100644
--- a/svtools/inc/svipcdef.h
+++ b/testshl2/inc/testshl/tresstatewrapper.h
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svipcdef.h,v $
- * $Revision: 1.3 $
+ * $RCSfile$
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -16,7 +16,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
@@ -28,42 +28,37 @@
  *
  ************************************************************************/
 
-#ifndef _SVIPCDEF_H
-#define _SVIPCDEF_H
+#ifndef TESTSTATEWRAPPER_H
+#define TESTSTATEWRAPPER_H
+
+#ifdef _RTL_TRES_H_
+#error "This is old code, please remove the include of rtl/tres.h"
+#endif
+
+#include <sal/types.h>
+#include "testshl/autoregister/registertestfunction.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined (WNT) || defined (WIN)
-#define CDECL __cdecl
-#elif defined CSET
-#define CDECL _System
-#else
-#define CDECL
-#endif
+// typedef void* hTestResult;
+typedef hTestResult rtlTestResult;
 
-#if defined WIN
-#define _EXTLIBCALL_ _pascal
-#else
-#define _EXTLIBCALL_ CDECL
-#endif
+// -----------------------------------------------------------------------------
+void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName);
+void c_rtl_tres_state_end(hTestResult _aResult, const sal_Char* _pName);
 
-typedef void (CDECL *IPCCallbackFunc)(void*);
+// -----------------------------------------------------------------------------
+// the old test state function, which here convert all values for using with the
+// new testshl tool
+
+sal_Bool SAL_CALL c_rtl_tres_state(
+    hTestResult pResult,
+    sal_Bool bSuccess,
+    char const * pTestMsg,
+    char const * pFuncName);
 
-extern void _EXTLIBCALL_ IPCFreeMemory(void*);
-extern short _EXTLIBCALL_ IPCGetStatus(void*);
-extern short _EXTLIBCALL_ IPCInit(void);
-extern void  _EXTLIBCALL_ IPCDeInit(void);
-extern void*  _EXTLIBCALL_ IPCConnectServer(const char*, IPCCallbackFunc);
-extern void  _EXTLIBCALL_ IPCDisconnectServer(void *);
-#ifdef WIN
-extern long CDECL IPCCALLFUNCTION(void *,unsigned long,void *,
-                                               short,const char *, char, ...);
-#else
-extern long CDECL IPCCallFunction(void *,unsigned long,void *,
-                                               short,const char *, char, ...);
-#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/svtools/inc/whmap.hxx b/testshl2/inc/testshl/tresstatewrapper.hxx
index 9677bdf328ce..c840c1606140 100644
--- a/svtools/inc/whmap.hxx
+++ b/testshl2/inc/testshl/tresstatewrapper.hxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: whmap.hxx,v $
- * $Revision: 1.3 $
+ * $RCSfile$
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -16,7 +16,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
@@ -27,35 +27,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SFX_WHMAP_HXX
-#define _SFX_WHMAP_HXX
 
-#include <solar.h>
+#ifndef teststatewrapper_hxx
+#define teststatewrapper_hxx
 
-struct SfxWhichMapEntry
-{
-    USHORT nWhichId;
-    USHORT nSlotId;
-};
+#include <testshl/nocopy.hxx>
+#include <sal/types.h>
 
-class SfxWhichMap
-{
-    const SfxWhichMapEntry *pMap;
-
-public:
-    inline              SfxWhichMap( const SfxWhichMapEntry *pMappings = 0 );
-    virtual             ~SfxWhichMap();
+#include <testshl/simpleheader.hxx>
+#include <cppunit/callbackfunc_fktptr.h>
 
-    int                 IsNull() const
-                        { return 0 == pMap; }
-    virtual USHORT      GetWhich(USHORT nSlot) const;
-    virtual USHORT      GetSlot(USHORT nWhich) const;
-    virtual SfxWhichMap*Clone() const;
-};
+// This is a hack, because it's possible that the testshl directory doesn't exist.
+#ifdef LOAD_TRESSTATEWRAPPER_LOCAL
+#include "tresstatewrapper.h"
+#else
+#include <testshl/tresstatewrapper.h>
+#endif
 
-inline SfxWhichMap::SfxWhichMap( const SfxWhichMapEntry *pMappings ):
-    pMap( pMappings )
+// -----------------------------------------------------------------------------
+// helper class to mark the start off old test code
+// the name is need in the test result generator
+class rtl_tres_state_start : NOCOPY
 {
-}
+    const sal_Char* m_pName;
+    hTestResult     m_aResult;
+public:
+    rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName);
+    ~rtl_tres_state_start();
+};
 
 #endif
+
diff --git a/testshl2/inc/testshl/versionhelper.hxx b/testshl2/inc/testshl/versionhelper.hxx
new file mode 100644
index 000000000000..bfba729397ba
--- /dev/null
+++ b/testshl2/inc/testshl/versionhelper.hxx
@@ -0,0 +1,87 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef AUTOREGISTER_HXX
+#define AUTOREGISTER_HXX
+
+#include <stdio.h>
+#include <vector>
+#include <ostream>
+#include <iostream>
+
+#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
+
+#include "dynamicregister.hxx"
+
+// -----------------------------------------------------------------------------
+// ---------------------------------- Version ----------------------------------
+// -----------------------------------------------------------------------------
+// extern "C" const struct VersionInfo *GetVersionInfo();
+
+// this is a Hack, but at the moment, no change to handle this behaviour better.
+struct VersionInfo
+{
+    const char* pTime;
+    const char* pDate;
+    const char* pUpd;
+    const char* pMinor;
+    const char* pBuild;
+    const char* pInpath;
+};
+typedef const struct VersionInfo* (*FktGetVersionInfoPtr)();
+
+// -----------------------------------------------------------------------------
+class VersionHelper : public DynamicLibraryHelper
+{
+    const VersionInfo *m_pInfo;
+
+public:
+    VersionHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions);
+//  void print(std::ostream& _aStream);
+    void printall(FILE*);
+
+    rtl::OString getTime() const;
+    rtl::OString getDate() const;
+    rtl::OString getUpd() const;
+    rtl::OString getMinor() const;
+    rtl::OString getBuild() const;
+    rtl::OString getInpath() const;
+
+    bool isOk() const;
+};
+
+/** insertion operator for easy output */
+// std::ostream &operator <<( std::ostream &stream,
+//                           VersionHelper &version );
+
+
+#endif
+
diff --git a/svtools/source/config/options.cxx b/testshl2/inc/testshl/winstuff.hxx
index b418b90530a3..d50a0aa6ce42 100644
--- a/svtools/source/config/options.cxx
+++ b/testshl2/inc/testshl/winstuff.hxx
@@ -6,8 +6,9 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: options.cxx,v $
- * $Revision: 1.5 $
+ * $RCSfile$
+ *
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,15 +29,16 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#include "sal/config.h"
-
-#include <svtools/options.hxx>
+#ifndef WINSTUFF_HXX
+#define WINSTUFF_HXX
 
-using svt::detail::Options;
+#include <sal/types.h>
 
-Options::Options() {}
+// Isolated into own compilation unit, to avoid interference with
+// windows headers
+void        WinDebugBreak();
+void        WinSleep( sal_uInt32 sec );
+sal_uInt32  WinGetCurrentProcessId();
+void        WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout );
 
-Options::~Options() {}
+#endif
diff --git a/testshl2/prj/build.lst b/testshl2/prj/build.lst
index d7a5c76cc435..7bbdfa8c1646 100644
--- a/testshl2/prj/build.lst
+++ b/testshl2/prj/build.lst
@@ -1,6 +1,9 @@
-t2  testshl2   :  cppunit NULL
+t2  testshl2   :  cppunit sal NULL
 t2  testshl2                           usr1    -   all t2_mkout NULL
-t2  testshl2\inc                       nmake   -    all t2_inc NULL
-t2  testshl2\source                    nmake   -   all t2_src t2_inc NULL
+t2  testshl2\inc                       nmake   -   all t2_inc NULL
+t2  testshl2\source\cppunit\win32      nmake   -   all t2_src_cppunit_win32 t2_inc NULL
+t2  testshl2\source\cppunit            nmake   -   all t2_src_cppunit t2_src_cppunit_win32 t2_inc NULL
+t2  testshl2\source\cppunit\result     nmake   -   all t2_src_cppunit_result t2_inc NULL
+t2  testshl2\source                    nmake   -   all t2_src t2_src_cppunit_result t2_src_cppunit t2_inc NULL
 t2  testshl2\util                      nmake   -   all t2_util t2_src NULL
 
diff --git a/testshl2/prj/d.lst b/testshl2/prj/d.lst
index f97cec8747d6..67cc1ad8e9e7 100644
--- a/testshl2/prj/d.lst
+++ b/testshl2/prj/d.lst
@@ -1,23 +1,29 @@
-..\%__SRC%\bin\testshl2.exe    %_DEST%\bin%_EXT%\testshl2.exe
-..\%__SRC%\bin\testshl2_timeout.exe    %_DEST%\bin%_EXT%\testshl2_timeout.exe
-..\%__SRC%\bin\testshl2        %_DEST%\bin%_EXT%\testshl2
-..\%__SRC%\bin\testshl2_timeout    %_DEST%\bin%_EXT%\testshl2_timeout
-..\%__SRC%\bin\versioninfo.exe %_DEST%\bin%_EXT%\versioninfo.exe
-..\%__SRC%\bin\versioninfo     %_DEST%\bin%_EXT%\versioninfo
+../%__SRC%/bin/testshl2.exe    %_DEST%/bin%_EXT%/testshl2.exe
+../%__SRC%/bin/testshl2_timeout.exe    %_DEST%/bin%_EXT%/testshl2_timeout.exe
+../%__SRC%/bin/testshl2        %_DEST%/bin%_EXT%/testshl2
+../%__SRC%/bin/testshl2_timeout    %_DEST%/bin%_EXT%/testshl2_timeout
+../%__SRC%/bin/versioninfo.exe %_DEST%/bin%_EXT%/versioninfo.exe
+../%__SRC%/bin/versioninfo     %_DEST%/bin%_EXT%/versioninfo
 
-..\source\codegen\codegen.pl %_DEST%\bin%_EXT%\codegen_testshl2.pl
+../source/codegen/codegen.pl %_DEST%/bin%_EXT%/codegen_testshl2.pl
 
-mkdir: %_DEST%\inc%_EXT%\testshl
-..\inc\*.hxx %_DEST%\inc%_EXT%\testshl\*.hxx
-..\inc\*.h   %_DEST%\inc%_EXT%\testshl\*.h
+mkdir: %_DEST%/inc%_EXT%/testshl
+mkdir: %_DEST%/inc%_EXT%/testshl/autoregister
+mkdir: %_DEST%/inc%_EXT%/testshl/result
+../inc/testshl/*.hxx %_DEST%/inc%_EXT%/testshl/*.hxx
+../inc/testshl/*.h   %_DEST%/inc%_EXT%/testshl/*.h
+../inc/testshl/result/*.hxx %_DEST%/inc%_EXT%/testshl/result/*.hxx
+../inc/testshl/result/*.h   %_DEST%/inc%_EXT%/testshl/result/*.h
+../inc/testshl/autoregister/*.h   %_DEST%/inc%_EXT%/testshl/autoregister/*.h
 
-..\%__SRC%\lib\cppunit.lib %_DEST%\lib%_EXT%\cppunit.lib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+../%__SRC%/lib/testshl2.lib %_DEST%/lib%_EXT%/testshl2.lib
+../%__SRC%/lib/*.a %_DEST%/lib%_EXT%/*.a
+../%__SRC%/lib/c5t_*.lib %_DEST%/lib%_EXT%/c5t_*.lib
 
 # The follows is a testshl2 selftest library, which must be delivered for tests.
 # But per default this library doesn't exists.
 # For more information see workben/selftest
-..\%__SRC%\bin\delivertest.dll      %_DEST%\bin%_EXT%\testshl2_deliver_test.dll
-..\%__SRC%\lib\libdelivertest.so    %_DEST%\lib%_EXT%\libtestshl2_deliver_test.so
-..\%__SRC%\lib\libdelivertest.dylib %_DEST%\lib%_EXT%\libtestshl2_deliver_test.dylib
+../%__SRC%/bin/delivertest.dll      %_DEST%/bin%_EXT%/testshl2_deliver_test.dll
+../%__SRC%/lib/libdelivertest.so    %_DEST%/lib%_EXT%/libtestshl2_deliver_test.so
+../%__SRC%/lib/libdelivertest.dylib %_DEST%/lib%_EXT%/libtestshl2_deliver_test.dylib
 
diff --git a/testshl2/source/autoregisterhelper.cxx b/testshl2/source/autoregisterhelper.cxx
index ff36ecac6db6..55dd1103861e 100644
--- a/testshl2/source/autoregisterhelper.cxx
+++ b/testshl2/source/autoregisterhelper.cxx
@@ -38,10 +38,10 @@
 
 #include <rtl/ustring.hxx>
 
-#include <cppunit/autoregister/registerfunc.h>
-#include <cppunit/autoregister/callbackstructure.h>
-#include <cppunit/result/callbackfunc.h>
-#include <cppunit/autoregister/testfunc.h>
+#include <testshl/autoregister/registerfunc.h>
+#include <testshl/autoregister/callbackstructure.h>
+#include <testshl/result/callbackfunc.h>
+#include <testshl/autoregister/testfunc.h>
 #include "testshl/filehelper.hxx"
 
 FunctionList m_Functions;
diff --git a/testshl2/source/codegen/codegen.pl b/testshl2/source/codegen/codegen.pl
index 6e2120798fac..ab7a68397aeb 100644
--- a/testshl2/source/codegen/codegen.pl
+++ b/testshl2/source/codegen/codegen.pl
@@ -63,7 +63,7 @@ sub generateNewPackage(*$)
     open(CPPFILE, ">$sFilename") || die "can't create source file";
     print CPPFILE "// autogenerated file with codegen.pl\n";
     print CPPFILE "\n";
-    print CPPFILE "#include <cppunit/simpleheader.hxx>\n";
+    print CPPFILE "#include <testshl/simpleheader.hxx>\n";
     print CPPFILE "\n";
     print CPPFILE "namespace $sPackageName\n";
     print CPPFILE "{\n";
diff --git a/testshl2/source/cppunit/cmdlinebits.cxx b/testshl2/source/cppunit/cmdlinebits.cxx
new file mode 100644
index 000000000000..9a9bf6789330
--- /dev/null
+++ b/testshl2/source/cppunit/cmdlinebits.cxx
@@ -0,0 +1,144 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#ifdef WNT
+# define UNDER_WINDOWS_DEBUGGING
+# include "testshl/winstuff.hxx"
+#endif /* WNT */
+
+#include <stdio.h>
+#include <testshl/cmdlinebits.hxx>
+#include "testshl/checkboom.hxx"
+
+#include <testshl/autoregister/callbackstructure.h>
+#include <osl/diagnose.h>
+#include <rtl/tres.h>
+#include <testshl/stringhelper.hxx>
+
+extern CallbackStructure aGlobalStructure;
+
+sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag );
+
+// sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag )
+// {
+//     return( ( _nBits & _nFlag ) == _nFlag );
+// }
+
+void CheckBoom(bool bCondition, std::string const& msg)
+{
+    (void) msg; // avoid warning
+    if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) )
+    {
+        /* force an assertion on false state */
+        if ( !bCondition ) {
+#ifdef UNDER_WINDOWS_DEBUGGING
+            WinDebugBreak();
+#else
+            OSL_ENSURE( false, msg.c_str() );
+#endif
+        }
+    }
+}
+
+void CheckBoom(bool bCondition, rtl::OUString const& msg)
+{
+    if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) )
+    {
+        /* force an assertion on false state */
+        rtl::OString sMessage;
+        sMessage <<= msg;
+        if ( !bCondition ) {
+#ifdef UNDER_WINDOWS_DEBUGGING
+            WinDebugBreak();
+#else
+            OSL_ENSURE( false, sMessage.getStr() );
+#endif
+        }
+    }
+}
+
+const char* getForwardString()
+{
+    return aGlobalStructure.psForward;
+}
+
+// -----------------------------------------------------------------------------
+// ----------------------------- own printf method -----------------------------
+// -----------------------------------------------------------------------------
+
+// bool isVerbose()
+// {
+//  if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_VERBOSE ) )
+//  {
+//         return true;
+//  }
+//     return false;
+// }
+//
+// bool isQuiet()
+// {
+//  if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_QUIET ) )
+//  {
+//         return true;
+//  }
+//     return false;
+// }
+//
+// void impl_t_print(const char* _pFormatStr, va_list &args)
+// {
+//     if (! isQuiet())
+//     {
+//         printf("# ");
+//         vprintf(_pFormatStr, args);
+//     }
+// }
+//
+// void t_print(const char* _pFormatStr, ...)
+// {
+//     va_list  args;
+//     va_start( args, _pFormatStr );
+//     impl_t_print(_pFormatStr, args);
+//     va_end( args );
+// }
+//
+// void t_print(T_Print_Params _eType, const char* _pFormatStr, ...)
+// {
+//     if (_eType == T_VERBOSE && isVerbose())
+//     {
+//         // if T_VERBOSE and we should be verbose, print info
+//         va_list  args;
+//         va_start( args, _pFormatStr );
+//         impl_t_print(_pFormatStr, args);
+//         va_end( args );
+//     }
+// }
diff --git a/testshl2/source/cppunit/joblist.cxx b/testshl2/source/cppunit/joblist.cxx
new file mode 100644
index 000000000000..52b36342c206
--- /dev/null
+++ b/testshl2/source/cppunit/joblist.cxx
@@ -0,0 +1,224 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fstream>
+#include <rtl/string.hxx>
+#include "testshl/joblist.hxx"
+
+#define C_SEPARATOR_LIST " \t,;:#"
+JobList::JobList()
+        :ppsJobList(NULL)
+{}
+
+// -----------------------------------------------------------------------------
+bool JobList::isInCurrentEnvironment(std::string const& _sString)
+{
+    int nSpace = 0;
+    std::string sSearchString = _sString;
+    bool bEnd = false;
+    // run through the hole given string,
+    std::string sEnv;
+
+    do {
+        nSpace = sSearchString.find_first_of(C_SEPARATOR_LIST);
+        if (nSpace < 0)
+        {
+            sEnv = sSearchString;
+            bEnd = true;
+        }
+        else
+        {
+            sEnv = sSearchString.substr(0, nSpace);
+            sSearchString = sSearchString.substr(nSpace + 1);
+        }
+        if (sEnv.length() > 0)
+        {
+            // cout << sEnv << endl;
+#ifdef LINUX
+            int nLinux = sEnv.find("unxlng");
+            if (nLinux >= 0)
+            {
+                // found unxlng
+                return true;
+            }
+#endif
+#ifdef SOLARIS
+            int nSolaris = sEnv.find("unxsol");
+            if (nSolaris >= 0)
+            {
+                // found unxsol
+                return true;
+            }
+#endif
+#ifdef WNT
+            int nWindows = sEnv.find("wnt");
+            if (nWindows >= 0)
+            {
+                // found wnt
+                return true;
+            }
+#endif
+        }
+    } while ( !bEnd );
+    return false;
+}
+
+std::string JobList::trim(std::string const& _sStringToTrim)
+{
+    rtl::OString sStr(_sStringToTrim.c_str());
+    sStr = sStr.trim();
+    return std::string(sStr.getStr());
+}
+
+// -----------------------------------------------------------------------------
+bool JobList::readfile(std::string const& _sFilename, JobType _nJobType)
+{
+    // StringList aJobList;
+    m_aJobList.clear();
+
+    std::ifstream in(_sFilename.c_str(), std::ios::in);
+
+    if (!in)
+    {
+        // fprintf(stderr, "warning: Can't open job file: %s\n", _sFilename.c_str());
+        return false;
+    }
+    else
+    {
+        if (_nJobType == JOB_EXCLUDE_LIST)
+        {
+            fprintf(stderr, "warning: There exist a job exclusion list file: %s\n", _sFilename.c_str());
+        }
+
+        // std::cout << "Check for signal" << std::endl;
+        std::string sLine;
+        while (std::getline(in, sLine))
+        {
+            if (sLine.size() > 0)
+            {
+                char ch = sLine[0];
+                if (ch != '#' &&
+                    isspace(ch) == 0)
+                {
+                    sLine = trim(sLine);
+
+                    // m_aJobList.push_back( sLine );
+                    int nSpace = sLine.find_first_of(C_SEPARATOR_LIST);
+                    if (nSpace < 0)
+                    {
+                        m_aJobList[sLine] = JOB_UNKNOWN;
+                    }
+                    else
+                    {
+                        // found a separator
+                        std::string sTest = sLine.substr(0, nSpace);
+                        std::string sRest = sLine.substr(nSpace + 1);
+                        if (isInCurrentEnvironment(sRest))
+                        {
+                            m_aJobList[sTest] = JOB_UNKNOWN;
+                        }
+                    }
+                }
+            }
+        }
+
+        // inclusion list
+/*
+  int nSize = m_aJobList.size();
+
+  ppsJobList = (char**) malloc((nSize + 1) * sizeof(char*));
+
+  int nIdx = 0;
+  StringList::const_iterator aItEnd = m_aJobList.end();
+  for(StringList::const_iterator it = m_aJobList.begin();
+  it != aItEnd; ++it)
+  {
+  std::string sValue = *it;
+  char* psTestFkt = (char*) malloc(sValue.size() + 1);
+  strcpy(psTestFkt, sValue.c_str());
+  ppsJobList[nIdx] = psTestFkt;
+  ++nIdx;
+  }
+
+  ppsJobList[nIdx] = NULL;
+*/
+    }
+    return true;
+}
+
+// -----------------------------------------------------------------------------
+int JobList::getJobListEntry(std::string const& _sIndexName)
+{
+    if (m_aJobList.find(_sIndexName) != m_aJobList.end())
+    {
+        return m_aJobList[_sIndexName];
+    }
+    return JOB_NOT_FOUND;
+}
+
+// -----------------------------------------------------------------------------
+void JobList::setJobListEntry(std::string const& _sIndexName, int _nValue)
+{
+    // if (m_aJobList.find(_sIndexName) == m_aJobList.end())
+    // {
+    m_aJobList[_sIndexName] = _nValue;
+    // }
+    // else
+    // {
+    //  fprintf(stderr, "error: test function '%s' already exist.\n", _sIndexName);
+    // }
+}
+
+// -----------------------------------------------------------------------------
+JobList::~JobList()
+{
+    int nIdx = 0;
+    if (ppsJobList)
+    {
+        while(ppsJobList[nIdx] != NULL)
+        {
+            free(ppsJobList[nIdx]);
+            ++nIdx;
+        }
+        free(ppsJobList);
+    }
+}
+// -----------------------------------------------------------------------------
+/*
+  bool JobList::checkFilter(JobList m_aJobFilter, std::string const& _sNodeName, std::string const& _sName)
+  {
+  std::string sFilter = m_aJobFilter.m_aJobList.begin();
+  }
+*/
diff --git a/testshl2/source/cppunit/makefile.mk b/testshl2/source/cppunit/makefile.mk
new file mode 100644
index 000000000000..6a6d913f6140
--- /dev/null
+++ b/testshl2/source/cppunit/makefile.mk
@@ -0,0 +1,103 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+# $Revision$
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=testshl2
+TARGET=testshl2
+LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
+# ENABLE_RTTI=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+# CXXFILES = \
+# 		  querytemplate.cxx	\
+# 		  stringhelper.cxx
+
+# ENVCFLAGSCXX+=-DCPPUNIT_BUILD_DLL
+
+CPPUNIT_TESTSHL_SLOFILES = \
+    $(SLO)$/joblist.obj \
+    $(SLO)$/t_print.obj \
+    $(SLO)$/signaltest.obj
+
+CPPUNIT_STATIC_SOLFILES = \
+    $(SLO)$/cmdlinebits.obj \
+    $(SLO)$/tresregister.obj \
+    $(SLO)$/tresstatewrapper.obj \
+    $(SLO)$/registertestfunction.obj
+
+
+SLOFILES = \
+    $(CPPUNIT_TESTSHL_SLOFILES) \
+    $(CPPUNIT_STATIC_SOLFILES)
+#-------------------------------------------------------------------------------
+# This is statically cppunit library
+LIB1TARGET= $(LB)$/$(TARGET).lib
+LIB1OBJFILES= \
+    $(SLOFILES)
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
+LIB1FILES=$(LB)$/c5t_winstuff.lib
+.ENDIF
+
+.IF "$(GUI)" == "UNX"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
+
+#-------------------------------------------------------------------------------
+TARGET2=c5t_no_regallfkt
+LIB2TARGET= $(LB)$/$(TARGET2).lib
+LIB2OBJFILES= \
+    $(CPPUNIT_TESTSHL_SLOFILES)
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a
+.ENDIF
+.ENDIF
+
+.IF "$(GUI)" == "UNX"
+LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/testshl2/source/cppunit/registertestfunction.cxx b/testshl2/source/cppunit/registertestfunction.cxx
new file mode 100644
index 000000000000..99e3fec38493
--- /dev/null
+++ b/testshl2/source/cppunit/registertestfunction.cxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <stdlib.h>
+#include <testshl/simpleheader.hxx>
+#include <testshl/additionalfunc.hxx>
+
+extern "C" void SAL_CALL testAllRegisteredFunctions(hTestResult _pResult)
+{
+    CppUnit::TestFactoryRegistry::testRegistries(_pResult);
+    // CppUnit::Test* tp = CppUnit::TestFactoryRegistry::getRegistry("rtl_OUString").makeTest();
+    // tp->run(pResult);
+}
+
+// -----------------------------------------------------------------------------
+// ---------------------------- RegisterTestFunctions ----------------------------
+// -----------------------------------------------------------------------------
+
+extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr _pFunc)
+{
+    if (_pFunc)
+    {
+        (_pFunc)(&testAllRegisteredFunctions, "");
+    }
+    else
+    {
+        // error, FktRegFuncPtr not given
+    }
+    RegisterAdditionalFunctions(_pFunc);
+}
diff --git a/testshl2/source/cppunit/result/SynchronizedObject.cpp b/testshl2/source/cppunit/result/SynchronizedObject.cpp
new file mode 100644
index 000000000000..73de43b8c543
--- /dev/null
+++ b/testshl2/source/cppunit/result/SynchronizedObject.cpp
@@ -0,0 +1,38 @@
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <cppunit/SynchronizedObject.h>
+
+
+namespace CppUnit
+{
+
+
+
+
+SynchronizedObject::SynchronizedObject( SynchronizationObject *syncObject )
+    : m_syncObject( syncObject == 0 ? new SynchronizationObject() :
+                                      syncObject )
+{
+}
+
+
+SynchronizedObject::~SynchronizedObject()
+{
+  delete m_syncObject;
+}
+
+
+/** Accept a new synchronization object for protection of this instance
+ * TestResult assumes ownership of the object
+ */
+void
+SynchronizedObject::setSynchronizationObject( SynchronizationObject *syncObject )
+{
+  delete m_syncObject;
+  m_syncObject = syncObject;
+}
+
+
+} //  namespace CppUnit
+
diff --git a/testshl2/source/cppunit/result/TestResult.cpp b/testshl2/source/cppunit/result/TestResult.cpp
new file mode 100644
index 000000000000..5fa5e444e540
--- /dev/null
+++ b/testshl2/source/cppunit/result/TestResult.cpp
@@ -0,0 +1,264 @@
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <cppunit/TestFailure.h>
+#include <testshl/result/TestListener.h>
+#include "testshl/getopt.hxx"
+#include <testshl/result/TestResult.h>
+#include <algorithm>
+#include "testshl/result/outputter.hxx"
+#include <cppunit/Test.h>
+#include <testshl/cmdlinebits.hxx>
+
+namespace CppUnit {
+
+/// Construct a TestResult
+TestResult::TestResult( GetOpt &_pOptions, SynchronizationObject *syncObject )
+    : SynchronizedObject( syncObject ),
+      m_aOptionHelper(_pOptions),
+      m_nExitValue(0)
+{
+  reset();
+}
+
+
+/// Destroys a test result
+TestResult::~TestResult()
+{
+}
+
+
+/** Resets the result for a new run.
+ *
+ * Clear the previous run result.
+ */
+void
+TestResult::reset()
+{
+  ExclusiveZone zone( m_syncObject );
+  m_stop = false;
+}
+
+
+/** Adds an error to the list of errors.
+ *  The passed in exception
+ *  caused the error
+ */
+void
+TestResult::addError( Test *test,
+                      Exception *e, ErrorType::num _eType )
+{
+  TestFailure aTestFailure( test, e, _eType );
+  addFailure( aTestFailure );
+}
+
+
+/** Adds a failure to the list of failures. The passed in exception
+ * caused the failure.
+ */
+void
+TestResult::addFailure( Test *test, Exception *e )
+{
+  TestFailure aTestFailure( test, e, ErrorType::ET_FAILURE );
+  addFailure( aTestFailure );
+}
+
+
+/** Called to add a failure to the list of failures.
+ */
+void
+TestResult::addFailure( const TestFailure &failure )
+{
+  ExclusiveZone zone( m_syncObject );
+
+  // LLA:
+  // this set the global returnvalue, due to the fact, there occurs a failure, we have to return a non zero value
+  // at the moment this seams to be a good place.
+  setExitValue(1);
+
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end();
+        ++it )
+  {
+      TestListener *pListener = *it;
+      pListener->addFailure( failure );
+  }
+}
+
+
+/// Informs the result that a test will be started.
+void
+TestResult::startTest( Test *test )
+{
+  ExclusiveZone zone( m_syncObject );
+  if (m_aOptionHelper.isVerbose())
+  {
+      std::string aStr;
+      if (test)
+      {
+          aStr = getNodeName();
+          aStr += ".";
+          aStr += test->getName();
+      }
+      // fprintf(stderr, "Start test: %s\n", aStr.c_str());
+      t_print( T_VERBOSE, "Start test: %s\n", aStr.c_str());
+  }
+
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end();
+        ++it )
+  {
+      TestListener *pListener = *it;
+      pListener->startTest( test );
+  }
+}
+
+
+/// Informs the result that a test was completed.
+void
+TestResult::endTest( Test *test )
+{
+  ExclusiveZone zone( m_syncObject );
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end();
+        ++it )
+  {
+      TestListener *pListener = *it;
+      pListener->endTest( test );
+  }
+}
+
+
+/// Returns whether testing should be stopped
+bool
+TestResult::shouldStop() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_stop;
+}
+
+
+/// Stop testing
+void
+TestResult::stop()
+{
+  ExclusiveZone zone( m_syncObject );
+  m_stop = true;
+}
+
+
+void
+TestResult::addListener( TestListener *listener )
+{
+  ExclusiveZone zone( m_syncObject );
+  m_listeners.push_back( listener );
+}
+
+
+void
+TestResult::removeListener ( TestListener *listener )
+{
+  ExclusiveZone zone( m_syncObject );
+#if defined(_MSC_VER) && (_MSC_VER >=1400)
+  m_listeners.erase( remove( m_listeners.begin(),
+#else
+  m_listeners.erase( std::remove( m_listeners.begin(),
+#endif
+                                  m_listeners.end(),
+                                  listener ),
+                     m_listeners.end());
+}
+
+void
+TestResult::addInfo(Test *test, const char* _aStr)
+{
+    ExclusiveZone zone( m_syncObject );
+    for ( TestListeners::iterator it = m_listeners.begin();
+          it != m_listeners.end();
+          ++it )
+    {
+        TestListener *pListener = *it;
+        pListener->addInfo( test, _aStr );
+    }
+}
+
+// old: void
+// old: TestResult::enterNode(const char* _aStr)
+// old: {
+// old:         ExclusiveZone zone( m_syncObject );
+// old:         for ( TestListeners::iterator it = m_listeners.begin();
+// old:                   it != m_listeners.end();
+// old:                   ++it )
+// old:         {
+// old:                 TestListener *pListener = *it;
+// old:                 pListener->enterNode( _aStr );
+// old:         }
+// old: }
+// old:
+// old: void
+// old: TestResult::leaveNode(const char* _aStr)
+// old: {
+// old:         ExclusiveZone zone( m_syncObject );
+// old:
+// old:         for ( TestListeners::iterator it = m_listeners.begin();
+// old:                   it != m_listeners.end();
+// old:                   ++it )
+// old:         {
+// old:                 TestListener *pListener = *it;
+// old:                 pListener->leaveNode( _aStr );
+// old:         }
+// old: }
+
+void TestResult::enterNode(const char* _sNode)
+{
+    ExclusiveZone zone( m_syncObject );
+    m_aCurrentNodeNames.push_back(std::string(_sNode));
+}
+
+void TestResult::leaveNode(const char* /*_sNode*/)
+{
+    ExclusiveZone zone( m_syncObject );
+    std::string sBack = m_aCurrentNodeNames.back();
+    m_aCurrentNodeNames.pop_back();
+
+    // due to a -Wall warning, comment out.
+    // if (sBack != std::string(_sNode))
+    // {
+    //     volatile int dummy = 0;
+    //     // problem?!
+    // }
+}
+
+std::string TestResult::getNodeName()
+{
+    std::string sName;
+    for (std::vector<std::string>::const_iterator it = m_aCurrentNodeNames.begin();
+         it != m_aCurrentNodeNames.end();
+         ++it)
+    {
+        if (sName.size() != 0)
+        {
+            sName += ".";
+        }
+        sName += *it;
+    }
+    return sName;
+}
+
+// -----------------------------------------------------------------------------
+bool TestResult::isAllowedToExecute(std::string const& _sName)
+{
+    return m_aOptionHelper.isAllowedToExecute(getNodeName(), _sName);
+}
+// -----------------------------------------------------------------------------
+bool TestResult::isOptionWhereAmI()
+{
+    return m_aOptionHelper.isOptionWhereAmI();
+}
+
+// -----------------------------------------------------------------------------
+void TestResult::print(Outputter&)
+{
+}
+
+} // namespace CppUnit
diff --git a/testshl2/source/cppunit/result/TestResultCollector.cpp b/testshl2/source/cppunit/result/TestResultCollector.cpp
new file mode 100644
index 000000000000..e3913219b541
--- /dev/null
+++ b/testshl2/source/cppunit/result/TestResultCollector.cpp
@@ -0,0 +1,150 @@
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <cppunit/TestFailure.h>
+#include <testshl/result/TestResultCollector.h>
+
+
+namespace CppUnit
+{
+
+
+TestResultCollector::TestResultCollector( TestResult* _pResult, SynchronizationObject *syncObject )
+        : TestSucessListener( syncObject ),
+          m_pResult(_pResult),
+          m_testErrors(0)
+{
+  reset();
+}
+
+
+TestResultCollector::~TestResultCollector()
+{
+    TestFailures::iterator itFailure = m_failures.begin();
+    while ( itFailure != m_failures.end() )
+    {
+        TestFailureEnvelope *pEnvelope = *itFailure++;
+        TestFailure *pFailure = pEnvelope->getTestFailure();
+        delete pFailure;
+    }
+}
+
+
+void
+TestResultCollector::reset()
+{
+  TestSucessListener::reset();
+
+  ExclusiveZone zone( m_syncObject );
+  m_testErrors = 0;
+  m_tests.clear();
+  m_failures.clear();
+}
+
+
+void
+TestResultCollector::startTest( Test *test )
+{
+  ExclusiveZone zone (m_syncObject);
+
+  m_tests.push_back( new TestEnvelope(test, m_pResult->getNodeName()) );
+}
+
+void
+TestResultCollector::endTest( Test * )
+{
+    // ExclusiveZone zone (m_syncObject);
+    // Nothing!
+}
+
+
+void
+TestResultCollector::addFailure( const TestFailure &failure )
+{
+  TestSucessListener::addFailure( failure );
+
+  ExclusiveZone zone( m_syncObject );
+  if ( failure.isError() )
+    ++m_testErrors;
+  m_failures.push_back( new TestFailureEnvelope(failure.clone(), m_pResult->getNodeName()) );
+}
+
+
+/// Gets the number of run tests.
+int
+TestResultCollector::runTests() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_tests.size();
+}
+
+
+/// Gets the number of detected errors (uncaught exception).
+int
+TestResultCollector::testErrors() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_testErrors;
+}
+
+
+/// Gets the number of detected failures (failed assertion).
+int
+TestResultCollector::testFailures() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_failures.size() - m_testErrors;
+}
+
+
+/// Gets the total number of detected failures.
+int
+TestResultCollector::testFailuresTotal() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_failures.size();
+}
+
+
+/// Returns a the list failures (random access collection).
+const TestResultCollector::TestFailures &
+TestResultCollector::failures() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_failures;
+}
+
+
+const TestResultCollector::Tests &
+TestResultCollector::tests() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_tests;
+}
+
+void TestResultCollector::addInfo(Test *_pTest, const char* _sInfo)
+{
+    ExclusiveZone zone( m_syncObject );
+    m_aInfos.push_back(new TestInfo(_pTest, _sInfo));
+}
+
+std::string TestResultCollector::getInfo(Test *_pTest)
+{
+    for (TestInfos::const_iterator it = m_aInfos.begin();
+         it != m_aInfos.end();
+         ++it)
+    {
+        TestInfo *pInfo   = *it;
+        Test *pTest       = pInfo->getTest();
+        if (pTest == _pTest)
+        {
+            std::string sInfo = pInfo->getString();
+            return sInfo;
+        }
+    }
+    return std::string();
+}
+
+
+} //  namespace CppUnit
+
diff --git a/testshl2/source/cppunit/result/TestSucessListener.cpp b/testshl2/source/cppunit/result/TestSucessListener.cpp
new file mode 100644
index 000000000000..d8f8268f09aa
--- /dev/null
+++ b/testshl2/source/cppunit/result/TestSucessListener.cpp
@@ -0,0 +1,50 @@
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+
+#include <testshl/result/TestSucessListener.h>
+
+
+
+namespace CppUnit
+{
+
+
+TestSucessListener::TestSucessListener( SynchronizationObject *syncObject )
+    : SynchronizedObject( syncObject )
+    , m_sucess( true )
+{
+}
+
+
+TestSucessListener::~TestSucessListener()
+{
+}
+
+
+void
+TestSucessListener::reset()
+{
+  ExclusiveZone zone( m_syncObject );
+  m_sucess = true;
+}
+
+
+void
+TestSucessListener::addFailure( const TestFailure & )
+{
+  ExclusiveZone zone( m_syncObject );
+  m_sucess = false;
+}
+
+
+bool
+TestSucessListener::wasSuccessful() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_sucess;
+}
+
+
+} //  namespace CppUnit
+
diff --git a/testshl2/source/cppunit/result/TextTestResult.cpp b/testshl2/source/cppunit/result/TextTestResult.cpp
new file mode 100644
index 000000000000..2ad271ded7de
--- /dev/null
+++ b/testshl2/source/cppunit/result/TextTestResult.cpp
@@ -0,0 +1,194 @@
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <cppunit/Exception.h>
+#include <cppunit/NotEqualException.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <testshl/result/TextTestResult.h>
+// #include <TextTestResult.h>
+//!io #include <iostream>
+
+namespace CppUnit {
+
+
+TextTestResult::TextTestResult(GetOpt& _aOptions)
+        :TestResult(_aOptions),
+         m_aResulter(this)
+{
+    addListener( &m_aResulter );
+}
+
+
+void
+TextTestResult::addFailure( const TestFailure &failure )
+{
+    TestResult::addFailure( failure );
+    // std::cerr << ( failure.isError() ? "E" : "F" );
+    if (failure.isError())
+        fprintf(stderr, "E");
+    else
+        fprintf(stderr, "F");
+}
+
+
+void
+TextTestResult::startTest( Test *test )
+{
+    TestResult::startTest (test);
+    // std::cerr << ".";
+    fprintf(stderr, ".");
+}
+
+void TextTestResult::endTest( Test *test )
+{
+    TestResult::endTest (test);
+}
+
+
+void
+TextTestResult::printFailures( std::ostream &stream )
+{
+    TestResultCollector::TestFailures::const_iterator itFailure = m_aResulter.failures().begin();
+    int failureNumber = 1;
+    while ( itFailure != m_aResulter.failures().end() )
+    {
+        stream  <<  std::endl;
+        TestFailure *pFailure= (*itFailure++)->getTestFailure();
+        printFailure( pFailure, failureNumber++, stream );
+  }
+}
+
+
+void
+TextTestResult::printFailure( TestFailure *failure,
+                              int failureNumber,
+                              std::ostream &stream )
+{
+  printFailureListMark( failureNumber, stream );
+  stream << ' ';
+  printFailureTestName( failure, stream );
+  stream << ' ';
+  printFailureType( failure, stream );
+  stream << ' ';
+  printFailureLocation( failure->sourceLine(), stream );
+  stream << std::endl;
+  printFailureDetail( failure->thrownException(), stream );
+  stream << std::endl;
+}
+
+
+void
+TextTestResult::printFailureListMark( int failureNumber,
+                                      std::ostream &stream )
+{
+  stream << failureNumber << ")";
+}
+
+
+void
+TextTestResult::printFailureTestName( TestFailure *failure,
+                                      std::ostream &stream )
+{
+    Test* pTest = failure->failedTest();
+    stream << "test: " << pTest->getName();
+}
+
+
+void
+TextTestResult::printFailureType( TestFailure *failure,
+                                  std::ostream &stream )
+{
+  stream << "("
+         << (failure->isError() ? "E" : "F")
+         << ")";
+}
+
+
+void
+TextTestResult::printFailureLocation( SourceLine sourceLine,
+                                      std::ostream &stream )
+{
+  if ( !sourceLine.isValid() )
+    return;
+
+  stream << "line: " << sourceLine.lineNumber()
+         << ' ' << sourceLine.fileName();
+}
+
+
+void
+TextTestResult::printFailureDetail( Exception *thrownException,
+                                    std::ostream &stream )
+{
+  if ( thrownException->isInstanceOf( NotEqualException::type() ) )
+  {
+    NotEqualException *e = (NotEqualException*)thrownException;
+    stream << "expected: " << e->expectedValue() << std::endl
+           << "but was:  " << e->actualValue();
+    if ( !e->additionalMessage().empty() )
+    {
+      stream  << std::endl;
+      stream  <<  "additional message:"  <<  std::endl
+              <<  e->additionalMessage();
+    }
+  }
+  else
+  {
+    stream << " \"" << thrownException->what() << "\"";
+  }
+}
+
+
+void
+TextTestResult::print( std::ostream& stream )
+{
+  printHeader( stream );
+  stream << std::endl;
+  printFailures( stream );
+}
+
+
+void
+TextTestResult::printHeader( std::ostream &stream )
+{
+    if (m_aResulter.wasSuccessful ())
+        stream << std::endl << "OK (" << m_aResulter.runTests () << " tests)"
+               << std::endl;
+    else
+    {
+        stream << std::endl;
+        printFailureWarning( stream );
+        printStatistics( stream );
+    }
+}
+
+
+void
+TextTestResult::printFailureWarning( std::ostream &stream )
+{
+  stream  << "!!!FAILURES!!!" << std::endl;
+}
+
+
+void
+TextTestResult::printStatistics( std::ostream &stream )
+{
+  stream  << "Test Results:" << std::endl;
+
+  stream  <<  "Run:  "  <<  m_aResulter.runTests()
+          <<  "   Failures: "  <<  m_aResulter.testFailures()
+          <<  "   Errors: "  <<  m_aResulter.testErrors()
+          <<  std::endl;
+}
+
+
+std::ostream &
+operator <<( std::ostream &stream,
+             TextTestResult &result )
+{
+  result.print (stream); return stream;
+}
+
+
+} // namespace CppUnit
diff --git a/testshl2/source/cppunit/result/emacsTestResult.cxx b/testshl2/source/cppunit/result/emacsTestResult.cxx
new file mode 100644
index 000000000000..cad9c08d4558
--- /dev/null
+++ b/testshl2/source/cppunit/result/emacsTestResult.cxx
@@ -0,0 +1,193 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <stdlib.h>
+
+#include <map>
+#include <cppunit/Exception.h>
+#include <cppunit/NotEqualException.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <testshl/result/emacsTestResult.hxx>
+// #include <TextTestResult.h>
+//!io #include <iostream>
+#include <string>
+
+#include <rtl/string.hxx>
+#include "testshl/result/outputter.hxx"
+
+namespace CppUnit {
+
+    emacsTestResult::emacsTestResult(GetOpt & _aOptions)
+            :TestResult(_aOptions),
+             m_aOptions(_aOptions),
+             m_aResulter(this)
+    {
+        addListener( &m_aResulter );
+    }
+
+    //# struct ltstr
+    //# {
+    //#     bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const
+    //#         {
+    //#             return p1 < p2;
+    //#         }
+    //# };
+    //# typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList;
+
+    void
+    emacsTestResult::print( Outputter& stream )
+    {
+        printHeader( stream );
+        // stream << std::endl;
+        // printFailures( stream );
+
+        // TestPtrList aFailedTests;
+
+        for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin();
+             it2 != m_aResulter.failures().end();
+             ++it2)
+        {
+            TestFailureEnvelope *pEnvelop = *it2;
+            TestFailure *pFailure = pEnvelop->getTestFailure();
+            std::string sNodeName = pEnvelop->getString();
+
+            // aFailedTests[ pFailure->failedTest() ] = true;
+
+            printFailureLine(stream, pFailure, sNodeName);
+        }
+
+        // only errors are from interest here
+        //# for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin();
+        //#      it != m_aResulter.tests().end();
+        //#      ++it)
+        //# {
+        //#     TestEnvelope *pEnvelop = *it;
+        //#     Test* pTest = pEnvelop->getTest();
+        //#     std::string sNodeName = pEnvelop->getString();
+        //#
+        //#     if (aFailedTests.find(pTest) == aFailedTests.end())
+        //#     {
+        //#         std::string sInfo = m_aResulter.getInfo(pTest);
+        //#         printTestLine(stream, pTest, sNodeName, sInfo);
+        //#     }
+        //# }
+        stream << "Test #PASSED#" << Outputter::endl();
+    }
+
+
+    void
+    emacsTestResult::printHeader( Outputter &stream )
+    {
+    std::string sDate(m_aOptionHelper.createDateTag());
+    stream << sDate << Outputter::endl();
+    }
+
+    void
+    emacsTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName)
+    {
+    std::string aName;
+    aName += _sNodeName;
+    aName += ".";
+    aName += _pFailure->failedTestName();
+
+    SourceLine aLine = _pFailure->sourceLine();
+    sal_Int32 nLine = -1;
+    std::string sFilename;
+    if (aLine.isValid())
+    {
+            nLine = aLine.lineNumber();
+            sFilename = aLine.fileName();
+    }
+
+    Exception  *pExp  = _pFailure->thrownException();
+    std::string sWhat;
+    if (pExp)
+    {
+            sWhat = pExp->what();
+    }
+
+    stream << sFilename;
+    stream << ":";
+    stream << nLine;
+    stream << ":";
+
+    stream << aName;
+    stream << ";#FAILED#";
+    // ErrorType::num eErr = _pFailure->getErrorType();
+    //# if (isErr)
+        //#     stream << "FAILED#;";
+    //# else
+        //#     stream << "ERROR#;";
+
+    stream << sWhat;
+    stream << Outputter::endl();
+    }
+
+    //# void
+    //# emacsTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo)
+    //# {
+    //#     std::string aName;
+    //#     aName += _sNodeName;
+    //#     aName += ".";
+    //#     aName += _pTest->getName();
+    //#
+    //#     stream << aName;
+    //#     stream << ";";
+    //#     stream << _sInfo << "#";
+    //#     stream << "OK#";
+    //#     stream << std::endl;
+    //# }
+
+
+//# void
+//# emacsTestResult::printStatistics( Outputter &stream )
+//# {
+//#     stream  << "Test Results:" << std::endl;
+//#
+//#     stream  <<  "Run:  "  <<  runTests()
+//#             <<  "   Failures: "  <<  testFailures()
+//#             <<  "   Errors: "  <<  testErrors()
+//#             <<  std::endl;
+//# }
+
+
+    Outputter &
+    operator <<( Outputter &stream,
+                 emacsTestResult &result )
+    {
+        result.print (stream); return stream;
+    }
+
+
+} // namespace CppUnit
diff --git a/testshl2/source/cppunit/result/log.cxx b/testshl2/source/cppunit/result/log.cxx
new file mode 100644
index 000000000000..985c7cfef413
--- /dev/null
+++ b/testshl2/source/cppunit/result/log.cxx
@@ -0,0 +1,125 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include "testshl/log.hxx"
+
+// #include <hash_map>
+// #include <list>
+// #include <set>
+
+using namespace std;
+
+::osl::FileBase::RC Log::open( sal_Bool append ) {
+
+    ::osl::FileBase::RC ret;
+
+    if ( ! append ) {
+        ret = ::osl::File::remove( m_logurl );
+    }
+
+    if( m_logfile->open( OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) {
+        ret = m_logfile->open( OpenFlag_Write | OpenFlag_Create );
+    }
+    else  {
+        ret = m_logfile->setPos( Pos_End, 0 );
+    }
+    return ret;
+}
+
+::osl::FileBase::RC Log::write( const sal_Char* buf, sal_Bool v ) {
+    sal_uInt64 uBytes=0;
+    sal_uInt32 len = 0;
+    const sal_Char* ptr = buf;
+
+    if( ptr ) {
+        while( *ptr++ ) len++;
+    }
+
+    if ( v ) {
+        // cout << buf << flush;
+        printf("%s", buf);
+    }
+    return m_logfile->write( buf, len , uBytes );
+}
+
+::osl::FileBase::RC Log::write( const rtl::OString& buf, sal_Bool v  ) {
+    sal_uInt64 uBytes=0;
+    if ( v ) {
+        // cout << buf.getStr() << flush;
+        printf("%s", buf.getStr());
+    }
+    return m_logfile->write( buf.getStr(), buf.getLength(), uBytes );
+}
+/*
+// LLA: due to a problem with sal/OUStingBuffer getLength() which isn't const, this
+// is so not compilable.
+::osl::FileBase::RC Log::write( rtl::OStringBuffer const& buf, sal_Bool v  ) {
+    sal_uInt64 uBytes=0;
+    if ( v ) {
+        cout << buf.getStr() << flush;
+    }
+    return m_logfile->write( buf.getStr(), buf.getLength(), uBytes );
+}
+*/
+::osl::FileBase::RC Log::write( const rtl::OUString& buf,
+                                    rtl_TextEncoding tenc, sal_Bool v  ) {
+    sal_uInt64 uBytes=0;
+    if ( ! tenc ) {
+        tenc = RTL_TEXTENCODING_ASCII_US;
+    }
+    rtl::OStringBuffer osbuf(
+                            rtl::OUStringToOString( buf, tenc ).getStr() );
+
+    if ( v ) {
+        // cout << osbuf.getStr() << flush;
+        printf("%s", osbuf.getStr());
+    }
+    return m_logfile->write( osbuf.getStr(), osbuf.getLength(), uBytes );
+}
+
+Log &operator <<( Log &_aLog, const sal_Char * _sValue )
+{
+    _aLog.write(_sValue); return _aLog;
+}
+Log &operator <<( Log &_aLog, rtl::OString const& _sValue )
+{
+    _aLog.write(_sValue); return _aLog;
+}
+Log &operator <<( Log &_aLog, rtl::OUString const& _sValue )
+{
+    _aLog.write(_sValue); return _aLog;
+}
+//! Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue )
+//! {
+//!     _aLog.write(_sValue); return _aLog;
+//! }
diff --git a/testshl2/source/cppunit/result/makefile.mk b/testshl2/source/cppunit/result/makefile.mk
new file mode 100644
index 000000000000..25ef193a2c88
--- /dev/null
+++ b/testshl2/source/cppunit/result/makefile.mk
@@ -0,0 +1,83 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+# $Revision$
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=testshl2
+TARGET=c5t_testresult
+LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
+# ENABLE_RTTI=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+# CXXFILES = \
+# 		  querytemplate.cxx	\
+# 		  stringhelper.cxx
+
+# ENVCFLAGSCXX+=-DCPPUNIT_BUILD_DLL
+SLOFILES = \
+    $(SLO)$/SynchronizedObject.obj \
+    $(SLO)$/TestResult.obj \
+    $(SLO)$/TestResultCollector.obj \
+    $(SLO)$/TestSucessListener.obj \
+    $(SLO)$/emacsTestResult.obj \
+    $(SLO)$/log.obj \
+    $(SLO)$/optionhelper.obj \
+    $(SLO)$/outputter.obj \
+    $(SLO)$/signal.obj \
+    $(SLO)$/testshlTestResult.obj \
+    $(SLO)$/treswrapper.obj
+
+# currently unused
+# 	$(SLO)$/TextTestResult.obj
+
+LIB1TARGET= $(LB)$/$(TARGET).lib
+LIB1OBJFILES=  $(SLOFILES)
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
+.ENDIF
+
+.IF "$(GUI)" == "UNX"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/testshl2/source/cppunit/result/optionhelper.cxx b/testshl2/source/cppunit/result/optionhelper.cxx
new file mode 100644
index 000000000000..bb7c89b24081
--- /dev/null
+++ b/testshl2/source/cppunit/result/optionhelper.cxx
@@ -0,0 +1,317 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include "testshl/result/optionhelper.hxx"
+// #include <sstream>
+// #include <string>
+#include <osl/time.h>
+#include "testshl/cmdlinebits.hxx"
+
+// -----------------------------------------------------------------------------
+
+namespace
+{
+    void split( const rtl::OString& opt,
+                const rtl::OString& _sSeparator,
+                OStringList& optLine )
+    {
+        optLine.clear();
+        // const sal_Int32 cSetLen = cSet.getLength();
+        sal_Int32 index = 0;
+        sal_Int32 oldIndex = 0;
+
+        // sal_Int32 i;
+        // sal_Int32 j = 0;
+        while ( opt.getLength() > 0)
+        {
+            // for ( i = 0; i < cSetLen; i++ )
+            // {
+            index = opt.indexOf( _sSeparator, oldIndex);
+            if( index != -1 )
+            {
+                optLine.push_back( opt.copy( oldIndex, index - oldIndex ) );
+                oldIndex = index + _sSeparator.getLength();
+            }
+            // }
+            else // if (index == -1)
+            {
+                optLine.push_back( opt.copy( oldIndex ) );
+                break;
+            }
+        }
+    } ///< split
+
+    bool match(OStringList const& _aFilter, OStringList const& _aName)
+    {
+        OStringList::const_iterator aFilterIter = _aFilter.begin();
+        OStringList::const_iterator aValueIter = _aName.begin();
+
+        bool bMatch = false;
+
+        while (aFilterIter != _aFilter.end() && aValueIter != _aName.end())
+        {
+            rtl::OString sFilter = *aFilterIter;
+            rtl::OString sName   = *aValueIter;
+
+            if (sFilter == sName)
+            {
+                bMatch = true;
+                ++aFilterIter;
+                ++aValueIter;
+            }
+            else if (sFilter == "*")
+            {
+                bMatch = true;
+                break;
+            }
+            else
+            {
+                // Filter does not match
+                bMatch = false;
+                break;
+            }
+        }
+        return bMatch;
+    }
+}
+
+/* static */
+std::string OptionHelper::integerToAscii(sal_Int32 nValue)
+{
+    sal_Char cBuf[30];
+    sal_Char *pBuf = cBuf;
+    sprintf(pBuf, "%d", static_cast<int>(nValue));
+//#     std::ostringstream sBuf;
+//#     sBuf << nValue;
+//    rtl::OString sStr;
+//    sStr = rtl::OString::valueOf(nValue);
+    return std::string(pBuf);
+}
+
+/* static */
+// if a given String is less then 2 char, add a "0" in front.
+std::string OptionHelper::twoDigits(std::string const& _sValue)
+{
+    std::string sBack;
+    if (_sValue.length() == 0)
+    {
+        sBack = "00";
+    }
+    else if (_sValue.length() == 1)
+    {
+        sBack = "0";
+        sBack += _sValue;
+    }
+    else
+    {
+        sBack = _sValue;
+    }
+    return sBack;
+}
+
+
+std::string OptionHelper::createDateTag(std::string const& _sProjectId, std::string const& _sBuildId)
+{
+    TimeValue tmv_system;
+    TimeValue tmv_local;
+    oslDateTime dt;
+    osl_getSystemTime( &tmv_system );
+    osl_getLocalTimeFromSystemTime(&tmv_system, &tmv_local);
+    osl_getDateTimeFromTimeValue( &tmv_local, &dt );
+
+    sal_Int32 nYear = dt.Year;
+    sal_Int32 nMonth = dt.Month;
+    sal_Int32 nDay = dt.Day;
+
+    std::string sDate;
+    sDate = "# Current Time: ";
+    sDate += std::string(twoDigits(integerToAscii(dt.Hours)));
+    sDate += ":";
+    sDate += std::string(twoDigits(integerToAscii(dt.Minutes)));
+    sDate += ":";
+    sDate += std::string(twoDigits(integerToAscii(dt.Seconds)));
+    sDate += "\n";
+
+    sDate += "[";
+
+    // sDate += rtl::OString::valueOf(nYear);
+    sDate.append(integerToAscii(nYear));
+    sDate += ".";
+    if (nMonth < 10)
+        sDate += "0";
+    // sDate += rtl::OString::valueOf(nMonth);
+    sDate.append(integerToAscii(nMonth));
+    sDate += ".";
+    if (nDay < 10)
+        sDate += "0";
+    // sDate += rtl::OString::valueOf(nDay);
+    sDate += std::string(integerToAscii(nDay));
+    sDate += "/";
+    sDate += _sProjectId;
+    sDate += "/";
+    sDate += _sBuildId;
+    sDate += "]";
+
+    return sDate;
+}
+
+//# rtl::OString createDateTag()
+//# {
+//#     TimeValue tmv;
+//#     oslDateTime dt;
+//#     osl_getSystemTime( &tmv );
+//#     osl_getDateTimeFromTimeValue( &tmv, &dt );
+//#
+//#     sal_Int32 nYear = dt.Year;
+//#     sal_Int32 nMonth = dt.Month;
+//#     sal_Int32 nDay = dt.Day;
+//#
+//#     rtl::OString sDate("[");
+//#     sDate += rtl::OString::valueOf(nYear);
+//#     sDate += ".";
+//#     if (nMonth < 10)
+//#             sDate += "0";
+//#     sDate += rtl::OString::valueOf(nMonth);
+//#     sDate += ".";
+//#     if (nDay < 10)
+//#             sDate += "0";
+//#     sDate += rtl::OString::valueOf(nDay);
+//#     sDate += "//]";
+//#
+//#     return sDate;
+//# }
+
+std::string OptionHelper::createDateTag()
+{
+    return createDateTag(m_sProjectId, m_sBuildId);
+}
+
+bool OptionHelper::showErrors()
+{
+    bool bRetValue = true; // default, show all
+    if (m_aOption.hasOpt("-noerrors"))
+    {
+        bRetValue = false;
+    }
+    return bRetValue;
+}
+
+bool OptionHelper::showTests()
+{
+    bool bRetValue = true; // default, show all
+    if (m_aOption.hasOpt("-onlyerrors"))
+    {
+        bRetValue = false;
+    }
+    return bRetValue;
+}
+
+// Check which parameter is given for handle the jobs.
+// If no parameter is given, all jobs (tests) will run through
+void OptionHelper::handleJobs()
+{
+    // load job file, the file contains the functions which we only want to test.
+    if (m_aOption.hasOpt("-jobexclude"))
+    {
+        rtl::OString sJobFile = m_aOption.getOpt("-jobexclude");
+        m_aJobExcludeList.readfile(sJobFile.getStr(), JOB_EXCLUDE_LIST);
+    }
+
+    if (m_aOption.hasOpt("-jobonly"))
+    {
+        rtl::OString sJobFile = m_aOption.getOpt("-jobonly");
+        m_aJobOnlyList.readfile(sJobFile.getStr(), JOB_ONLY_LIST);
+    }
+
+    //
+    if (m_aOption.hasOpt("-jobfilter"))
+    {
+        rtl::OString sJobFilter = m_aOption.getOpt("-jobfilter");
+        split(sJobFilter, ".", m_aJobFilter);
+    }
+}
+
+// -----------------------------------------------------------------------------
+// Here will be decide, if a job/test will execute or not.
+// therefore exist some lists, in which stay all jobs (positive list) or a list (negative list) which jobs should not execute
+// or if only specific jobs should execute by a given filter
+
+bool OptionHelper::isAllowedToExecute(std::string const& _sNodeName, std::string const& _sName)
+{
+    std::string sJobName = _sNodeName + "." + _sName;
+    // t_print(T_VERBOSE, "Jobname %s\n", sJobName.c_str());
+    if (isOnlyShowJobs())                        // true, if parameter -onlyshowjob
+    {
+        m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
+        return false;
+    }
+
+    if (m_aJobOnlyList.size())                   // >0 if parameter -jobonly
+    {
+        if (m_aJobOnlyList.getJobListEntry(sJobName) != JOB_NOT_FOUND)
+        {
+            // job entry found, mark as accessed
+            m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
+            return true;
+        }
+        return false;
+    }
+    else if (m_aJobFilter.size() > 0)            // >0 if parameter -jobfilter
+    {
+        OStringList aSplitName;
+        split(sJobName.c_str(), ".", aSplitName);
+        if (! match(m_aJobFilter, aSplitName))
+        {
+            t_print(T_VERBOSE, "job: '%s' filtered by [-jobfilter]\n", sJobName.c_str());
+            return false;
+        }
+    }
+    else if (m_aJobExcludeList.size() > 0)       // >0 if parameter -jobexclude
+    {
+        if (m_aJobExcludeList.getJobListEntry(sJobName) != JOB_NOT_FOUND)
+        {
+            // job entry found, this job should not executed, so return false
+            t_print(T_VERBOSE, "job: '%s' filtered by [-jobexclude]\n", sJobName.c_str());
+            return false;
+        }
+        // m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
+        return true;
+    }
+    else
+    {
+        //! not handled yet
+    }
+
+    return true;
+}
+
diff --git a/testshl2/source/cppunit/result/outputter.cxx b/testshl2/source/cppunit/result/outputter.cxx
new file mode 100644
index 000000000000..a0fceddda604
--- /dev/null
+++ b/testshl2/source/cppunit/result/outputter.cxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+//
+#include <string>
+#include <sal/types.h>
+#include "testshl/result/outputter.hxx"
+
+// -----------------------------------------------------------------------------
+
+Outputter::~Outputter()
+{
+    // delete m_pLog;
+}
+
+void Outputter::writeToAll(const sal_Char* _sCharStr)
+{
+    // std::cout << _sCharStr;
+    if (m_pStream)
+    {
+        *m_pStream << _sCharStr;
+    }
+    if (m_pLog.get())
+    {
+        m_pLog->write(_sCharStr);
+    }
+}
+
+void Outputter::write(const sal_Char* _sCharStr)
+{
+    writeToAll(_sCharStr);
+}
+
+void Outputter::write(std::string const& _sStr)
+{
+    writeToAll(_sStr.c_str());
+}
+
+void Outputter::write(sal_Int32 _nValue)
+{
+    sal_Char cBuf[20];
+    sal_Char* pBuf = cBuf;
+    sprintf(pBuf, "%d", SAL_STATIC_CAST(int, _nValue));
+    writeToAll(pBuf);
+}
+
+// -----------------------------------------------------------------------------
+
+Outputter& operator <<( Outputter &_aStreamWrapper, const sal_Char* _sValue)
+{
+    _aStreamWrapper.write(_sValue);
+    return _aStreamWrapper;
+}
+
+Outputter& operator <<( Outputter &_aStreamWrapper, std::string const& _sValue)
+{
+    _aStreamWrapper.write(_sValue);
+    return _aStreamWrapper;
+}
+
+Outputter& operator <<( Outputter &_aStreamWrapper, sal_Int32 _nValue)
+{
+    _aStreamWrapper.write(_nValue);
+    return _aStreamWrapper;
+}
+
+//# Outputter& operator <<( Outputter &_aStreamWrapper, double )
+//# {
+//#     return _aStreamWrapper;
+//# }
+
+Outputter& operator <<( Outputter &_aStreamWrapper, Outputter::endl const&)
+{
+    _aStreamWrapper.write("\n");
+    return _aStreamWrapper;
+}
diff --git a/testshl2/source/cppunit/result/signal.cxx b/testshl2/source/cppunit/result/signal.cxx
new file mode 100644
index 000000000000..cf5ce08368bc
--- /dev/null
+++ b/testshl2/source/cppunit/result/signal.cxx
@@ -0,0 +1,999 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#if (defined UNX) || (defined OS2)
+#include <signal.h>
+#include <errno.h>
+#endif
+
+#include <fstream>
+#include <vector>
+#include <hash_map>
+
+#include <rtl/tres.h>
+#include <rtl/string.hxx>
+
+#include "testshl/autoregisterhelper.hxx"
+#include "testshl/getopt.hxx"
+#include "signal.hxx"
+#include <cppunit/tagvalues.hxx>
+#include <testshl/taghelper.hxx>
+#include <unistd.h>
+#include "testshl/filehelper.hxx"
+#include <testshl/result/TestResult.h>
+#include "testshl/signaltest.h"
+#include "cppunit/Exception.h"
+
+#ifdef WNT
+#include "testshl/winstuff.hxx"
+#endif
+
+// typedef std::vector<std::string> StringList;
+// StringList sCurrentNodeName;
+CppUnit::TestResult *pTestResult = NULL;
+std::string sSignalFile;
+
+typedef std::hash_map< std::string, int > HashMap;
+HashMap m_aSignalHash;
+bool bSignalsCached = false;
+bool bDoNotTouchSignalFile = false;
+
+// -----------------------------------------------------------------------------
+
+// return 'true' if signalfile doesn't exist.
+// else 'false'
+bool existsSignalFile(std::string const& _sSignalFilename)
+{
+    FILE* pFile = fopen(_sSignalFilename.c_str(), "r");
+    if (!pFile)
+    {
+        return false;
+    }
+    fprintf(stderr, "'%s' exists.\n", _sSignalFilename.c_str());
+    fclose(pFile);
+    return true;
+}
+
+// -----------------------------------------------------------------------------
+void createEmptySignalFile(std::string const& _sSignalFilename)
+{
+    FILE* pFile = fopen(_sSignalFilename.c_str(), "w");
+    if (!pFile)
+    {
+        fprintf(stderr, "error: Could not create signal helper file %s for signal info.\n", _sSignalFilename.c_str());
+    }
+    else
+    {
+        fprintf(pFile, "# This is an auto generated helper file for signal handling.\n");
+        fprintf(pFile, "# An entry start by '#' is a comment.\n");
+        fprintf(pFile, "# All other are test functions which have abort, before this line is removed.\n");
+        fprintf(pFile, "# So you have to check this functions by hand.\n");
+
+        fclose(pFile);
+    }
+}
+
+// -----------------------------------------------------------------------------
+/** get Current PID.
+*/
+inline ::rtl::OUString getCurrentPID(  )
+{
+        //~ Get current PID and turn it into OUString;
+        sal_uInt32 nPID = 0;
+#ifdef WNT
+        nPID = WinGetCurrentProcessId();
+#else
+        nPID = getpid();
+#endif
+        return ( ::rtl::OUString::valueOf( static_cast<long>(nPID ) ) );
+}
+// -----------------------------------------------------------------------------
+static std::string integerToAscii(sal_uInt32 nValue)
+{
+    sal_Char cBuf[30];
+    sal_Char *pBuf = cBuf;
+    sprintf(pBuf, "%d", static_cast<unsigned int>(nValue));
+    return std::string(pBuf);
+}
+void my_sleep(int sec);
+
+// -----------------------------------------------------------------------------
+void setSignalFilename(GetOpt & opt)
+{
+    if (opt.hasOpt("-dntsf") || opt.hasOpt("-donottouchsignalfile"))
+    {
+        // special feature, for debugging, so the signal file will not manipulate.
+        // but create, if no one exist.
+        bDoNotTouchSignalFile = true;
+    }
+
+    if (opt.hasOpt("-sf") || opt.hasOpt("-signalfile"))
+    {
+        if (opt.hasOpt("-sf"))
+        {
+            sSignalFile = opt.getOpt("-sf");
+        }
+        else if (opt.hasOpt("-signalfile"))
+        {
+            sSignalFile = opt.getOpt("-signalfile");
+        }
+    }
+    else
+    {
+        std::string sPath;
+        // std::string sPath(FileHelper::getTempPath());
+        std::string sFilename("signalfile");
+        std::string sFilenameExt(".txt");
+        bool bCanQuitLoop = true;
+        do
+        {
+
+// #ifdef WNT
+//         sPath += "\\";
+// #endif
+// #ifdef UNX
+//         sPath += "/";
+// #endif
+            sPath = sFilename;
+            // BUG: i72675
+            // add "_12345" where 12345 is the current process ID
+
+            TimeValue aTimeValue;
+            osl_getSystemTime(&aTimeValue);
+
+            sPath += "_";
+            sPath += integerToAscii(aTimeValue.Seconds);
+            // rtl::OUString suPID = getCurrentPID();
+            // rtl::OString sPID = rtl::OUStringToOString(suPID, RTL_TEXTENCODING_ASCII_US);
+            // sPath += sPID.getStr();
+            sPath += sFilenameExt;
+            bCanQuitLoop = true;
+            if (existsSignalFile(sPath))
+            {
+                // there is already a signal file, wait a second, choose an other one.
+                my_sleep(1);
+                bCanQuitLoop = false;
+            }
+        }
+        while (!(bCanQuitLoop));
+
+        sSignalFile = sPath;
+        fprintf(stderr, "Use default signal file name '%s'\n", sSignalFile.c_str());
+    }
+
+    if (opt.hasOpt("-dnrmsf"))
+    {
+        fprintf(stderr, "'Don't remove signal file' (-dnrmsf) is set.\n");
+    }
+    else
+    {
+        if (bDoNotTouchSignalFile == true)
+        {
+            fprintf(stderr, "warning: 'Don't touch signal file' parameter (-dntsf) is set, will not remove existing signal file.\n");
+        }
+        else
+        {
+            // remove signalfile
+            createEmptySignalFile(sSignalFile);
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+bool doNotTouchSignalFile() { return bDoNotTouchSignalFile; }
+
+// -----------------------------------------------------------------------------
+std::string buildTestFunctionName(std::string const& _sName)
+{
+    std::string sName;
+    if (pTestResult)
+    {
+        sName = pTestResult->getNodeName();
+        sName += ".";
+    }
+
+/*
+    for (StringList::const_iterator it = sCurrentNodeName.begin();
+         it != sCurrentNodeName.end();
+         ++it)
+    {
+        sName += *it;
+        sName += ".";
+    }
+*/
+    sName += _sName;
+
+    return sName;
+}
+// -----------------------------------------------------------------------------
+// old: void executionPushName(std::string const& _sName)
+// old: {
+// old:     sCurrentNodeName.push_back(_sName);
+// old: }
+// old: void executionPopName()
+// old: {
+// old:     sCurrentNodeName.pop_back();
+// old: }
+// old:
+
+// -----------------------------------------------------------------------------
+// ------------------------------ Signal Handling ------------------------------
+// -----------------------------------------------------------------------------
+
+// std::string sLastTestFunctionName;
+
+std::string getSignalName(sal_Int32 nSignalNo);
+// -----------------------------------------------------------------------------
+
+std::string getSignalFilename()
+{
+    return sSignalFile;
+}
+
+// -----------------------------------------------------------------------------
+// void storeNoSignal(std::string const& _sTestName)
+// {
+    // sLastTestFunctionName = buildTestFunctionName(_sTestName);
+    // std::ofstream out(getSignalFilename().c_str(), std::ios::out);
+    // out << NO_SIGNAL << std::endl;               // no signal!
+// }
+
+void markSignalAsAlreadyDone(sal_Int32 _nSignalNo)
+{
+    // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app);
+    FILE *out = fopen(getSignalFilename().c_str(), "a");
+    if (out != NULL)
+    {
+//#         out << "# the previous test function creates signal: "
+//#             << getSignalName(_nSignalNo)
+//#             << " ("
+//#             << _nSignalNo
+//#             << ")" << std::endl;
+//#         // out << sLastTestFunctionName << std::endl;               // SIGNAL!
+
+        fprintf(out, "# the previous test function creates signal: %s(%d)\n", getSignalName(_nSignalNo).c_str(), SAL_STATIC_CAST(int, _nSignalNo));
+        // fprintf(out, "%s\n", sLastTestFunctionName );
+        fclose(out);
+    }
+    else
+    {
+        fprintf(stderr, "error: Can't write signal info to file %s \n", getSignalFilename().c_str());
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+Signal hasSignaled(std::string const& _sTestName)
+{
+    // BACK:  true: signal
+    //       false: nothing
+
+    if (bSignalsCached == true)
+    {
+
+        if (m_aSignalHash.find(buildTestFunctionName(_sTestName)) != m_aSignalHash.end())
+        {
+            return HAS_SIGNAL;
+        }
+        return NO_SIGNAL;
+    }
+
+    std::ifstream in(getSignalFilename().c_str(), std::ios::in);
+
+    // std::cout << "Check for signal" << std::endl;
+    std::string sLine, sLastLine;
+    while (std::getline(in, sLine))
+    {
+        // std::cout << sTest << std::endl;
+        char ch = sLine[0];
+        if (isspace(ch) == 0 &&
+            sLine.size() > 0)
+        {
+            if (ch == '#')
+            {
+                if (sLastLine.size() > 0)
+                {
+                    rtl::OString aStrLine(sLine.c_str());
+                    sal_Int32 nIdx = aStrLine.indexOf("(") + 1;
+                    sal_Int32 nIdx2 = aStrLine.indexOf(")");
+                    sal_Int32 nSignalNo = 0;
+                    if (nIdx > 0 && nIdx2 > 0)
+                    {
+                        rtl::OString sSignalNo = aStrLine.copy(nIdx, nIdx2 - nIdx);
+                        nSignalNo = sSignalNo.toInt32();
+                        m_aSignalHash[sLastLine] = nSignalNo;
+                    }
+                    sLastLine.clear();
+                }
+            }
+            else
+            {
+                // if (sTest == buildTestFunctionName(_sTestName))
+                m_aSignalHash[sLine] = 1;
+                sLastLine = sLine;
+                // return HAS_SIGNAL;
+            }
+        }
+    }
+
+    bSignalsCached = true;
+    return hasSignaled(_sTestName);
+    // return NO_SIGNAL;
+}
+
+#ifdef UNX
+
+// -----------------------------------------------------------------------------
+
+void release_signal_Handling();
+
+//# void signalFunction(int value)
+//# {
+//#     std::cout << "Signal caught: (" << value << "), please restart." << std::endl;
+//#     markSignalAsAlreadyDone();
+//#
+//#     release_signal_Handling();
+//#         std::cout.flush();
+//#     abort();
+//# }
+
+// -----------------------------------------------------------------------------
+extern "C" void SignalHandlerFunction(int _nSignalNo, siginfo_t *, void*)
+{
+    // std::cout << "Signal caught: " << getSignalName(_nSignalNo) << " (" << _nSignalNo << "), please restart." << std::endl;
+    fprintf(stderr, "Signal caught %s(%d)\n", getSignalName(_nSignalNo).c_str(), _nSignalNo);
+    markSignalAsAlreadyDone(_nSignalNo);
+
+    release_signal_Handling();
+    // std::cout.flush();
+    abort();
+}
+
+// -----------------------------------------------------------------------------
+// This is a copy of the osl/signal.c code
+#define ACT_IGNORE      1
+#define ACT_ABORT       2
+#define ACT_EXIT        3
+#define ACT_SYSTEM      4
+#define ACT_HIDE        5
+
+extern "C" {
+static struct SignalAction
+{
+    int Signal;
+    int Action;
+    void (*Handler)(int);
+} Signals[] =
+{
+    { SIGHUP,    ACT_IGNORE, NULL },    /* hangup */
+    { SIGINT,    ACT_EXIT,   NULL },    /* interrupt (rubout) */
+    { SIGQUIT,   ACT_ABORT,  NULL },    /* quit (ASCII FS) */
+    { SIGILL,    ACT_SYSTEM,  NULL },    /* illegal instruction (not reset when caught) */
+/* changed from ACT_ABOUT to ACT_SYSTEM to try and get collector to run*/
+    { SIGTRAP,   ACT_ABORT,  NULL },    /* trace trap (not reset when caught) */
+#if ( SIGIOT != SIGABRT )
+    { SIGIOT,    ACT_ABORT,  NULL },    /* IOT instruction */
+#endif
+//      { SIGABRT,   ACT_ABORT,  NULL },    /* used by abort, replace SIGIOT in the future */
+#ifdef SIGEMT
+    { SIGEMT,    ACT_SYSTEM,  NULL },    /* EMT instruction */
+/* changed from ACT_ABORT to ACT_SYSTEM to remove handler*/
+/* SIGEMT may also be used by the profiler - so it is probably not a good
+   plan to have the new handler use this signal*/
+#endif
+    { SIGFPE,    ACT_ABORT,  NULL },    /* floating point exception */
+    { SIGKILL,   ACT_SYSTEM, NULL },    /* kill (cannot be caught or ignored) */
+    { SIGBUS,    ACT_ABORT,  NULL },    /* bus error */
+    { SIGSEGV,   ACT_ABORT,  NULL },    /* segmentation violation */
+#ifdef SIGSYS
+    { SIGSYS,    ACT_ABORT,  NULL },    /* bad argument to system call */
+#endif
+    { SIGPIPE,   ACT_HIDE,   NULL },    /* write on a pipe with no one to read it */
+    { SIGALRM,   ACT_EXIT,   NULL },    /* alarm clock */
+    { SIGTERM,   ACT_EXIT,   NULL },    /* software termination signal from kill */
+    { SIGUSR1,   ACT_SYSTEM, NULL },    /* user defined signal 1 */
+    { SIGUSR2,   ACT_SYSTEM, NULL },    /* user defined signal 2 */
+    { SIGCHLD,   ACT_SYSTEM, NULL },    /* child status change */
+#ifdef SIGPWR
+    { SIGPWR,    ACT_IGNORE, NULL },    /* power-fail restart */
+#endif
+    { SIGWINCH,  ACT_IGNORE, NULL },    /* window size change */
+    { SIGURG,    ACT_EXIT,   NULL },    /* urgent socket condition */
+#ifdef SIGPOLL
+    { SIGPOLL,   ACT_EXIT,   NULL },    /* pollable event occured */
+#endif
+    { SIGSTOP,   ACT_SYSTEM, NULL },    /* stop (cannot be caught or ignored) */
+    { SIGTSTP,   ACT_SYSTEM, NULL },    /* user stop requested from tty */
+    { SIGCONT,   ACT_SYSTEM, NULL },    /* stopped process has been continued */
+    { SIGTTIN,   ACT_SYSTEM, NULL },    /* background tty read attempted */
+    { SIGTTOU,   ACT_SYSTEM, NULL },    /* background tty write attempted */
+    { SIGVTALRM, ACT_EXIT,   NULL },    /* virtual timer expired */
+    { SIGPROF,   ACT_SYSTEM,   NULL },    /* profiling timer expired */
+/*Change from ACT_EXIT to ACT_SYSTEM for SIGPROF is so that profiling signals do
+  not get taken by the new handler - the new handler does not pass on context
+  information which causes 'collect' to crash. This is a way of avoiding
+  what looks like a bug in the new handler*/
+    { SIGXCPU,   ACT_ABORT,  NULL },    /* exceeded cpu limit */
+    { SIGXFSZ,   ACT_ABORT,  NULL }     /* exceeded file size limit */
+};
+}
+
+const int NoSignals = sizeof(Signals) / sizeof(struct SignalAction);
+
+#endif /* UNX */
+
+// -----------------------------------------------------------------------------
+void init_signal_Handling(CppUnit::TestResult *_pResult)
+{
+    pTestResult = _pResult;
+#ifdef UNX
+
+//    signal(SIGSEGV, signalFunction);
+    // signal(SIGSEGV, signalFunction);
+    // signal(SIGFPE, signalFunction);
+
+//    signal(1, signalFunction);
+    // struct sigaction action, oldaction;
+    // action.sa_sigaction = signalFunction2;
+    // action.sa_flags     = SA_ONESHOT /* | SA_SIGINFO */;
+
+    struct sigaction act;
+    struct sigaction oact;
+
+    // act.sa_handler = SignalHandlerFunction;
+    act.sa_flags     = SA_RESTART;
+    // act.sa_flags     = SA_ONESHOT /* | SA_SIGINFO */;
+    act.sa_sigaction = SignalHandlerFunction;
+
+    sigfillset(&(act.sa_mask));
+
+    /* Initialize the rest of the signals */
+    for (int i = 0; i < NoSignals; i++)
+    {
+        if (Signals[i].Action != ACT_SYSTEM)
+        {
+            if (Signals[i].Action == ACT_HIDE)
+            {
+                struct sigaction ign;
+
+                ign.sa_handler = SIG_IGN;
+                ign.sa_flags   = 0;
+                sigemptyset(&ign.sa_mask);
+
+                if (sigaction(Signals[i].Signal, &ign, &oact) == 0)
+                    Signals[i].Handler = oact.sa_handler;
+                else
+                    Signals[i].Handler = SIG_DFL;
+            }
+            else
+                if (sigaction(Signals[i].Signal, &act, &oact) == 0)
+                    Signals[i].Handler = oact.sa_handler;
+                else
+                    Signals[i].Handler = SIG_DFL;
+        }
+    }
+#endif
+
+    // ------------ signal helper file must exist -----------------
+    FILE* pFile = fopen(getSignalFilename().c_str(), "r");
+    if (!pFile)
+    {
+        createEmptySignalFile( getSignalFilename() );
+    }
+    else
+    {
+        fclose(pFile);
+    }
+}
+
+// -----------------------------------------------------------------------------
+void release_signal_Handling()
+{
+    // frees all signals
+#ifdef UNX
+    int i;
+    struct sigaction act;
+
+    act.sa_flags   = 0;
+    sigemptyset(&(act.sa_mask));
+
+    /* Initialize the rest of the signals */
+    for (i = NoSignals - 1; i >= 0; i--)
+    {
+        if (Signals[i].Action != ACT_SYSTEM)
+        {
+            act.sa_handler = Signals[i].Handler;
+
+            sigaction(Signals[i].Signal, &act, NULL);
+        }
+    }
+#endif
+}
+
+// -----------------------------------------------------------------------------
+Signal signalCheck(CppUnit::TestResult* _pResult, std::string const& _sTestName)
+{
+    // BACK: HAS_SIGNAL: the test has already done and signaled
+    if (hasSignaled(_sTestName) == HAS_SIGNAL)
+    {
+        // std::cout << "The Test '" << buildTestFunctionName(_sTestName) << "' is marked as signaled." << std::endl;
+        std::string sTestFunctionName = buildTestFunctionName(_sTestName);
+        fprintf(stderr, "The Test '%s' is marked as signaled.\n", sTestFunctionName.c_str());
+        if (_pResult)
+        {
+            CppUnit::SignalTest *pTest = new CppUnit::SignalTest(_sTestName);
+
+            std::string sErrorText = "Function is marked as signaled: ";
+            sal_Int32 nSignalNo = m_aSignalHash[sTestFunctionName];
+            sErrorText += getSignalName(nSignalNo);
+            sErrorText += " (";
+            sErrorText += OptionHelper::integerToAscii(nSignalNo);
+            sErrorText += ")";
+
+            _pResult->addError(pTest, new CppUnit::SignalException(sErrorText), ErrorType::ET_SIGNAL);
+        }
+        return HAS_SIGNAL;
+    }
+
+    // storeNoSignal(_sTestName);
+    return NO_SIGNAL;
+}
+
+// -----------------------------------------------------------------------------
+bool copyFile(std::string const& _sFrom, std::string const& _sTo)
+{
+    bool bRetValue = false;
+    const int MAXBUFSIZE = 1024;
+    char buff[MAXBUFSIZE];
+    FILE *in = fopen(_sFrom.c_str(), "r");
+    if (in == NULL)
+    {
+        fprintf(stderr, "error: Can't open file %s for read to copy.\n", _sFrom.c_str());
+        bRetValue = false;
+    }
+    else
+    {
+        FILE *out = fopen(_sTo.c_str(), "w");
+        if (out == NULL)
+        {
+            fclose(in);
+            fprintf(stderr, "error: Can't open file %s for write to copy.\n", _sTo.c_str());
+            bRetValue = false;
+        }
+        else
+        {
+            int nRealGot = 0;
+            while(!feof(in))
+            {
+                nRealGot = fread(buff, sizeof(char), MAXBUFSIZE, in);
+                if (nRealGot > 0)
+                {
+                    fwrite(buff, sizeof(char), nRealGot, out);
+                }
+            }
+            bRetValue = true;
+            fclose(out);
+            fclose(in);
+        }
+    }
+    return bRetValue;
+}
+
+// -----------------------------------------------------------------------------
+void signalStartTest(std::string const& _sName)
+{
+    if (doNotTouchSignalFile()) return;
+
+    // fprintf(stderr, "### signalStartTest!\n");
+    // due to the fact, that functions are vicious, we write the name first.
+    // if it isn't vivious, than we removed it.
+    std::string sNewName = getSignalFilename();
+    sNewName += ".bak";
+    if (copyFile(getSignalFilename(), sNewName))
+    {
+        // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app);
+        FILE *out = fopen(getSignalFilename().c_str(), "a");
+        if (out != NULL)
+        {
+            // out << buildTestFunctionName(_sName) << std::endl;
+            fprintf(out, "%s\n", buildTestFunctionName(_sName).c_str());
+            fclose(out);
+        }
+        else
+        {
+            fprintf(stderr, "error: Can't open file %s for append.\n", getSignalFilename().c_str());
+        }
+    }
+    else
+    {
+        fprintf(stderr, "error: Can't copy signal helper from file %s to file %s, %d\n", getSignalFilename().c_str(), sNewName.c_str(), errno);
+    }
+}
+
+// -----------------------------------------------------------------------------
+void signalEndTest()
+{
+    if (doNotTouchSignalFile()) return;
+
+    // fprintf(stderr, "### signalEndTest!\n");
+    if (0 != remove(getSignalFilename().c_str()))
+    {
+        fprintf(stderr, "error: Can't delete file %s\n", getSignalFilename().c_str());
+    }
+    else
+    {
+        std::string sNewName = getSignalFilename();
+        sNewName += ".bak";
+        if (0 != rename(sNewName.c_str(), getSignalFilename().c_str()))
+        {
+            fprintf(stderr, "error: Can't rename file %s to file %s errno: %d\n", sNewName.c_str(), getSignalFilename().c_str(), errno);
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+void removeSignalFile(GetOpt & opt)
+{
+    // fprintf(stderr, "### remove signal file: '%s'\n", sSignalFile.c_str());
+    if (opt.hasOpt("-dnrmsf"))
+    {
+        return;
+    }
+    if (bDoNotTouchSignalFile == true)
+    {
+        return;
+    }
+    remove(getSignalFilename().c_str());
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 SignalHandlerA( TagHelper const& _aTagItems )
+{
+    sal_Int32 nRetValue = 0;
+    TagData nTagType     = _aTagItems.GetTagData(TAG_TYPE, 0);
+// LLA: unused
+//    hTestResult hResult  = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ );
+//    CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult;
+
+    try
+    {
+        switch(nTagType)
+        {
+        // old: case SIGNAL_PUSH_NAME:
+        // old: {
+        // old:     const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
+        // old:     if (sName != NULL)
+        // old:         signalPushName(sName);
+        // old:     break;
+        // old: }
+        // old:
+        // old: case SIGNAL_POP_NAME:
+        // old:     signalPopName();
+        // old:     break;
+
+        // old: case SIGNAL_CHECK:
+        // old: {
+        // old:     const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
+        // old:     if (sName != NULL)
+        // old:     {
+        // old:         nRetValue = signalCheck(sName);
+        // old:     }
+        // old:     break;
+        // old: }
+
+        // old: case INIT_SIGNAL_HANDLING:
+        // old:     init_signal_Handling();
+        // old:     break;
+        // old:
+        // old: case RELEASE_SIGNAL_HANDLING:
+        // old:     release_signal_Handling();
+        // old:     break;
+
+        case SIGNAL_START_TEST:
+        {
+            // fprintf(stderr, "### SIGNAL_START_TEST!\n");
+            const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
+            if (sName != NULL)
+            {
+                signalStartTest(sName);
+            }
+            break;
+        }
+
+        case SIGNAL_END_TEST:
+        {
+            // fprintf(stderr, "### SIGNAL_END_TEST!\n");
+            const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
+            if (sName != NULL)
+            {
+                signalEndTest();
+            }
+            break;
+        }
+
+        default:
+            fprintf(stderr, "error: SignalHandlerA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType));
+            fflush(stderr);
+            // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/);
+        }
+    }
+    catch (std::exception &e)
+    {
+        fprintf(stderr, "error: SignalHandlerA: Exception caught: %s\n", e.what());
+        fflush(stderr);
+        // throw e;
+    }
+
+    return nRetValue;
+}
+// -----------------------------------------------------------------------------
+// This a little bit more abstract code, could be easier to modify or expand.
+
+sal_Int32 CheckExecution(CppUnit::TestResult* _pResult, std::string const& _sName)
+{
+    // more checks in the corresponding job lists
+    if (_pResult)
+    {
+        if (! _pResult->isAllowedToExecute(_sName))
+        {
+            return DO_NOT_EXECUTE;
+        }
+    }
+
+    // Check if the given test should be executed.
+    if (signalCheck(_pResult, _sName) == HAS_SIGNAL)
+    {
+        return DO_NOT_EXECUTE;
+    }
+
+    return GO_EXECUTE;
+}
+
+// -----------------------------------------------------------------------------
+sal_Int32 ExecutionA( TagHelper const& _aTagItems )
+{
+    sal_Int32 nRetValue = 0;
+    TagData nTagType     = _aTagItems.GetTagData(TAG_TYPE, 0);
+    hTestResult hResult  = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ );
+    CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult;
+
+    try
+    {
+        switch(nTagType)
+        {
+        case EXECUTION_CHECK:
+        {
+            const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
+            if (sName)
+            {
+                nRetValue = CheckExecution(pResult, sName);
+                if (nRetValue == GO_EXECUTE)
+                {
+                    if (pResult && pResult->isOptionWhereAmI())
+                    {
+                        printf("# This is: %s\n", buildTestFunctionName(sName).c_str());
+                    }
+                }
+            }
+
+            break;
+        }
+
+        // old: case EXECUTION_PUSH_NAME:
+        // old: {
+        // old:     const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
+        // old:     if (sName != NULL)
+        // old:         executionPushName(sName);
+        // old:     break;
+        // old: }
+        // old:
+        // old: case EXECUTION_POP_NAME:
+        // old:     executionPopName();
+        // old:     break;
+
+        case INIT_TEST:
+            init_signal_Handling(pResult);
+            break;
+
+        case RELEASE_TEST:
+            release_signal_Handling();
+            break;
+
+        default:
+            fprintf(stderr, "ExceptionA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType));
+            break;
+        }
+    }
+    catch (std::exception &e)
+    {
+        fprintf(stderr, "ExecutionA: exception caught: %s\n", e.what());
+        fflush(stderr);
+        // throw e;
+    }
+    return nRetValue;
+}
+
+// -----------------------------------------------------------------------------
+std::string getSignalName(sal_Int32 nSignalNo)
+{
+    std::string sValue;
+#ifdef UNX
+    switch(nSignalNo)
+    {
+    case SIGHUP:
+        sValue = "SIGHUP";
+        break;
+
+    case SIGINT:
+        sValue = "SIGINT";
+        break;
+
+    case SIGQUIT:
+        sValue = "SIGQUIT";
+        break;
+
+    case SIGILL:
+        sValue = "SIGILL";
+        break;
+
+    case SIGTRAP:
+        sValue = "SIGTRAP";
+        break;
+
+#if ( SIGIOT != SIGABRT )
+    case SIGIOT:
+        sValue = "SIGIOT";
+        break;
+#endif
+//      case SIGABRT:
+#ifdef SIGEMT
+    case SIGEMT:
+        sValue = "SIGEMT";
+        break;
+#endif
+    case SIGFPE:
+        sValue = "SIGFPE";
+        break;
+
+    case SIGKILL:
+        sValue = "SIGKILL";
+        break;
+
+    case SIGBUS:
+        sValue = "SIGBUS";
+        break;
+
+    case SIGSEGV:
+        sValue = "SIGSEGV";
+        break;
+
+#ifdef SIGSYS
+    case SIGSYS:
+        sValue = "SIGSYS";
+        break;
+#endif
+    case SIGPIPE:
+        sValue = "SIGPIPE";
+        break;
+
+    case SIGALRM:
+        sValue = "SIGALRM";
+        break;
+
+    case SIGTERM:
+        sValue = "SIGTERM";
+        break;
+
+    case SIGUSR1:
+        sValue = "SIGUSR1";
+        break;
+
+    case SIGUSR2:
+        sValue = "SIGUSR2";
+        break;
+
+    case SIGCHLD:
+        sValue = "SIGCHLD";
+        break;
+
+#ifdef SIGPWR
+    case SIGPWR:
+        sValue = "SIGPWR";
+        break;
+#endif
+    case SIGWINCH:
+        sValue = "SIGWINCH";
+        break;
+
+    case SIGURG:
+        sValue = "SIGURG";
+        break;
+
+#ifdef SIGPOLL
+    case SIGPOLL:
+        sValue = "SIGPOLL";
+        break;
+#endif
+    case SIGSTOP:
+        sValue = "SIGSTOP";
+        break;
+
+    case SIGTSTP:
+        sValue = "SIGTSTP";
+        break;
+
+    case SIGCONT:
+        sValue = "SIGCONT";
+        break;
+
+    case SIGTTIN:
+        sValue = "SIGTTIN";
+        break;
+
+    case SIGTTOU:
+        sValue = "SIGTTOU";
+        break;
+
+    case SIGVTALRM:
+        sValue = "SIGVTALRM";
+        break;
+
+    case SIGPROF:
+        sValue = "SIGPROF";
+        break;
+
+    case SIGXCPU:
+        sValue = "SIGXCPU";
+        break;
+
+    case SIGXFSZ:
+        sValue = "SIGXFSZ";
+        break;
+
+    default:
+        sValue = "Unhandled Signal.";
+    }
+#else
+    (void) nSignalNo; // unused
+#endif
+    return sValue;
+}
+
+// The following sets variables for GNU EMACS
+// Local Variables:
+// tab-width:4
+// End:
diff --git a/testshl2/source/cppunit/result/signal.hxx b/testshl2/source/cppunit/result/signal.hxx
new file mode 100644
index 000000000000..d95569f8bf8b
--- /dev/null
+++ b/testshl2/source/cppunit/result/signal.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SIGNAL_HXX
+#define SIGNAL_HXX
+
+#include <sal/types.h>
+
+#define HAS_SIGNAL 1
+#define NO_SIGNAL  0
+
+typedef sal_Int32 Signal;
+
+#endif
+
diff --git a/testshl2/source/cppunit/result/testshlTestResult.cxx b/testshl2/source/cppunit/result/testshlTestResult.cxx
new file mode 100644
index 000000000000..fdba53136f2b
--- /dev/null
+++ b/testshl2/source/cppunit/result/testshlTestResult.cxx
@@ -0,0 +1,428 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <stdlib.h>
+
+#include <map>
+#include <cppunit/Exception.h>
+#include <cppunit/NotEqualException.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <testshl/result/testshlTestResult.h>
+// #include <TextTestResult.h>
+//!io #include <iostream>
+#include <string>
+
+#include <rtl/string.hxx>
+#include "testshl/result/outputter.hxx"
+
+namespace CppUnit {
+
+    testshlTestResult::testshlTestResult(GetOpt & _aOptions)
+            :TestResult(_aOptions),
+             m_aOptions(_aOptions),
+             // m_aOptionHelper(_aOptions),
+             m_aResulter(this)
+    {
+        addListener( &m_aResulter );
+    }
+
+    testshlTestResult::~testshlTestResult()
+    {
+    }
+
+//# void
+//# testshlTestResult::addFailure( const TestFailure &failure )
+//# {
+//#     // TestResultCollector::addFailure( failure );
+//#     // std::cerr << ( failure.isError() ? "E" : "F" );
+//#     m_aResulter.addFailure(failure);
+//# }
+//#
+//#
+//# void
+//# testshlTestResult::startTest( Test *test )
+//# {
+//#     // TestResultCollector::startTest (test);
+//#     m_aResulter.startTest(test);
+//#     // std::cerr << ".";
+//# }
+//#
+//# void testshlTestResult::endTest( Test *test )
+//# {
+//# }
+
+// -----------------------------------------------------------------------------
+
+//# void
+//# testshlTestResult::printFailures( Outputter &stream )
+//# {
+//#   TestFailures::const_iterator itFailure = failures().begin();
+//#   int failureNumber = 1;
+//#   while ( itFailure != failures().end() )
+//#   {
+//#       stream  <<  std::endl;
+//#       printFailure( *itFailure++, failureNumber++, stream );
+//#   }
+//# }
+//#
+//#
+//# void
+//# testshlTestResult::printFailure( TestFailure *failure,
+//#                               int failureNumber,
+//#                               std::ostream &stream )
+//# {
+//#   printFailureListMark( failureNumber, stream );
+//#   stream << ' ';
+//#   printFailureTestName( failure, stream );
+//#   stream << ' ';
+//#   printFailureType( failure, stream );
+//#   stream << ' ';
+//#   printFailureLocation( failure->sourceLine(), stream );
+//#   stream << std::endl;
+//#   printFailureDetail( failure->thrownException(), stream );
+//#   stream << std::endl;
+//# }
+//#
+//#
+//# void
+//# testshlTestResult::printFailureListMark( int failureNumber,
+//#                                       std::ostream &stream )
+//# {
+//#     stream << failureNumber << ")";
+//# }
+//#
+//#
+//# void
+//# testshlTestResult::printFailureTestName( TestFailure *failure,
+//#                                       std::ostream &stream )
+//# {
+//#     Test* pTest = failure->failedTest();
+//#     stream << "test: " << pTest->getName();
+//# }
+//#
+//#
+//# void
+//# testshlTestResult::printFailureType( TestFailure *failure,
+//#                                   std::ostream &stream )
+//# {
+//#     stream << "("
+//#          << (failure->isError() ? "E" : "F")
+//#          << ")";
+//# }
+//#
+//#
+//# void
+//# testshlTestResult::printFailureLocation( SourceLine sourceLine,
+//#                                       std::ostream &stream )
+//# {
+//#     if ( !sourceLine.isValid() )
+//#         return;
+//#
+//#     stream << "line: " << sourceLine.lineNumber()
+//#            << ' ' << sourceLine.fileName();
+//# }
+//#
+//#
+//# void
+//# testshlTestResult::printFailureDetail( Exception *thrownException,
+//#                                     std::ostream &stream )
+//# {
+//#     if ( thrownException->isInstanceOf( NotEqualException::type() ) )
+//#     {
+//#         NotEqualException *e = (NotEqualException*)thrownException;
+//#         stream << "expected: " << e->expectedValue() << std::endl
+//#                << "but was:  " << e->actualValue();
+//#         if ( !e->additionalMessage().empty() )
+//#         {
+//#             stream  << std::endl;
+//#             stream  <<  "additional message:"  <<  std::endl
+//#                     <<  e->additionalMessage();
+//#         }
+//#     }
+//#     else
+//#     {
+//#         stream << " \"" << thrownException->what() << "\"";
+//#     }
+//# }
+
+
+// LLA: output format:
+// Header
+// # -- BEGIN
+// Error lines
+// No error lines
+// unknown lines
+// # -- END
+// Text 'Test #PASSED#' or 'Errors only'
+
+void
+testshlTestResult::print( Outputter& stream )
+{
+    printHeader( stream );
+    // stream << std::endl;
+    // printFailures( stream );
+
+    bool bPassed = false;
+    if (isOnlyShowJobs())
+    {
+        JobList jl(m_aOptionHelper.getJobOnlyList());
+        HashMap aJobList = jl.getHashMap();
+        printLines(stream, aJobList);
+    }
+    else
+    {
+        stream << "# -- BEGIN:" << Outputter::endl();
+
+        TestPtrList aFailedTests;
+
+        // List of failures
+        printFailedTests(stream, aFailedTests);
+
+        if (! m_aOptionHelper.getOptions().hasOpt("-onlyerrors"))
+        {
+        // List of well done tests
+        printTestLines(stream, aFailedTests);
+
+        // List of unknown Tests
+        JobList jl(m_aOptionHelper.getJobOnlyList());
+        HashMap aJobList = jl.getHashMap();
+        printUnknownLines(stream, aJobList);
+
+            bPassed = true;
+        }
+        stream << "# -- END:" << Outputter::endl();
+
+        if (bPassed)
+        {
+        stream << "Test #PASSED#" << Outputter::endl();
+        }
+
+        if (m_aOptionHelper.getOptions().hasOpt("-onlyerrors"))
+        {
+            stream << "Errors only." << Outputter::endl();
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+void
+testshlTestResult::printLines(Outputter &stream, HashMap & _aJobList)
+{
+    int nCount = _aJobList.size();
+    if (nCount != 0)
+    {
+        for (HashMap::const_iterator it = _aJobList.begin();
+             it != _aJobList.end();
+             ++it)
+        {
+            std::string aKey = (*it).first;
+            if (_aJobList[aKey] == JOB_ACCESS)
+            {
+                stream << aKey;
+                stream << Outputter::endl();
+            }
+        }
+    }
+}
+
+void
+testshlTestResult::printFailedTests(Outputter &stream, TestPtrList &aFailedTests)
+{
+    for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin();
+         it2 != m_aResulter.failures().end();
+         ++it2)
+    {
+        TestFailureEnvelope *pEnvelop = *it2;
+        TestFailure *pFailure = pEnvelop->getTestFailure();
+        std::string sNodeName = pEnvelop->getString();
+
+        aFailedTests[ pFailure->failedTest() ] = true;
+
+        printFailureLine(stream, pFailure, sNodeName);
+    }
+}
+
+void
+testshlTestResult::printTestLines(Outputter &stream, TestPtrList &aFailedTests)
+{
+    for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin();
+         it != m_aResulter.tests().end();
+         ++it)
+    {
+        TestEnvelope *pEnvelop = *it;
+        Test* pTest = pEnvelop->getTest();
+        std::string sNodeName = pEnvelop->getString();
+
+        if (aFailedTests.find(pTest) == aFailedTests.end())
+        {
+            std::string sInfo = m_aResulter.getInfo(pTest);
+            printTestLine(stream, pTest, sNodeName, sInfo);
+        }
+    }
+}
+
+void
+testshlTestResult::printUnknownLines(Outputter &stream, HashMap & _aJobList)
+{
+    int nCount = _aJobList.size();
+    if (nCount != 0)
+    {
+        for (HashMap::const_iterator it = _aJobList.begin();
+             it != _aJobList.end();
+             ++it)
+        {
+            std::string aKey = (*it).first;
+            if (_aJobList[aKey] == JOB_UNKNOWN)
+            {
+                printUnknownLine(stream, aKey);
+            }
+        }
+    }
+}
+
+void
+testshlTestResult::printHeader( Outputter &stream )
+{
+    std::string sDate(m_aOptionHelper.createDateTag());
+    if (isOnlyShowJobs())
+    {
+            stream << "# This is an automatically generated job file." << Outputter::endl();
+            stream << "# ";
+    }
+    else
+    {
+        stream << sDate << Outputter::endl();
+    }
+}
+
+void
+testshlTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName)
+{
+    std::string aName;
+    aName += _sNodeName;
+    aName += ".";
+    aName += _pFailure->failedTestName();
+
+    SourceLine aLine = _pFailure->sourceLine();
+    sal_Int32 nLine = -1;
+    std::string sFilename;
+    if (aLine.isValid())
+    {
+        nLine = aLine.lineNumber();
+        sFilename = aLine.fileName();
+    }
+
+    Exception  *pExp  = _pFailure->thrownException();
+    std::string sWhat;
+    if (pExp)
+    {
+        sWhat = pExp->what();
+    }
+
+    ErrorType::num eErr = _pFailure->getErrorType();
+
+    stream << aName;
+    stream << ";";
+
+    if (eErr == ErrorType::ET_FAILURE)
+        stream << "FAILED";
+
+    else if (eErr == ErrorType::ET_ERROR)
+        stream << "ERROR";
+
+    else if (eErr == ErrorType::ET_SIGNAL)
+        stream << "SIGNAL";
+
+    else
+        stream << "UNKNOWN";
+
+    stream << "#FAILED#";
+
+    stream << sWhat;
+    stream << Outputter::endl();
+}
+
+void
+testshlTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo)
+{
+    std::string aName;
+    aName += _sNodeName;
+    aName += ".";
+    aName += _pTest->getName();
+
+    stream << aName;
+    stream << ";";
+    stream << _sInfo << "#";
+    if (_sInfo == "PASSED")
+    {
+        stream << "OK#";
+    }
+    else
+    {
+        stream << "FAILED#";
+    }
+    stream << Outputter::endl();
+}
+
+void
+testshlTestResult::printUnknownLine( Outputter &stream, std::string const& _sTestName)
+{
+    stream << _sTestName;
+    stream << ";";
+    stream << "UNKNOWN#";
+    stream << "FAILED#";
+    stream << Outputter::endl();
+}
+
+//# void
+//# testshlTestResult::printStatistics( Outputter &stream )
+//# {
+//#     stream  << "Test Results:" << std::endl;
+//#
+//#     stream  <<  "Run:  "  <<  runTests()
+//#             <<  "   Failures: "  <<  testFailures()
+//#             <<  "   Errors: "  <<  testErrors()
+//#             <<  std::endl;
+//# }
+
+
+Outputter &
+operator <<( Outputter &stream,
+             testshlTestResult &result )
+{
+    result.print (stream); return stream;
+}
+
+
+} // namespace CppUnit
diff --git a/testshl2/source/cppunit/result/treswrapper.cxx b/testshl2/source/cppunit/result/treswrapper.cxx
new file mode 100644
index 000000000000..56e891fa026f
--- /dev/null
+++ b/testshl2/source/cppunit/result/treswrapper.cxx
@@ -0,0 +1,262 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <cstdarg>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <sal/types.h>
+#include <cppunit/Test.h>
+#include "testshl/autoregister/htestresult.h"
+#include "cppunit/callbackfunc_fktptr.h"
+#include "testshl/result/callbackfunc.h"
+#include "testshl/result/TestResult.h"
+#include <testshl/taghelper.hxx>
+
+#include <cppunit/tagvalues.hxx>
+
+namespace
+{
+    void TestResult_startTest(hTestResult _pResult, hTest _pTest)
+    {
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
+
+        std::string sName = pTest->getName();
+        CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_START_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE);
+
+        pResult->startTest(pTest);
+    }
+
+    void TestResult_endTest( hTestResult _pResult, hTest _pTest )
+    {
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
+        pResult->endTest(pTest);
+
+        std::string sName = pTest->getName();
+        CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_END_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE);
+    }
+
+// -----------------------------------------------------------------------------
+
+    void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException )
+    {
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
+        CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
+        pResult->addFailure(pTest, pException);
+    }
+
+    void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException )
+    {
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
+        CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
+        pResult->addError(pTest, pException);
+    }
+
+    sal_Int32 TestResult_shouldStop(hTestResult _pResult)
+    {
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        return pResult->shouldStop() == true ? 1 : 0;
+    }
+
+// -----------------------------------------------------------------------------
+    void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo )
+    {
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
+        // CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
+        pResult->addInfo(pTest, _sInfo);
+    }
+// -----------------------------------------------------------------------------
+    void TestResult_enterNode( hTestResult _pResult, const char* _sNode )
+    {
+        // signalPushName(getName());
+        // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_PUSH_NAME, TAG_RESULT_PTR, _pResult, TAG_NODENAME, _sNode, TAG_DONE);
+
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        // CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
+        // CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
+        pResult->enterNode(_sNode);
+    }
+    void TestResult_leaveNode( hTestResult _pResult, const char* _sNode )
+    {
+        CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
+        // CppUnit::Test*       pTest   = (CppUnit::Test*)_pTest;
+        // CppUnit::Exception*      pException = (CppUnit::Exception*)_pException;
+        pResult->leaveNode(_sNode);
+
+        // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_POP_NAME, TAG_RESULT_PTR, _pResult, TAG_DONE);
+    }
+
+// -----------------------------------------------------------------------------
+    sal_Int32 TestResult_StarterA(TagHelper const& _aTagItems)
+    {
+        sal_Int32 nRetValue = 0;
+        TagData nTagType     = _aTagItems.GetTagData(TAG_TYPE, 0);
+        hTestResult pResult  = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */);
+        CppUnit::Test* pTest = (CppUnit::Test*) _aTagItems.GetTagData(TAG_TEST_PTR, 0 /* NULL */);
+
+        try
+        {
+            switch(nTagType)
+            {
+            case RESULT_START:
+                TestResult_startTest(pResult, pTest);
+                break;
+
+            case RESULT_END:
+                TestResult_endTest(pResult, pTest);
+                break;
+
+            case RESULT_ADD_FAILURE:
+            {
+                hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0);
+                TestResult_addFailure(pResult, pTest, pException);
+                break;
+            }
+
+            case RESULT_ADD_ERROR:
+            {
+                hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0);
+                TestResult_addError(pResult, pTest, pException);
+                break;
+            }
+
+            case RESULT_ADD_INFO:
+            {
+                const char* pInfo = (const char* ) _aTagItems.GetTagData(TAG_INFO, 0);
+                TestResult_addInfo(pResult, pTest, pInfo);
+                break;
+            }
+
+            case RESULT_ENTER_NODE:
+            {
+                const char* pNode = (const char* )_aTagItems.GetTagData(TAG_NODENAME, 0);
+                TestResult_enterNode(pResult, pNode);
+                break;
+            }
+
+            case RESULT_LEAVE_NODE:
+            {
+                const char* pNode = (const char* ) _aTagItems.GetTagData(TAG_NODENAME, 0);
+                TestResult_leaveNode(pResult, pNode);
+                break;
+            }
+
+            case RESULT_SHOULD_STOP:
+                nRetValue = TestResult_shouldStop(pResult);
+                break;
+
+            default:
+                fprintf(stderr, "TestResult_StarterA: Can't handle the tag type %8x\n", SAL_STATIC_CAST(int, nTagType));
+                fflush(stderr);
+                // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/);
+            }
+        }
+        catch (std::exception &e)
+        {
+            fprintf(stderr, "TestResult_StarterA: Exception caught: %s\n", e.what());
+            // throw e;
+        }
+
+        return nRetValue;
+    }
+} // namespace anonymous
+
+// --------------------------------- Prototypes ---------------------------------
+
+sal_Int32 SignalHandlerA( TagHelper const& _aTagItems );
+sal_Int32 ExecutionA( TagHelper const& _aTagItems );
+
+// -----------------------------------------------------------------------------
+long CallbackDispatch(int x, ...)
+{
+    (void) x; // avoid warning
+
+    // The idea behind TagItems are from the Amiga OS.
+    // Due to the fact that the following code does not find my ok
+    // I decide to wrote a simple helper
+    //
+    // struct TagItem *tags = (struct TagItem *)&x + 1;
+
+    TagHelper aTagItems;
+
+    // the following code could also be in a #define, so other functions could
+    // use this, but at the moment this function a the only one.
+
+    // FILL_TAGS(aTagItems, x);
+    std::va_list  args;
+    va_start( args, x );
+    Tag nTag;
+    do
+    {
+        nTag = va_arg(args, Tag);
+        if (nTag != TAG_DONE)
+        {
+            TagData nValue = va_arg(args, TagData);
+            // printf("Tag: %8x Value:%8x\n", nTag, nValue);
+            aTagItems.insert(nTag, nValue);
+        }
+    } while (nTag != TAG_DONE);
+
+    va_end   ( args );
+
+    // FILL_TAGS:END
+
+    // printf(".\n");
+
+    long nRetValue = 0;
+    Tag nPreTag = aTagItems.GetTagData(TAG_TYPE);
+    if ( (nPreTag & TAG_RESULT) == TAG_RESULT)
+    {
+        nRetValue = TestResult_StarterA( aTagItems );
+    }
+    else if ((nPreTag & TAG_SIGNAL) == TAG_SIGNAL)
+    {
+        nRetValue = SignalHandlerA(aTagItems);
+    }
+    else if (( nPreTag & TAG_EXECUTION) == TAG_EXECUTION)
+    {
+        nRetValue = ExecutionA(aTagItems);
+    }
+    else
+    {
+        fprintf(stderr, "CallbackDispatch: First tag is unknown %8x\n", SAL_STATIC_CAST(int, nPreTag));
+        // unknown TAG_TYPE
+    }
+    return nRetValue;
+}
+
diff --git a/testshl2/source/cppunit/signaltest.cxx b/testshl2/source/cppunit/signaltest.cxx
new file mode 100644
index 000000000000..78bc447f06e4
--- /dev/null
+++ b/testshl2/source/cppunit/signaltest.cxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <typeinfo>
+
+#include "testshl/signaltest.h"
+
+namespace CppUnit
+{
+
+/** Constructs a test case for a suite.
+ *  This TestCase is intended for use by the TestCaller and should not
+ *  be used by a test case for which run() is called.
+ **/
+SignalTest::SignalTest(std::string const& _sName)
+    : m_sName( _sName )
+{
+}
+
+
+/// Destructs a test case
+SignalTest::~SignalTest()
+{
+}
+
+
+/// Returns a count of all the tests executed
+int
+SignalTest::countTestCases() const
+{
+  return 1;
+}
+
+/// We never need to start this
+void SignalTest::run(hTestResult) {}
+
+
+/// Returns the name of the test case
+std::string
+SignalTest::getName() const
+{
+  return m_sName;
+}
+
+
+/// Returns the name of the test case instance
+std::string
+SignalTest::toString() const
+{
+  std::string className;
+
+#if CPPUNIT_USE_TYPEINFO_NAME
+  const std::type_info& thisClass = typeid( *this );
+  className = thisClass.name();
+#else
+  className = "SignalTest";
+#endif
+
+  return className + "." + getName();
+}
+
+} // namespace CppUnit
diff --git a/testshl2/source/cppunit/t_print.cxx b/testshl2/source/cppunit/t_print.cxx
new file mode 100644
index 000000000000..602a77998da3
--- /dev/null
+++ b/testshl2/source/cppunit/t_print.cxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <stdio.h>
+#include <testshl/cmdlinebits.hxx>
+#include <rtl/tres.h>
+#include <osl/mutex.hxx>
+
+extern CmdLineBits st_nBits;
+
+sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag )
+{
+    return( ( _nBits & _nFlag ) == _nFlag );
+}
+
+// -----------------------------------------------------------------------------
+// ----------------------------- own printf method -----------------------------
+// -----------------------------------------------------------------------------
+
+bool isVerbose()
+{
+    if ( isBit( st_nBits, rtl_tres_Flag_VERBOSE ) )
+    {
+        return true;
+    }
+    return false;
+}
+
+bool isQuiet()
+{
+    if ( isBit( st_nBits, rtl_tres_Flag_QUIET ) )
+    {
+        return true;
+    }
+    return false;
+}
+
+// ::osl::Mutex   m_aTPrintMutex;
+
+void impl_t_print(const char* _pFormatStr, va_list &args)
+{
+    if (! isQuiet())
+    {
+        // ::osl::MutexGuard g(m_aTPrintMutex);
+        printf("# ");
+        vprintf(_pFormatStr, args);
+    }
+}
+
+void t_print(const char* _pFormatStr, ...)
+{
+    va_list  args;
+    va_start( args, _pFormatStr );
+    impl_t_print(_pFormatStr, args);
+    va_end( args );
+}
+
+void t_print(T_Print_Params _eType, const char* _pFormatStr, ...)
+{
+    if (_eType == T_VERBOSE && isVerbose())
+    {
+        // if T_VERBOSE and we should be verbose, print info
+        va_list  args;
+        va_start( args, _pFormatStr );
+        impl_t_print(_pFormatStr, args);
+        va_end( args );
+    }
+}
diff --git a/testshl2/source/cppunit/tresregister.cxx b/testshl2/source/cppunit/tresregister.cxx
new file mode 100644
index 000000000000..96491345416b
--- /dev/null
+++ b/testshl2/source/cppunit/tresregister.cxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <stdio.h>
+#include <sal/types.h>
+#include <testshl/autoregister/registerfunc.h>
+#include <testshl/autoregister/callbackstructure.h>
+#include <testshl/cmdlinebits.hxx>
+
+//! is this global CallbackStructure need?
+CallbackStructure aGlobalStructure;
+CmdLineBits st_nBits;
+
+FktPtr_CallbackDispatch  pCallbackFunc = NULL;
+
+// This function is called from the TestShl tool.
+extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* _pCallback)
+{
+    aGlobalStructure = *_pCallback;
+
+        st_nBits = aGlobalStructure.nBits;
+
+    pCallbackFunc = _pCallback->aCallbackDispatch;
+    FktRegFuncPtr pFunc = _pCallback->aRegisterFunction;
+    if (pFunc)
+    {
+        RegisterTestFunctions(pFunc);
+    }
+    else
+    {
+        // error, should be echoed
+        fprintf(stderr, "error: Callback Structure doesn't contain a test function ptr.\n");
+    }
+
+    // all is done, copy the magic value
+    // this is only a simple internal invariant check,
+    // if the called registerAllTestFunctions Function do, what we want.
+    _pCallback->nMagic2 = _pCallback->nMagic;
+}
diff --git a/testshl2/source/cppunit/tresstatewrapper.cxx b/testshl2/source/cppunit/tresstatewrapper.cxx
new file mode 100644
index 000000000000..bdfe23ac574e
--- /dev/null
+++ b/testshl2/source/cppunit/tresstatewrapper.cxx
@@ -0,0 +1,169 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+// this functions build the wrapper, to handle old function calls to rtl_tres_state
+// IMPORTANT: Due to the fact that rtl_tres_state is in the sal.lib
+// you have to rename rtl_tres_state to c_rtl_tres_state
+//
+// return c_rtl_tres_state
+// (
+//     hRtlTestResult,
+//     pData->length == 0 &&
+//     ! *pData->buffer,
+//     "New OString containing no characters",
+//     "ctor_001"
+// )
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "cppunit/Test.h"
+#include "testshl/autoregister/htestresult.h"
+#include "cppunit/callbackfunc_fktptr.h"
+#include "cppunit/TestAssert.h"
+#include "testshl/checkboom.hxx"
+
+#define LOAD_TRESSTATEWRAPPER_LOCAL
+#include "testshl/tresstatewrapper.hxx"
+#undef LOAD_TRESSTATEWRAPPER_LOCAL
+
+#include "cppunit/tagvalues.hxx"
+#include "cppunit/externcallbackfunc.hxx"
+
+// -----------------------------------------------------------------------------
+// Wrapper class for the CppUnit::Test, because the new TestResult
+// expect a CppUnit::Test interface
+
+class WrappedTest : public CppUnit::Test
+{
+    std::string m_sName;
+public:
+    WrappedTest(std::string const& _sName)
+            :m_sName(_sName){}
+
+    virtual                       ~WrappedTest () {}
+    virtual void                  run (hTestResult /*pResult*/){}
+    virtual int                   countTestCases () const {return 1;}
+    virtual std::string           getName () const {return m_sName;}
+    virtual std::string           toString () const {return "WrappedTest";}
+};
+
+// -----------------------------------------------------------------------------
+rtl_tres_state_start::rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName)
+        :m_pName(_pName),
+         m_aResult(_aResult)
+{
+    // (pTestResult_EnterNode)(m_aResult, m_pName);
+    (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE);
+}
+rtl_tres_state_start::~rtl_tres_state_start()
+{
+    // (pTestResult_LeaveNode)(m_aResult, m_pName);
+    (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE);
+}
+
+// --------------------------------- C-Wrapper ---------------------------------
+typedef std::vector<rtl_tres_state_start*> rtl_tres_states;
+rtl_tres_states m_StateStack;
+
+extern "C" void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName)
+{
+    rtl_tres_state_start* pState = new rtl_tres_state_start(_aResult, _pName);
+    m_StateStack.push_back(pState);
+}
+
+extern "C" void c_rtl_tres_state_end(hTestResult, const sal_Char*)
+{
+    rtl_tres_state_start* pState = m_StateStack.back();
+
+    delete pState;
+    m_StateStack.pop_back();
+}
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------
+// ------------------------- Wrapper for rtl_tres_state -------------------------
+// -----------------------------------------------------------------------------
+
+sal_Bool SAL_CALL c_rtl_tres_state(
+    hTestResult pResult,
+    sal_Bool bSuccess,
+    char const * pTestMsg,
+    char const * pFuncName)
+{
+    CppUnit::Test* pTest = new WrappedTest(pFuncName);
+
+    sal_Int32 nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, pResult, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE);
+    if (nValue == DO_NOT_EXECUTE)
+    {
+        return false;
+    }
+
+    // This code is copied from CppUnit::TestCase and less adapted, to work with the
+    // old test code.
+    // (pTestResult_StartTest)(pResult, pTest);
+    (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE);
+
+    try
+    {
+        CPPUNIT_ASSERT_MESSAGE( pTestMsg, bSuccess ? true : false );
+        // (pTestResult_AddInfo)(pResult, pTest, "#PASSED#");
+        (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE);
+    }
+    catch ( CppUnit::Exception &e )
+    {
+        CppUnit::Exception *copy = e.clone();
+        // (pTestResult_AddFailure)( pResult, pTest, copy );
+        (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE );
+    }
+    catch ( std::exception &e )
+    {
+        //(pTestResult_AddError)( pResult, pTest, new CppUnit::Exception( e.what() ) );
+        (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE );
+    }
+    catch (...)
+    {
+        CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" );
+        // (pTestResult_AddError)( pResult, pTest, e );
+        (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE );
+    }
+
+
+    // (pTestResult_EndTest)( pResult, pTest );
+    (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE );
+
+    return bSuccess;
+}
+
diff --git a/testshl2/source/cppunit/win32/makefile.mk b/testshl2/source/cppunit/win32/makefile.mk
new file mode 100644
index 000000000000..9c9882d87113
--- /dev/null
+++ b/testshl2/source/cppunit/win32/makefile.mk
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile$
+#
+# $Revision$
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME=testshl2
+TARGET=c5t_winstuff
+LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+.INCLUDE :  settings.mk
+
+# ------------------------------------------------------------------
+
+SLOFILES = \
+        $(SLO)$/winstuff.obj
+
+#-------------------------------------------------------------------------------
+# This is a static lib
+LIB1TARGET= $(LB)$/$(TARGET).lib
+LIB1OBJFILES= \
+    $(SLOFILES)
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
+.ENDIF
+
+.IF "$(GUI)" == "UNX"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/testshl2/source/cppunit/win32/winstuff.cxx b/testshl2/source/cppunit/win32/winstuff.cxx
new file mode 100644
index 000000000000..41fc4157171b
--- /dev/null
+++ b/testshl2/source/cppunit/win32/winstuff.cxx
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#ifdef WIN32
+#include "testshl/winstuff.hxx"
+
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#include <MAPIWin.h>
+
+void WinDebugBreak()
+{
+    // forward to WinAPI. Note that the whole story is simply to
+    // disentangle OOo headers from Windows headers (which are largely
+    // incompatible, due to name clashes and macro mess-ups)
+    DebugBreak();
+}
+
+void WinSleep( sal_uInt32 sec )
+{
+    Sleep(sec * 1000);
+}
+
+sal_uInt32 WinGetCurrentProcessId()
+{
+    return GetCurrentProcessId();
+}
+
+#define TA_FAILED 0
+#define TA_SUCCESS_CLEAN 1
+#define TA_SUCCESS_KILL 2
+#define TA_SUCCESS_16 3
+
+   // Declare Callback Enum Functions.
+bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam );
+
+/*----------------------------------------------------------------
+   DWORD WINAPI TerminateApp( DWORD dwPID, DWORD dwTimeout )
+
+   Purpose:
+      Shut down a 32-Bit Process (or 16-bit process under Windows 95)
+
+   Parameters:
+      dwPID
+         Process ID of the process to shut down.
+
+      dwTimeout
+         Wait time in milliseconds before shutting down the process.
+
+   Return Value:
+      TA_FAILED - If the shutdown failed.
+      TA_SUCCESS_CLEAN - If the process was shutdown using WM_CLOSE.
+      TA_SUCCESS_KILL - if the process was shut down with
+         TerminateProcess().
+      NOTE:  See header for these defines.
+   ----------------------------------------------------------------*/
+void WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout )
+{
+    HANDLE   hProc;
+    DWORD   dwRet;
+
+    // If we can't open the process with PROCESS_TERMINATE rights,
+    // then we give up immediately.
+    hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, false,
+                        dwPID);
+
+    if(hProc == NULL)
+        return;
+
+    // TerminateAppEnum() posts WM_CLOSE to all windows whose PID
+    // matches your process's.
+    EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM) dwPID);
+
+    // Wait on the handle. If it signals, great. If it times out,
+    // then you kill it.
+    if (WaitForSingleObject(hProc, dwTimeout) != WAIT_OBJECT_0)
+        dwRet= (TerminateProcess(hProc,0) ? TA_SUCCESS_KILL : TA_FAILED);
+    else
+        dwRet = TA_SUCCESS_CLEAN;
+
+    CloseHandle(hProc);
+}
+
+bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam )
+{
+    DWORD dwID;
+
+    GetWindowThreadProcessId(hwnd, &dwID);
+
+    if(dwID == (DWORD)lParam)
+    {
+        PostMessage(hwnd, WM_CLOSE, 0, 0);
+    }
+
+    return true;
+}
+#else
+
+// this file is only need within Windows.
+// due to the fact that empty files don't create libraries
+// we store one function in it.
+int WinStuffDummy_this_function_will_never_need()
+{
+    return 42; // we need some code
+}
+
+#endif /* WIN32 */
+
diff --git a/testshl2/source/makefile.mk b/testshl2/source/makefile.mk
index f411f7d7948f..ab0d9685e667 100644..100755
--- a/testshl2/source/makefile.mk
+++ b/testshl2/source/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,15 +47,15 @@ ENABLE_EXCEPTIONS=TRUE
 COMMON_OBJFILES=\
     $(OBJ)$/getopt.obj \
     $(OBJ)$/filehelper.obj \
-    $(OBJ)$/dynamicregister.obj 
+    $(OBJ)$/dynamicregister.obj
 
 TESTSHL_OBJFILES=\
     $(OBJ)$/autoregisterhelper.obj \
-    $(OBJ)$/testshl.obj 
+    $(OBJ)$/testshl.obj
 
 VERSIONINFO_OBJFILES=\
     $(OBJ)$/versionhelper.obj \
-    $(OBJ)$/versioner.obj 
+    $(OBJ)$/versioner.obj
 
 BMSMA_OBJFILES=\
     $(OBJ)$/bmsma.obj
@@ -70,35 +70,34 @@ APP1RPATH=NONE
 
 APP1STDLIBS=$(SALLIB)
 
-# the c5t*.lib files are out of the cppunit module
-# APP1DEPN= \
-# 	$(SOLARLIBDIR)$/c5t_no_regallfkt.lib \
-# 	$(SOLARLIBDIR)$/c5t_testresult.lib
-
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)" == "GCC"
 APP1STDLIBS+= \
-    $(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \
-    $(SOLARLIBDIR)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \
-    $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a
+        $(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \
+        $(LB)$/libc5t_testresult$(DLLPOSTFIX).a \
+        $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \
+        $(LB)$/libc5t_winstuff$(DLLPOSTFIX).a
 .ELSE
 APP1LIBS= \
-    $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \
-    $(SOLARLIBDIR)$/c5t_testresult.lib
-APP1LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib
+        $(SOLARLIBDIR)$/cppunit.lib \
+        $(LB)$/c5t_testresult.lib \
+        $(LB)$/c5t_no_regallfkt.lib \
+        $(LB)$/c5t_winstuff.lib
 .ENDIF
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
 APP1LIBS= \
-    $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \
-    $(SOLARLIBDIR)$/c5t_testresult.lib
+        $(SOLARLIBDIR)$/cppunit.lib \
+        $(LB)$/c5t_no_regallfkt.lib \
+        $(LB)$/c5t_testresult.lib
 .ENDIF
 
 .IF "$(GUI)" == "UNX"
 APP1STDLIBS+= \
-    $(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \
-    $(SOLARLIBDIR)$/libc5t_no_regallfkt$(DLLPOSTFIX).a
+        $(LB)$/libc5t_testresult$(DLLPOSTFIX).a \
+        $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \
+        $(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
 .ENDIF
 
 #
@@ -108,24 +107,24 @@ APP2OBJS= $(COMMON_OBJFILES) $(VERSIONINFO_OBJFILES)
 
 APP2STDLIBS=$(SALLIB)
 
-APP2DEPN= 
-APP2LIBS= 
+APP2DEPN=
+APP2LIBS=
 
 # ------------------------------------------------------------------
 APP3TARGET= $(TARGET)_timeout
-APP3OBJS= 	$(OBJ)$/getopt.obj $(OBJ)$/filehelper.obj $(OBJ)$/terminate.obj
+APP3OBJS=   $(OBJ)$/getopt.obj $(OBJ)$/filehelper.obj $(OBJ)$/terminate.obj
 
 APP3STDLIBS=$(SALLIB)
 
-APP3DEPN= 
-APP3LIBS= 
+APP3DEPN=
+APP3LIBS=
 
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)" == "GCC"
 APP3STDLIBS+= \
-    $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a
+        $(LB)$/libc5t_winstuff$(DLLPOSTFIX).a
 .ELSE
-APP3LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib
+APP3LIBS += $(LB)$/c5t_winstuff.lib
 .ENDIF
 .ENDIF
 
diff --git a/testshl2/source/testshl.cxx b/testshl2/source/testshl.cxx
index bf44b3c4572f..eaeb1f9e5fbe 100644
--- a/testshl2/source/testshl.cxx
+++ b/testshl2/source/testshl.cxx
@@ -55,15 +55,15 @@
 #include "testshl/log.hxx"
 #include "testshl/filehelper.hxx"
 #include "testshl/getopt.hxx"
-#include "cppunit/result/outputter.hxx"
-#include "cppunit/joblist.hxx"
+#include "testshl/result/outputter.hxx"
+#include "testshl/joblist.hxx"
 
 // #include <osl/time.h>
 
 using namespace std;
 
-#include "cppunit/result/testshlTestResult.h"
-#include "cppunit/result/emacsTestResult.hxx"
+#include "testshl/result/testshlTestResult.h"
+#include "testshl/result/emacsTestResult.hxx"
 
 // Prototype for signal handling
 void setSignalFilename(GetOpt & opt);
diff --git a/testtools/qa/cli/makefile.mk b/testtools/qa/cli/makefile.mk
index 181c28791e60..89e389de3104 100644
--- a/testtools/qa/cli/makefile.mk
+++ b/testtools/qa/cli/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = clitest
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = CLITest.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/testtools/qa/cliversioning/makefile.mk b/testtools/qa/cliversioning/makefile.mk
index 70f535c341e1..1c0506786c42 100644
--- a/testtools/qa/cliversioning/makefile.mk
+++ b/testtools/qa/cliversioning/makefile.mk
@@ -41,7 +41,7 @@ PACKAGE = cliversion
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES = VersionTestCase.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
index 8c9cb27ecd04..ed7855663f36 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
+++ b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/toolkit$/interface_tests
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = _XAccessibleComponent.java         \
                   _XAccessibleContext.java           \
                   _XAccessibleExtendedComponent.java \
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
index b375d1d5b238..c895c8403498 100755
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ b/toolkit/qa/complex/toolkit/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/toolkit
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
+JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
 JAVAFILES       = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 SUBDIRS		= interface_tests
diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst
index 7b35ccc73c73..d4be6f5e3517 100644
--- a/toolkit/src2xml/include.lst
+++ b/toolkit/src2xml/include.lst
@@ -128,7 +128,6 @@
 ../../cppcanvas/inc
 ../../cppcanvas/source/inc
 ../../cppcanvas/unxlngi6.pro/inc
-../../sandbox/unxlngi6.pro/inc
 ../../eventattacher/unxlngi6.pro/inc
 ../../unotools/inc
 ../../unotools/unxlngi6.pro/inc
@@ -301,4 +300,4 @@
 ../../cli_ure/inc
 ../../cli_ure/unxlngi6.pro/inc
 ../../psprint/inc
-../../psprint/unxlngi6.pro/inc
\ No newline at end of file
+../../psprint/unxlngi6.pro/inc
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index dd218de40da7..3b5bd768566b 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -34,7 +34,6 @@
 #undef NDEBUG
 
 /*
-#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 */
@@ -189,12 +188,12 @@ public:
         while ( xParent.is() && !uno::Reference< awt::XWindow >( xParent, uno::UNO_QUERY ).is() )
         {
             uno::Reference< awt::XLayoutContainer > xContainer( xParent, uno::UNO_QUERY );
-            assert( xContainer.is() );
+            OSL_ASSERT( xContainer.is() );
             xParent = uno::Reference< awt::XLayoutContainer >( xContainer->getParent(), uno::UNO_QUERY );
         }
 
         mxWidget = WidgetFactory::createWidget( xToolkit, xParent, unoName, nAttrbs );
-        assert( mxWidget.is() );
+        OSL_ASSERT( mxWidget.is() );
         mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY );
 
         mrLabel = mrUnoName = unoName;
@@ -340,7 +339,7 @@ public:
         else
             maChildren.push_back( pChild );
 
-        assert( pChild->mpParent == NULL );
+        OSL_ASSERT( pChild->mpParent == NULL );
         pChild->mpParent = this;
 
         // store container props
@@ -1733,7 +1732,7 @@ EditorImpl::EditorImpl( layout::Dialog *dialog,
         mxFactory->createInstance(
             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ),
         uno::UNO_QUERY );
-    assert( mxToolkit.is() );
+    OSL_ASSERT( mxToolkit.is() );
 
     // custom widgets
 #if DEBUG_PRINT
@@ -1890,7 +1889,7 @@ IMPL_LINK( EditorImpl, CreateWidgetHdl, layout::Button *, pBtn )
         if ( pBtn == *it )
             break;
     }
-    assert( i < WIDGETS_SPECS_LEN );
+    OSL_ASSERT( i < WIDGETS_SPECS_LEN );
     createWidget( WIDGETS_SPECS[i].pName );
     return 0;
 }
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index ed70359be0c0..4f281a9b1359 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -99,17 +99,4 @@ public:
                     ~ImplPolyPolygon();
 };
 
-inline long MinMax( long nVal, long nMin, long nMax )
-{
-    return( nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin );
-}
-
-// ------------------------------------------------------------------
-
-inline long FRound( double fVal )
-{
-    return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
-}
-
-
 #endif // _SV_POLY_H
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 87602e27d874..e14be54b7df1 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -115,6 +115,9 @@ public:
     TOOLS_DLLPUBLIC friend Date     operator +( const Date& rDate, long nDays );
     TOOLS_DLLPUBLIC friend Date     operator -( const Date& rDate, long nDays );
     TOOLS_DLLPUBLIC friend long     operator -( const Date& rDate1, const Date& rDate2 );
+
+    static long DateToDays( USHORT nDay, USHORT nMonth, USHORT nYear );
+
 };
 
 #endif // _DATE_HXX
diff --git a/sandbox/com/sun/star/lib/sandbox/WeakEntry.java b/tools/inc/tools/fldunit.hxx
index d4ea8f637ed2..786796030eb3 100644
--- a/sandbox/com/sun/star/lib/sandbox/WeakEntry.java
+++ b/tools/inc/tools/fldunit.hxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WeakEntry.java,v $
+ * $RCSfile: fldunit.hxx,v $
  * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
@@ -28,19 +28,17 @@
  *
  ************************************************************************/
 
-package com.sun.star.lib.sandbox;
+#ifndef _TOOLS_FLDUNIT_HXX
+#define _TOOLS_FLDUNIT_HXX
 
-class WeakEntry {
-    Class weakClass;
-    WeakRef weakRef;
+// --------------
+// - FieldTypes -
+// --------------
 
-    public WeakEntry(Class weakClass, WeakRef weakRef) {
-        this.weakClass = weakClass;
-        this.weakRef   = weakRef;
-    }
-
-    public String toString() {
-        return (weakRef == null) ? "null" : weakRef.toString();
-    }
-}
+// By changes you must also change: rsc/vclrsc.hxx
+enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
+                 FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
+                 FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
+                 FUNIT_PERCENT, FUNIT_100TH_MM };
 
+#endif // _TOOLS_FLDUNIT_HXX
diff --git a/tools/inc/tools/fontenum.hxx b/tools/inc/tools/fontenum.hxx
new file mode 100644
index 000000000000..6c529cedb30d
--- /dev/null
+++ b/tools/inc/tools/fontenum.hxx
@@ -0,0 +1,175 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: vclenum.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _TOOLS_FONTENUM_HXX
+#define _TOOLS_FONTENUM_HXX
+
+#include <sal/types.h>
+#include <tools/solar.h>
+
+#ifndef ENUM_FONTFAMILY_DECLARED
+#define ENUM_FONTFAMILY_DECLARED
+
+enum FontFamily { FAMILY_DONTKNOW, FAMILY_DECORATIVE, FAMILY_MODERN,
+                  FAMILY_ROMAN, FAMILY_SCRIPT, FAMILY_SWISS, FAMILY_SYSTEM, FontFamily_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTPITCH_DECLARED
+#define ENUM_FONTPITCH_DECLARED
+
+enum FontPitch { PITCH_DONTKNOW, PITCH_FIXED, PITCH_VARIABLE, FontPitch_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_TEXTALIGN_DECLARED
+#define ENUM_TEXTALIGN_DECLARED
+
+enum TextAlign { ALIGN_TOP, ALIGN_BASELINE, ALIGN_BOTTOM, TextAlign_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTWEIGHT_DECLARED
+#define ENUM_FONTWEIGHT_DECLARED
+
+enum FontWeight { WEIGHT_DONTKNOW, WEIGHT_THIN, WEIGHT_ULTRALIGHT,
+                  WEIGHT_LIGHT, WEIGHT_SEMILIGHT, WEIGHT_NORMAL,
+                  WEIGHT_MEDIUM, WEIGHT_SEMIBOLD, WEIGHT_BOLD,
+                  WEIGHT_ULTRABOLD, WEIGHT_BLACK, FontWeight_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTWIDTH_DECLARED
+#define ENUM_FONTWIDTH_DECLARED
+
+enum FontWidth { WIDTH_DONTKNOW, WIDTH_ULTRA_CONDENSED, WIDTH_EXTRA_CONDENSED,
+                 WIDTH_CONDENSED, WIDTH_SEMI_CONDENSED, WIDTH_NORMAL,
+                 WIDTH_SEMI_EXPANDED, WIDTH_EXPANDED, WIDTH_EXTRA_EXPANDED,
+                 WIDTH_ULTRA_EXPANDED,
+                 FontWidth_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTITALIC_DECLARED
+#define ENUM_FONTITALIC_DECLARED
+
+enum FontItalic { ITALIC_NONE, ITALIC_OBLIQUE, ITALIC_NORMAL, ITALIC_DONTKNOW, FontItalic_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTUNDERLINE_DECLARED
+#define ENUM_FONTUNDERLINE_DECLARED
+
+enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
+                     UNDERLINE_DOTTED, UNDERLINE_DONTKNOW,
+                     UNDERLINE_DASH, UNDERLINE_LONGDASH,
+                     UNDERLINE_DASHDOT, UNDERLINE_DASHDOTDOT,
+                     UNDERLINE_SMALLWAVE,
+                     UNDERLINE_WAVE, UNDERLINE_DOUBLEWAVE,
+                     UNDERLINE_BOLD, UNDERLINE_BOLDDOTTED,
+                     UNDERLINE_BOLDDASH, UNDERLINE_BOLDLONGDASH,
+                     UNDERLINE_BOLDDASHDOT, UNDERLINE_BOLDDASHDOTDOT,
+                     UNDERLINE_BOLDWAVE,
+                     FontUnderline_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTSTRIKEOUT_DECLARED
+#define ENUM_FONTSTRIKEOUT_DECLARED
+
+enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
+                     STRIKEOUT_DONTKNOW, STRIKEOUT_BOLD,
+                     STRIKEOUT_SLASH, STRIKEOUT_X,
+                     FontStrikeout_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTEMPHASISMARK_DECLARED
+#define ENUM_FONTEMPHASISMARK_DECLARED
+
+typedef USHORT FontEmphasisMark;
+#define EMPHASISMARK_NONE           ((FontEmphasisMark)0x0000)
+#define EMPHASISMARK_DOT            ((FontEmphasisMark)0x0001)
+#define EMPHASISMARK_CIRCLE         ((FontEmphasisMark)0x0002)
+#define EMPHASISMARK_DISC           ((FontEmphasisMark)0x0003)
+#define EMPHASISMARK_ACCENT         ((FontEmphasisMark)0x0004)
+#define EMPHASISMARK_STYLE          ((FontEmphasisMark)0x00FF)
+#define EMPHASISMARK_POS_ABOVE      ((FontEmphasisMark)0x1000)
+#define EMPHASISMARK_POS_BELOW      ((FontEmphasisMark)0x2000)
+
+// Only for kompability
+#define EMPHASISMARK_DOTS_ABOVE     (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_DOTS_BELOW     (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW)
+#define EMPHASISMARK_SIDE_DOTS      (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE)
+#define EMPHASISMARK_CIRCLE_ABOVE   (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE)
+
+#endif
+
+// ------------------------------------------------------------
+
+#ifndef ENUM_FONTTYPE_DECLARED
+#define ENUM_FONTTYPE_DECLARED
+
+enum FontType { TYPE_DONTKNOW, TYPE_RASTER, TYPE_VECTOR, TYPE_SCALABLE,
+                FontType_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
+
+#endif
+
+#ifndef ENUM_FONTEMBEDDEDBITMAP_DECLARED
+#define ENUM_FONTEMBEDDEDBITMAP_DECLARED
+
+enum FontEmbeddedBitmap { EMBEDDEDBITMAP_DONTKNOW, EMBEDDEDBITMAP_FALSE, EMBEDDEDBITMAP_TRUE };
+
+#endif
+
+#ifndef ENUM_FONTANTIALIAS_DECLARED
+#define ENUM_FONTANTIALIAS_DECLARED
+
+enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
+
+#endif
+
+#endif  // _TOOLS_FONTENUM_HXX
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 8223d77106e3..f1da7579aee6 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -570,7 +570,7 @@ void FSysEnableSysErrorBox( BOOL bEnable );
 
 //========================================================================
 
-#if defined(DBG_UTIL) && !defined(PRODUCT)
+#if defined(DBG_UTIL)
 void FSysTest();
 #endif
 
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index e01eb98842c2..0d82f4d73160 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -37,6 +37,37 @@
 
 class SvStream;
 
+// --------------------
+// - Helper functions -
+// --------------------
+
+inline long MinMax( long nVal, long nMin, long nMax );
+inline long AlignedWidth4Bytes( long nWidthBits );
+inline long FRound( double fVal );
+
+// ---------------
+// - Inlines -
+// ---------------
+
+inline long MinMax( long nVal, long nMin, long nMax )
+{
+    return( nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin );
+}
+
+// ------------------------------------------------------------------
+
+inline long AlignedWidth4Bytes( long nWidthBits )
+{
+    return( ( ( nWidthBits + 31 ) >> 5 ) << 2 );
+}
+
+// ------------------------------------------------------------------
+
+inline long FRound( double fVal )
+{
+    return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
+}
+
 // --------
 // - Pair -
 // --------
diff --git a/tools/inc/tools/mapunit.hxx b/tools/inc/tools/mapunit.hxx
new file mode 100644
index 000000000000..76267192347a
--- /dev/null
+++ b/tools/inc/tools/mapunit.hxx
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: mapunit.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _TOOLS_MAPUNIT_HXX
+#define _TOOLS_MAPUNIT_HXX
+
+// -----------------
+// - MapMode-Types -
+// -----------------
+
+// By changes you must also change: rsc/vclrsc.hxx
+enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
+               MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
+               MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT,
+               MAP_RELATIVE, MAP_REALAPPFONT, MAP_LASTENUMDUMMY };
+
+#endif  // _TOOLS_MAPUNIT_HXX
diff --git a/soldep/inc/XmlBuildListDef.hxx b/tools/inc/tools/solarmutex.hxx
index 7f68059e18f5..42aff1f23f43 100755
--- a/soldep/inc/XmlBuildListDef.hxx
+++ b/tools/inc/tools/solarmutex.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XmlBuildListDef.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,24 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef _TOOLS_SOLARMUTEX_HXX
+#define _TOOLS_SOLARMUTEX_HXX
 
-#ifndef _XMLBUILDLISTDEF_HXX
-#define _XMLBUILDLISTDEF_HXX
+#include "tools/toolsdllapi.h"
+#include <vos/mutex.hxx>
 
-enum DepTypes
+namespace tools
 {
-    mdsimple,
-    mdalways,
-    mdforce
-};
-
-#define DEP_MD_SIMPLE   1;
-//#define DEP_MD_ALWAYS 2;
-//#define DEP_MD_FORCE  4;
-
-//static const char * DEP_MD_ALWAYS_STR =   "md-always";
-//static const char * DEP_MD_FORCE_STR  =   "md-force";
+    class TOOLS_DLLPUBLIC SolarMutex
+    {
+    public:
+        static ::vos::IMutex* GetSolarMutex();
+        static void SetSolarMutex( ::vos::IMutex* pMutex );
+        static bool Acquire();
+        static void Release();
+    };
+}
 
 #endif
-
-
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
new file mode 100644
index 000000000000..a9c23de87ddd
--- /dev/null
+++ b/tools/inc/tools/wintypes.hxx
@@ -0,0 +1,337 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: wintypes.hxx,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _TOOLS_WINTYPES_HXX
+#define _TOOLS_WINTYPES_HXX
+
+#include <tools/solar.h>
+#include <sal/types.h>
+
+// ----------------
+// - Window-Types -
+// ----------------
+
+typedef USHORT WindowType;
+#define WINDOW_BASE                 0x0100
+#define WINDOW_FIRST                (WINDOW_BASE + 0x30)
+#define WINDOW_MESSBOX              (WINDOW_FIRST)
+#define WINDOW_INFOBOX              (WINDOW_FIRST + 0x01)
+#define WINDOW_WARNINGBOX           (WINDOW_FIRST + 0x02)
+#define WINDOW_ERRORBOX             (WINDOW_FIRST + 0x03)
+#define WINDOW_QUERYBOX             (WINDOW_FIRST + 0x04)
+#define WINDOW_WINDOW               (WINDOW_FIRST + 0x05)
+#define WINDOW_SYSWINDOW            (WINDOW_FIRST + 0x06)
+#define WINDOW_WORKWINDOW           (WINDOW_FIRST + 0x07)
+// #define WINDOW_MDIWINDOW            (WINDOW_FIRST + 0x08)
+#define WINDOW_FLOATINGWINDOW       (WINDOW_FIRST + 0x09)
+#define WINDOW_DIALOG               (WINDOW_FIRST + 0x0a)
+#define WINDOW_MODELESSDIALOG       (WINDOW_FIRST + 0x0b)
+#define WINDOW_MODALDIALOG          (WINDOW_FIRST + 0x0c)
+#define WINDOW_SYSTEMDIALOG         (WINDOW_FIRST + 0x0d)
+#define WINDOW_PATHDIALOG           (WINDOW_FIRST + 0x0e)
+#define WINDOW_FILEDIALOG           (WINDOW_FIRST + 0x0f)
+#define WINDOW_PRINTERSETUPDIALOG   (WINDOW_FIRST + 0x10)
+#define WINDOW_PRINTDIALOG          (WINDOW_FIRST + 0x11)
+#define WINDOW_COLORDIALOG          (WINDOW_FIRST + 0x12)
+#define WINDOW_FONTDIALOG           (WINDOW_FIRST + 0x13)
+#define WINDOW_CONTROL              (WINDOW_FIRST + 0x14)
+#define WINDOW_BUTTON               (WINDOW_FIRST + 0x15)
+#define WINDOW_PUSHBUTTON           (WINDOW_FIRST + 0x16)
+#define WINDOW_OKBUTTON             (WINDOW_FIRST + 0x17)
+#define WINDOW_CANCELBUTTON         (WINDOW_FIRST + 0x18)
+#define WINDOW_HELPBUTTON           (WINDOW_FIRST + 0x19)
+#define WINDOW_IMAGEBUTTON          (WINDOW_FIRST + 0x1a)
+#define WINDOW_MENUBUTTON           (WINDOW_FIRST + 0x1b)
+#define WINDOW_MOREBUTTON           (WINDOW_FIRST + 0x1c)
+#define WINDOW_SPINBUTTON           (WINDOW_FIRST + 0x1d)
+#define WINDOW_RADIOBUTTON          (WINDOW_FIRST + 0x1e)
+#define WINDOW_IMAGERADIOBUTTON     (WINDOW_FIRST + 0x1f)
+#define WINDOW_CHECKBOX             (WINDOW_FIRST + 0x20)
+#define WINDOW_TRISTATEBOX          (WINDOW_FIRST + 0x21)
+#define WINDOW_EDIT                 (WINDOW_FIRST + 0x22)
+#define WINDOW_MULTILINEEDIT        (WINDOW_FIRST + 0x23)
+#define WINDOW_COMBOBOX             (WINDOW_FIRST + 0x24)
+#define WINDOW_LISTBOX              (WINDOW_FIRST + 0x25)
+#define WINDOW_MULTILISTBOX         (WINDOW_FIRST + 0x26)
+#define WINDOW_FIXEDTEXT            (WINDOW_FIRST + 0x27)
+#define WINDOW_FIXEDLINE            (WINDOW_FIRST + 0x28)
+#define WINDOW_FIXEDBITMAP          (WINDOW_FIRST + 0x29)
+#define WINDOW_FIXEDIMAGE           (WINDOW_FIRST + 0x2a)
+#define WINDOW_GROUPBOX             (WINDOW_FIRST + 0x2c)
+#define WINDOW_SCROLLBAR            (WINDOW_FIRST + 0x2d)
+#define WINDOW_SCROLLBARBOX         (WINDOW_FIRST + 0x2e)
+#define WINDOW_SPLITTER             (WINDOW_FIRST + 0x2f)
+#define WINDOW_SPLITWINDOW          (WINDOW_FIRST + 0x30)
+#define WINDOW_SPINFIELD            (WINDOW_FIRST + 0x31)
+#define WINDOW_PATTERNFIELD         (WINDOW_FIRST + 0x32)
+#define WINDOW_NUMERICFIELD         (WINDOW_FIRST + 0x33)
+#define WINDOW_METRICFIELD          (WINDOW_FIRST + 0x34)
+#define WINDOW_CURRENCYFIELD        (WINDOW_FIRST + 0x35)
+#define WINDOW_DATEFIELD            (WINDOW_FIRST + 0x36)
+#define WINDOW_TIMEFIELD            (WINDOW_FIRST + 0x37)
+#define WINDOW_PATTERNBOX           (WINDOW_FIRST + 0x38)
+#define WINDOW_NUMERICBOX           (WINDOW_FIRST + 0x39)
+#define WINDOW_METRICBOX            (WINDOW_FIRST + 0x3a)
+#define WINDOW_CURRENCYBOX          (WINDOW_FIRST + 0x3b)
+#define WINDOW_DATEBOX              (WINDOW_FIRST + 0x3c)
+#define WINDOW_TIMEBOX              (WINDOW_FIRST + 0x3d)
+#define WINDOW_LONGCURRENCYFIELD    (WINDOW_FIRST + 0x3e)
+#define WINDOW_LONGCURRENCYBOX      (WINDOW_FIRST + 0x3f)
+#define WINDOW_TOOLBOX              (WINDOW_FIRST + 0x41)
+#define WINDOW_DOCKINGWINDOW        (WINDOW_FIRST + 0x42)
+#define WINDOW_STATUSBAR            (WINDOW_FIRST + 0x43)
+#define WINDOW_TABPAGE              (WINDOW_FIRST + 0x44)
+#define WINDOW_TABCONTROL           (WINDOW_FIRST + 0x45)
+#define WINDOW_TABDIALOG            (WINDOW_FIRST + 0x46)
+#define WINDOW_BORDERWINDOW         (WINDOW_FIRST + 0x47)
+#define WINDOW_BUTTONDIALOG         (WINDOW_FIRST + 0x48)
+#define WINDOW_SYSTEMCHILDWINDOW    (WINDOW_FIRST + 0x49)
+#define WINDOW_FIXEDBORDER          (WINDOW_FIRST + 0x4a)
+#define WINDOW_SLIDER               (WINDOW_FIRST + 0x4b)
+#define WINDOW_MENUBARWINDOW        (WINDOW_FIRST + 0x4c)
+#define WINDOW_TREELISTBOX          (WINDOW_FIRST + 0x4d)
+#define WINDOW_HELPTEXTWINDOW       (WINDOW_FIRST + 0x4e)
+#define WINDOW_INTROWINDOW          (WINDOW_FIRST + 0x4f)
+#define WINDOW_LISTBOXWINDOW        (WINDOW_FIRST + 0x50)
+#define WINDOW_DOCKINGAREA          (WINDOW_FIRST + 0x51)
+#define WINDOW_LAST                 (WINDOW_DOCKINGAREA)
+
+
+// ---------------
+// - Window-Bits -
+// ---------------
+
+// By changes you must also change: rsc/vclrsc.hxx
+typedef sal_Int64 WinBits;
+
+// Window-Bits fuer Window
+#define WB_CLIPCHILDREN         ((WinBits)0x00000001)
+#define WB_DIALOGCONTROL        ((WinBits)0x00000002)
+#define WB_NODIALOGCONTROL      ((WinBits)0x00000004)
+#define WB_BORDER               ((WinBits)0x00000008)
+#define WB_NOBORDER             ((WinBits)0x00000010)
+#define WB_SIZEABLE             ((WinBits)0x00000020)
+#define WB_3DLOOK               ((WinBits)0x00000040)
+#define WB_AUTOSIZE             ((WinBits)0x00000080)
+
+// Window-Bits fuer SystemWindows
+#define WB_MOVEABLE             ((WinBits)0x00000100)
+#define WB_ROLLABLE             ((WinBits)0x00000200)
+#define WB_CLOSEABLE            ((WinBits)0x00000400)
+#define WB_STANDALONE           ((WinBits)0x00000800)
+#define WB_APP                  ((WinBits)0x00001000)
+#define WB_PINABLE              ((WinBits)0x00002000)
+#define WB_SYSTEMWINDOW         ((WinBits)SAL_CONST_INT64(0x40000000))
+// warning: do not confuse WB_SYSTEMCHILDWINDOW with the SystemChildWindow class
+
+// the SystemChildWindow class was there first and is a very specialized
+// sytem child window type for plugged applications. The SystemChildWindow class
+// explicitly should never use the WB_SYSTEMCHILDWINDOW WinBit
+
+// WB_SYSTEMCHILDWINDOW on the other hand is to be used on system windows
+// which should be created as system child windows with (more or less)
+// normal event handling
+#define WB_SYSTEMCHILDWINDOW    ((WinBits)SAL_CONST_INT64(0x8000000000))
+#define WB_SIZEMOVE             (WB_SIZEABLE | WB_MOVEABLE)
+
+// Standard-Window-Bits fuer ChildWindows
+#define WB_TABSTOP              ((WinBits)0x00000100)
+#define WB_NOTABSTOP            ((WinBits)0x00000200)
+#define WB_GROUP                ((WinBits)0x00000400)
+#define WB_NOGROUP              ((WinBits)0x00000800)
+#define WB_HORZ                 ((WinBits)0x00001000)
+#define WB_VERT                 ((WinBits)0x00002000)
+#define WB_LEFT                 ((WinBits)0x00004000)
+#define WB_CENTER               ((WinBits)0x00008000)
+#define WB_RIGHT                ((WinBits)0x00010000)
+#define WB_TOP                  ((WinBits)0x00020000)
+#define WB_VCENTER              ((WinBits)0x00040000)
+#define WB_BOTTOM               ((WinBits)0x00080000)
+#define WB_DRAG                 ((WinBits)0x00100000)
+#define WB_SPIN                 ((WinBits)0x00200000)
+#define WB_REPEAT               ((WinBits)0x00400000)
+#define WB_NOPOINTERFOCUS       ((WinBits)0x00800000)
+#define WB_WORDBREAK            ((WinBits)0x01000000)
+#define WB_NOLABEL              ((WinBits)0x02000000)
+#define WB_SORT                 ((WinBits)0x04000000)
+#define WB_DROPDOWN             ((WinBits)0x08000000)
+#define WB_AUTOHSCROLL          ((WinBits)SAL_CONST_INT64(0x10000000))
+#define WB_DOCKABLE             ((WinBits)SAL_CONST_INT64(0x20000000))
+#define WB_AUTOVSCROLL          ((WinBits)SAL_CONST_INT64(0x40000000))
+#define WB_HYPHENATION          (((WinBits)SAL_CONST_INT64(0x80000000)) | WB_WORDBREAK)
+#define WB_CHILDDLGCTRL         ((WinBits)SAL_CONST_INT64(0x100000000000))
+
+// system floating window
+#define WB_SYSTEMFLOATWIN       ((WinBits)SAL_CONST_INT64(0x100000000))
+#define WB_INTROWIN             ((WinBits)SAL_CONST_INT64(0x200000000))
+#define WB_NOSHADOW             ((WinBits)SAL_CONST_INT64(0x400000000))
+#define WB_TOOLTIPWIN           ((WinBits)SAL_CONST_INT64(0x800000000))
+#define WB_OWNERDRAWDECORATION  ((WinBits)SAL_CONST_INT64(0x2000000000))
+#define WB_DEFAULTWIN           ((WinBits)SAL_CONST_INT64(0x4000000000))
+#define WB_NEEDSFOCUS           ((WinBits)SAL_CONST_INT64(0x1000000000))
+
+#define WB_HIDE                 ((WinBits)SAL_CONST_INT64(0x80000000))
+#define WB_HSCROLL              WB_HORZ
+#define WB_VSCROLL              WB_VERT
+#define WB_TOPIMAGE             WB_TOP
+
+// Window-Bits for PushButtons
+#define WB_DEFBUTTON            ((WinBits)0x10000000)
+#define WB_NOLIGHTBORDER        ((WinBits)0x20000000)
+#define WB_RECTSTYLE            ((WinBits)0x08000000)
+#define WB_SMALLSTYLE           ((WinBits)0x04000000)
+#define WB_TOGGLE               ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_BEVELBUTTON          ((WinBits)SAL_CONST_INT64(0x2000000000))
+
+// Window-Bits for FixedText
+#define WB_PATHELLIPSIS         ((WinBits)0x00100000)
+#define WB_EXTRAOFFSET          ((WinBits)0x02000000)
+#define WB_NOMULTILINE          ((WinBits)0x10000000)
+#define WB_INFO                 ((WinBits)0x20000000)
+
+// Window-Bits for CheckBox
+#define WB_CBLINESTYLE          ((WinBits)SAL_CONST_INT64(0x2000000000))
+
+// Window-Bits for Edit
+#define WB_PASSWORD             ((WinBits)0x01000000)
+#define WB_READONLY             ((WinBits)0x02000000)
+#define WB_NOHIDESELECTION      ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_FORCECTRLBACKGROUND  ((WinBits)0x80000000)
+
+// Window-Bits for MultiLineEdit
+#define WB_IGNORETAB            ((WinBits)0x20000000)
+
+// Window-Bits for ListBox and MultiListBox
+#define WB_SIMPLEMODE           ((WinBits)0x20000000)
+
+// Window-Bits for FixedBitmap
+#define WB_FAST                 ((WinBits)0x04000000)
+#define WB_SCALE                ((WinBits)0x08000000)
+#define WB_TOPLEFTVISIBLE       ((WinBits)0x10000000)
+
+// Window-Bits for ToolBox
+#define WB_LINESPACING          ((WinBits)0x01000000)
+#define WB_SCROLL               ((WinBits)0x02000000)
+#define WB_FORCETABCYCLE        ((WinBits)0x04000000)
+
+// Window-Bits for TabControl
+#define WB_SINGLELINE           ((WinBits)0x02000000)
+
+// Window-Bits for DockingWindows
+#define WB_DOCKBORDER           ((WinBits)0x00001000)
+
+// Window-Bits for SplitWindow
+#define WB_NOSPLITDRAW          ((WinBits)0x01000000)
+#define WB_FLATSPLITDRAW        ((WinBits)0x02000000)
+
+// Window-Bits for MessageBoxen
+#define WB_OK                   ((WinBits)0x00100000)
+#define WB_OK_CANCEL            ((WinBits)0x00200000)
+#define WB_YES_NO               ((WinBits)0x00400000)
+#define WB_YES_NO_CANCEL        ((WinBits)0x00800000)
+#define WB_RETRY_CANCEL         ((WinBits)0x01000000)
+#define WB_DEF_OK               ((WinBits)0x02000000)
+#define WB_DEF_CANCEL           ((WinBits)0x04000000)
+#define WB_DEF_RETRY            ((WinBits)0x08000000)
+#define WB_DEF_YES              ((WinBits)SAL_CONST_INT64(0x10000000))
+#define WB_DEF_NO               ((WinBits)SAL_CONST_INT64(0x20000000))
+#define WB_ABORT_RETRY_IGNORE  ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_DEF_IGNORE          ((WinBits)SAL_CONST_INT64(0x2000000000))
+
+// Standard-WinBits
+#define WB_STDWORK              (WB_SIZEMOVE | WB_CLOSEABLE)
+#define WB_STDDOCKWIN           (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
+#define WB_STDFLOATWIN          (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
+#define WB_STDDIALOG            (WB_MOVEABLE | WB_CLOSEABLE)
+#define WB_STDMODELESS          (WB_STDDIALOG)
+#define WB_STDMODAL             (WB_STDDIALOG)
+#define WB_STDTABDIALOG         (WB_STDDIALOG)
+#define WB_STDTABCONTROL        0
+
+// For TreeListBox
+#define WB_HASBUTTONS           ((WinBits)0x00800000)
+#define WB_HASLINES             ((WinBits)0x01000000)
+#define WB_HASLINESATROOT       ((WinBits)0x02000000)
+
+// For FileOpen Dialog
+#define WB_PATH                 ((WinBits)0x00100000)
+#define WB_OPEN                 ((WinBits)0x00200000)
+#define WB_SAVEAS               ((WinBits)0x00400000)
+
+// For Slider
+// Window-Bits for TabControl
+#define WB_SLIDERSET            ((WinBits)0x02000000)
+
+
+// --------------------
+// - extended WinBits -
+// --------------------
+#define WB_EXT_DOCUMENT         ((WinBits)0x00000001)
+#define WB_EXT_DOCMODIFIED      ((WinBits)0x00000002)
+
+// ---------------
+// - WindowAlign -
+// ---------------
+
+// By changes you must also change: rsc/vclrsc.hxx
+enum WindowAlign { WINDOWALIGN_LEFT, WINDOWALIGN_TOP, WINDOWALIGN_RIGHT, WINDOWALIGN_BOTTOM };
+enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_BOTTOM,
+                  IMAGEALIGN_LEFT_TOP, IMAGEALIGN_LEFT_BOTTOM, IMAGEALIGN_TOP_LEFT,
+                  IMAGEALIGN_TOP_RIGHT, IMAGEALIGN_RIGHT_TOP, IMAGEALIGN_RIGHT_BOTTOM,
+                  IMAGEALIGN_BOTTOM_LEFT, IMAGEALIGN_BOTTOM_RIGHT, IMAGEALIGN_CENTER };
+enum SymbolAlign { SYMBOLALIGN_LEFT, SYMBOLALIGN_RIGHT };
+
+// ------------
+// - TriState -
+// ------------
+
+// By changes you must also change: rsc/vclrsc.hxx
+enum TriState { STATE_NOCHECK, STATE_CHECK, STATE_DONTKNOW };
+
+
+// ----------------------
+// - ButtonDialog-Types -
+// ----------------------
+
+typedef USHORT StandardButtonType;
+#define BUTTON_OK           ((StandardButtonType)0)
+#define BUTTON_CANCEL       ((StandardButtonType)1)
+#define BUTTON_YES          ((StandardButtonType)2)
+#define BUTTON_NO           ((StandardButtonType)3)
+#define BUTTON_RETRY        ((StandardButtonType)4)
+#define BUTTON_HELP         ((StandardButtonType)5)
+#define BUTTON_CLOSE        ((StandardButtonType)6)
+#define BUTTON_MORE         ((StandardButtonType)7)
+#define BUTTON_IGNORE       ((StandardButtonType)8)
+#define BUTTON_ABORT        ((StandardButtonType)9)
+#define BUTTON_LESS         ((StandardButtonType)10)
+#define BUTTON_COUNT        11
+
+#endif // _TOOLS_WINTYPES_HXX
+
diff --git a/tools/prj/d.lst b/tools/prj/d.lst
index e8fde61686a4..3208ecbb3168 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -34,7 +34,11 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
 ..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
 ..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
 
-..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx
+..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
+..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx
+..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx
+..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx
+..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx
 ..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx
 ..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx
 ..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
index 15f9c6a9fdaf..c63aa966b7fc 100644
--- a/tools/qa/makefile.mk
+++ b/tools/qa/makefile.mk
@@ -40,7 +40,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = test_pathutils
 SHL1OBJS = $(SLO)$/test_pathutils.obj $(SLO)$/pathutils.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
@@ -52,4 +52,4 @@ SLOFILES = $(SHL1OBJS)
 ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN)
-    testshl2 $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
+    $(TESTSHL2) $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index 9cd4e2110937..c028a2f654c4 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.cxx
@@ -33,7 +33,7 @@
 
 #include <cwchar>
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "tools/pathutils.hxx"
 
 namespace {
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 7f204d5e46da..5f0d7f3ebe1d 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -88,7 +88,7 @@ inline USHORT DaysInMonth( USHORT nMonth, USHORT nYear )
 
 // -----------------------------------------------------------------------
 
-static long DateToDays( USHORT nDay, USHORT nMonth, USHORT nYear )
+long Date::DateToDays( USHORT nDay, USHORT nMonth, USHORT nYear )
 {
     long nDays;
 
@@ -489,9 +489,9 @@ Date operator -( const Date& rDate, long nDays )
 
 long operator -( const Date& rDate1, const Date& rDate2 )
 {
-    ULONG  nTempDays1 = DateToDays( rDate1.GetDay(), rDate1.GetMonth(),
+    ULONG  nTempDays1 = Date::DateToDays( rDate1.GetDay(), rDate1.GetMonth(),
                                     rDate1.GetYear() );
-    ULONG  nTempDays2 = DateToDays( rDate2.GetDay(), rDate2.GetMonth(),
+    ULONG  nTempDays2 = Date::DateToDays( rDate2.GetDay(), rDate2.GetMonth(),
                                     rDate2.GetYear() );
     return nTempDays1 - nTempDays2;
 }
diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx
index 5e698d50c006..d86ff82cb739 100644
--- a/tools/source/generic/line.cxx
+++ b/tools/source/generic/line.cxx
@@ -39,11 +39,6 @@
 #include <cstdlib>
 #include <math.h>
 
-inline long FRound( double fVal )
-{
-    return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
-}
-
 // --------
 // - Line -
 // --------
diff --git a/tools/source/misc/makefile.mk b/tools/source/misc/makefile.mk
index 7742c471445f..adc098b023b8 100644
--- a/tools/source/misc/makefile.mk
+++ b/tools/source/misc/makefile.mk
@@ -42,9 +42,10 @@ LIB1TARGET = $(SLB)$/$(TARGET).lib
 LIB1OBJFILES = \
     $(SLO)$/appendunixshellword.obj \
     $(SLO)$/extendapplicationenvironment.obj \
+    $(SLO)$/solarmutex.obj \
     $(SLO)$/getprocessworkingdir.obj
 
 OBJFILES = $(OBJ)$/pathutils.obj
-SLOFILES = $(SLO)$/pathutils.obj $(LIB1OBJFILES)
+SLOFILES = $(SLO)$/pathutils.obj $(LIB1OBJFILES) $(SLO)$/solarmutex.obj
 
 .INCLUDE: target.mk
diff --git a/svtools/source/misc/vcldata.cxx b/tools/source/misc/solarmutex.cxx
index 28b2e833e974..9049c13997a9 100644
--- a/svtools/source/misc/vcldata.cxx
+++ b/tools/source/misc/solarmutex.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vcldata.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,29 +26,35 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <svtools/svtdata.hxx>
-
-//============================================================================
-//
-//  class ImpSvtData
-//
-//============================================================================
+#include "precompiled_tools.hxx"
+#include <tools/solarmutex.hxx>
 
-ResMgr * ImpSvtData::GetResMgr()
+namespace tools
 {
-    return GetResMgr(Application::GetSettings().GetUILocale());
-}
+    static ::vos::IMutex* pSolarMutex = 0;
 
-ResMgr * ImpSvtData::GetPatchResMgr()
-{
-    return GetPatchResMgr(Application::GetSettings().GetUILocale());
-}
+    ::vos::IMutex* SolarMutex::GetSolarMutex()
+    {
+        return pSolarMutex;
+    }
 
-SvpResId::SvpResId( USHORT nId ) :
-    ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() )
-{
-}
+    void SolarMutex::SetSolarMutex( ::vos::IMutex* pMutex )
+    {
+        pSolarMutex = pMutex;
+    }
 
+    bool SolarMutex::Acquire()
+    {
+        if ( pSolarMutex )
+            pSolarMutex->acquire();
+        else
+            return false;
+        return true;
+    }
+
+    void SolarMutex::Release()
+    {
+        if ( pSolarMutex )
+            pSolarMutex->release();
+    }
+}
diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk
index 63108677829c..22796f47d72f 100644
--- a/tools/test/makefile.mk
+++ b/tools/test/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -48,19 +48,20 @@ SHL1OBJS=  \
 SHL1TARGET= tests
 SHL1STDLIBS= 	$(SALLIB)	 \
                 $(TOOLSLIB)	 \
+                                $(TESTSHL2LIB)    \
                 $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map 
+SHL1VERSIONMAP = export.map
 
 #------------------------------- All object files ----------------------------
 
 # do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS) 
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk 
+.INCLUDE : _cppunit.mk
diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx
index 913bd444f145..a2bfb63d4c5f 100644
--- a/tools/test/tests.cxx
+++ b/tools/test/tests.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_tools.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <rtl/math.hxx>
 #include <tools/fract.hxx>
 
diff --git a/transex3/inc/xmlparse.hxx b/transex3/inc/xmlparse.hxx
index a497355d6201..18b047ef75c1 100644
--- a/transex3/inc/xmlparse.hxx
+++ b/transex3/inc/xmlparse.hxx
@@ -32,11 +32,7 @@
 #define BOOTSTRP_XMLPARSE_HXX
 
 #include <signal.h>
-#ifdef SYSTEM_EXPAT
 #include <expat.h>
-#else
-#include <external/expat/xmlparse.h>
-#endif
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "tools/string.hxx"
diff --git a/transex3/source/help/HelpLinker.cxx b/transex3/source/help/HelpLinker.cxx
index 19b9ead8521e..7dfe4ee4a2a2 100644
--- a/transex3/source/help/HelpLinker.cxx
+++ b/transex3/source/help/HelpLinker.cxx
@@ -45,11 +45,7 @@
 #include <osl/time.h>
 #include <rtl/bootstrap.hxx>
 
-#ifdef SYSTEM_EXPAT
 #include <expat.h>
-#else
-#include <expat/xmlparse.h>
-#endif
 
 #define DBHELP_ONLY
 
@@ -118,35 +114,41 @@ void IndexerPreProcessor::processDocument
 {
     std::string aStdStr_EncodedDocPathURL = getEncodedPath( EncodedDocPath );
 
-    xmlDocPtr resCaption = xsltApplyStylesheet( m_xsltStylesheetPtrCaption, doc, NULL );
-    xmlNodePtr pResNodeCaption = resCaption->xmlChildrenNode;
-    if( pResNodeCaption )
+    if( m_xsltStylesheetPtrCaption )
     {
-        fs::path fsCaptionPureTextFile_docURL = m_fsCaptionFilesDirName / aStdStr_EncodedDocPathURL;
-        std::string aCaptionPureTextFileStr_docURL = fsCaptionPureTextFile_docURL.native_file_string();
-        FILE* pFile_docURL = fopen( aCaptionPureTextFileStr_docURL.c_str(), "w" );
-        if( pFile_docURL )
+        xmlDocPtr resCaption = xsltApplyStylesheet( m_xsltStylesheetPtrCaption, doc, NULL );
+        xmlNodePtr pResNodeCaption = resCaption->xmlChildrenNode;
+        if( pResNodeCaption )
         {
-            fprintf( pFile_docURL, "%s\n", pResNodeCaption->content );
-            fclose( pFile_docURL );
+            fs::path fsCaptionPureTextFile_docURL = m_fsCaptionFilesDirName / aStdStr_EncodedDocPathURL;
+            std::string aCaptionPureTextFileStr_docURL = fsCaptionPureTextFile_docURL.native_file_string();
+            FILE* pFile_docURL = fopen( aCaptionPureTextFileStr_docURL.c_str(), "w" );
+            if( pFile_docURL )
+            {
+                fprintf( pFile_docURL, "%s\n", pResNodeCaption->content );
+                fclose( pFile_docURL );
+            }
         }
+        xmlFreeDoc(resCaption);
     }
-    xmlFreeDoc(resCaption);
 
-    xmlDocPtr resContent = xsltApplyStylesheet( m_xsltStylesheetPtrContent, doc, NULL );
-    xmlNodePtr pResNodeContent = resContent->xmlChildrenNode;
-    if( pResNodeContent )
+    if( m_xsltStylesheetPtrContent )
     {
-        fs::path fsContentPureTextFile_docURL = m_fsContentFilesDirName / aStdStr_EncodedDocPathURL;
-        std::string aContentPureTextFileStr_docURL = fsContentPureTextFile_docURL.native_file_string();
-        FILE* pFile_docURL = fopen( aContentPureTextFileStr_docURL.c_str(), "w" );
-        if( pFile_docURL )
+        xmlDocPtr resContent = xsltApplyStylesheet( m_xsltStylesheetPtrContent, doc, NULL );
+        xmlNodePtr pResNodeContent = resContent->xmlChildrenNode;
+        if( pResNodeContent )
         {
-            fprintf( pFile_docURL, "%s\n", pResNodeContent->content );
-            fclose( pFile_docURL );
+            fs::path fsContentPureTextFile_docURL = m_fsContentFilesDirName / aStdStr_EncodedDocPathURL;
+            std::string aContentPureTextFileStr_docURL = fsContentPureTextFile_docURL.native_file_string();
+            FILE* pFile_docURL = fopen( aContentPureTextFileStr_docURL.c_str(), "w" );
+            if( pFile_docURL )
+            {
+                fprintf( pFile_docURL, "%s\n", pResNodeContent->content );
+                fclose( pFile_docURL );
+            }
         }
+        xmlFreeDoc(resContent);
     }
-    xmlFreeDoc(resContent);
 }
 
 struct Data
@@ -245,8 +247,9 @@ public:
 class HelpLinker
 {
 public:
-    void main(std::vector<std::string> &args, std::string* pExtensionPath = NULL )
-        throw( HelpProcessingException );
+    void main(std::vector<std::string> &args,
+        std::string* pExtensionPath = NULL, const rtl::OUString* pOfficeHelpPath = NULL )
+            throw( HelpProcessingException );
 
     HelpLinker()
         : init(true)
@@ -751,21 +754,21 @@ void HelpLinker::link() throw( HelpProcessingException )
 }
 
 
-void HelpLinker::main(std::vector<std::string> &args, std::string* pExtensionPath)
-    throw( HelpProcessingException )
+void HelpLinker::main( std::vector<std::string> &args,
+    std::string* pExtensionPath, const rtl::OUString* pOfficeHelpPath )
+        throw( HelpProcessingException )
 {
     rtl::OUString aOfficeHelpPath;
 
     bExtensionMode = false;
-    if( pExtensionPath && pExtensionPath->length() > 0 )
+    if( pExtensionPath && pExtensionPath->length() > 0 && pOfficeHelpPath )
     {
         helpFiles.clear();
         bExtensionMode = true;
         extensionPath = *pExtensionPath;
         sourceRoot = fs::path(extensionPath);
 
-        aOfficeHelpPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/help") );
-        rtl::Bootstrap::expandMacros( aOfficeHelpPath );
+        aOfficeHelpPath = *pOfficeHelpPath;
     }
     if (args.size() > 0 && args[0][0] == '@')
     {
@@ -1065,6 +1068,7 @@ HelpProcessingErrorInfo& HelpProcessingErrorInfo::operator=( const struct HelpPr
 // Returns true in case of success, false in case of error
 HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 (
+     const rtl::OUString& aOfficeHelpPath,
     const rtl::OUString& aExtensionName,
     const rtl::OUString& aExtensionLanguageRoot,
     sal_Int32 nXhpFileCount, const rtl::OUString* pXhpFiles,
@@ -1107,7 +1111,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
     try
     {
         HelpLinker* pHelpLinker = new HelpLinker();
-        pHelpLinker->main( args,&aStdStrExtensionPath );
+        pHelpLinker->main( args, &aStdStrExtensionPath, &aOfficeHelpPath );
         delete pHelpLinker;
     }
     catch( const HelpProcessingException& e )
diff --git a/transex3/source/help/MANIFEST.MF b/transex3/source/help/MANIFEST.MF
deleted file mode 100644
index bf0e4ab46cb2..000000000000
--- a/transex3/source/help/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-RegistrationClassName: com.sun.star.help.HelpComponent
-Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar
diff --git a/transex3/source/help/compilehelp.hxx b/transex3/source/help/compilehelp.hxx
index 1e9a1c8604b8..d123d628be27 100644
--- a/transex3/source/help/compilehelp.hxx
+++ b/transex3/source/help/compilehelp.hxx
@@ -71,6 +71,7 @@ struct HelpProcessingErrorInfo
 // Returns true in case of success, false in case of error
 HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 (
+     const rtl::OUString& aOfficeHelpPath,
     const rtl::OUString& aExtensionName,
     const rtl::OUString& aExtensionLanguageRoot,
     sal_Int32 nXhpFileCount, const rtl::OUString* pXhpFiles,
diff --git a/transex3/source/help/makefile.mk b/transex3/source/help/makefile.mk
index edf68d906133..6fc823a1b59a 100644
--- a/transex3/source/help/makefile.mk
+++ b/transex3/source/help/makefile.mk
@@ -104,36 +104,17 @@ JAVACLASSFILES = \
     $(CLASSDIR)$/$(PACKAGE)$/HelpIndexerTool.class			        \
     $(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
 
-
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpSearch.class			        \
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class			        \
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpComponent.class			        \
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
-
-#JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar
 .IF "$(SYSTEM_LUCENE)" == "YES"
 CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-COMP=fix_system_lucene
 .ELSE
 JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
 .ENDIF
 JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-#JAVAFILES = $(JAVACLASSFILES) 
 
 JARCLASSDIRS	   = $(PACKAGE)/*
 JARTARGET	       = HelpIndexerTool.jar
 JARCOMPRESS        = TRUE 
-#CUSTOMMANIFESTFILE = MANIFEST.MF 
  
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(JARTARGETN)"!=""
-$(JARTARGETN) : $(COMP)
-.ENDIF
-
-fix_system_lucene:
-    @echo "Fix Java Class-Path entry for Lucene libraries from system."
-    @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
-    -i ../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
diff --git a/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk
index 4656c805fd34..e62ec14be250 100755
--- a/ucb/qa/complex/tdoc/interfaces/makefile.mk
+++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/tdoc$/interfaces
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES = _XChild.java                         \
             _XCommandInfoChangeNotifier.java     \
             _XCommandProcessor.java              \
diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk
index 50aada12e72a..5a25db74cfd0 100755
--- a/ucb/qa/complex/tdoc/makefile.mk
+++ b/ucb/qa/complex/tdoc/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex.tdoc
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES = CheckContentProvider.java \
             CheckTransientDocumentsContent.java \
             CheckTransientDocumentsContentProvider.java \
diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk
index 147b1b306454..e0285e70d362 100755
--- a/ucb/qa/complex/ucb/makefile.mk
+++ b/ucb/qa/complex/ucb/makefile.mk
@@ -40,7 +40,7 @@ PACKAGE = complex$/ucb
 
 #----- compile .java files -----------------------------------------
 
-JARFILES 		= mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES 		= mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = UCB.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 2756262ce91d..7360304e8328 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -68,7 +68,7 @@ static void ooo_mount_operation_class_init (OOoMountOperationClass *klass)
 using namespace com::sun::star;
 
 static void ooo_mount_operation_ask_password (GMountOperation *op,
-    const char *message, const char *default_user,
+    const char * /*message*/, const char *default_user,
     const char *default_domain, GAskPasswordFlags flags)
 {
     uno::Reference< task::XInteractionHandler > xIH;
diff --git a/svtools/inc/svtools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index 24894c46c535..70a0d26545f5 100644
--- a/svtools/inc/svtools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -27,11 +27,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_ACCELCFG_HXX
-#define INCLUDED_SVTOOLS_ACCELCFG_HXX
+#ifndef INCLUDED_unotools_ACCELCFG_HXX
+#define INCLUDED_unotools_ACCELCFG_HXX
 
 #include <com/sun/star/awt/KeyEvent.hpp>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
@@ -51,7 +51,7 @@ class KeyEvent;
 class String;
 class SvtAcceleratorConfig_Impl;
 
-class SvtAcceleratorConfiguration: public svt::detail::Options
+class SvtAcceleratorConfiguration: public utl::detail::Options
 {
     SvtAcceleratorConfig_Impl*    pImp;
 
diff --git a/svtools/inc/cacheoptions.hxx b/unotools/inc/unotools/cacheoptions.hxx
index 0dd1d2eaaf6d..a9adf9a14467 100644
--- a/svtools/inc/cacheoptions.hxx
+++ b/unotools/inc/unotools/cacheoptions.hxx
@@ -28,14 +28,14 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SVTOOLS_CACHEOPTIONS_HXX
-#define INCLUDED_SVTOOLS_CACHEOPTIONS_HXX
+#ifndef INCLUDED_unotools_CACHEOPTIONS_HXX
+#define INCLUDED_unotools_CACHEOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
@@ -67,7 +67,7 @@ class SvtCacheOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtCacheOptions
+class UNOTOOLS_DLLPUBLIC SvtCacheOptions
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -152,7 +152,7 @@ class SVL_DLLPUBLIC SvtCacheOptions
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -173,4 +173,4 @@ class SVL_DLLPUBLIC SvtCacheOptions
 
 };
 
-#endif // #ifndef INCLUDED_SVTOOLS_CACHEOPTIONS_HXX
+#endif // #ifndef INCLUDED_unotools_CACHEOPTIONS_HXX
diff --git a/svtools/inc/svtools/cmdoptions.hxx b/unotools/inc/unotools/cmdoptions.hxx
index 9feb2508982b..85d8a0725f3c 100644
--- a/svtools/inc/svtools/cmdoptions.hxx
+++ b/unotools/inc/unotools/cmdoptions.hxx
@@ -27,20 +27,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_CMDOPTIONS_HXX
-#define INCLUDED_SVTOOLS_CMDOPTIONS_HXX
+#ifndef INCLUDED_unotools_CMDOPTIONS_HXX
+#define INCLUDED_unotools_CMDOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  types, enums, ...
@@ -79,7 +79,7 @@ class SvtCommandOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtCommandOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
 {
     friend class SvtCommandOptions_Impl;
 
@@ -234,7 +234,7 @@ class SVL_DLLPUBLIC SvtCommandOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -255,4 +255,4 @@ class SVL_DLLPUBLIC SvtCommandOptions: public svt::detail::Options
 
 };      // class SvtCmdOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_CMDOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_CMDOPTIONS_HXX
diff --git a/svtools/inc/svtools/compatibility.hxx b/unotools/inc/unotools/compatibility.hxx
index 2337980d3707..0c7c41882c09 100644
--- a/svtools/inc/svtools/compatibility.hxx
+++ b/unotools/inc/unotools/compatibility.hxx
@@ -27,19 +27,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_COMPATIBILITY_HXX
-#define INCLUDED_SVTOOLS_COMPATIBILITY_HXX
+#ifndef INCLUDED_unotools_COMPATIBILITY_HXX
+#define INCLUDED_unotools_COMPATIBILITY_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  types, enums, ...
@@ -107,7 +107,7 @@ class SvtCompatibilityOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtCompatibilityOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -231,7 +231,7 @@ class SVL_DLLPUBLIC SvtCompatibilityOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -252,5 +252,5 @@ class SVL_DLLPUBLIC SvtCompatibilityOptions: public svt::detail::Options
 
 };      // class SvtCompatibilityOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_COMPATIBILITY_HXX
+#endif  // #ifndef INCLUDED_unotools_COMPATIBILITY_HXX
 
diff --git a/unotools/inc/unotools/configitem.hxx b/unotools/inc/unotools/configitem.hxx
index f3b9db2da452..3cc0dc1b079e 100644
--- a/unotools/inc/unotools/configitem.hxx
+++ b/unotools/inc/unotools/configitem.hxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Reference.h>
 #include "unotools/unotoolsdllapi.h"
+#include "unotools/options.hxx"
 
 //-----------------------------------------------------------------------------
 namespace com{ namespace sun{ namespace star{
@@ -76,7 +77,7 @@ namespace utl
     class ConfigManager;
     struct ConfigItem_Impl;
 
-    class UNOTOOLS_DLLPUBLIC ConfigItem
+    class UNOTOOLS_DLLPUBLIC ConfigItem : public ConfigurationBroadcaster
     {
             friend class ConfigChangeListener_Impl;
             friend class ConfigManager;
@@ -185,7 +186,7 @@ namespace utl
 
             /** is called from the ConfigManager before application ends of from the
                 PropertyChangeListener if the sub tree broadcasts changes. */
-            virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+            virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames)=0;
 
             /** is called from the ConfigManager if it is destroyed before the ConfigItem. */
             void                    ReleaseConfigMgr();
@@ -200,7 +201,7 @@ namespace utl
             sal_Bool                IsModified() const;
 
             /** writes the changed values into the sub tree. Always called in the Dtor of the derived class.  */
-            virtual void            Commit();
+            virtual void            Commit()=0;
 
             sal_Bool                IsInValueChange() const;
 
diff --git a/svtools/inc/svtools/defaultoptions.hxx b/unotools/inc/unotools/defaultoptions.hxx
index 03408ac1ed35..603d7fd6d22a 100644
--- a/svtools/inc/svtools/defaultoptions.hxx
+++ b/unotools/inc/unotools/defaultoptions.hxx
@@ -27,12 +27,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_DEFAULTOPTIONS_HXX
-#define INCLUDED_SVTOOLS_DEFAULTOPTIONS_HXX
+#ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
+#define INCLUDED_unotools_DEFAULTOPTIONS_HXX
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include "tools/solar.h"
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 class String;
 class SvtDefaultOptions_Impl;
@@ -40,7 +40,7 @@ class SvtDefaultOptions_Impl;
 // class SvtDefaultOptions -----------------------------------------------
 
 class SvtDefaultOptions_Impl;
-class SVL_DLLPUBLIC SvtDefaultOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtDefaultOptions: public utl::detail::Options
 {
 private:
     SvtDefaultOptions_Impl* pImp;
@@ -53,5 +53,5 @@ public:
     String  GetDefaultPath( USHORT nId ) const;
 };
 
-#endif // #ifndef INCLUDED_SVTOOLS_DEFAULTOPTIONS_HXX
+#endif // #ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
 
diff --git a/svtools/inc/svtools/dynamicmenuoptions.hxx b/unotools/inc/unotools/dynamicmenuoptions.hxx
index 4a6b7a44d13f..2841970c5a84 100644
--- a/svtools/inc/svtools/dynamicmenuoptions.hxx
+++ b/unotools/inc/unotools/dynamicmenuoptions.hxx
@@ -27,19 +27,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_DYNAMICMENUOPTIONS_HXX
-#define INCLUDED_SVTOOLS_DYNAMICMENUOPTIONS_HXX
+#ifndef INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
+#define INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  types, enums, ...
@@ -90,7 +90,7 @@ class SvtDynamicMenuOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtDynamicMenuOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -198,7 +198,7 @@ class SVL_DLLPUBLIC SvtDynamicMenuOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -219,4 +219,4 @@ class SVL_DLLPUBLIC SvtDynamicMenuOptions: public svt::detail::Options
 
 };      // class SvtDynamicMenuOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_DYNAMICMENUOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
diff --git a/svtools/inc/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx
index 4ee175f5b7e0..0cee43e59dc5 100644
--- a/svtools/inc/eventcfg.hxx
+++ b/unotools/inc/unotools/eventcfg.hxx
@@ -30,7 +30,7 @@
 #ifndef _EVENTCFG_HXX
 #define _EVENTCFG_HXX
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <unotools/configitem.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
@@ -99,7 +99,7 @@ public:
     ::rtl::OUString GetEventName( sal_Int32 nID );
 };
 
-class SVL_DLLPUBLIC GlobalEventConfig:
+class UNOTOOLS_DLLPUBLIC GlobalEventConfig:
         public ::cppu::WeakImplHelper2 < ::com::sun::star::document::XEventsSupplier, ::com::sun::star::container::XNameReplace >
 {
     public:
diff --git a/svtools/inc/svtools/extendedsecurityoptions.hxx b/unotools/inc/unotools/extendedsecurityoptions.hxx
index 700f707c00fe..114cf81d6ced 100644
--- a/svtools/inc/svtools/extendedsecurityoptions.hxx
+++ b/unotools/inc/unotools/extendedsecurityoptions.hxx
@@ -27,19 +27,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_EXTENDEDSECURITYOPTIONS_HXX
-#define INCLUDED_SVTOOLS_EXTENDEDSECURITYOPTIONS_HXX
+#ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
+#define INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -70,7 +70,7 @@ class SvtExtendedSecurityOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtExtendedSecurityOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -139,7 +139,7 @@ class SVL_DLLPUBLIC SvtExtendedSecurityOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -160,4 +160,4 @@ class SVL_DLLPUBLIC SvtExtendedSecurityOptions: public svt::detail::Options
 
 };      // class SvtExtendedSecurityOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_EXTENDEDSECURITYOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
diff --git a/svtools/inc/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx
index 480ebc28b29f..1422ba1a7a8f 100644
--- a/svtools/inc/fltrcfg.hxx
+++ b/unotools/inc/unotools/fltrcfg.hxx
@@ -32,11 +32,11 @@
 
 // -----------------------------------------------------------------------
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <unotools/configitem.hxx>
 
 struct SvtFilterOptions_Impl;
-class SVL_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem
+class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem
 {
     SvtFilterOptions_Impl* pImp;
 
diff --git a/vcl/inc/vcl/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx
index 76864f0cb40a..4d0ed4036328 100644
--- a/vcl/inc/vcl/fontcfg.hxx
+++ b/unotools/inc/unotools/fontcfg.hxx
@@ -27,14 +27,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _VCL_FONTCFG_HXX
-#define _VCL_FONTCFG_HXX
+#ifndef _UNOTOOLS_FONTCFG_HXX
+#define _UNOTOOLS_FONTCFG_HXX
 
-#include "dllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <tools/string.hxx>
-#ifndef _VCL_ENUM_HXX
-#include <vcl/vclenum.hxx>
-#endif
+#include <tools/fontenum.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -60,7 +58,7 @@ inline bool operator==( const com::sun::star::lang::Locale& rLeft, const com::su
 }
 }}}}
 
-namespace vcl
+namespace utl
 {
 
 struct LocaleHash
@@ -74,7 +72,7 @@ struct LocaleHash
     }
 };
 
-class DefaultFontConfiguration
+class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
 {
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
             m_xConfigProvider;
@@ -92,7 +90,7 @@ class DefaultFontConfiguration
 
     std::hash_map< com::sun::star::lang::Locale,
                    LocaleAccess,
-                   vcl::LocaleHash >
+                   utl::LocaleHash >
             m_aConfig;
 
     rtl::OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rType ) const;
@@ -165,7 +163,7 @@ class DefaultFontConfiguration
                                       IMPL_FONT_ATTR_GOTHIC | IMPL_FONT_ATTR_SCHOOLBOOK |\
                                       IMPL_FONT_ATTR_SHADOW | IMPL_FONT_ATTR_OUTLINE)
 
-struct FontNameAttr
+struct UNOTOOLS_DLLPUBLIC FontNameAttr
 {
     String                              Name;
     ::std::vector< String >             Substitutions;
@@ -177,7 +175,7 @@ struct FontNameAttr
     unsigned long                       Type; // bitfield of IMPL_FONT_ATTR_*
 };
 
-class VCL_DLLPUBLIC FontSubstConfiguration
+class UNOTOOLS_DLLPUBLIC FontSubstConfiguration
 {
 private:
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
@@ -196,7 +194,7 @@ private:
 
         LocaleSubst() : bConfigRead( false ) {}
     };
-    std::hash_map< com::sun::star::lang::Locale, LocaleSubst, vcl::LocaleHash > m_aSubst;
+    std::hash_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst;
     typedef std::hash_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash;
     mutable UniqueSubstHash maSubstHash;
 
@@ -227,6 +225,6 @@ public:
     static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, ULONG& rType );
 };
 
-} // namespace vcl
+} // namespace utl
 
-#endif // _VCL_FONTCFG_HXX
+#endif // _UNOTOOLS_FONTCFG_HXX
diff --git a/vcl/inc/vcl/fontcvt.hxx b/unotools/inc/unotools/fontcvt.hxx
index 8269928dc730..679a2dc5a6d9 100644
--- a/vcl/inc/vcl/fontcvt.hxx
+++ b/unotools/inc/unotools/fontcvt.hxx
@@ -28,10 +28,10 @@
  *
  ************************************************************************/
 
-#ifndef _SV_FONTCVT_HXX
-#define _SV_FONTCVT_HXX
+#ifndef _UNOTOOLS_FONTCVT_HXX
+#define _UNOTOOLS_FONTCVT_HXX
 
-#include <vcl/dllapi.h>
+#include <unotools/unotoolsdllapi.h>
 #include <tools/string.hxx>
 
 // ------------------
@@ -43,37 +43,16 @@
 #define FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS     ((ULONG)0x00000004)
 
 typedef void* FontToSubsFontConverter;
-VCL_DLLPUBLIC FontToSubsFontConverter     CreateFontToSubsFontConverter( const String& rFontName, ULONG nFlags );
-VCL_DLLPUBLIC void                        DestroyFontToSubsFontConverter( FontToSubsFontConverter hConverter );
-VCL_DLLPUBLIC sal_Unicode                 ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c );
-VCL_DLLPUBLIC String                      GetFontToSubsFontName( FontToSubsFontConverter hConverter );
-
-// ----------------
-// - SubsFontName -
-// ----------------
-
-#define SUBSFONT_ONLYONE    ((ULONG)0x00000001)
-#define SUBSFONT_MS         ((ULONG)0x00000002)
-#define SUBSFONT_PS         ((ULONG)0x00000004)
-#define SUBSFONT_HTML       ((ULONG)0x00000008)
-VCL_DLLPUBLIC String GetSubsFontName( const String& rName, ULONG nFlags );
-
-// -----------------
-// - FontTokenName -
-// -----------------
-
-VCL_DLLPUBLIC String GetFontToken( const String& rName, xub_StrLen nToken, xub_StrLen& rIndex );
-inline String GetFontToken( const String& rName, xub_StrLen nToken )
-{
-    xub_StrLen nTempIndex = 0;
-    return GetFontToken( rName, nToken, nTempIndex );
-}
+UNOTOOLS_DLLPUBLIC FontToSubsFontConverter     CreateFontToSubsFontConverter( const String& rFontName, ULONG nFlags );
+UNOTOOLS_DLLPUBLIC void                        DestroyFontToSubsFontConverter( FontToSubsFontConverter hConverter );
+UNOTOOLS_DLLPUBLIC sal_Unicode                 ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c );
+UNOTOOLS_DLLPUBLIC String                      GetFontToSubsFontName( FontToSubsFontConverter hConverter );
 
 // ---------------------------
 // - StarSymbolToMSMultiFont -
 // ---------------------------
 
-class VCL_DLLPUBLIC StarSymbolToMSMultiFont
+class UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont
 {
 public:
     //Returns the name of the best windows symbol font which this char can be
@@ -99,5 +78,5 @@ public:
 //recognizably similiar. Even in this mode there will be characters that fail.
 //The users of this might want to make a distinction between failed characters
 //which were inside and those outside the unicode private area.
-VCL_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
-#endif // _SV_FONTCVT_HXX
+UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
+#endif // _UNOTOOLS_FONTCVT_HXX
diff --git a/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx
new file mode 100644
index 000000000000..ef4f68bb9e8a
--- /dev/null
+++ b/unotools/inc/unotools/fontdefs.hxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _UNOTOOLS_FONTDEFS_HXX
+#define _UNOTOOLS_FONTDEFS_HXX
+
+#include <unotools/unotoolsdllapi.h>
+#include <sal/types.h>
+#include <tools/string.hxx>
+
+namespace utl {
+  class FontSubstConfiguration;
+  struct FontNameAttr;
+}
+
+// ----------------
+// - SubsFontName -
+// ----------------
+
+#define SUBSFONT_ONLYONE    ((ULONG)0x00000001)
+#define SUBSFONT_MS         ((ULONG)0x00000002)
+#define SUBSFONT_PS         ((ULONG)0x00000004)
+#define SUBSFONT_HTML       ((ULONG)0x00000008)
+
+UNOTOOLS_DLLPUBLIC String GetSubsFontName( const String& rName, ULONG nFlags );
+
+// -----------------
+// - FontTokenName -
+// -----------------
+
+UNOTOOLS_DLLPUBLIC String GetFontToken( const String& rName, xub_StrLen nToken, xub_StrLen& rIndex );
+inline String GetFontToken( const String& rName, xub_StrLen nToken )
+{
+    xub_StrLen nTempIndex = 0;
+    return GetFontToken( rName, nToken, nTempIndex );
+}
+
+UNOTOOLS_DLLPUBLIC void AddTokenFontName( String& rName, const String& rNewToken );
+
+struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const String&) const; };
+
+// ---------------
+// - ConvertChar -
+// ---------------
+
+class UNOTOOLS_DLLPUBLIC ConvertChar
+{
+public:
+    const sal_Unicode*  mpCvtTab;
+    const char*         mpSubsFontName;
+    sal_Unicode         (*mpCvtFunc)( sal_Unicode );
+    sal_Unicode         RecodeChar( sal_Unicode c ) const;
+    void                RecodeString( String& rStra, xub_StrLen nIndex, xub_StrLen nLen ) const;
+    static const ConvertChar* GetRecodeData( const String& rOrgFontName, const String& rMapFontName );
+};
+
+
+// Default-Font
+#define DEFAULTFONT_SANS_UNICODE        ((USHORT)1)
+#define DEFAULTFONT_SANS                ((USHORT)2)
+#define DEFAULTFONT_SERIF               ((USHORT)3)
+#define DEFAULTFONT_FIXED               ((USHORT)4)
+#define DEFAULTFONT_SYMBOL              ((USHORT)5)
+#define DEFAULTFONT_UI_SANS             ((USHORT)1000)
+#define DEFAULTFONT_UI_FIXED            ((USHORT)1001)
+#define DEFAULTFONT_LATIN_TEXT          ((USHORT)2000)
+#define DEFAULTFONT_LATIN_PRESENTATION  ((USHORT)2001)
+#define DEFAULTFONT_LATIN_SPREADSHEET   ((USHORT)2002)
+#define DEFAULTFONT_LATIN_HEADING       ((USHORT)2003)
+#define DEFAULTFONT_LATIN_DISPLAY       ((USHORT)2004)
+#define DEFAULTFONT_LATIN_FIXED         ((USHORT)2005)
+#define DEFAULTFONT_CJK_TEXT            ((USHORT)3000)
+#define DEFAULTFONT_CJK_PRESENTATION    ((USHORT)3001)
+#define DEFAULTFONT_CJK_SPREADSHEET     ((USHORT)3002)
+#define DEFAULTFONT_CJK_HEADING         ((USHORT)3003)
+#define DEFAULTFONT_CJK_DISPLAY         ((USHORT)3004)
+#define DEFAULTFONT_CTL_TEXT            ((USHORT)4000)
+#define DEFAULTFONT_CTL_PRESENTATION    ((USHORT)4001)
+#define DEFAULTFONT_CTL_SPREADSHEET     ((USHORT)4002)
+#define DEFAULTFONT_CTL_HEADING         ((USHORT)4003)
+#define DEFAULTFONT_CTL_DISPLAY         ((USHORT)4004)
+
+UNOTOOLS_DLLPUBLIC String GetNextFontToken( const String& rTokenStr, xub_StrLen& rIndex );
+
+UNOTOOLS_DLLPUBLIC void GetEnglishSearchFontName( String& rName );
+
+#endif
diff --git a/svtools/inc/svtools/fontoptions.hxx b/unotools/inc/unotools/fontoptions.hxx
index 4689cb6ad91b..644670711595 100644
--- a/svtools/inc/svtools/fontoptions.hxx
+++ b/unotools/inc/unotools/fontoptions.hxx
@@ -27,18 +27,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_FONTOPTIONS_HXX
-#define INCLUDED_SVTOOLS_FONTOPTIONS_HXX
+#ifndef INCLUDED_unotools_FONTOPTIONS_HXX
+#define INCLUDED_unotools_FONTOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -67,7 +67,7 @@ class SvtFontOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtFontOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -152,7 +152,7 @@ class SVL_DLLPUBLIC SvtFontOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -173,4 +173,4 @@ class SVL_DLLPUBLIC SvtFontOptions: public svt::detail::Options
 
 };      // class SvtFontOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_FONTOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_FONTOPTIONS_HXX
diff --git a/svtools/inc/svtools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx
index d688da08ae76..c1bd8f62fca1 100644
--- a/svtools/inc/svtools/historyoptions.hxx
+++ b/unotools/inc/unotools/historyoptions.hxx
@@ -34,13 +34,13 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  types, enums, ...
@@ -94,7 +94,7 @@ class SvtHistoryOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtHistoryOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -227,7 +227,7 @@ class SVL_DLLPUBLIC SvtHistoryOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
diff --git a/svtools/source/inc/configitems/historyoptions_const.hxx b/unotools/inc/unotools/historyoptions_const.hxx
index c9148aeb26f8..48632b66b018 100644
--- a/svtools/source/inc/configitems/historyoptions_const.hxx
+++ b/unotools/inc/unotools/historyoptions_const.hxx
@@ -34,7 +34,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
 #ifndef INCLUDE_CONFIGITEMS_HISTORYOPTIONS_CONST_HXX
 #define INCLUDE_CONFIGITEMS_HISTORYOPTIONS_CONST_HXX
diff --git a/svtools/inc/svtools/inetoptions.hxx b/unotools/inc/unotools/inetoptions.hxx
index 367ea9bb3f52..42f01f40b7c2 100644
--- a/svtools/inc/svtools/inetoptions.hxx
+++ b/unotools/inc/unotools/inetoptions.hxx
@@ -28,14 +28,14 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_INETOPTIONS_HXX_
-#define _SVTOOLS_INETOPTIONS_HXX_
+#ifndef _unotools_INETOPTIONS_HXX_
+#define _unotools_INETOPTIONS_HXX_
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sal/types.h>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 namespace com { namespace sun { namespace star { namespace beans {
     class XPropertiesChangeListener;
@@ -68,7 +68,7 @@ namespace rtl { class OUString; }
     true is passed, the new value is instantly written back to the
     configuration database.
  */
-class SVL_DLLPUBLIC SvtInetOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtInetOptions: public utl::detail::Options
 {
 public:
     SvtInetOptions();
@@ -143,4 +143,4 @@ private:
     static Impl * m_pImpl;
 };
 
-#endif // _SVTOOLS_INETOPTIONS_HXX_
+#endif // _unotools_INETOPTIONS_HXX_
diff --git a/svtools/inc/svtools/internaloptions.hxx b/unotools/inc/unotools/internaloptions.hxx
index 6a491480c143..d5c9adaa7b92 100644
--- a/svtools/inc/svtools/internaloptions.hxx
+++ b/unotools/inc/unotools/internaloptions.hxx
@@ -27,18 +27,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX
-#define INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX
+#ifndef INCLUDED_unotools_INTERNALOPTIONS_HXX
+#define INCLUDED_unotools_INTERNALOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespaces!
@@ -76,7 +76,7 @@ class SvtInternalOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtInternalOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -159,7 +159,7 @@ class SVL_DLLPUBLIC SvtInternalOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static MUTEX& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static MUTEX& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -180,4 +180,4 @@ class SVL_DLLPUBLIC SvtInternalOptions: public svt::detail::Options
 
 };      // class SvtInternalOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_INTERNALOPTIONS_HXX
diff --git a/svtools/source/config/itemholderbase.hxx b/unotools/inc/unotools/itemholderbase.hxx
index b5c1dd5d57d0..3b8bbccb3549 100644
--- a/svtools/source/config/itemholderbase.hxx
+++ b/unotools/inc/unotools/itemholderbase.hxx
@@ -28,8 +28,8 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SVTOOLS_ITEMHOLDERBASE_HXX_
-#define INCLUDED_SVTOOLS_ITEMHOLDERBASE_HXX_
+#ifndef INCLUDED_unotools_ITEMHOLDERBASE_HXX_
+#define INCLUDED_unotools_ITEMHOLDERBASE_HXX_
 
 //-----------------------------------------------
 // includes
@@ -37,7 +37,7 @@
 #include <vector>
 #include <osl/mutex.hxx>
 
-namespace svt { namespace detail { class Options; } }
+namespace utl { namespace detail { class Options; } }
 
 //-----------------------------------------------
 // definitions
@@ -122,10 +122,10 @@ struct TItemInfo
         : pItem(0)
     {}
 
-    svt::detail::Options * pItem;
+    utl::detail::Options * pItem;
     EItem eItem;
 };
 
 typedef ::std::vector< TItemInfo > TItems;
 
-#endif // INCLUDED_SVTOOLS_ITEMHOLDERBASE_HXX_
+#endif // INCLUDED_unotools_ITEMHOLDERBASE_HXX_
diff --git a/svtools/inc/javaoptions.hxx b/unotools/inc/unotools/javaoptions.hxx
index 4e1f23376407..9996a496bf31 100644
--- a/svtools/inc/javaoptions.hxx
+++ b/unotools/inc/unotools/javaoptions.hxx
@@ -27,10 +27,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVTOOLS_JAVAOPTIONS_HXX
-#define _SVTOOLS_JAVAOPTIONS_HXX
+#ifndef _unotools_JAVAOPTIONS_HXX
+#define _unotools_JAVAOPTIONS_HXX
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <unotools/configitem.hxx>
 
@@ -39,7 +39,7 @@
 
 struct SvtJavaOptions_Impl;
 
-class SVL_DLLPUBLIC SvtJavaOptions : public utl::ConfigItem
+class UNOTOOLS_DLLPUBLIC SvtJavaOptions : public utl::ConfigItem
 {
     SvtJavaOptions_Impl* pImpl;
 public:
diff --git a/svtools/inc/svtools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index dd3dbdef811f..49500db964c2 100644
--- a/svtools/inc/svtools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.hxx
@@ -28,10 +28,10 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_LINGUCFG_HXX_
-#define _SVTOOLS_LINGUCFG_HXX_
+#ifndef _unotools_LINGUCFG_HXX_
+#define _unotools_LINGUCFG_HXX_
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.h>
@@ -41,7 +41,7 @@
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
 #include <osl/mutex.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 #include <i18npool/lang.h>
 
 #include <vector>
@@ -50,7 +50,7 @@ class SvtLinguConfigItem;
 
 //////////////////////////////////////////////////////////////////////
 
-struct SVL_DLLPUBLIC SvtLinguOptions
+struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
 {
     ::com::sun::star::uno::Sequence< rtl::OUString >    aActiveDics;
     ::com::sun::star::uno::Sequence< rtl::OUString >    aActiveConvDics;
@@ -144,7 +144,7 @@ struct SVL_DLLPUBLIC SvtLinguOptions
 
 //////////////////////////////////////////////////////////////////////
 
-struct SVL_DLLPUBLIC SvtLinguConfigDictionaryEntry
+struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry
 {
     // the URL's pointing to the location of the files the dictionary consists of
     com::sun::star::uno::Sequence< rtl::OUString >  aLocations;
@@ -156,10 +156,10 @@ struct SVL_DLLPUBLIC SvtLinguConfigDictionaryEntry
 
 //////////////////////////////////////////////////////////////////////
 
-class SVL_DLLPUBLIC SvtLinguConfig: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options
 {
     // returns static object
-    SVL_DLLPRIVATE SvtLinguConfigItem &   GetConfigItem();
+    UNOTOOLS_DLLPRIVATE SvtLinguConfigItem &   GetConfigItem();
 
     SvtLinguConfigItem &   GetConfigItem() const    { return const_cast< SvtLinguConfig * >( this )->GetConfigItem(); }
 
diff --git a/svtools/inc/linguprops.hxx b/unotools/inc/unotools/linguprops.hxx
index 883d5069f7a8..3edd1004bec0 100644
--- a/svtools/inc/linguprops.hxx
+++ b/unotools/inc/unotools/linguprops.hxx
@@ -28,8 +28,8 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_LINGUPROPS_HXX_
-#define _SVTOOLS_LINGUPROPS_HXX_
+#ifndef _unotools_LINGUPROPS_HXX_
+#define _unotools_LINGUPROPS_HXX_
 
 
 // UNO property names for general options
diff --git a/svtools/inc/svtools/localisationoptions.hxx b/unotools/inc/unotools/localisationoptions.hxx
index c19bf0e9fbba..d401eccee51a 100644
--- a/svtools/inc/svtools/localisationoptions.hxx
+++ b/unotools/inc/unotools/localisationoptions.hxx
@@ -27,17 +27,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_LOCALISATIONOPTIONS_HXX
-#define INCLUDED_SVTOOLS_LOCALISATIONOPTIONS_HXX
+#ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
+#define INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
 #include <sal/types.h>
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <osl/mutex.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -66,7 +66,7 @@ class SvtLocalisationOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtLocalisationOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -157,7 +157,7 @@ class SVL_DLLPUBLIC SvtLocalisationOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -178,4 +178,4 @@ class SVL_DLLPUBLIC SvtLocalisationOptions: public svt::detail::Options
 
 };      // class SvtLocalisationOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_LOCALISATIONOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
diff --git a/svtools/source/config/loghelper.hxx b/unotools/inc/unotools/loghelper.hxx
index 22efd5cff46d..22efd5cff46d 100644
--- a/svtools/source/config/loghelper.hxx
+++ b/unotools/inc/unotools/loghelper.hxx
diff --git a/svtools/inc/misccfg.hxx b/unotools/inc/unotools/misccfg.hxx
index 3f897e1cecc3..14ecb12b388a 100644
--- a/svtools/inc/misccfg.hxx
+++ b/unotools/inc/unotools/misccfg.hxx
@@ -27,49 +27,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SFX_MISCCFG_HXX
-#define _SFX_MISCCFG_HXX
+#ifndef _UTL_MISCCFG_HXX
+#define _UTL_MISCCFG_HXX
 
-#include "svtools/svtdllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include "tools/solar.h"
-#include "unotools/configitem.hxx"
+#include "unotools/options.hxx"
 
 /*--------------------------------------------------------------------
      Beschreibung:
  --------------------------------------------------------------------*/
-
-class SVT_DLLPUBLIC SfxMiscCfg : public utl::ConfigItem
+namespace utl
 {
-    BOOL            bPaperSize;     // printer warnings
-    BOOL            bPaperOrientation;
-    BOOL            bNotFound;
-    sal_Int32       nYear2000;      // two digit year representation
+    class SfxMiscCfg;
 
-    const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
-    void                    Load();
+class UNOTOOLS_DLLPUBLIC MiscCfg : public detail::Options
+{
+    SfxMiscCfg*     pImpl;
 
 public:
-    SfxMiscCfg( );
-    ~SfxMiscCfg( );
-
-    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
-    virtual void            Commit();
+    MiscCfg( );
+    virtual ~MiscCfg( );
 
-    BOOL        IsNotFoundWarning()     const {return bNotFound;}
+    BOOL        IsNotFoundWarning()     const;
     void        SetNotFoundWarning( BOOL bSet);
 
-    BOOL        IsPaperSizeWarning()    const {return bPaperSize;}
+    BOOL        IsPaperSizeWarning()    const;
     void        SetPaperSizeWarning(BOOL bSet);
 
-    BOOL        IsPaperOrientationWarning()     const {return bPaperOrientation;}
+    BOOL        IsPaperOrientationWarning()     const;
     void        SetPaperOrientationWarning( BOOL bSet);
 
                 // 0 ... 99
-    sal_Int32   GetYear2000()           const { return nYear2000; }
+    sal_Int32   GetYear2000()           const;
     void        SetYear2000( sal_Int32 nSet );
-
 };
 
+}
+
 #endif // _MISCCFG_HXX
 
 
diff --git a/svtools/inc/svtools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx
index fc28ce1f399e..8b759a0834cf 100644
--- a/svtools/inc/svtools/moduleoptions.hxx
+++ b/unotools/inc/unotools/moduleoptions.hxx
@@ -35,14 +35,14 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <salhelper/singletonref.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  const
@@ -85,7 +85,7 @@ class SvtModuleOptions_Impl;
     @devstatus      ready to use
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class SVL_DLLPUBLIC SvtModuleOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public const declarations!
@@ -237,7 +237,7 @@ class SVL_DLLPUBLIC SvtModuleOptions: public svt::detail::Options
     //  private methods
     //-------------------------------------------------------------------------------------------------------------
     private:
-        SVL_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
diff --git a/unotools/inc/unotools/options.hxx b/unotools/inc/unotools/options.hxx
new file mode 100755
index 000000000000..b5664edac2d1
--- /dev/null
+++ b/unotools/inc/unotools/options.hxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: options.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_unotools_OPTIONS_HXX
+#define INCLUDED_unotools_OPTIONS_HXX
+
+#include "sal/config.h"
+#include "unotools/unotoolsdllapi.h"
+
+/*
+    The class utl::detail::Options provides a kind of multiplexer. It implements a ConfigurationListener
+    that is usually registered at a ConfigItem class. At the same time it implements a ConfigurationBroadcaster
+    that allows further ("external") listeners to register.
+    Once the class deriving from Options is notified about
+    configuration changes by the ConfigItem if its content has been changed by calling some of its methods,
+    a call of the Options::NotifyListeners() method will send out notifications to all external listeners.
+*/
+
+namespace utl {
+
+    class ConfigurationBroadcaster;
+    class IMPL_ConfigurationListenerList;
+
+    // interface for configuration listener
+    class UNOTOOLS_DLLPUBLIC ConfigurationListener
+    {
+    public:
+        virtual void ConfigurationChanged( ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ) = 0;
+    };
+
+    // complete broadcasting implementation
+    class UNOTOOLS_DLLPUBLIC ConfigurationBroadcaster
+    {
+        IMPL_ConfigurationListenerList* mpList;
+        sal_Int32               m_nBroadcastBlocked;     // broadcast only if this is 0
+        sal_uInt32              m_nBlockedHint;
+
+    public:
+        void AddListener( utl::ConfigurationListener* pListener );
+        void RemoveListener( utl::ConfigurationListener* pListener );
+
+        // notify listeners; nHint is an implementation detail of the particular class deriving from ConfigurationBroadcaster
+        void NotifyListeners( sal_uInt32 nHint );
+        ConfigurationBroadcaster();
+        virtual ~ConfigurationBroadcaster();
+        virtual void BlockBroadcasts( bool bBlock );
+    };
+
+namespace detail {
+
+// A base class for the various option classes supported by
+// unotools/source/config/itemholderbase.hxx (which must be public, as it is
+// shared between unotools, svl and svt)
+// It also provides an implementation for a Configuration Listener and inherits a broadcaster implementation
+
+class UNOTOOLS_DLLPUBLIC Options : public utl::ConfigurationBroadcaster, public utl::ConfigurationListener
+{
+public:
+    Options();
+
+    virtual ~Options() = 0;
+
+private:
+    UNOTOOLS_DLLPRIVATE Options(Options &); // not defined
+    UNOTOOLS_DLLPRIVATE void operator =(Options &); // not defined
+
+protected:
+    virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint=0 );
+};
+
+} }
+
+#endif
diff --git a/svtools/inc/svtools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx
index 0ebfd1ab357d..87649a82358c 100644
--- a/svtools/inc/svtools/optionsdlg.hxx
+++ b/unotools/inc/unotools/optionsdlg.hxx
@@ -27,18 +27,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_OPTIONSDLG_HXX
-#define INCLUDED_SVTOOLS_OPTIONSDLG_HXX
+#ifndef INCLUDED_unotools_OPTIONSDLG_HXX
+#define INCLUDED_unotools_OPTIONSDLG_HXX
 
-#ifndef INCLUDED_SVTDLLAPI_H
-#include "svtools/svldllapi.h"
+#ifndef INCLUDED_unotoolsdllapi_H
+#include "unotools/unotoolsdllapi.h"
 #endif
 #include <tools/string.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 class SvtOptionsDlgOptions_Impl;
 
-class SVL_DLLPUBLIC SvtOptionsDialogOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtOptionsDialogOptions: public utl::detail::Options
 {
 private:
     SvtOptionsDlgOptions_Impl* m_pImp;
diff --git a/svtools/inc/svtools/pathoptions.hxx b/unotools/inc/unotools/pathoptions.hxx
index 20185e79c886..e606180c25de 100644
--- a/svtools/inc/svtools/pathoptions.hxx
+++ b/unotools/inc/unotools/pathoptions.hxx
@@ -27,20 +27,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#define INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#ifndef INCLUDED_unotools_PATHOPTIONS_HXX
+#define INCLUDED_unotools_PATHOPTIONS_HXX
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <tools/string.hxx>
 #include <com/sun/star/lang/Locale.hpp>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 #define SVT_SEARCHPATH_DELIMITER      ';'
 
 // class SvtPathOptions --------------------------------------------------
 
 class SvtPathOptions_Impl;
-class SVL_DLLPUBLIC SvtPathOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtPathOptions: public utl::detail::Options
 {
 private:
     SvtPathOptions_Impl*    pImp;
@@ -139,5 +139,5 @@ public:
     sal_Bool        IsReadonly() const;
 };
 
-#endif // #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
+#endif // #ifndef INCLUDED_unotools_PATHOPTIONS_HXX
 
diff --git a/svtools/inc/svtools/printwarningoptions.hxx b/unotools/inc/unotools/printwarningoptions.hxx
index 863d407f221e..3663fb8c63d0 100644
--- a/svtools/inc/svtools/printwarningoptions.hxx
+++ b/unotools/inc/unotools/printwarningoptions.hxx
@@ -28,18 +28,18 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SVTOOLS_PRINTWARNINGOPTIONS_HXX
-#define INCLUDED_SVTOOLS_PRINTWARNINGOPTIONS_HXX
+#ifndef INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
+#define INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -68,7 +68,7 @@ class SvtPrintWarningOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtPrintWarningOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -141,7 +141,7 @@ class SVL_DLLPUBLIC SvtPrintWarningOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -161,4 +161,4 @@ class SVL_DLLPUBLIC SvtPrintWarningOptions: public svt::detail::Options
 
 };      // class SvtPrintWarningOptions
 
-#endif // #ifndef INCLUDED_SVTOOLS_PRINTWARNINGOPTIONS_HXX
+#endif // #ifndef INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
diff --git a/svtools/inc/regoptions.hxx b/unotools/inc/unotools/regoptions.hxx
index 109cc6dd7754..3b0f6c760b1f 100644
--- a/svtools/inc/regoptions.hxx
+++ b/unotools/inc/unotools/regoptions.hxx
@@ -28,14 +28,14 @@
  *
  ************************************************************************/
 
-#ifndef SVTOOLS_REGOPTIONS_HXX
-#define SVTOOLS_REGOPTIONS_HXX
+#ifndef unotools_REGOPTIONS_HXX
+#define unotools_REGOPTIONS_HXX
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <tools/string.hxx>
 
 //........................................................................
-namespace svt
+namespace utl
 {
 //........................................................................
 
@@ -45,13 +45,13 @@ namespace svt
     class RegOptionsImpl;
     /** encapsulates access to the configuration settings for registering the product
     */
-    class SVL_DLLPUBLIC RegOptions
+    class UNOTOOLS_DLLPUBLIC RegOptions
     {
     private:
         RegOptionsImpl*     m_pImpl;
 
         // the impl class is constructed upon need only (as this is expensive)
-        SVL_DLLPRIVATE void ensureImpl( );
+        UNOTOOLS_DLLPRIVATE void ensureImpl( );
 
     public:
         RegOptions( );
@@ -122,8 +122,8 @@ namespace svt
     };
 
 //........................................................................
-}   // namespace svt
+}   // namespace utl
 //........................................................................
 
-#endif // SVTOOLS_REGOPTIONS_HXX
+#endif // unotools_REGOPTIONS_HXX
 
diff --git a/svtools/inc/svtools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx
index 2966e2f24aba..bb50cadafb1d 100644
--- a/svtools/inc/svtools/saveopt.hxx
+++ b/unotools/inc/unotools/saveopt.hxx
@@ -27,14 +27,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_SAVEOPT_HXX
-#define INCLUDED_SVTOOLS_SAVEOPT_HXX
+#ifndef INCLUDED_unotools_SAVEOPT_HXX
+#define INCLUDED_unotools_SAVEOPT_HXX
 
-#include "svtools/svldllapi.h"
-#include <svtools/options.hxx>
+#include "unotools/unotoolsdllapi.h"
+#include <unotools/options.hxx>
 
 struct SvtLoadSaveOptions_Impl;
-class SVL_DLLPUBLIC SvtSaveOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtSaveOptions: public utl::detail::Options
 {
     SvtLoadSaveOptions_Impl*    pImp;
 
diff --git a/svtools/inc/searchopt.hxx b/unotools/inc/unotools/searchopt.hxx
index 4475f406805d..4f53a1e050b0 100644
--- a/svtools/inc/searchopt.hxx
+++ b/unotools/inc/unotools/searchopt.hxx
@@ -31,12 +31,12 @@
 #ifndef _SVT_SEARCHOPT_HXX_
 #define _SVT_SEARCHOPT_HXX_
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include "tools/solar.h"
 
 class SvtSearchOptions_Impl;
 
-class SVL_DLLPUBLIC SvtSearchOptions
+class UNOTOOLS_DLLPUBLIC SvtSearchOptions
 {
     SvtSearchOptions_Impl   *pImpl;
 
diff --git a/svtools/inc/svtools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx
index 36ba2af9668a..bbca1770b836 100644
--- a/svtools/inc/svtools/securityoptions.hxx
+++ b/unotools/inc/unotools/securityoptions.hxx
@@ -27,19 +27,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_SECURITYOPTIONS_HXX
-#define INCLUDED_SVTOOLS_SECURITYOPTIONS_HXX
+#ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX
+#define INCLUDED_unotools_SECURITYOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -82,7 +82,7 @@ enum EBasicSecurityMode
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtSecurityOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public types
@@ -275,7 +275,7 @@ class SVL_DLLPUBLIC SvtSecurityOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -296,4 +296,4 @@ class SVL_DLLPUBLIC SvtSecurityOptions: public svt::detail::Options
 
 };      // class SvtSecurityOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_SECURITYOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX
diff --git a/svtools/inc/svtools/sourceviewconfig.hxx b/unotools/inc/unotools/sourceviewconfig.hxx
index 0e3f6a34e3c1..cc28bd3dae61 100644
--- a/svtools/inc/svtools/sourceviewconfig.hxx
+++ b/unotools/inc/unotools/sourceviewconfig.hxx
@@ -27,26 +27,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVTOOLS_SOURCEVIEWCONFIG_HXX
-#define _SVTOOLS_SOURCEVIEWCONFIG_HXX
+#ifndef _unotools_SOURCEVIEWCONFIG_HXX
+#define _unotools_SOURCEVIEWCONFIG_HXX
 
 // include ---------------------------------------------------------------
 
-#include "svtools/svldllapi.h"
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include "unotools/unotoolsdllapi.h"
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 /* -----------------------------12.10.00 11:40--------------------------------
 
  ---------------------------------------------------------------------------*/
-namespace svt
+namespace utl
 {
     class SourceViewConfig_Impl;
-    class SVL_DLLPUBLIC SourceViewConfig:
-        public svt::detail::Options, public SfxBroadcaster, private SfxListener
+    class UNOTOOLS_DLLPUBLIC SourceViewConfig: public utl::detail::Options
     {
         static SourceViewConfig_Impl* m_pImplConfig;
         static sal_Int32              m_nRefCount;
@@ -63,9 +60,6 @@ namespace svt
 
             sal_Bool                IsShowProportionalFontsOnly() const;
             void                    SetShowProportionalFontsOnly(sal_Bool bSet);
-
-            //SfxListener:
-            virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
     };
 }
 #endif
diff --git a/svtools/inc/svtools/startoptions.hxx b/unotools/inc/unotools/startoptions.hxx
index 82a3c761965e..a23fb08fce6b 100644
--- a/svtools/inc/svtools/startoptions.hxx
+++ b/unotools/inc/unotools/startoptions.hxx
@@ -27,18 +27,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_STARTOPTIONS_HXX
-#define INCLUDED_SVTOOLS_STARTOPTIONS_HXX
+#ifndef INCLUDED_unotools_STARTOPTIONS_HXX
+#define INCLUDED_unotools_STARTOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -67,7 +67,7 @@ class SvtStartOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtStartOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtStartOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -149,7 +149,7 @@ class SVL_DLLPUBLIC SvtStartOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -170,4 +170,4 @@ class SVL_DLLPUBLIC SvtStartOptions: public svt::detail::Options
 
 };      // class SvtStartOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_STARTOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_STARTOPTIONS_HXX
diff --git a/svtools/inc/svtools/syslocale.hxx b/unotools/inc/unotools/syslocale.hxx
index bd853d0d4eeb..adce66b7e84a 100644
--- a/svtools/inc/svtools/syslocale.hxx
+++ b/unotools/inc/unotools/syslocale.hxx
@@ -28,16 +28,18 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#define INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#ifndef INCLUDED_UNOTOOLS_SYSLOCALE_HXX
+#define INCLUDED_UNOTOOLS_SYSLOCALE_HXX
 
-#include "svtools/svtdllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <sal/types.h>
-
+#include <i18npool/lang.h>
 
 class SvtSysLocale_Impl;
+class SvtSysLocaleOptions;
+
 namespace osl { class Mutex; }
 class LocaleDataWrapper;
 
@@ -50,14 +52,14 @@ class LocaleDataWrapper;
     SvtSysLocale is not expensive as long as there is at least one instance
     left.
  */
-class SVT_DLLPUBLIC SvtSysLocale
+class UNOTOOLS_DLLPUBLIC SvtSysLocale
 {
     friend class SvtSysLocale_Impl;     // access to mutex
 
     static  SvtSysLocale_Impl*  pImpl;
     static  sal_Int32           nRefCount;
 
-    SVT_DLLPRIVATE static  ::osl::Mutex&               GetMutex();
+    UNOTOOLS_DLLPRIVATE static  ::osl::Mutex&               GetMutex();
 
 public:
                                         SvtSysLocale();
@@ -72,7 +74,11 @@ public:
      */
             const LocaleDataWrapper*    GetLocaleDataPtr() const;
             const CharClass*            GetCharClassPtr() const;
-
+            SvtSysLocaleOptions&        GetOptions() const;
+            com::sun::star::lang::Locale GetLocale() const;
+            LanguageType                GetLanguage() const;
+            com::sun::star::lang::Locale GetUILocale() const;
+            LanguageType                GetUILanguage() const;
 };
 
 #endif  // INCLUDED_SVTOOLS_SYSLOCALE_HXX
diff --git a/svtools/inc/svtools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx
index 19e130fea45b..b417e00eec12 100644..100755
--- a/svtools/inc/svtools/syslocaleoptions.hxx
+++ b/unotools/inc/unotools/syslocaleoptions.hxx
@@ -31,35 +31,39 @@
 #ifndef INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
 #define INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <tools/link.hxx>
 #include <i18npool/lang.h>
 #include <tools/string.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 // bits for broadcasting hints of changes in a SfxSimpleHint, may be combined
 const ULONG SYSLOCALEOPTIONS_HINT_LOCALE    = 0x00000001;
 const ULONG SYSLOCALEOPTIONS_HINT_CURRENCY  = 0x00000002;
+const ULONG SYSLOCALEOPTIONS_HINT_UILOCALE  = 0x00000004;
+const ULONG SYSLOCALEOPTIONS_HINT_DECSEP    = 0x00000008;
 
 class SvtSysLocaleOptions_Impl;
 class SvtListener;
 namespace osl { class Mutex; }
 
-class SVT_DLLPUBLIC SvtSysLocaleOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtSysLocaleOptions: public utl::detail::Options
 {
     static  SvtSysLocaleOptions_Impl*   pOptions;
     static  sal_Int32                   nRefCount;
 
-    SVT_DLLPRIVATE static  ::osl::Mutex&       GetMutex();
+    UNOTOOLS_DLLPRIVATE static  ::osl::Mutex&       GetMutex();
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 nHint );
 
 public:
 
     enum EOption
     {
         E_LOCALE,
+        E_UILOCALE,
         E_CURRENCY
     };
                                 SvtSysLocaleOptions();
@@ -76,8 +80,6 @@ public:
                                         <TRUE/> if added
                                         <FALSE/> if not added
                                  */
-            BOOL                AddListener( SvtListener& );
-            BOOL                RemoveListener( SvtListener& );
 
     /** Block broadcasts and accumulate hints. This may be useful if, for
         example, the locale and currency are changed and the currency was
@@ -97,13 +99,23 @@ public:
         BlockBroadcasts(FALSE) or otherwise pending hints would never be
         broadcasted again.
      */
-            void                BlockBroadcasts( BOOL bBlock );
+       virtual void                BlockBroadcasts( bool bBlock );
 
     // config value access methods
 
     /// The config string may be empty to denote the SYSTEM locale
             const ::rtl::OUString&  GetLocaleConfigString() const;
             void                SetLocaleConfigString( const ::rtl::OUString& rStr );
+            com::sun::star::lang::Locale GetLocale() const;
+            com::sun::star::lang::Locale GetRealLocale() const;
+            LanguageType        GetRealLanguage() const;
+
+    /// The config string may be empty to denote the SYSTEM locale
+            const ::rtl::OUString&  GetUILocaleConfigString() const;
+            void                SetUILocaleConfigString( const ::rtl::OUString& rStr );
+            com::sun::star::lang::Locale GetUILocale() const;
+            com::sun::star::lang::Locale GetRealUILocale() const;
+            LanguageType        GetRealUILanguage() const;
 
     /// The config string may be empty to denote the default currency of the locale
             const ::rtl::OUString&  GetCurrencyConfigString() const;
@@ -115,11 +127,6 @@ public:
 
     // convenience methods
 
-    /** Get the LanguageType of the current locale, may be LANGUAGE_SYSTEM if
-        LocaleConfigString is empty. If you need the real locale used in the
-        application, call Application::GetSettings().GetLanguage() instead */
-            LanguageType        GetLocaleLanguageType() const;
-
     /// Get currency abbreviation and locale from an USD-en-US or EUR-de-DE string
     static  void                GetCurrencyAbbrevAndLanguage(
                                     String& rAbbrev,
diff --git a/svtools/inc/svtools/undoopt.hxx b/unotools/inc/unotools/undoopt.hxx
index 7fa63c104eec..288ec3c6b5de 100644
--- a/svtools/inc/svtools/undoopt.hxx
+++ b/unotools/inc/unotools/undoopt.hxx
@@ -27,19 +27,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_UNDOOPT_HXX
-#define INCLUDED_SVTOOLS_UNDOOPT_HXX
+#ifndef INCLUDED_unotools_UNDOOPT_HXX
+#define INCLUDED_unotools_UNDOOPT_HXX
 
-#include "svtools/svtdllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 class SvtUndoOptions_Impl;
 
-class SVT_DLLPUBLIC SvtUndoOptions:
-    public svt::detail::Options, public SfxBroadcaster, public SfxListener
+class UNOTOOLS_DLLPUBLIC SvtUndoOptions: public utl::detail::Options
 {
     SvtUndoOptions_Impl*    pImp;
 
@@ -47,8 +44,6 @@ public:
                             SvtUndoOptions();
                             virtual ~SvtUndoOptions();
 
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
     void                    SetUndoCount( sal_Int32 n );
     sal_Int32               GetUndoCount() const;
 };
diff --git a/svtools/inc/svtools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx
index f5a07a2e4e79..67fd3e5bbf35 100644
--- a/svtools/inc/svtools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -27,16 +27,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_USEROPTIONS_HXX
-#define INCLUDED_SVTOOLS_USEROPTIONS_HXX
+#ifndef INCLUDED_unotools_USEROPTIONS_HXX
+#define INCLUDED_unotools_USEROPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <unotools/configitem.hxx>
 #include <tools/string.hxx>
 #include <osl/mutex.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 // define ----------------------------------------------------------------
 
@@ -62,8 +60,7 @@
 
 class SvtUserOptions_Impl;
 
-class SVT_DLLPUBLIC SvtUserOptions:
-    public svt::detail::Options, public SfxBroadcaster, public SfxListener
+class UNOTOOLS_DLLPUBLIC SvtUserOptions: public utl::detail::Options
 {
 private:
     SvtUserOptions_Impl*    pImp;
@@ -74,8 +71,6 @@ public:
 
     static ::osl::Mutex&    GetInitMutex();
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
     // get the address token
      ::rtl::OUString    GetCompany() const;
      ::rtl::OUString    GetFirstName() const;
@@ -123,4 +118,4 @@ public:
     ::rtl::OUString GetToken(USHORT nToken) const;
 };
 
-#endif // #ifndef INCLUDED_SVTOOLS_USEROPTIONS_HXX
+#endif // #ifndef INCLUDED_unotools_USEROPTIONS_HXX
diff --git a/svtools/source/inc/configitems/useroptions_const.hxx b/unotools/inc/unotools/useroptions_const.hxx
index 4dbd6da8bba3..4dbd6da8bba3 100644
--- a/svtools/source/inc/configitems/useroptions_const.hxx
+++ b/unotools/inc/unotools/useroptions_const.hxx
diff --git a/svtools/inc/svtools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx
index e95af38cb322..07f4da9e3159 100644
--- a/svtools/inc/svtools/viewoptions.hxx
+++ b/unotools/inc/unotools/viewoptions.hxx
@@ -27,14 +27,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
-#define INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
+#ifndef INCLUDED_unotools_VIEWOPTIONS_HXX
+#define INCLUDED_unotools_VIEWOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "svtools/svldllapi.h"
+#include "unotools/unotoolsdllapi.h"
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <unotools/configmgr.hxx>
@@ -42,7 +42,7 @@
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -122,7 +122,7 @@ enum EViewType
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVL_DLLPUBLIC SvtViewOptions: public svt::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options
 {
     /*
     #ifdef TF_OLDVIEW
@@ -318,7 +318,7 @@ class SVL_DLLPUBLIC SvtViewOptions: public svt::detail::Options
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        SVL_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
+        UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -353,4 +353,4 @@ class SVL_DLLPUBLIC SvtViewOptions: public svt::detail::Options
 
 };      // class SvtViewOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_VIEWOPTIONS_HXX
diff --git a/svtools/inc/svtools/workingsetoptions.hxx b/unotools/inc/unotools/workingsetoptions.hxx
index b66f71512e7e..9a422e25cc32 100644
--- a/svtools/inc/svtools/workingsetoptions.hxx
+++ b/unotools/inc/unotools/workingsetoptions.hxx
@@ -27,8 +27,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef INCLUDED_SVTOOLS_WORKINGSETOPTIONS_HXX
-#define INCLUDED_SVTOOLS_WORKINGSETOPTIONS_HXX
+#ifndef INCLUDED_unotools_WORKINGSETOPTIONS_HXX
+#define INCLUDED_unotools_WORKINGSETOPTIONS_HXX
 
 //_________________________________________________________________________________________________________________
 //  includes
@@ -38,7 +38,7 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustring.hxx>
-#include <svtools/options.hxx>
+#include <unotools/options.hxx>
 
 //_________________________________________________________________________________________________________________
 //  forward declarations
@@ -67,7 +67,7 @@ class SvtWorkingSetOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SvtWorkingSetOptions: public svt::detail::Options
+class SvtWorkingSetOptions: public utl::detail::Options
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -156,4 +156,4 @@ class SvtWorkingSetOptions: public svt::detail::Options
 
 };      // class SvtWorkingSetOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_WORKINGSETOPTIONS_HXX
+#endif  // #ifndef INCLUDED_unotools_WORKINGSETOPTIONS_HXX
diff --git a/svtools/inc/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx
index 00967b234111..8b975f2a26ff 100644
--- a/svtools/inc/xmlaccelcfg.hxx
+++ b/unotools/inc/unotools/xmlaccelcfg.hxx
@@ -28,15 +28,15 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SVTOOLS_XMLACCELCFG_HXX
-#define INCLUDED_SVTOOLS_XMLACCELCFG_HXX
+#ifndef INCLUDED_unotools_XMLACCELCFG_HXX
+#define INCLUDED_unotools_XMLACCELCFG_HXX
 
 #ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #endif
 #include <cppuhelper/weak.hxx>
 
-#include <svtools/accelcfg.hxx>
+#include <unotools/accelcfg.hxx>
 
 class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler,
                                       public ::cppu::OWeakObject
@@ -109,4 +109,4 @@ class OWriteAccelatorDocumentHandler
         const SvtAcceleratorItemList&                           m_aWriteAcceleratorList;
 };
 
-#endif // INCLUDED_SVTOOLS_XMLACCELCFG_HXX
+#endif // INCLUDED_unotools_XMLACCELCFG_HXX
diff --git a/svtools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index 6daa1a9491a2..f911b36e83fe 100644
--- a/svtools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 #include "rtl/instance.hxx"
@@ -50,9 +50,9 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <svtools/accelcfg.hxx>
-#include "xmlaccelcfg.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/accelcfg.hxx>
+#include <unotools/xmlaccelcfg.hxx>
+#include <unotools/pathoptions.hxx>
 #include "itemholder1.hxx"
 
 
diff --git a/svtools/source/config/cacheoptions.cxx b/unotools/source/config/cacheoptions.cxx
index 39b2b2c74085..dc8031ea0078 100644
--- a/svtools/source/config/cacheoptions.cxx
+++ b/unotools/source/config/cacheoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include "cacheoptions.hxx"
+#include <unotools/cacheoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -94,6 +94,7 @@ public:
 //---------------------------------------------------------------------------------------------------------
 
     virtual void    Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
 //---------------------------------------------------------------------------------------------------------
 //  public interface
@@ -247,6 +248,10 @@ void SvtCacheOptions_Impl::Commit()
     PutProperties( aSeqNames, aSeqValues );
 }
 
+void SvtCacheOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
+{
+}
+
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
diff --git a/svtools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 356b6782b892..421b201d98c0 100644
--- a/svtools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index a55aff0c90f8..46967eb7b43d 100644
--- a/svtools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/compatibility.hxx>
+#include <unotools/compatibility.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index a6b3bbaa1e2f..3d70f99f4ec0 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -33,6 +33,7 @@
 #include "unotools/configitem.hxx"
 #include "unotools/configmgr.hxx"
 #include "unotools/configpathes.hxx"
+#include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
@@ -43,12 +44,13 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/XRequestCallback.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/XStringEscape.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <osl/diagnose.h>
-
+#include <tools/solarmutex.hxx>
 #include <rtl/ustrbuf.hxx>
 
 using namespace utl;
@@ -81,15 +83,22 @@ catch(Exception& rEx)   \
     #define CATCH_INFO(a) catch(Exception& ){}
 #endif
 
+/*
+    The ConfigChangeListener_Impl receives notifications from the configuration about changes that
+    have happened. It forwards this notification to the ConfigItem it knows a pParent by calling its
+    "CallNotify" method. As ConfigItems are most probably not thread safe, the SolarMutex is acquired
+    before doing so.
+*/
+
 namespace utl{
     class ConfigChangeListener_Impl : public cppu::WeakImplHelper1
     <
         com::sun::star::util::XChangesListener
     >
     {
+        public:
             ConfigItem*                 pParent;
             const Sequence< OUString >  aPropertyNames;
-        public:
             ConfigChangeListener_Impl(ConfigItem& rItem, const Sequence< OUString >& rNames);
             ~ConfigChangeListener_Impl();
 
@@ -98,7 +107,6 @@ namespace utl{
 
         //XEventListener
         virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException);
-
     };
 /* -----------------------------12.02.01 11:38--------------------------------
 
@@ -208,12 +216,17 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th
         if(lcl_Find(sTemp, pCheckPropertyNames, aPropertyNames.getLength()))
             pNames[nNotify++] = sTemp;
     }
-    if(nNotify)
+    if( nNotify )
     {
-        aChangedNames.realloc(nNotify);
-        pParent->CallNotify(aChangedNames);
+        if ( ::tools::SolarMutex::Acquire() )
+        {
+            aChangedNames.realloc(nNotify);
+            pParent->CallNotify(aChangedNames);
+            ::tools::SolarMutex::Release();
+        }
     }
 }
+
 /* -----------------------------29.08.00 16:34--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -274,13 +287,6 @@ ConfigItem::~ConfigItem()
 /* -----------------------------29.08.00 12:52--------------------------------
 
  ---------------------------------------------------------------------------*/
-void    ConfigItem::Commit()
-{
-    OSL_ENSURE(sal_False, "Base class called");
-}
-/* -----------------------------29.08.00 12:52--------------------------------
-
- ---------------------------------------------------------------------------*/
 void    ConfigItem::ReleaseConfigMgr()
 {
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
@@ -302,16 +308,13 @@ void    ConfigItem::ReleaseConfigMgr()
  ---------------------------------------------------------------------------*/
 void ConfigItem::CallNotify( const com::sun::star::uno::Sequence<OUString>& rPropertyNames )
 {
+    // the call is forwarded to the virtual Notify() method
+    // it is pure virtual, so all classes deriving from ConfigItem have to decide how they
+    // want to notify listeners
     if(!IsInValueChange() || pImpl->bEnableInternalNotification)
         Notify(rPropertyNames);
 }
-/* -----------------------------29.08.00 12:52--------------------------------
 
- ---------------------------------------------------------------------------*/
-void ConfigItem::Notify( const com::sun::star::uno::Sequence<OUString>& /*rPropertyNames*/)
-{
-    OSL_ENSURE(sal_False, "Base class called");
-}
 /* -----------------------------12.12.00 17:09--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -1420,4 +1423,3 @@ void ConfigItem::UnlockTree()
 }
 
 
-
diff --git a/svtools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index fbbcf60a11a6..baaa4a220a93 100644
--- a/svtools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#include <svtools/defaultoptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/defaultoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <tools/debug.hxx>
@@ -111,6 +111,8 @@ public:
                     SvtDefaultOptions_Impl();
 
     String          GetDefaultPath( USHORT nId ) const;
+    virtual void    Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 };
 
 // global ----------------------------------------------------------------
@@ -189,6 +191,16 @@ Sequence< OUString > GetDefaultPropertyNames()
     return aNames;
 }
 
+void SvtDefaultOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
+{
+    // no notification, will never be changed
+}
+
+void SvtDefaultOptions_Impl::Commit()
+{
+    // will never be changed
+}
+
 // class SvtDefaultOptions_Impl ------------------------------------------
 
 String SvtDefaultOptions_Impl::GetDefaultPath( USHORT nId ) const
diff --git a/svtools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 7b60a1c3716c..d3fca4350a67 100644
--- a/svtools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,8 +37,8 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/dynamicmenuoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 6026c3d4a3a0..3155f4ac2fa7 100644
--- a/svtools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#include "eventcfg.hxx"
+#include <unotools/eventcfg.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 2f3c57ea4748..b4d21f79246b 100644
--- a/svtools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -45,7 +45,7 @@
 #include <tools/wldcrd.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <hash_map>
 
@@ -447,7 +447,7 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions()
     // ... and initialize ouer data container only if it not already exist!
     if( m_pDataContainer == NULL )
     {
-       RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtExtendedSecurityOptions_Impl::ctor()");
+       RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtExtendedSecurityOptions_Impl::ctor()");
        m_pDataContainer = new SvtExtendedSecurityOptions_Impl;
 
         ItemHolder1::holdConfigItem(E_EXTENDEDSECURITYOPTIONS);
diff --git a/svtools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 056826bf62ba..a0870ff6a8a5 100644
--- a/svtools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#include "fltrcfg.hxx"
+#include <unotools/fltrcfg.hxx>
 #include <tools/debug.hxx>
 
 #include <rtl/logfile.hxx>
@@ -81,6 +81,7 @@ public:
         bSaveVBA(sal_False)  {}
     ~SvtAppFilterOptions_Impl();
     virtual void            Commit();
+    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
     void                    Load();
 
     sal_Bool                IsLoad() const {return bLoadVBA;}
@@ -125,6 +126,13 @@ void    SvtAppFilterOptions_Impl::Commit()
 
     PutProperties(aNames, aValues);
 }
+
+void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
+{
+    // no listeners supported yet
+}
+
+
 /* -----------------------------22.01.01 10:38--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -280,7 +288,7 @@ SvtFilterOptions::SvtFilterOptions() :
     ConfigItem( C2U("Office.Common/Filter/Microsoft") ),
     pImp(new SvtFilterOptions_Impl)
 {
-    RTL_LOGFILE_CONTEXT(aLog, "svtools SvtFilterOptions::SvtFilterOptions()");
+    RTL_LOGFILE_CONTEXT(aLog, "unotools SvtFilterOptions::SvtFilterOptions()");
     EnableNotification(GetPropertyNames());
     Load();
 }
diff --git a/vcl/source/gdi/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 68d3b499341d..3ee556f372c7 100644
--- a/vcl/source/gdi/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -29,18 +29,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-#include <vcl/fontcfg.hxx>
-#include <vcl/configsettings.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/unohelp.hxx>
+#include "precompiled_unotools.hxx"
+#include <unotools/fontcfg.hxx>
+#include <unotools/fontdefs.hxx>
+#include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <unotools/configpathes.hxx>
+#include <unotools/syslocale.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/debug.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
@@ -52,9 +51,7 @@
 
 #define DEFAULTFONT_CONFIGNODE "VCL/DefaultFonts"
 #define SUBSTFONT_CONFIGNODE "VCL/FontSubstitutions"
-#define SETTINGS_CONFIGNODE "VCL/Settings"
 
-using namespace vcl;
 using namespace rtl;
 using namespace utl;
 using namespace com::sun::star::uno;
@@ -62,6 +59,9 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
+static DefaultFontConfiguration* mpDefaultFontConfiguration = 0;
+
+static FontSubstConfiguration* mpFontSubstConfiguration = 0;
 
 /*
  * DefaultFontConfiguration
@@ -102,10 +102,9 @@ static const char* getKeyType( int nKeyType )
 
 DefaultFontConfiguration* DefaultFontConfiguration::get()
 {
-    ImplSVData* pSVData = ImplGetSVData();
-    if( ! pSVData->maGDIData.mpDefaultFontConfiguration )
-        pSVData->maGDIData.mpDefaultFontConfiguration = new DefaultFontConfiguration();
-    return pSVData->maGDIData.mpDefaultFontConfiguration;
+    if( !mpDefaultFontConfiguration )
+        mpDefaultFontConfiguration = new DefaultFontConfiguration();
+    return mpDefaultFontConfiguration;
 }
 
 DefaultFontConfiguration::DefaultFontConfiguration()
@@ -113,7 +112,7 @@ DefaultFontConfiguration::DefaultFontConfiguration()
     try
     {
         // get service provider
-        Reference< XMultiServiceFactory > xSMgr( unohelper::GetMultiServiceFactory() );
+        Reference< XMultiServiceFactory > xSMgr( comphelper::getProcessServiceFactory() );
         // create configuration hierachical access name
         if( xSMgr.is() )
         {
@@ -271,7 +270,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale )
 {
     Locale aLocale = rLocale;
     if( ! aLocale.Language.getLength() )
-        aLocale = Application::GetSettings().GetUILocale();
+        aLocale = SvtSysLocale().GetUILocale();
 
     OUString aUIFont = getDefaultFont( aLocale, DEFAULTFONT_UI_SANS );
 
@@ -378,10 +377,9 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale )
 
 FontSubstConfiguration* FontSubstConfiguration::get()
 {
-    ImplSVData* pSVData = ImplGetSVData();
-    if( ! pSVData->maGDIData.mpFontSubstConfiguration )
-        pSVData->maGDIData.mpFontSubstConfiguration = new FontSubstConfiguration();
-    return pSVData->maGDIData.mpFontSubstConfiguration;
+    if( !mpFontSubstConfiguration )
+        mpFontSubstConfiguration = new FontSubstConfiguration();
+    return mpFontSubstConfiguration;
 }
 
 /*
@@ -394,7 +392,7 @@ FontSubstConfiguration::FontSubstConfiguration() :
     try
     {
         // get service provider
-        Reference< XMultiServiceFactory > xSMgr( unohelper::GetMultiServiceFactory() );
+        Reference< XMultiServiceFactory > xSMgr( comphelper::getProcessServiceFactory() );
         // create configuration hierachical access name
         if( xSMgr.is() )
         {
@@ -1192,7 +1190,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const String& rFontNam
     aLocale.Variant = rLocale.Variant.toAsciiUpperCase();
 
     if( ! aLocale.Language.getLength() )
-        aLocale = Application::GetSettings().GetUILocale();
+        aLocale = SvtSysLocale().GetUILocale();
 
     while( aLocale.Language.getLength() )
     {
@@ -1220,162 +1218,3 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const String& rFontNam
     return NULL;
 }
 
-/*
- *  SettingsConfigItem::get
- */
-
-SettingsConfigItem* SettingsConfigItem::get()
-{
-    ImplSVData* pSVData = ImplGetSVData();
-    if( ! pSVData->mpSettingsConfigItem )
-        pSVData->mpSettingsConfigItem = new SettingsConfigItem();
-    return pSVData->mpSettingsConfigItem;
-}
-
-/*
- *  SettignsConfigItem constructor
- */
-
-SettingsConfigItem::SettingsConfigItem()
-        :
-        ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( SETTINGS_CONFIGNODE ) ),
-                    CONFIG_MODE_DELAYED_UPDATE ),
-    m_aSettings( 0 )
-{
-    getValues();
-}
-
-/*
- *  SettingsConfigItem destructor
- */
-
-SettingsConfigItem::~SettingsConfigItem()
-{
-    if( IsModified() )
-        Commit();
-}
-
-/*
- *  SettingsConfigItem::Commit
- */
-
-void SettingsConfigItem::Commit()
-{
-    if( ! IsValidConfigMgr() )
-        return;
-
-    std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group;
-
-    for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group )
-    {
-        String aKeyName( group->first );
-        /*sal_Bool bAdded =*/ AddNode( OUString(), aKeyName );
-        Sequence< PropertyValue > aValues( group->second.size() );
-        PropertyValue* pValues = aValues.getArray();
-        int nIndex = 0;
-        SmallOUStrMap::const_iterator it;
-        for( it = group->second.begin(); it != group->second.end(); ++it )
-        {
-            String aName( aKeyName );
-            aName.Append( '/' );
-            aName.Append( String( it->first ) );
-            pValues[nIndex].Name    = aName;
-            pValues[nIndex].Handle  = 0;
-            pValues[nIndex].Value <<= it->second;
-            pValues[nIndex].State   = PropertyState_DIRECT_VALUE;
-            nIndex++;
-        }
-        ReplaceSetProperties( aKeyName, aValues );
-    }
-}
-
-/*
- *  SettingsConfigItem::Notify
- */
-
-void SettingsConfigItem::Notify( const Sequence< OUString >& )
-{
-    getValues();
-}
-
-/*
- *  SettingsConfigItem::getValues
- */
-void SettingsConfigItem::getValues()
-{
-    if( ! IsValidConfigMgr() )
-        return;
-
-    m_aSettings.clear();
-
-    Sequence< OUString > aNames( GetNodeNames( OUString() ) );
-    m_aSettings.resize( aNames.getLength() );
-
-    for( int j = 0; j < aNames.getLength(); j++ )
-    {
-#if OSL_DEBUG_LEVEL > 2
-        fprintf( stderr, "found settings data for \"%s\"\n",
-                 OUStringToOString( aNames.getConstArray()[j], RTL_TEXTENCODING_ASCII_US ).getStr()
-                 );
-#endif
-        String aKeyName( aNames.getConstArray()[j] );
-        Sequence< OUString > aKeys( GetNodeNames( aKeyName ) );
-        Sequence< OUString > aSettingsKeys( aKeys.getLength() );
-        const OUString* pFrom = aKeys.getConstArray();
-        OUString* pTo = aSettingsKeys.getArray();
-        for( int m = 0; m < aKeys.getLength(); m++ )
-        {
-            String aName( aKeyName );
-            aName.Append( '/' );
-            aName.Append( String( pFrom[m] ) );
-            pTo[m] = aName;
-        }
-        Sequence< Any > aValues( GetProperties( aSettingsKeys ) );
-        const Any* pValue = aValues.getConstArray();
-        for( int i = 0; i < aValues.getLength(); i++, pValue++ )
-        {
-            if( pValue->getValueTypeClass() == TypeClass_STRING )
-            {
-                const OUString* pLine = (const OUString*)pValue->getValue();
-                if( pLine->getLength() )
-                    m_aSettings[ aKeyName ][ pFrom[i] ] = *pLine;
-#if OSL_DEBUG_LEVEL > 2
-                fprintf( stderr, "   \"%s\"=\"%.30s\"\n",
-                         OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(),
-                         OUStringToOString( *pLine, RTL_TEXTENCODING_ASCII_US ).getStr()
-                         );
-#endif
-            }
-        }
-    }
-}
-
-/*
- *  SettingsConfigItem::getDefaultFont
- */
-
-const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const
-{
-    ::std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
-    if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() )
-    {
-        static OUString aEmpty;
-        return aEmpty;
-    }
-    return group->second.find(rKey)->second;
-}
-
-/*
- *  SettingsConfigItem::setDefaultFont
- */
-
-void SettingsConfigItem::setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue )
-{
-    bool bModified = m_aSettings[ rGroup ][ rKey ] != rValue;
-    if( bModified )
-    {
-        m_aSettings[ rGroup ][ rKey ] = rValue;
-        SetModified();
-    }
-}
-
diff --git a/svtools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index 1044344ff567..ac7fd2a94b62 100644
--- a/svtools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/fontoptions.hxx>
+#include <unotools/fontoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -409,7 +409,7 @@ SvtFontOptions::SvtFontOptions()
     // ... and initialize ouer data container only if it not already exist!
     if( m_pDataContainer == NULL )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtFontOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtFontOptions_Impl::ctor()");
         m_pDataContainer = new SvtFontOptions_Impl;
 
         ItemHolder1::holdConfigItem(E_FONTOPTIONS);
diff --git a/svtools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 758753df0e4e..0a28884e24c2 100644
--- a/svtools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,8 +37,8 @@
 // includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/historyoptions.hxx>
-#include "configitems/historyoptions_const.hxx"
+#include <unotools/historyoptions.hxx>
+#include <unotools/historyoptions_const.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -81,7 +81,7 @@
 #endif
 
 #ifndef _SVT_LOGHELPER_HXX
-#include "loghelper.hxx"
+#include <unotools/loghelper.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
@@ -648,7 +648,7 @@ SvtHistoryOptions::SvtHistoryOptions()
     // ... and initialize ouer data container only if it not already exist!
     if( m_pDataContainer == NULL )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtHistoryOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtHistoryOptions_Impl::ctor()");
         m_pDataContainer = new SvtHistoryOptions_Impl;
 
         ItemHolder1::holdConfigItem(E_HISTORYOPTIONS);
diff --git a/svtools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 109c2d94ada7..13c72d73152d 100644
--- a/svtools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/inetoptions.hxx>
+#include "precompiled_unotools.hxx"
+#include <unotools/inetoptions.hxx>
 #include "rtl/instance.hxx"
 #include <tools/urlobj.hxx>
 #ifndef _WILDCARD_HXX
@@ -419,7 +419,7 @@ SvtInetOptions::SvtInetOptions()
     osl::MutexGuard aGuard(LocalSingleton::get());
     if (!m_pImpl)
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtInetOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtInetOptions_Impl::ctor()");
         m_pImpl = new Impl;
 
         ItemHolder1::holdConfigItem(E_INETOPTIONS);
diff --git a/svtools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx
index dc8cc7c34772..54dce3d7094b 100644
--- a/svtools/source/config/internaloptions.cxx
+++ b/unotools/source/config/internaloptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -39,7 +39,7 @@
 
 #include <deque>
 
-#include <svtools/internaloptions.hxx>
+#include <unotools/internaloptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -514,7 +514,7 @@ SvtInternalOptions::SvtInternalOptions()
     // ... and initialize ouer data container only if it not already!
     if( m_pDataContainer == NULL )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtInternalOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtInternalOptions_Impl::ctor()");
         m_pDataContainer = new SvtInternalOptions_Impl();
 
         ItemHolder1::holdConfigItem(E_INTERNALOPTIONS);
diff --git a/svtools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 37a57259c807..214b5a9b4276 100644
--- a/svtools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
 #include "itemholder1.hxx"
 
@@ -38,38 +38,40 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 
-#include <svtools/accelcfg.hxx>
-#include <svtools/addxmltostorageoptions.hxx>
-#include <cacheoptions.hxx>
-#include <svtools/cmdoptions.hxx>
-#include <svtools/compatibility.hxx>
-#include <svtools/defaultoptions.hxx>
-#include <svtools/dynamicmenuoptions.hxx>
-#include <eventcfg.hxx>
-#include <svtools/extendedsecurityoptions.hxx>
-#include <fltrcfg.hxx>
-#include <svtools/fontoptions.hxx>
-#include <svtools/historyoptions.hxx>
-#include <svtools/inetoptions.hxx>
-#include <svtools/internaloptions.hxx>
-#include <javaoptions.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/localisationoptions.hxx>
-#include <svtools/menuoptions.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/printwarningoptions.hxx>
-#include <regoptions.hxx>
-#include <svtools/optionsdlg.hxx>
-#include <svtools/saveopt.hxx>
-#include <searchopt.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/sourceviewconfig.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/viewoptions.hxx>
-#include <svtools/workingsetoptions.hxx>
-#include <xmlaccelcfg.hxx>
-#include <svtools/options.hxx>
+#include <unotools/misccfg.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/accelcfg.hxx>
+#include <unotools/cacheoptions.hxx>
+#include <unotools/cmdoptions.hxx>
+#include <unotools/compatibility.hxx>
+#include <unotools/defaultoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
+#include <unotools/eventcfg.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
+#include <unotools/fltrcfg.hxx>
+#include <unotools/fontoptions.hxx>
+#include <unotools/historyoptions.hxx>
+#include <unotools/inetoptions.hxx>
+#include <unotools/internaloptions.hxx>
+#include <unotools/javaoptions.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/localisationoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/printwarningoptions.hxx>
+#include <unotools/regoptions.hxx>
+#include <unotools/optionsdlg.hxx>
+#include <unotools/saveopt.hxx>
+#include <unotools/searchopt.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/sourceviewconfig.hxx>
+#include <unotools/startoptions.hxx>
+#include <unotools/viewoptions.hxx>
+#include <unotools/workingsetoptions.hxx>
+#include <unotools/xmlaccelcfg.hxx>
+#include <unotools/options.hxx>
+#include <unotools/syslocaleoptions.hxx>
 
 //-----------------------------------------------
 // namespaces
@@ -180,10 +182,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem)
             rItem.pItem = new SvtAcceleratorConfiguration();
             break;
 
-        case E_ADDXMLTOSTORAGEOPTIONS :
-            rItem.pItem = new SvtAddXMLToStorageOptions();
-            break;
-
         case E_CMDOPTIONS :
             rItem.pItem = new SvtCommandOptions();
             break;
@@ -240,10 +238,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem)
             rItem.pItem = new SvtLocalisationOptions();
             break;
 
-        case E_MENUOPTIONS :
-            rItem.pItem = new SvtMenuOptions();
-            break;
-
         case E_MODULEOPTIONS :
             rItem.pItem = new SvtModuleOptions();
             break;
@@ -260,8 +254,8 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem)
             rItem.pItem = new SvtPrintWarningOptions();
             break;
 
-        case E_REGOPTIONS :
-// no ref count            rItem.pItem = new ::svt::RegOptions();
+        case E_MISCCFG :
+            rItem.pItem = new ::utl::MiscCfg();
             break;
 
         case E_SAVEOPTIONS :
@@ -277,7 +271,7 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem)
             break;
 
         case E_SOURCEVIEWCONFIG :
-            rItem.pItem = new ::svt::SourceViewConfig();
+            rItem.pItem = new ::utl::SourceViewConfig();
             break;
 
         case E_STARTOPTIONS :
@@ -307,6 +301,19 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem)
         case E_XMLACCELCFG :
             // ??? TODO
             break;
+
+        case E_UNDOOPTIONS :
+            rItem.pItem = new SvtUndoOptions();
+            break;
+
+        case E_USEROPTIONS :
+            rItem.pItem = new SvtUserOptions();
+            break;
+
+        case E_SYSLOCALEOPTIONS :
+            rItem.pItem = new SvtSysLocaleOptions();
+            break;
+
         default:
             OSL_ASSERT( "unknown item type" );
             break;
diff --git a/svtools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx
index b040292ab5c6..89a5bc3da299 100644
--- a/svtools/source/config/itemholder1.hxx
+++ b/unotools/source/config/itemholder1.hxx
@@ -28,13 +28,13 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SVTOOLS_ITEMHOLDER1_HXX_
-#define INCLUDED_SVTOOLS_ITEMHOLDER1_HXX_
+#ifndef INCLUDED_unotools_ITEMHOLDER1_HXX_
+#define INCLUDED_unotools_ITEMHOLDER1_HXX_
 
 //-----------------------------------------------
 // includes
 
-#include "itemholderbase.hxx"
+#include <unotools/itemholderbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 
@@ -89,4 +89,4 @@ class ItemHolder1 : private ItemHolderMutexBase
 
 #undef css
 
-#endif // INCLUDED_SVTOOLS_ITEMHOLDER1_HXX_
+#endif // INCLUDED_unotools_ITEMHOLDER1_HXX_
diff --git a/svtools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx
index 7915f0042614..0eec89a31782 100644
--- a/svtools/source/config/javaoptions.cxx
+++ b/unotools/source/config/javaoptions.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
-#ifndef _SVTOOLS_JAVAPTIONS_HXX
-#include <javaoptions.hxx>
+#ifndef _unotools_JAVAPTIONS_HXX
+#include <unotools/javaoptions.hxx>
 #endif
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -57,6 +57,7 @@ public:
     SvtExecAppletsItem_Impl();
 
     virtual void    Commit();
+    void Notify( const Sequence< rtl::OUString >&  );
 
     sal_Bool IsExecuteApplets() const {return bExecute;}
     void     SetExecuteApplets(sal_Bool bSet);
@@ -82,7 +83,7 @@ SvtExecAppletsItem_Impl::SvtExecAppletsItem_Impl() :
         bExecute       (sal_False                       ),
         bRO            (CFG_READONLY_DEFAULT            )
 {
-    RTL_LOGFILE_CONTEXT(aLog, "svtools SvtExecAppletsItem_Impl::SvtExecAppletsItem_Impl()");
+    RTL_LOGFILE_CONTEXT(aLog, "unotools SvtExecAppletsItem_Impl::SvtExecAppletsItem_Impl()");
 
     Sequence< OUString > aNames(1);
     aNames.getArray()[0] = C2U("Enable");
@@ -108,6 +109,10 @@ void    SvtExecAppletsItem_Impl::Commit()
     PutProperties(aNames, aValues);
 }
 
+void SvtExecAppletsItem_Impl::Notify( const Sequence< rtl::OUString >&  )
+{
+    // no listeners supported yet
+}
 
 struct SvtJavaOptions_Impl
 {
@@ -147,7 +152,7 @@ SvtJavaOptions::SvtJavaOptions() :
     utl::ConfigItem(C2U("Office.Java/VirtualMachine")),
     pImpl(new SvtJavaOptions_Impl)
 {
-    RTL_LOGFILE_CONTEXT(aLog, "svtools SvtJavaOptions::SvtJavaOptions()");
+    RTL_LOGFILE_CONTEXT(aLog, "unotools SvtJavaOptions::SvtJavaOptions()");
 
     Sequence< Any > aValues = GetProperties(pImpl->aPropertyNames);
     Sequence< sal_Bool > aROStates = GetReadOnlyStates(pImpl->aPropertyNames);
diff --git a/svtools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 2b4e4d482c3f..d4eff83efec6 100644
--- a/svtools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
 
 #include <com/sun/star/lang/Locale.hpp>
@@ -44,9 +44,9 @@
 #include <vos/mutex.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <svtools/lingucfg.hxx>
-#include <linguprops.hxx>
+#include <tools/string.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 
 #include <comphelper/processfactory.hxx>
 
@@ -229,6 +229,7 @@ SvtLinguConfigItem::~SvtLinguConfigItem()
 void SvtLinguConfigItem::Notify( const uno::Sequence< OUString > &rPropertyNames )
 {
     LoadOptions( rPropertyNames );
+    NotifyListeners(0);
 }
 
 
@@ -573,6 +574,7 @@ BOOL SvtLinguConfigItem::SetProperty( INT32 nPropertyHandle, const uno::Any &rVa
     if (bMod)
         SetModified();
 
+    NotifyListeners(0);
     return bSucc;
 }
 
@@ -592,6 +594,7 @@ BOOL SvtLinguConfigItem::SetOptions( const SvtLinguOptions &rOptions )
 
     aOpt = rOptions;
     SetModified();
+    NotifyListeners(0);
     return TRUE;
 }
 
@@ -1055,8 +1058,6 @@ static uno::Reference< util::XMacroExpander > lcl_GetMacroExpander()
     uno::Reference< util::XMacroExpander > xMacroExpander( aG_xMacroExpander );
     if ( !xMacroExpander.is() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
         if ( !xMacroExpander.is() )
         {
             uno::Reference< uno::XComponentContext > xContext;
diff --git a/svtools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index aab7ab17b1ea..2ac2524e7d08 100644
--- a/svtools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/localisationoptions.hxx>
+#include <unotools/localisationoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -271,6 +271,8 @@ void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropert
         else DBG_ASSERT( sal_False, "SvtLocalisationOptions_Impl::Notify()\nUnkown property detected ... I can't handle these!\n" );
         #endif
     }
+
+    NotifyListeners(0);
 }
 
 //*****************************************************************************************************************
@@ -372,7 +374,7 @@ SvtLocalisationOptions::SvtLocalisationOptions()
     // ... and initialize ouer data container only if it not already exist!
     if( m_pDataContainer == NULL )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtLocalisationOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtLocalisationOptions_Impl::ctor()");
         m_pDataContainer = new SvtLocalisationOptions_Impl;
 
         ItemHolder1::holdConfigItem(E_LOCALISATIONOPTIONS);
diff --git a/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk
index bd5a1b16512f..de87d9503339 100644
--- a/unotools/source/config/makefile.mk
+++ b/unotools/source/config/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -45,13 +45,49 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files -------------------------------------
 
 SLOFILES=\
+        $(SLO)$/syslocaleoptions.obj \
         $(SLO)$/configvaluecontainer.obj \
         $(SLO)$/confignode.obj \
         $(SLO)$/configitem.obj \
         $(SLO)$/configmgr.obj  \
         $(SLO)$/configpathes.obj  \
         $(SLO)$/docinfohelper.obj  \
-        $(SLO)$/bootstrap.obj
+                $(SLO)$/bootstrap.obj \
+        $(SLO)$/accelcfg.obj                                \
+        $(SLO)$/cacheoptions.obj            \
+    $(SLO)$/cmdoptions.obj				\
+    $(SLO)$/compatibility.obj           \
+    $(SLO)$/defaultoptions.obj			\
+    $(SLO)$/dynamicmenuoptions.obj		\
+    $(SLO)$/eventcfg.obj                \
+    $(SLO)$/extendedsecurityoptions.obj \
+        $(SLO)$/fltrcfg.obj                             \
+    $(SLO)$/fontcfg.obj \
+    $(SLO)$/fontoptions.obj				\
+        $(SLO)$/historyoptions.obj                         \
+    $(SLO)$/inetoptions.obj				\
+    $(SLO)$/internaloptions.obj			\
+        $(SLO)$/itemholder1.obj \
+        $(SLO)$/javaoptions.obj             \
+        $(SLO)$/lingucfg.obj                \
+    $(SLO)$/localisationoptions.obj		\
+        $(SLO)$/misccfg.obj                             \
+        $(SLO)$/moduleoptions.obj           \
+        $(SLO)$/options.obj                     \
+        $(SLO)$/optionsdlg.obj              \
+        $(SLO)$/pathoptions.obj             \
+    $(SLO)$/printwarningoptions.obj		\
+    $(SLO)$/regoptions.obj				\
+    $(SLO)$/saveopt.obj					\
+    $(SLO)$/searchopt.obj				\
+    $(SLO)$/securityoptions.obj			\
+    $(SLO)$/sourceviewconfig.obj		\
+    $(SLO)$/startoptions.obj			\
+        $(SLO)$/undoopt.obj                 \
+        $(SLO)$/useroptions.obj      \
+    $(SLO)$/viewoptions.obj				\
+    $(SLO)$/workingsetoptions.obj		\
+        $(SLO)$/xmlaccelcfg.obj
 
 # --- Targets ----------------------------------
 
diff --git a/unotools/source/config/menuoptions.cxx b/unotools/source/config/menuoptions.cxx
new file mode 100644
index 000000000000..c885d5a1e81c
--- /dev/null
+++ b/unotools/source/config/menuoptions.cxx
@@ -0,0 +1,564 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: menuoptions.cxx,v $
+ * $Revision: 1.14 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_unotools.hxx"
+#ifndef GCC
+#endif
+
+//_________________________________________________________________________________________________________________
+//  includes
+//_________________________________________________________________________________________________________________
+
+#include <unotools/menuoptions.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/configitem.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <vcl/svapp.hxx>
+
+#include <rtl/logfile.hxx>
+#include "itemholder1.hxx"
+
+//_________________________________________________________________________________________________________________
+//  namespaces
+//_________________________________________________________________________________________________________________
+
+using namespace ::utl                   ;
+using namespace ::rtl                   ;
+using namespace ::osl                   ;
+using namespace ::com::sun::star::uno   ;
+
+//_________________________________________________________________________________________________________________
+//  const
+//_________________________________________________________________________________________________________________
+
+#define ROOTNODE_MENU                           OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu"  ))
+#define DEFAULT_DONTHIDEDISABLEDENTRIES         sal_False
+#define DEFAULT_FOLLOWMOUSE                     sal_True
+#define DEFAULT_MENUICONS                       2
+
+#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES    OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry"    ))
+#define PROPERTYNAME_FOLLOWMOUSE                OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse"              ))
+#define PROPERTYNAME_SHOWICONSINMENUES          OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues"        ))
+#define PROPERTYNAME_SYSTEMICONSINMENUES        OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus"     ))
+
+#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES  0
+#define PROPERTYHANDLE_FOLLOWMOUSE              1
+#define PROPERTYHANDLE_SHOWICONSINMENUES        2
+#define PROPERTYHANDLE_SYSTEMICONSINMENUES      3
+
+#define PROPERTYCOUNT                           4
+
+#include <tools/link.hxx>
+#include <tools/list.hxx>
+DECLARE_LIST( LinkList, Link * )
+
+//_________________________________________________________________________________________________________________
+//  private declarations!
+//_________________________________________________________________________________________________________________
+
+class SvtMenuOptions_Impl : public ConfigItem
+{
+    //-------------------------------------------------------------------------------------------------------------
+    //  private member
+    //-------------------------------------------------------------------------------------------------------------
+
+    private:
+        LinkList    aList;
+        sal_Bool    m_bDontHideDisabledEntries          ;   /// cache "DontHideDisabledEntries" of Menu section
+        sal_Bool    m_bFollowMouse                      ;   /// cache "FollowMouse" of Menu section
+        sal_Int16   m_nMenuIcons                        ;   /// cache "MenuIcons" of Menu section
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  public methods
+    //-------------------------------------------------------------------------------------------------------------
+
+    public:
+
+        //---------------------------------------------------------------------------------------------------------
+        //  constructor / destructor
+        //---------------------------------------------------------------------------------------------------------
+
+         SvtMenuOptions_Impl();
+        ~SvtMenuOptions_Impl();
+
+        void AddListener( const Link& rLink );
+        void RemoveListener( const Link& rLink );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  overloaded methods of baseclass
+        //---------------------------------------------------------------------------------------------------------
+
+        /*-****************************************************************************************************//**
+            @short      called for notify of configmanager
+            @descr      These method is called from the ConfigManager before application ends or from the
+                         PropertyChangeListener if the sub tree broadcasts changes. You must update your
+                        internal values.
+
+            @seealso    baseclass ConfigItem
+
+            @param      "seqPropertyNames" is the list of properties which should be updated.
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void Notify( const Sequence< OUString >& seqPropertyNames );
+
+        /*-****************************************************************************************************//**
+            @short      write changes to configuration
+            @descr      These method writes the changed values into the sub tree
+                        and should always called in our destructor to guarantee consistency of config data.
+
+            @seealso    baseclass ConfigItem
+
+            @param      -
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void Commit();
+
+        //---------------------------------------------------------------------------------------------------------
+        //  public interface
+        //---------------------------------------------------------------------------------------------------------
+
+        /*-****************************************************************************************************//**
+            @short      access method to get internal values
+            @descr      These method give us a chance to regulate acces to ouer internal values.
+                        It's not used in the moment - but it's possible for the feature!
+
+            @seealso    -
+
+            @param      -
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        sal_Bool    IsEntryHidingEnabled() const
+                    { return m_bDontHideDisabledEntries; }
+
+        sal_Bool    IsFollowMouseEnabled() const
+                    { return m_bFollowMouse; }
+
+        sal_Int16   GetMenuIconsState() const
+                    { return m_nMenuIcons; }
+
+        void        SetEntryHidingState ( sal_Bool bState )
+                    {
+                        m_bDontHideDisabledEntries = bState;
+                        SetModified();
+                        for ( USHORT n=0; n<aList.Count(); n++ )
+                            aList.GetObject(n)->Call( this );
+                        Commit();
+                    }
+
+        void        SetFollowMouseState ( sal_Bool bState )
+                    {
+                        m_bFollowMouse = bState;
+                        SetModified();
+                        for ( USHORT n=0; n<aList.Count(); n++ )
+                            aList.GetObject(n)->Call( this );
+                        Commit();
+                    }
+
+        void        SetMenuIconsState ( sal_Int16 bState    )
+                    {
+                        m_nMenuIcons = bState;
+                        SetModified();
+                        for ( USHORT n=0; n<aList.Count(); n++ )
+                            aList.GetObject(n)->Call( this );
+                        Commit();
+                    }
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  private methods
+    //-------------------------------------------------------------------------------------------------------------
+
+    private:
+
+        /*-****************************************************************************************************//**
+            @short      return list of fix key names of ouer configuration management which represent oue module tree
+            @descr      These methods return a static const list of key names. We need it to get needed values from our
+                        configuration management.
+
+            @seealso    -
+
+            @param      -
+            @return     A list of needed configuration keys is returned.
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        static Sequence< OUString > impl_GetPropertyNames();
+};
+
+//_________________________________________________________________________________________________________________
+//  definitions
+//_________________________________________________________________________________________________________________
+
+//*****************************************************************************************************************
+//  constructor
+//*****************************************************************************************************************
+SvtMenuOptions_Impl::SvtMenuOptions_Impl()
+    // Init baseclasses first
+    :   ConfigItem                  ( ROOTNODE_MENU                     )
+    // Init member then.
+    ,   m_bDontHideDisabledEntries  ( DEFAULT_DONTHIDEDISABLEDENTRIES   )
+    ,   m_bFollowMouse              ( DEFAULT_FOLLOWMOUSE               )
+    ,   m_nMenuIcons                ( DEFAULT_MENUICONS                 )
+{
+    // Use our static list of configuration keys to get his values.
+    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
+    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+
+    // Safe impossible cases.
+    // We need values from ALL configuration keys.
+    // Follow assignment use order of values in relation to our list of key names!
+    DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
+
+    sal_Bool bMenuIcons = true;
+    sal_Bool bSystemMenuIcons = true;
+
+    // Copy values from list in right order to ouer internal member.
+    sal_Int32 nPropertyCount    =   seqValues.getLength()   ;
+    sal_Int32 nProperty         =   0                       ;
+    for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
+    {
+        // Safe impossible cases.
+        // Check any for valid value.
+        DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" );
+        switch( nProperty )
+        {
+            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES :   {
+                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" );
+                                                                seqValues[nProperty] >>= m_bDontHideDisabledEntries;
+                                                            }
+                                                            break;
+
+            case PROPERTYHANDLE_FOLLOWMOUSE             :   {
+                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" );
+                                                                seqValues[nProperty] >>= m_bFollowMouse;
+                                                            }
+                                                            break;
+            case PROPERTYHANDLE_SHOWICONSINMENUES       :   {
+                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
+                                                                seqValues[nProperty] >>= bMenuIcons;
+                                                            }
+                                                            break;
+            case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
+                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
+                                                                seqValues[nProperty] >>= bSystemMenuIcons;
+                                                            }
+                                                            break;
+        }
+    }
+
+    m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+
+    EnableNotification( seqNames );
+}
+
+//*****************************************************************************************************************
+//  destructor
+//*****************************************************************************************************************
+SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
+{
+    // Flush data to configuration!
+    // User has no chance to do that.
+    if( IsModified() == sal_True )
+    {
+        Commit();
+    }
+
+    for ( USHORT n=0; n<aList.Count(); )
+        delete aList.Remove(n);
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
+{
+    // Use given list of updated properties to get his values from configuration directly!
+    Sequence< Any > seqValues = GetProperties( seqPropertyNames );
+    // Safe impossible cases.
+    // We need values from ALL notified configuration keys.
+    DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
+
+    sal_Bool bMenuIcons = true;
+    sal_Bool bSystemMenuIcons = true;
+
+    // Step over list of property names and get right value from coreesponding value list to set it on internal members!
+    sal_Int32 nCount = seqPropertyNames.getLength();
+    for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
+    {
+        if( seqPropertyNames[nProperty] == PROPERTYNAME_DONTHIDEDISABLEDENTRIES )
+        {
+            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" );
+            seqValues[nProperty] >>= m_bDontHideDisabledEntries;
+        }
+        else if( seqPropertyNames[nProperty] == PROPERTYNAME_FOLLOWMOUSE )
+        {
+            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" );
+            seqValues[nProperty] >>= m_bFollowMouse;
+        }
+        else if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWICONSINMENUES )
+        {
+            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
+            seqValues[nProperty] >>= bMenuIcons;
+        }
+        else if( seqPropertyNames[nProperty] == PROPERTYNAME_SYSTEMICONSINMENUES )
+        {
+            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
+            seqValues[nProperty] >>= bSystemMenuIcons;
+        }
+
+        #if OSL_DEBUG_LEVEL > 1
+        else DBG_ASSERT( sal_False, "SvtMenuOptions_Impl::Notify()\nUnkown property detected ... I can't handle these!\n" );
+        #endif
+    }
+
+    m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+
+    for ( USHORT n=0; n<aList.Count(); n++ )
+        aList.GetObject(n)->Call( this );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtMenuOptions_Impl::Commit()
+{
+    // Get names of supported properties, create a list for values and copy current values to it.
+    Sequence< OUString >    seqNames    = impl_GetPropertyNames();
+    sal_Int32               nCount      = seqNames.getLength();
+    Sequence< Any >         seqValues   ( nCount );
+    for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
+    {
+        switch( nProperty )
+        {
+            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES :   {
+                                                                seqValues[nProperty] <<= m_bDontHideDisabledEntries;
+                                                            }
+                                                            break;
+
+            case PROPERTYHANDLE_FOLLOWMOUSE             :   {
+                                                                seqValues[nProperty] <<= m_bFollowMouse;
+                                                            }
+                                                            break;
+            //Output cache of current setting as possibly modified by System Theme for older version
+            case PROPERTYHANDLE_SHOWICONSINMENUES       :   {
+                                                                seqValues[nProperty] <<=(sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
+                                                            }
+                                                            break;
+            case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
+                                                                seqValues[nProperty] <<= (m_nMenuIcons == 2 ? sal_True : sal_False) ;
+                                                            }
+                                                            break;
+        }
+    }
+    // Set properties in configuration.
+    PutProperties( seqNames, seqValues );
+}
+
+//*****************************************************************************************************************
+//  private method
+//*****************************************************************************************************************
+Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
+{
+    // Build static list of configuration key names.
+    static const OUString pProperties[] =
+    {
+        PROPERTYNAME_DONTHIDEDISABLEDENTRIES    ,
+        PROPERTYNAME_FOLLOWMOUSE                ,
+        PROPERTYNAME_SHOWICONSINMENUES          ,
+        PROPERTYNAME_SYSTEMICONSINMENUES
+    };
+    // Initialize return sequence with these list ...
+    static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
+    // ... and return it.
+    return seqPropertyNames;
+}
+
+void SvtMenuOptions_Impl::AddListener( const Link& rLink )
+{
+    aList.Insert( new Link( rLink ) );
+}
+
+void SvtMenuOptions_Impl::RemoveListener( const Link& rLink )
+{
+    for ( USHORT n=0; n<aList.Count(); n++ )
+    {
+        if ( (*aList.GetObject(n) ) == rLink )
+        {
+            delete aList.Remove(n);
+            break;
+        }
+    }
+}
+
+//*****************************************************************************************************************
+//  initialize static member
+//  DON'T DO IT IN YOUR HEADER!
+//  see definition for further informations
+//*****************************************************************************************************************
+SvtMenuOptions_Impl*    SvtMenuOptions::m_pDataContainer    = NULL  ;
+sal_Int32               SvtMenuOptions::m_nRefCount         = 0     ;
+
+//*****************************************************************************************************************
+//  constructor
+//*****************************************************************************************************************
+SvtMenuOptions::SvtMenuOptions()
+{
+    // Global access, must be guarded (multithreading!).
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    // Increase ouer refcount ...
+    ++m_nRefCount;
+    // ... and initialize ouer data container only if it not already!
+    if( m_pDataContainer == NULL )
+    {
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtMenuOptions_Impl::ctor()");
+        m_pDataContainer = new SvtMenuOptions_Impl();
+
+        ItemHolder1::holdConfigItem(E_MENUOPTIONS);
+    }
+}
+
+//*****************************************************************************************************************
+//  destructor
+//*****************************************************************************************************************
+SvtMenuOptions::~SvtMenuOptions()
+{
+    // Global access, must be guarded (multithreading!)
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    // Decrease ouer refcount.
+    --m_nRefCount;
+    // If last instance was deleted ...
+    // we must destroy ouer static data container!
+    if( m_nRefCount <= 0 )
+    {
+        delete m_pDataContainer;
+        m_pDataContainer = NULL;
+    }
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsEntryHidingEnabled();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsFollowMouseEnabled();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtMenuOptions::SetEntryHidingState( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetEntryHidingState( bState );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtMenuOptions::SetFollowMouseState( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetFollowMouseState( bState );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Int16 SvtMenuOptions::GetMenuIconsState() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetMenuIconsState();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetMenuIconsState( bState );
+}
+
+//*****************************************************************************************************************
+//  private method
+//*****************************************************************************************************************
+Mutex& SvtMenuOptions::GetOwnStaticMutex()
+{
+    // Initialize static mutex only for one time!
+    static Mutex* pMutex = NULL;
+    // If these method first called (Mutex not already exist!) ...
+    if( pMutex == NULL )
+    {
+        // ... we must create a new one. Protect follow code with the global mutex -
+        // It must be - we create a static variable!
+        MutexGuard aGuard( Mutex::getGlobalMutex() );
+        // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+        if( pMutex == NULL )
+        {
+            // Create the new mutex and set it for return on static variable.
+            static Mutex aMutex;
+            pMutex = &aMutex;
+        }
+    }
+    // Return new created or already existing mutex object.
+    return *pMutex;
+}
+
+void SvtMenuOptions::AddListener( const Link& rLink )
+{
+    m_pDataContainer->AddListener( rLink );
+}
+
+void SvtMenuOptions::RemoveListener( const Link& rLink )
+{
+    m_pDataContainer->RemoveListener( rLink );
+}
diff --git a/svtools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 06cc9b7446c0..a1c905d292f3 100644
--- a/svtools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -29,19 +29,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
-#include "misccfg.hxx"
-#include <svtools/zforlist.hxx>
+#include <unotools/misccfg.hxx>
+#include "rtl/instance.hxx"
+#include <unotools/configmgr.hxx>
+#include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
-
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/logfile.hxx>
-
+#include "itemholder1.hxx"
 
 #define DEFAULT_TAB 2000
 
@@ -52,6 +52,45 @@ using namespace rtl;
 using namespace com::sun::star::uno;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
+
+namespace utl
+{
+
+static SfxMiscCfg* pOptions = NULL;
+static sal_Int32 nRefCount = 0;
+
+class SfxMiscCfg : public utl::ConfigItem
+{
+    BOOL            bPaperSize;     // printer warnings
+    BOOL            bPaperOrientation;
+    BOOL            bNotFound;
+    sal_Int32       nYear2000;      // two digit year representation
+
+    const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+    void                    Load();
+
+public:
+    SfxMiscCfg( );
+    ~SfxMiscCfg( );
+
+    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void            Commit();
+
+    BOOL        IsNotFoundWarning()     const {return bNotFound;}
+    void        SetNotFoundWarning( BOOL bSet);
+
+    BOOL        IsPaperSizeWarning()    const {return bPaperSize;}
+    void        SetPaperSizeWarning(BOOL bSet);
+
+    BOOL        IsPaperOrientationWarning()     const {return bPaperOrientation;}
+    void        SetPaperOrientationWarning( BOOL bSet);
+
+                // 0 ... 99
+    sal_Int32   GetYear2000()           const { return nYear2000; }
+    void        SetYear2000( sal_Int32 nSet );
+
+};
+
 /*--------------------------------------------------------------------
      Beschreibung:
  --------------------------------------------------------------------*/
@@ -60,9 +99,9 @@ SfxMiscCfg::SfxMiscCfg() :
     bPaperSize(FALSE),
     bPaperOrientation (FALSE),
     bNotFound (FALSE),
-    nYear2000( SvNumberFormatter::GetYear2000Default() )
+    nYear2000( 1930 )
 {
-    RTL_LOGFILE_CONTEXT(aLog, "svtools SfxMiscCfg::SfxMiscCfg()");
+    RTL_LOGFILE_CONTEXT(aLog, "svl SfxMiscCfg::SfxMiscCfg()");
 
     Load();
 }
@@ -192,4 +231,83 @@ void SfxMiscCfg::Commit()
     }
     PutProperties(aNames, aValues);
 }
+// -----------------------------------------------------------------------
+namespace
+{
+    class LocalSingleton : public rtl::Static< osl::Mutex, LocalSingleton >
+    {
+    };
+}
+
+MiscCfg::MiscCfg( )
+{
+    // Global access, must be guarded (multithreading)
+    ::osl::MutexGuard aGuard( LocalSingleton::get() );
+    if ( !pOptions )
+    {
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) SfxMiscCfg::ctor()");
+        pOptions = new SfxMiscCfg;
+
+        ItemHolder1::holdConfigItem(E_MISCCFG);
+    }
+
+    ++nRefCount;
+    pImpl = pOptions;
+    pImpl->AddListener(this);
+}
+
+MiscCfg::~MiscCfg( )
+{
+    // Global access, must be guarded (multithreading)
+    ::osl::MutexGuard aGuard( LocalSingleton::get() );
+    pImpl->RemoveListener(this);
+    if ( !--nRefCount )
+    {
+        if ( pOptions->IsModified() )
+            pOptions->Commit();
+        DELETEZ( pOptions );
+    }
+}
+
+BOOL MiscCfg::IsNotFoundWarning()   const
+{
+    return pImpl->IsNotFoundWarning();
+}
+
+void MiscCfg::SetNotFoundWarning(   BOOL bSet)
+{
+    pImpl->SetNotFoundWarning( bSet );
+}
+
+BOOL MiscCfg::IsPaperSizeWarning()  const
+{
+    return pImpl->IsPaperSizeWarning();
+}
+
+void MiscCfg::SetPaperSizeWarning(BOOL bSet)
+{
+    pImpl->SetPaperSizeWarning( bSet );
+}
+
+BOOL MiscCfg::IsPaperOrientationWarning()   const
+{
+    return pImpl->IsPaperOrientationWarning();
+}
+
+void MiscCfg::SetPaperOrientationWarning(   BOOL bSet)
+{
+    pImpl->SetPaperOrientationWarning( bSet );
+}
+
+sal_Int32 MiscCfg::GetYear2000() const
+{
+    return pImpl->GetYear2000();
+}
+
+void MiscCfg::SetYear2000( sal_Int32 nSet )
+{
+    pImpl->SetYear2000( nSet );
+}
+
+}
 
diff --git a/svtools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index fda0967d65ed..f966d4415558 100644
--- a/svtools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
@@ -1120,7 +1120,7 @@ SvtModuleOptions::SvtModuleOptions()
     ++m_nRefCount;
     if( m_nRefCount == 1 )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtModuleOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtModuleOptions_Impl::ctor()");
         m_pDataContainer = new SvtModuleOptions_Impl(this);
 
         ItemHolder1::holdConfigItem(E_MODULEOPTIONS);
diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx
new file mode 100755
index 000000000000..7c004e1475a6
--- /dev/null
+++ b/unotools/source/config/options.cxx
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: options.cxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_unotools.hxx"
+
+#include "sal/config.h"
+#include <tools/list.hxx>
+#include <unotools/options.hxx>
+
+namespace utl
+{
+    DECLARE_LIST( IMPL_ConfigurationListenerList, ConfigurationListener* )
+}
+
+using utl::detail::Options;
+using utl::ConfigurationBroadcaster;
+
+ConfigurationBroadcaster::ConfigurationBroadcaster()
+: mpList(0)
+, m_nBroadcastBlocked( 0 )
+, m_nBlockedHint( 0 )
+{
+}
+
+ConfigurationBroadcaster::~ConfigurationBroadcaster()
+{
+    delete mpList;
+}
+
+void ConfigurationBroadcaster::AddListener( utl::ConfigurationListener* pListener )
+{
+    if ( !mpList )
+        mpList = new IMPL_ConfigurationListenerList;
+    mpList->Insert( pListener );
+}
+
+void ConfigurationBroadcaster::RemoveListener( utl::ConfigurationListener* pListener )
+{
+    if ( mpList )
+        mpList->Remove( pListener );
+}
+
+void ConfigurationBroadcaster::NotifyListeners( sal_uInt32 nHint )
+{
+    if ( m_nBroadcastBlocked )
+        m_nBlockedHint |= nHint;
+    else
+    {
+        nHint |= m_nBlockedHint;
+        m_nBlockedHint = 0;
+        if ( mpList )
+            for ( sal_uInt32 n=0; n<mpList->Count(); n++ )
+                mpList->GetObject(n)->ConfigurationChanged( this, nHint );
+    }
+}
+
+void ConfigurationBroadcaster::BlockBroadcasts( bool bBlock )
+{
+    if ( bBlock )
+        ++m_nBroadcastBlocked;
+    else if ( m_nBroadcastBlocked )
+    {
+        if ( --m_nBroadcastBlocked == 0 )
+            NotifyListeners( 0 );
+    }
+}
+
+Options::Options()
+{
+}
+
+Options::~Options()
+{
+}
+
+void Options::ConfigurationChanged( ConfigurationBroadcaster*, sal_uInt32 nHint )
+{
+    NotifyListeners( nHint );
+}
+
+
diff --git a/svtools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 87878b0302bc..5ac76af8efd7 100644
--- a/svtools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#include <svtools/optionsdlg.hxx>
+#include <unotools/optionsdlg.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/unotools/source/config/optionsdrawinglayer.cxx b/unotools/source/config/optionsdrawinglayer.cxx
new file mode 100644
index 000000000000..7bfefdcbef09
--- /dev/null
+++ b/unotools/source/config/optionsdrawinglayer.cxx
@@ -0,0 +1,1708 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: optionsdrawinglayer.cxx,v $
+ * $Revision: 1.12 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifdef _MSC_VER
+#pragma hdrstop
+#endif
+
+//_________________________________________________________________________________________________________________
+//  includes
+//_________________________________________________________________________________________________________________
+
+#include <unotools/optionsdrawinglayer.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/configitem.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/outdev.hxx>
+
+//_________________________________________________________________________________________________________________
+//  namespaces
+//_________________________________________________________________________________________________________________
+
+using namespace ::utl                   ;
+using namespace ::rtl                   ;
+using namespace ::osl                   ;
+using namespace ::com::sun::star::uno   ;
+
+//_________________________________________________________________________________________________________________
+//  const
+//_________________________________________________________________________________________________________________
+
+#define ROOTNODE_START                  OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer"   ))
+#define DEFAULT_OVERLAYBUFFER           sal_True
+#define DEFAULT_PAINTBUFFER             sal_True
+#define DEFAULT_STRIPE_COLOR_A          0
+#define DEFAULT_STRIPE_COLOR_B          16581375
+#define DEFAULT_STRIPE_LENGTH           4
+
+// #i73602#
+// #i74769#, #i75172# : Change default for Calc and Writer to True
+#define DEFAULT_OVERLAYBUFFER_CALC          sal_True
+#define DEFAULT_OVERLAYBUFFER_WRITER        sal_True
+#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS   sal_True
+
+// #i74769#, #i75172#
+#define DEFAULT_PAINTBUFFER_CALC            sal_True
+#define DEFAULT_PAINTBUFFER_WRITER          sal_True
+#define DEFAULT_PAINTBUFFER_DRAWIMPRESS     sal_True
+
+// #i4219#
+#define DEFAULT_MAXIMUMPAPERWIDTH           300
+#define DEFAULT_MAXIMUMPAPERHEIGHT          300
+#define DEFAULT_MAXIMUMPAPERLEFTMARGIN      9999
+#define DEFAULT_MAXIMUMPAPERRIGHTMARGIN     9999
+#define DEFAULT_MAXIMUMPAPERTOPMARGIN       9999
+#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN    9999
+
+// primitives
+#define DEFAULT_ANTIALIASING                        sal_True
+#define DEFAULT_SNAPHORVERLINESTODISCRETE           sal_True
+#define DEFAULT_SOLIDDRAGCREATE                     sal_True
+#define DEFAULT_RENDERDECORATEDTEXTDIRECT           sal_True
+#define DEFAULT_RENDERSIMPLETEXTDIRECT              sal_True
+#define DEFAULT_QUADRATIC3DRENDERLIMIT              1000000
+#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT     45000
+
+// #i97672# selection settings
+#define DEFAULT_TRANSPARENTSELECTION                sal_True
+#define DEFAULT_TRANSPARENTSELECTIONPERCENT         75
+#define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT    70
+
+#define PROPERTYNAME_OVERLAYBUFFER      OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer"    ))
+#define PROPERTYNAME_PAINTBUFFER        OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer"      ))
+#define PROPERTYNAME_STRIPE_COLOR_A     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA"     ))
+#define PROPERTYNAME_STRIPE_COLOR_B     OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB"     ))
+#define PROPERTYNAME_STRIPE_LENGTH      OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength"     ))
+
+// #i73602#
+#define PROPERTYNAME_OVERLAYBUFFER_CALC         OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc"))
+#define PROPERTYNAME_OVERLAYBUFFER_WRITER       OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer"))
+#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS  OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress"))
+
+// #i74769#, #i75172#
+#define PROPERTYNAME_PAINTBUFFER_CALC           OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc"))
+#define PROPERTYNAME_PAINTBUFFER_WRITER         OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer"))
+#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS    OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress"))
+
+// #i4219#
+#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth"))
+#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight"))
+#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin"))
+#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin"))
+#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin"))
+#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin"))
+
+// primitives
+#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing"))
+#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete"))
+#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate"))
+#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect"))
+#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect"))
+#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit"))
+#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit"))
+
+// #i97672# selection settings
+#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection"))
+#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent"))
+#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent"))
+
+#define PROPERTYHANDLE_OVERLAYBUFFER                0
+#define PROPERTYHANDLE_PAINTBUFFER                  1
+#define PROPERTYHANDLE_STRIPE_COLOR_A               2
+#define PROPERTYHANDLE_STRIPE_COLOR_B               3
+#define PROPERTYHANDLE_STRIPE_LENGTH                4
+
+// #i73602#
+#define PROPERTYHANDLE_OVERLAYBUFFER_CALC           5
+#define PROPERTYHANDLE_OVERLAYBUFFER_WRITER         6
+#define PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS    7
+
+// #i74769#, #i75172#
+#define PROPERTYHANDLE_PAINTBUFFER_CALC             8
+#define PROPERTYHANDLE_PAINTBUFFER_WRITER           9
+#define PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS      10
+
+// #i4219#
+#define PROPERTYHANDLE_MAXIMUMPAPERWIDTH            11
+#define PROPERTYHANDLE_MAXIMUMPAPERHEIGHT           12
+#define PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN       13
+#define PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN      14
+#define PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN        15
+#define PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN     16
+
+// primitives
+#define PROPERTYHANDLE_ANTIALIASING                     17
+#define PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE        18
+#define PROPERTYHANDLE_SOLIDDRAGCREATE                  19
+#define PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT        20
+#define PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT           21
+#define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT           22
+#define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT  23
+
+// #i97672# selection settings
+#define PROPERTYHANDLE_TRANSPARENTSELECTION             24
+#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT      25
+#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26
+
+#define PROPERTYCOUNT                               27
+
+class SvtOptionsDrawinglayer_Impl : public ConfigItem
+{
+public:
+
+//---------------------------------------------------------------------------------------------------------
+//  constructor / destructor
+//---------------------------------------------------------------------------------------------------------
+
+     SvtOptionsDrawinglayer_Impl();
+    ~SvtOptionsDrawinglayer_Impl();
+
+//---------------------------------------------------------------------------------------------------------
+//  overloaded methods of baseclass
+//---------------------------------------------------------------------------------------------------------
+
+    virtual void Commit();
+
+//---------------------------------------------------------------------------------------------------------
+//  public interface
+//---------------------------------------------------------------------------------------------------------
+
+    sal_Bool    IsOverlayBuffer() const;
+    sal_Bool    IsPaintBuffer() const;
+    Color       GetStripeColorA() const;
+    Color       GetStripeColorB() const;
+    sal_uInt16  GetStripeLength() const;
+
+    // #i73602#
+    sal_Bool    IsOverlayBuffer_Calc() const;
+    sal_Bool    IsOverlayBuffer_Writer() const;
+    sal_Bool    IsOverlayBuffer_DrawImpress() const;
+
+    // #i74769#, #i75172#
+    sal_Bool    IsPaintBuffer_Calc() const;
+    sal_Bool    IsPaintBuffer_Writer() const;
+    sal_Bool    IsPaintBuffer_DrawImpress() const;
+
+    void        SetOverlayBuffer( sal_Bool bState );
+    void        SetPaintBuffer( sal_Bool bState );
+    void        SetStripeColorA( Color aColor );
+    void        SetStripeColorB( Color aColor );
+    void        SetStripeLength( sal_uInt16 nLength );
+
+    // #i73602#
+    void        SetOverlayBuffer_Calc( sal_Bool bState );
+    void        SetOverlayBuffer_Writer( sal_Bool bState );
+    void        SetOverlayBuffer_DrawImpress( sal_Bool bState );
+
+    // #i74769#, #i75172#
+    void        SetPaintBuffer_Calc( sal_Bool bState );
+    void        SetPaintBuffer_Writer( sal_Bool bState );
+    void        SetPaintBuffer_DrawImpress( sal_Bool bState );
+
+    // #i4219#
+    sal_uInt32 GetMaximumPaperWidth() const;
+    sal_uInt32 GetMaximumPaperHeight() const;
+    sal_uInt32 GetMaximumPaperLeftMargin() const;
+    sal_uInt32 GetMaximumPaperRightMargin() const;
+    sal_uInt32 GetMaximumPaperTopMargin() const;
+    sal_uInt32 GetMaximumPaperBottomMargin() const;
+
+    void SetMaximumPaperWidth(sal_uInt32 nNew);
+    void SetMaximumPaperHeight(sal_uInt32 nNew);
+    void SetMaximumPaperLeftMargin(sal_uInt32 nNew);
+    void SetMaximumPaperRightMargin(sal_uInt32 nNew);
+    void SetMaximumPaperTopMargin(sal_uInt32 nNew);
+    void SetMaximumPaperBottomMargin(sal_uInt32 nNew);
+
+    // helper
+    sal_Bool IsAAPossibleOnThisSystem() const;
+
+    // primitives
+    sal_Bool    IsAntiAliasing() const;
+    sal_Bool    IsSnapHorVerLinesToDiscrete() const;
+    sal_Bool    IsSolidDragCreate() const;
+    sal_Bool    IsRenderDecoratedTextDirect() const;
+    sal_Bool    IsRenderSimpleTextDirect() const;
+    sal_uInt32  GetQuadratic3DRenderLimit() const;
+    sal_uInt32  GetQuadraticFormControlRenderLimit() const;
+
+    void        SetAntiAliasing( sal_Bool bState );
+    void        SetSnapHorVerLinesToDiscrete( sal_Bool bState );
+    void        SetSolidDragCreate( sal_Bool bState );
+    void        SetRenderDecoratedTextDirect( sal_Bool bState );
+    void        SetRenderSimpleTextDirect( sal_Bool bState );
+    void        SetQuadratic3DRenderLimit(sal_uInt32 nNew);
+    void        SetQuadraticFormControlRenderLimit(sal_uInt32 nNew);
+
+    // #i97672# selection settings
+    sal_Bool    IsTransparentSelection() const;
+    sal_uInt16  GetTransparentSelectionPercent() const;
+    sal_uInt16  GetSelectionMaximumLuminancePercent() const;
+
+    void        SetTransparentSelection( sal_Bool bState );
+    void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
+    void        SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
+
+//-------------------------------------------------------------------------------------------------------------
+//  private methods
+//-------------------------------------------------------------------------------------------------------------
+
+private:
+
+    static Sequence< OUString > impl_GetPropertyNames();
+
+//-------------------------------------------------------------------------------------------------------------
+//  private member
+//-------------------------------------------------------------------------------------------------------------
+
+private:
+
+        sal_Bool    m_bOverlayBuffer;
+        sal_Bool    m_bPaintBuffer;
+        Color       m_bStripeColorA;
+        Color       m_bStripeColorB;
+        sal_uInt16  m_nStripeLength;
+
+        // #i73602#
+        sal_Bool    m_bOverlayBuffer_Calc;
+        sal_Bool    m_bOverlayBuffer_Writer;
+        sal_Bool    m_bOverlayBuffer_DrawImpress;
+
+        // #i74769#, #i75172#
+        sal_Bool    m_bPaintBuffer_Calc;
+        sal_Bool    m_bPaintBuffer_Writer;
+        sal_Bool    m_bPaintBuffer_DrawImpress;
+
+        // #i4219#
+        sal_uInt32  m_nMaximumPaperWidth;
+        sal_uInt32  m_nMaximumPaperHeight;
+        sal_uInt32  m_nMaximumPaperLeftMargin;
+        sal_uInt32  m_nMaximumPaperRightMargin;
+        sal_uInt32  m_nMaximumPaperTopMargin;
+        sal_uInt32  m_nMaximumPaperBottomMargin;
+
+        // primitives
+        sal_Bool    m_bAntiAliasing;
+        sal_Bool    m_bSnapHorVerLinesToDiscrete;
+        sal_Bool    m_bSolidDragCreate;
+        sal_Bool    m_bRenderDecoratedTextDirect;
+        sal_Bool    m_bRenderSimpleTextDirect;
+        sal_uInt32  m_nQuadratic3DRenderLimit;
+        sal_uInt32  m_nQuadraticFormControlRenderLimit;
+
+        // #i97672# selection settings
+        sal_uInt16  m_nTransparentSelectionPercent;
+        sal_uInt16  m_nSelectionMaximumLuminancePercent;
+        sal_Bool    m_bTransparentSelection;
+
+        // local values
+        bool        m_bAllowAA : 1;
+        bool        m_bAllowAAChecked : 1;
+};
+
+//_________________________________________________________________________________________________________________
+//  definitions
+//_________________________________________________________________________________________________________________
+
+//*****************************************************************************************************************
+//  constructor
+//*****************************************************************************************************************
+SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
+    ConfigItem( ROOTNODE_START  ),
+    m_bOverlayBuffer( DEFAULT_OVERLAYBUFFER ),
+    m_bPaintBuffer( DEFAULT_PAINTBUFFER ),
+    m_bStripeColorA(Color(DEFAULT_STRIPE_COLOR_A)),
+    m_bStripeColorB(Color(DEFAULT_STRIPE_COLOR_B)),
+    m_nStripeLength(DEFAULT_STRIPE_LENGTH),
+
+    // #i73602#
+    m_bOverlayBuffer_Calc( DEFAULT_OVERLAYBUFFER_CALC ),
+    m_bOverlayBuffer_Writer( DEFAULT_OVERLAYBUFFER_WRITER ),
+    m_bOverlayBuffer_DrawImpress( DEFAULT_OVERLAYBUFFER_DRAWIMPRESS ),
+
+    // #i74769#, #i75172#
+    m_bPaintBuffer_Calc( DEFAULT_PAINTBUFFER_CALC ),
+    m_bPaintBuffer_Writer( DEFAULT_PAINTBUFFER_WRITER ),
+    m_bPaintBuffer_DrawImpress( DEFAULT_PAINTBUFFER_DRAWIMPRESS ),
+
+    // #i4219#
+    m_nMaximumPaperWidth(DEFAULT_MAXIMUMPAPERWIDTH),
+    m_nMaximumPaperHeight(DEFAULT_MAXIMUMPAPERHEIGHT),
+    m_nMaximumPaperLeftMargin(DEFAULT_MAXIMUMPAPERLEFTMARGIN),
+    m_nMaximumPaperRightMargin(DEFAULT_MAXIMUMPAPERRIGHTMARGIN),
+    m_nMaximumPaperTopMargin(DEFAULT_MAXIMUMPAPERTOPMARGIN),
+    m_nMaximumPaperBottomMargin(DEFAULT_MAXIMUMPAPERBOTTOMMARGIN),
+
+    // primitives
+    m_bAntiAliasing(DEFAULT_ANTIALIASING),
+    m_bSnapHorVerLinesToDiscrete(DEFAULT_SNAPHORVERLINESTODISCRETE),
+    m_bSolidDragCreate(DEFAULT_SOLIDDRAGCREATE),
+    m_bRenderDecoratedTextDirect(DEFAULT_RENDERDECORATEDTEXTDIRECT),
+    m_bRenderSimpleTextDirect(DEFAULT_RENDERSIMPLETEXTDIRECT),
+    m_nQuadratic3DRenderLimit(DEFAULT_QUADRATIC3DRENDERLIMIT),
+    m_nQuadraticFormControlRenderLimit(DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT),
+
+    // #i97672# selection settings
+    m_nTransparentSelectionPercent(DEFAULT_TRANSPARENTSELECTIONPERCENT),
+    m_nSelectionMaximumLuminancePercent(DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT),
+    m_bTransparentSelection(DEFAULT_TRANSPARENTSELECTION),
+
+    // local values
+    m_bAllowAA(true),
+    m_bAllowAAChecked(false)
+{
+    Sequence< OUString >    seqNames( impl_GetPropertyNames() );
+    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
+
+    DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nI miss some values of configuration keys!\n" );
+
+    // Copy values from list in right order to ouer internal member.
+    sal_Int32 nPropertyCount = seqValues.getLength();
+    sal_Int32 nProperty = 0;
+
+    for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
+    {
+        DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nInvalid property value for property detected!\n" );
+
+        switch( nProperty )
+        {
+            case PROPERTYHANDLE_OVERLAYBUFFER:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\OverlayBuffer\"?" );
+                seqValues[nProperty] >>= m_bOverlayBuffer;
+            }
+            break;
+
+            case PROPERTYHANDLE_PAINTBUFFER:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\PaintBuffer\"?" );
+                seqValues[nProperty] >>= m_bPaintBuffer;
+            }
+            break;
+
+            case PROPERTYHANDLE_STRIPE_COLOR_A:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\StripeColorA\"?" );
+                sal_Int32 nValue = 0;
+                seqValues[nProperty] >>= nValue;
+                m_bStripeColorA = nValue;
+            }
+            break;
+
+            case PROPERTYHANDLE_STRIPE_COLOR_B:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\StripeColorB\"?" );
+                sal_Int32 nValue = 0;
+                seqValues[nProperty] >>= nValue;
+                m_bStripeColorB = nValue;
+            }
+            break;
+
+            case PROPERTYHANDLE_STRIPE_LENGTH:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\StripeLength\"?" );
+                seqValues[nProperty] >>= m_nStripeLength;
+            }
+            break;
+
+            // #i73602#
+            case PROPERTYHANDLE_OVERLAYBUFFER_CALC:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\OverlayBuffer_Calc\"?" );
+                seqValues[nProperty] >>= m_bOverlayBuffer_Calc;
+            }
+            break;
+
+            case PROPERTYHANDLE_OVERLAYBUFFER_WRITER:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\OverlayBuffer_Writer\"?" );
+                seqValues[nProperty] >>= m_bOverlayBuffer_Writer;
+            }
+            break;
+
+            case PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\OverlayBuffer_DrawImpress\"?" );
+                seqValues[nProperty] >>= m_bOverlayBuffer_DrawImpress;
+            }
+            break;
+
+            // #i74769#, #i75172#
+            case PROPERTYHANDLE_PAINTBUFFER_CALC:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\PaintBuffer_Calc\"?" );
+                seqValues[nProperty] >>= m_bPaintBuffer_Calc;
+            }
+            break;
+
+            case PROPERTYHANDLE_PAINTBUFFER_WRITER:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\PaintBuffer_Writer\"?" );
+                seqValues[nProperty] >>= m_bPaintBuffer_Writer;
+            }
+            break;
+
+            case PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\PaintBuffer_DrawImpress\"?" );
+                seqValues[nProperty] >>= m_bPaintBuffer_DrawImpress;
+            }
+            break;
+
+            // #i4219#
+            case PROPERTYHANDLE_MAXIMUMPAPERWIDTH:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\MaximumPaperWidth\"?" );
+                seqValues[nProperty] >>= m_nMaximumPaperWidth;
+            }
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERHEIGHT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\MaximumPaperHeight\"?" );
+                seqValues[nProperty] >>= m_nMaximumPaperHeight;
+            }
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\MaximumPaperLeftMargin\"?" );
+                seqValues[nProperty] >>= m_nMaximumPaperLeftMargin;
+            }
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\MaximumPaperRightMargin\"?" );
+                seqValues[nProperty] >>= m_nMaximumPaperRightMargin;
+            }
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\MaximumPaperTopMargin\"?" );
+                seqValues[nProperty] >>= m_nMaximumPaperTopMargin;
+            }
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\MaximumPaperBottomMargin\"?" );
+                seqValues[nProperty] >>= m_nMaximumPaperBottomMargin;
+            }
+            break;
+
+            // primitives
+            case PROPERTYHANDLE_ANTIALIASING:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\AntiAliasing\"?" );
+                seqValues[nProperty] >>= m_bAntiAliasing;
+            }
+            break;
+
+            // primitives
+            case PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\SnapHorVerLinesToDiscrete\"?" );
+                seqValues[nProperty] >>= m_bSnapHorVerLinesToDiscrete;
+            }
+            break;
+
+            case PROPERTYHANDLE_SOLIDDRAGCREATE:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\SolidDragCreate\"?" );
+                seqValues[nProperty] >>= m_bSolidDragCreate;
+            }
+            break;
+
+            case PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\RenderDecoratedTextDirect\"?" );
+                seqValues[nProperty] >>= m_bRenderDecoratedTextDirect;
+            }
+            break;
+
+            case PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\RenderSimpleTextDirect\"?" );
+                seqValues[nProperty] >>= m_bRenderSimpleTextDirect;
+            }
+            break;
+
+            case PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\Quadratic3DRenderLimit\"?" );
+                seqValues[nProperty] >>= m_nQuadratic3DRenderLimit;
+            }
+            break;
+
+            case PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\QuadraticFormControlRenderLimit\"?" );
+                seqValues[nProperty] >>= m_nQuadraticFormControlRenderLimit;
+            }
+            break;
+
+            // #i97672# selection settings
+            case PROPERTYHANDLE_TRANSPARENTSELECTION:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelection\"?" );
+                seqValues[nProperty] >>= m_bTransparentSelection;
+            }
+            break;
+
+            case PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelectionPercent\"?" );
+                seqValues[nProperty] >>= m_nTransparentSelectionPercent;
+            }
+
+            case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT:
+            {
+                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\SelectionMaximumLuminancePercent\"?" );
+                seqValues[nProperty] >>= m_nSelectionMaximumLuminancePercent;
+            }
+            break;
+        }
+    }
+}
+
+//*****************************************************************************************************************
+//  destructor
+//*****************************************************************************************************************
+SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl()
+{
+    if( IsModified() )
+        Commit();
+}
+
+//*****************************************************************************************************************
+//  Commit
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer_Impl::Commit()
+{
+    Sequence< OUString >    aSeqNames( impl_GetPropertyNames() );
+    Sequence< Any >         aSeqValues( aSeqNames.getLength() );
+
+    for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty )
+    {
+        switch( nProperty )
+        {
+            case PROPERTYHANDLE_OVERLAYBUFFER:
+                aSeqValues[nProperty] <<= m_bOverlayBuffer;
+            break;
+
+            case PROPERTYHANDLE_PAINTBUFFER:
+                aSeqValues[nProperty] <<= m_bPaintBuffer;
+            break;
+
+            case PROPERTYHANDLE_STRIPE_COLOR_A:
+                aSeqValues[nProperty] <<= m_bStripeColorA.GetColor();
+            break;
+
+            case PROPERTYHANDLE_STRIPE_COLOR_B:
+                aSeqValues[nProperty] <<= m_bStripeColorB.GetColor();
+            break;
+
+            case PROPERTYHANDLE_STRIPE_LENGTH:
+                aSeqValues[nProperty] <<= m_nStripeLength;
+            break;
+
+            // #i73602#
+            case PROPERTYHANDLE_OVERLAYBUFFER_CALC:
+                aSeqValues[nProperty] <<= m_bOverlayBuffer_Calc;
+            break;
+
+            case PROPERTYHANDLE_OVERLAYBUFFER_WRITER:
+                aSeqValues[nProperty] <<= m_bOverlayBuffer_Writer;
+            break;
+
+            case PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS:
+                aSeqValues[nProperty] <<= m_bOverlayBuffer_DrawImpress;
+            break;
+
+            // #i74769#, #i75172#
+            case PROPERTYHANDLE_PAINTBUFFER_CALC:
+                aSeqValues[nProperty] <<= m_bPaintBuffer_Calc;
+            break;
+
+            case PROPERTYHANDLE_PAINTBUFFER_WRITER:
+                aSeqValues[nProperty] <<= m_bPaintBuffer_Writer;
+            break;
+
+            case PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS:
+                aSeqValues[nProperty] <<= m_bPaintBuffer_DrawImpress;
+            break;
+
+            // #i4219#
+            case PROPERTYHANDLE_MAXIMUMPAPERWIDTH:
+                aSeqValues[nProperty] <<= m_nMaximumPaperWidth;
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERHEIGHT:
+                aSeqValues[nProperty] <<= m_nMaximumPaperHeight;
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN:
+                aSeqValues[nProperty] <<= m_nMaximumPaperLeftMargin;
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN:
+                aSeqValues[nProperty] <<= m_nMaximumPaperRightMargin;
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN:
+                aSeqValues[nProperty] <<= m_nMaximumPaperTopMargin;
+            break;
+
+            case PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN:
+                aSeqValues[nProperty] <<= m_nMaximumPaperBottomMargin;
+            break;
+
+            // primitives
+            case PROPERTYHANDLE_ANTIALIASING:
+                aSeqValues[nProperty] <<= m_bAntiAliasing;
+            break;
+
+            case PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE:
+                aSeqValues[nProperty] <<= m_bSnapHorVerLinesToDiscrete;
+            break;
+
+            case PROPERTYHANDLE_SOLIDDRAGCREATE:
+                aSeqValues[nProperty] <<= m_bSolidDragCreate;
+            break;
+
+            case PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT:
+                aSeqValues[nProperty] <<= m_bRenderDecoratedTextDirect;
+            break;
+
+            case PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT:
+                aSeqValues[nProperty] <<= m_bRenderSimpleTextDirect;
+            break;
+
+            case PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT:
+                aSeqValues[nProperty] <<= m_nQuadratic3DRenderLimit;
+            break;
+
+            case PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT:
+                aSeqValues[nProperty] <<= m_nQuadraticFormControlRenderLimit;
+            break;
+
+            // #i97672# selection settings
+            case PROPERTYHANDLE_TRANSPARENTSELECTION:
+                aSeqValues[nProperty] <<= m_bTransparentSelection;
+            break;
+
+            case PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT:
+                aSeqValues[nProperty] <<= m_nTransparentSelectionPercent;
+            break;
+
+            case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT:
+                aSeqValues[nProperty] <<= m_nSelectionMaximumLuminancePercent;
+            break;
+        }
+    }
+
+    PutProperties( aSeqNames, aSeqValues );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
+{
+    return m_bOverlayBuffer;
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
+{
+    return m_bPaintBuffer;
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const
+{
+    return m_bStripeColorA;
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const
+{
+    return m_bStripeColorB;
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_uInt16 SvtOptionsDrawinglayer_Impl::GetStripeLength() const
+{
+    return m_nStripeLength;
+}
+
+// #i73602#
+sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Calc() const
+{
+    return m_bOverlayBuffer_Calc;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Writer() const
+{
+    return m_bOverlayBuffer_Writer;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_DrawImpress() const
+{
+    return m_bOverlayBuffer_DrawImpress;
+}
+
+// #i74769#, #i75172#
+sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Calc() const
+{
+    return m_bPaintBuffer_Calc;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Writer() const
+{
+    return m_bPaintBuffer_Writer;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_DrawImpress() const
+{
+    return m_bPaintBuffer_DrawImpress;
+}
+
+// #i4219#
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperWidth() const
+{
+    return m_nMaximumPaperWidth;
+}
+
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperHeight() const
+{
+    return m_nMaximumPaperHeight;
+}
+
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperLeftMargin() const
+{
+    return m_nMaximumPaperLeftMargin;
+}
+
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperRightMargin() const
+{
+    return m_nMaximumPaperRightMargin;
+}
+
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperTopMargin() const
+{
+    return m_nMaximumPaperTopMargin;
+}
+
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperBottomMargin() const
+{
+    return m_nMaximumPaperBottomMargin;
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState )
+{
+    if(m_bOverlayBuffer != bState)
+    {
+        m_bOverlayBuffer = bState;
+        SetModified();
+    }
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState )
+{
+    if(m_bPaintBuffer != bState)
+    {
+        m_bPaintBuffer = bState;
+        SetModified();
+    }
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor )
+{
+    if(m_bStripeColorA != aColor)
+    {
+        m_bStripeColorA = aColor;
+        SetModified();
+    }
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor )
+{
+    if(m_bStripeColorB != aColor)
+    {
+        m_bStripeColorB = aColor;
+        SetModified();
+    }
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer_Impl::SetStripeLength( sal_uInt16 nLength )
+{
+    if(m_nStripeLength != nLength)
+    {
+        m_nStripeLength = nLength;
+        SetModified();
+    }
+}
+
+// #i73602#
+void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Calc( sal_Bool bState )
+{
+    if(m_bOverlayBuffer_Calc != bState)
+    {
+        m_bOverlayBuffer_Calc = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Writer( sal_Bool bState )
+{
+    if(m_bOverlayBuffer_Writer != bState)
+    {
+        m_bOverlayBuffer_Writer = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_DrawImpress( sal_Bool bState )
+{
+    if(m_bOverlayBuffer_DrawImpress != bState)
+    {
+        m_bOverlayBuffer_DrawImpress = bState;
+        SetModified();
+    }
+}
+
+// #i74769#, #i75172#
+void SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Calc( sal_Bool bState )
+{
+    if(m_bPaintBuffer_Calc != bState)
+    {
+        m_bPaintBuffer_Calc = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Writer( sal_Bool bState )
+{
+    if(m_bPaintBuffer_Writer != bState)
+    {
+        m_bPaintBuffer_Writer = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetPaintBuffer_DrawImpress( sal_Bool bState )
+{
+    if(m_bPaintBuffer_DrawImpress != bState)
+    {
+        m_bPaintBuffer_DrawImpress = bState;
+        SetModified();
+    }
+}
+
+// #i4219#
+void SvtOptionsDrawinglayer_Impl::SetMaximumPaperWidth( sal_uInt32 nNew )
+{
+    if(m_nMaximumPaperWidth != nNew)
+    {
+        m_nMaximumPaperWidth = nNew;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetMaximumPaperHeight( sal_uInt32 nNew )
+{
+    if(m_nMaximumPaperHeight != nNew)
+    {
+        m_nMaximumPaperHeight = nNew;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetMaximumPaperLeftMargin( sal_uInt32 nNew )
+{
+    if(m_nMaximumPaperLeftMargin != nNew)
+    {
+        m_nMaximumPaperLeftMargin = nNew;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetMaximumPaperRightMargin( sal_uInt32 nNew )
+{
+    if(m_nMaximumPaperRightMargin != nNew)
+    {
+        m_nMaximumPaperRightMargin = nNew;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetMaximumPaperTopMargin( sal_uInt32 nNew )
+{
+    if(m_nMaximumPaperTopMargin != nNew)
+    {
+        m_nMaximumPaperTopMargin = nNew;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetMaximumPaperBottomMargin( sal_uInt32 nNew )
+{
+    if(m_nMaximumPaperBottomMargin != nNew)
+    {
+        m_nMaximumPaperBottomMargin = nNew;
+        SetModified();
+    }
+}
+
+// helper
+sal_Bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const
+{
+    if(!m_bAllowAAChecked)
+    {
+        SvtOptionsDrawinglayer_Impl* pThat = const_cast< SvtOptionsDrawinglayer_Impl* >(this);
+        pThat->m_bAllowAAChecked = true;
+
+#ifdef WIN32
+        // WIN32 uses GDIPlus with VCL forthe first incarnation; this will be enhanced
+        // in the future to use canvases and the canvas renderer, thus a AA-abled
+        // canvas needs to be checked here in the future.
+        // Currently, just allow AA for WIN32
+#endif
+
+        // check XRenderExtension
+        if(m_bAllowAA && !Application::GetDefaultDevice()->supportsOperation( OutDevSupport_TransparentRect ))
+        {
+            pThat->m_bAllowAA = false;
+        }
+    }
+
+    return m_bAllowAA;
+}
+
+// primitives
+sal_Bool SvtOptionsDrawinglayer_Impl::IsAntiAliasing() const
+{
+    return m_bAntiAliasing;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsSnapHorVerLinesToDiscrete() const
+{
+    return m_bSnapHorVerLinesToDiscrete;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsSolidDragCreate() const
+{
+    return m_bSolidDragCreate;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsRenderDecoratedTextDirect() const
+{
+    return m_bRenderDecoratedTextDirect;
+}
+
+sal_Bool SvtOptionsDrawinglayer_Impl::IsRenderSimpleTextDirect() const
+{
+    return m_bRenderSimpleTextDirect;
+}
+
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetQuadratic3DRenderLimit() const
+{
+    return m_nQuadratic3DRenderLimit;
+}
+
+sal_uInt32 SvtOptionsDrawinglayer_Impl::GetQuadraticFormControlRenderLimit() const
+{
+    return m_nQuadraticFormControlRenderLimit;
+}
+
+void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( sal_Bool bState )
+{
+    if(m_bAntiAliasing != bState)
+    {
+        m_bAntiAliasing = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetSnapHorVerLinesToDiscrete( sal_Bool bState )
+{
+    if(m_bSnapHorVerLinesToDiscrete != bState)
+    {
+        m_bSnapHorVerLinesToDiscrete = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetSolidDragCreate( sal_Bool bState )
+{
+    if(m_bSolidDragCreate != bState)
+    {
+        m_bSolidDragCreate = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetRenderDecoratedTextDirect( sal_Bool bState )
+{
+    if(m_bRenderDecoratedTextDirect != bState)
+    {
+        m_bRenderDecoratedTextDirect = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetRenderSimpleTextDirect( sal_Bool bState )
+{
+    if(m_bRenderSimpleTextDirect != bState)
+    {
+        m_bRenderSimpleTextDirect = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetQuadratic3DRenderLimit(sal_uInt32 nNew)
+{
+    if(m_nQuadratic3DRenderLimit != nNew)
+    {
+        m_nQuadratic3DRenderLimit = nNew;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetQuadraticFormControlRenderLimit(sal_uInt32 nNew)
+{
+    if(m_nQuadraticFormControlRenderLimit != nNew)
+    {
+        m_nQuadraticFormControlRenderLimit = nNew;
+        SetModified();
+    }
+}
+
+// #i97672# selection settings
+sal_Bool SvtOptionsDrawinglayer_Impl::IsTransparentSelection() const
+{
+    return m_bTransparentSelection;
+}
+
+void SvtOptionsDrawinglayer_Impl::SetTransparentSelection( sal_Bool bState )
+{
+    if(m_bTransparentSelection != bState)
+    {
+        m_bTransparentSelection = bState;
+        SetModified();
+    }
+}
+
+void SvtOptionsDrawinglayer_Impl::SetTransparentSelectionPercent( sal_uInt16 nPercent )
+{
+    if(m_nTransparentSelectionPercent != nPercent)
+    {
+        m_nTransparentSelectionPercent = nPercent;
+        SetModified();
+    }
+}
+
+sal_uInt16 SvtOptionsDrawinglayer_Impl::GetTransparentSelectionPercent() const
+{
+    return m_nTransparentSelectionPercent;
+}
+
+void SvtOptionsDrawinglayer_Impl::SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent )
+{
+    if(m_nSelectionMaximumLuminancePercent != nPercent)
+    {
+        m_nSelectionMaximumLuminancePercent = nPercent;
+        SetModified();
+    }
+}
+
+sal_uInt16 SvtOptionsDrawinglayer_Impl::GetSelectionMaximumLuminancePercent() const
+{
+    return m_nSelectionMaximumLuminancePercent;
+}
+
+//*****************************************************************************************************************
+//  private method
+//*****************************************************************************************************************
+Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
+{
+    // Build static list of configuration key names.
+    static const OUString pProperties[] =
+    {
+        PROPERTYNAME_OVERLAYBUFFER      ,
+        PROPERTYNAME_PAINTBUFFER        ,
+        PROPERTYNAME_STRIPE_COLOR_A     ,
+        PROPERTYNAME_STRIPE_COLOR_B     ,
+        PROPERTYNAME_STRIPE_LENGTH      ,
+
+        // #i73602#
+        PROPERTYNAME_OVERLAYBUFFER_CALC,
+        PROPERTYNAME_OVERLAYBUFFER_WRITER,
+        PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS,
+
+        // #i74769#, #i75172#
+        PROPERTYNAME_PAINTBUFFER_CALC,
+        PROPERTYNAME_PAINTBUFFER_WRITER,
+        PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS,
+
+        // #i4219#
+        PROPERTYNAME_MAXIMUMPAPERWIDTH,
+        PROPERTYNAME_MAXIMUMPAPERHEIGHT,
+        PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN,
+        PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN,
+        PROPERTYNAME_MAXIMUMPAPERTOPMARGIN,
+        PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN,
+
+        // primitives
+        PROPERTYNAME_ANTIALIASING,
+        PROPERTYNAME_SNAPHORVERLINESTODISCRETE,
+        PROPERTYNAME_SOLIDDRAGCREATE,
+        PROPERTYNAME_RENDERDECORATEDTEXTDIRECT,
+        PROPERTYNAME_RENDERSIMPLETEXTDIRECT,
+        PROPERTYNAME_QUADRATIC3DRENDERLIMIT,
+        PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT,
+
+        // #i97672# selection settings
+        PROPERTYNAME_TRANSPARENTSELECTION,
+        PROPERTYNAME_TRANSPARENTSELECTIONPERCENT,
+        PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT
+    };
+
+    // Initialize return sequence with these list ...
+    static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
+    // ... and return it.
+    return seqPropertyNames;
+}
+
+//*****************************************************************************************************************
+//  initialize static member
+//  DON'T DO IT IN YOUR HEADER!
+//  see definition for further informations
+//*****************************************************************************************************************
+SvtOptionsDrawinglayer_Impl* SvtOptionsDrawinglayer::m_pDataContainer = NULL;
+sal_Int32 SvtOptionsDrawinglayer::m_nRefCount = 0;
+
+//*****************************************************************************************************************
+//  constructor
+//*****************************************************************************************************************
+SvtOptionsDrawinglayer::SvtOptionsDrawinglayer()
+{
+    // Global access, must be guarded (multithreading!).
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    // Increase ouer refcount ...
+    ++m_nRefCount;
+    // ... and initialize ouer data container only if it not already!
+    if( m_pDataContainer == NULL )
+    {
+        m_pDataContainer = new SvtOptionsDrawinglayer_Impl();
+    }
+}
+
+//*****************************************************************************************************************
+//  destructor
+//*****************************************************************************************************************
+SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
+{
+    // Global access, must be guarded (multithreading!)
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    // Decrease ouer refcount.
+    --m_nRefCount;
+    // If last instance was deleted ...
+    // we must destroy ouer static data container!
+    if( m_nRefCount <= 0 )
+    {
+        delete m_pDataContainer;
+        m_pDataContainer = NULL;
+    }
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsOverlayBuffer();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsPaintBuffer();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+Color SvtOptionsDrawinglayer::GetStripeColorA() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetStripeColorA();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+Color SvtOptionsDrawinglayer::GetStripeColorB() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetStripeColorB();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+sal_uInt16 SvtOptionsDrawinglayer::GetStripeLength() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetStripeLength();
+}
+
+// #i73602#
+sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_Calc() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsOverlayBuffer_Calc();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_Writer() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsOverlayBuffer_Writer();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_DrawImpress() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsOverlayBuffer_DrawImpress();
+}
+
+// #i74769#, #i75172#
+sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_Calc() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsPaintBuffer_Calc();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_Writer() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsPaintBuffer_Writer();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_DrawImpress() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsPaintBuffer_DrawImpress();
+}
+
+// #i4219#
+sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperWidth() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetMaximumPaperWidth();
+}
+
+sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperHeight() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetMaximumPaperHeight();
+}
+
+sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperLeftMargin() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetMaximumPaperLeftMargin();
+}
+
+sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperRightMargin() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetMaximumPaperRightMargin();
+}
+
+sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperTopMargin() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetMaximumPaperTopMargin();
+}
+
+sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetMaximumPaperBottomMargin();
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetOverlayBuffer( bState );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetPaintBuffer( bState );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetStripeColorA( aColor );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetStripeColorB( aColor );
+}
+
+//*****************************************************************************************************************
+//  public method
+//*****************************************************************************************************************
+void SvtOptionsDrawinglayer::SetStripeLength( sal_uInt16 nLength )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetStripeLength( nLength );
+}
+
+// #i73602#
+void SvtOptionsDrawinglayer::SetOverlayBuffer_Calc( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetOverlayBuffer_Calc( bState );
+}
+
+void SvtOptionsDrawinglayer::SetOverlayBuffer_Writer( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetOverlayBuffer_Writer( bState );
+}
+
+void SvtOptionsDrawinglayer::SetOverlayBuffer_DrawImpress( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetOverlayBuffer_DrawImpress( bState );
+}
+
+// #i74769#, #i75172#
+void SvtOptionsDrawinglayer::SetPaintBuffer_Calc( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetPaintBuffer_Calc( bState );
+}
+
+void SvtOptionsDrawinglayer::SetPaintBuffer_Writer( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetPaintBuffer_Writer( bState );
+}
+
+void SvtOptionsDrawinglayer::SetPaintBuffer_DrawImpress( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetPaintBuffer_DrawImpress( bState );
+}
+
+// #i4219#
+void SvtOptionsDrawinglayer::SetMaximumPaperWidth( sal_uInt32 nNew )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetMaximumPaperWidth( nNew );
+}
+
+void SvtOptionsDrawinglayer::SetMaximumPaperHeight( sal_uInt32 nNew )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetMaximumPaperHeight( nNew );
+}
+
+void SvtOptionsDrawinglayer::SetMaximumPaperLeftMargin( sal_uInt32 nNew )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetMaximumPaperLeftMargin( nNew );
+}
+
+void SvtOptionsDrawinglayer::SetMaximumPaperRightMargin( sal_uInt32 nNew )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetMaximumPaperRightMargin( nNew );
+}
+
+void SvtOptionsDrawinglayer::SetMaximumPaperTopMargin( sal_uInt32 nNew )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetMaximumPaperTopMargin( nNew );
+}
+
+void SvtOptionsDrawinglayer::SetMaximumPaperBottomMargin( sal_uInt32 nNew )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetMaximumPaperBottomMargin( nNew );
+}
+
+// helper
+sal_Bool SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem() const
+{
+    return m_pDataContainer->IsAAPossibleOnThisSystem();
+}
+
+// primitives
+sal_Bool SvtOptionsDrawinglayer::IsAntiAliasing() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsAntiAliasing() && IsAAPossibleOnThisSystem();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsSnapHorVerLinesToDiscrete() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsAntiAliasing() && m_pDataContainer->IsSnapHorVerLinesToDiscrete();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsSolidDragCreate() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsSolidDragCreate();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsRenderDecoratedTextDirect() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsRenderDecoratedTextDirect();
+}
+
+sal_Bool SvtOptionsDrawinglayer::IsRenderSimpleTextDirect() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsRenderSimpleTextDirect();
+}
+
+sal_uInt32 SvtOptionsDrawinglayer::GetQuadratic3DRenderLimit() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetQuadratic3DRenderLimit();
+}
+
+sal_uInt32 SvtOptionsDrawinglayer::GetQuadraticFormControlRenderLimit() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetQuadraticFormControlRenderLimit();
+}
+
+void SvtOptionsDrawinglayer::SetAntiAliasing( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetAntiAliasing( bState );
+}
+
+void SvtOptionsDrawinglayer::SetSnapHorVerLinesToDiscrete( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetSnapHorVerLinesToDiscrete( bState );
+}
+
+void SvtOptionsDrawinglayer::SetSolidDragCreate( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetSolidDragCreate( bState );
+}
+
+void SvtOptionsDrawinglayer::SetRenderDecoratedTextDirect( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetRenderDecoratedTextDirect( bState );
+}
+
+void SvtOptionsDrawinglayer::SetRenderSimpleTextDirect( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetRenderSimpleTextDirect( bState );
+}
+
+void SvtOptionsDrawinglayer::SetQuadratic3DRenderLimit(sal_uInt32 nNew)
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetQuadratic3DRenderLimit( nNew );
+}
+
+void SvtOptionsDrawinglayer::SetQuadraticFormControlRenderLimit(sal_uInt32 nNew)
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetQuadraticFormControlRenderLimit( nNew );
+}
+
+// #i97672# selection settings
+sal_Bool SvtOptionsDrawinglayer::IsTransparentSelection() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->IsTransparentSelection();
+}
+
+void SvtOptionsDrawinglayer::SetTransparentSelection( sal_Bool bState )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    m_pDataContainer->SetTransparentSelection( bState );
+}
+
+sal_uInt16 SvtOptionsDrawinglayer::GetTransparentSelectionPercent() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    sal_uInt16 aRetval(m_pDataContainer->GetTransparentSelectionPercent());
+
+    // crop to range [10% .. 90%]
+    if(aRetval < 10)
+    {
+        aRetval = 10;
+    }
+
+    if(aRetval > 90)
+    {
+        aRetval = 90;
+    }
+
+    return aRetval;
+}
+
+void SvtOptionsDrawinglayer::SetTransparentSelectionPercent( sal_uInt16 nPercent )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+
+    // crop to range [10% .. 90%]
+    if(nPercent < 10)
+    {
+        nPercent = 10;
+    }
+
+    if(nPercent > 90)
+    {
+        nPercent = 90;
+    }
+
+    m_pDataContainer->SetTransparentSelectionPercent( nPercent );
+}
+
+sal_uInt16 SvtOptionsDrawinglayer::GetSelectionMaximumLuminancePercent() const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    sal_uInt16 aRetval(m_pDataContainer->GetSelectionMaximumLuminancePercent());
+
+    // crop to range [0% .. 100%]
+    if(aRetval > 90)
+    {
+        aRetval = 90;
+    }
+
+    return aRetval;
+}
+
+void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent )
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+
+    // crop to range [0% .. 100%]
+    if(nPercent > 90)
+    {
+        nPercent = 90;
+    }
+
+    m_pDataContainer->SetSelectionMaximumLuminancePercent( nPercent );
+}
+
+//*****************************************************************************************************************
+//  private method
+//*****************************************************************************************************************
+Mutex& SvtOptionsDrawinglayer::GetOwnStaticMutex()
+{
+    // Initialize static mutex only for one time!
+    static Mutex* pMutex = NULL;
+    // If these method first called (Mutex not already exist!) ...
+    if( pMutex == NULL )
+    {
+        // ... we must create a new one. Protect follow code with the global mutex -
+        // It must be - we create a static variable!
+        MutexGuard aGuard( Mutex::getGlobalMutex() );
+        // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+        if( pMutex == NULL )
+        {
+            // Create the new mutex and set it for return on static variable.
+            static Mutex aMutex;
+            pMutex = &aMutex;
+        }
+    }
+    // Return new created or already existing mutex object.
+    return *pMutex;
+}
+
+// eof
+
diff --git a/svtools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 8c561b299d46..5b74ec1db879 100644
--- a/svtools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <tools/debug.hxx>
@@ -1075,7 +1075,7 @@ void SAL_CALL PathService::flush(  ) throw(::com::sun::star::uno::RuntimeExcepti
 
 ::rtl::OUString SAL_CALL PathService::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.svtools.PathService");
+    return OUString::createFromAscii("com.sun.star.comp.unotools.PathService");
 }
 
 sal_Bool SAL_CALL PathService::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
diff --git a/svtools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index c2dfe94b0a2b..29dfabd45ea7 100644
--- a/svtools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/printwarningoptions.hxx>
+#include <unotools/printwarningoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -91,6 +91,7 @@ public:
 //---------------------------------------------------------------------------------------------------------
 
     virtual void Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
 //---------------------------------------------------------------------------------------------------------
 //  public interface
@@ -242,6 +243,10 @@ void SvtPrintWarningOptions_Impl::Commit()
     PutProperties( aSeqNames, aSeqValues );
 }
 
+void SvtPrintWarningOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
+{
+}
+
 //*****************************************************************************************************************
 //  private method
 //*****************************************************************************************************************
diff --git a/svtools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx
index 7c94807f2c25..b0f41602da2e 100644
--- a/svtools/source/config/regoptions.cxx
+++ b/unotools/source/config/regoptions.cxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include "regoptions.hxx"
+#include "precompiled_unotools.hxx"
+#include <unotools/regoptions.hxx>
 #include <unotools/confignode.hxx>
 #include <tools/date.hxx>
 #include <comphelper/processfactory.hxx>
@@ -39,11 +39,10 @@
 #include <rtl/ustring.hxx>
 
 //........................................................................
-namespace svt
+namespace utl
 {
 //........................................................................
 
-    using namespace ::utl;
     using namespace ::com::sun::star::uno;
 
     //====================================================================
@@ -549,6 +548,6 @@ namespace svt
     }
 
 //........................................................................
-}   // namespace svt
+}   // namespace utl
 //........................................................................
 
diff --git a/svtools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 2b18d1bf4767..49e01c0457e9 100644
--- a/svtools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
 #ifndef GCC
 #endif
 
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include "rtl/instance.hxx"
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
@@ -840,7 +840,7 @@ SvtSaveOptions::SvtSaveOptions()
     ::osl::MutexGuard aGuard( LocalSingleton::get() );
     if ( !pOptions )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtSaveOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtSaveOptions_Impl::ctor()");
         pOptions = new SvtLoadSaveOptions_Impl;
         pOptions->pSaveOpt = new SvtSaveOptions_Impl;
         pOptions->pLoadOpt = new SvtLoadOptions_Impl;
diff --git a/svtools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 261edf4d0f1e..01fbd9a3216d 100644
--- a/svtools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#include "searchopt.hxx"
+#include <unotools/searchopt.hxx>
 #include <tools/solar.h>
 #include <tools/debug.hxx>
 #include <unotools/configitem.hxx>
@@ -75,6 +75,7 @@ public:
 
     // ConfigItem
     virtual void    Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 
     BOOL            GetFlag( USHORT nOffset ) const;
     void            SetFlag( USHORT nOffset, BOOL bVal );
@@ -85,7 +86,7 @@ public:
 SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
     ConfigItem( OUString::createFromAscii( "Office.Common/SearchOptions" ) )
 {
-    RTL_LOGFILE_CONTEXT(aLog, "svtools SvtSearchOptions_Impl::SvtSearchOptions_Impl()");
+    RTL_LOGFILE_CONTEXT(aLog, "unotools SvtSearchOptions_Impl::SvtSearchOptions_Impl()");
     nFlags = 0x0003FFFF;    // set all options values to 'true'
     Load();
     SetModified( FALSE );
@@ -104,6 +105,10 @@ void SvtSearchOptions_Impl::Commit()
         Save();
 }
 
+void SvtSearchOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
+{
+}
+
 
 BOOL SvtSearchOptions_Impl::GetFlag( USHORT nOffset ) const
 {
diff --git a/svtools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 8fbc9008d51e..ca2968d3a807 100644
--- a/svtools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -48,7 +48,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/wldcrd.hxx>
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <rtl/logfile.hxx>
 #include "itemholder1.hxx"
@@ -1073,7 +1073,7 @@ SvtSecurityOptions::SvtSecurityOptions()
     // ... and initialize ouer data container only if it not already exist!
     if( m_pDataContainer == NULL )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtSecurityOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtSecurityOptions_Impl::ctor()");
         m_pDataContainer = new SvtSecurityOptions_Impl;
 
         ItemHolder1::holdConfigItem(E_SECURITYOPTIONS);
diff --git a/svtools/source/config/sourceviewconfig.cxx b/unotools/source/config/sourceviewconfig.cxx
index 40b41d571751..3de0276643bf 100644
--- a/svtools/source/config/sourceviewconfig.cxx
+++ b/unotools/source/config/sourceviewconfig.cxx
@@ -29,23 +29,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <svtools/sourceviewconfig.hxx>
+#include "precompiled_unotools.hxx"
+#include <unotools/sourceviewconfig.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
 #include <rtl/instance.hxx>
-#include <svtools/smplhint.hxx>
 
 #include <itemholder1.hxx>
 
 using namespace utl;
 using namespace rtl;
 using namespace com::sun::star::uno;
-namespace svt
+namespace utl
 {
-class SourceViewConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
+class SourceViewConfig_Impl : public utl::ConfigItem
 {
 private:
     OUString        m_sFontName;
@@ -192,11 +191,7 @@ void SourceViewConfig_Impl::Commit()
     }
     PutProperties( aNames, aValues );
 
-    //notify SfxListener
-    {
-        SfxSimpleHint aHint = SfxSimpleHint( SFX_HINT_DATACHANGED );
-        Broadcast(aHint);
-    }
+    NotifyListeners(0);
 }
 /*-- 28.08.2002 16:32:19---------------------------------------------------
 
@@ -213,14 +208,15 @@ SourceViewConfig::SourceViewConfig()
 
          ++m_nRefCount;
     }
-    StartListening( *m_pImplConfig, TRUE );
+
+    m_pImplConfig->AddListener( this );
 }
 /*-- 28.08.2002 16:32:19---------------------------------------------------
 
   -----------------------------------------------------------------------*/
 SourceViewConfig::~SourceViewConfig()
 {
-    EndListening( *m_pImplConfig, TRUE );
+    m_pImplConfig->RemoveListener( this );
     ::osl::MutexGuard aGuard( lclMutex::get() );
     if( !--m_nRefCount )
     {
@@ -271,11 +267,5 @@ void SourceViewConfig::SetShowProportionalFontsOnly(sal_Bool bSet)
 {
     m_pImplConfig->SetShowProportionalFontsOnly(bSet);
 }
-/* -----------------------------30.08.2002 10:40------------------------------
-
- ---------------------------------------------------------------------------*/
-void SourceViewConfig::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    Broadcast( rHint );
 }
-}//namespace svt
+// namespace utl
diff --git a/svtools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx
index 08f4a7e0500e..172a931231fe 100644
--- a/svtools/source/config/startoptions.cxx
+++ b/unotools/source/config/startoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/startoptions.hxx>
+#include <unotools/startoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
@@ -374,7 +374,7 @@ SvtStartOptions::SvtStartOptions()
     // ... and initialize ouer data container only if it not already!
     if( m_pDataContainer == NULL )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtStartOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtStartOptions_Impl::ctor()");
         m_pDataContainer = new SvtStartOptions_Impl();
 
         ItemHolder1::holdConfigItem(E_STARTOPTIONS);
diff --git a/svtools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index a75c63e34af0..7b14c9cb8c2f 100644..100755
--- a/svtools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -29,33 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
-
-#include <svtools/syslocaleoptions.hxx>
-#include <broadcast.hxx>
-#include <listener.hxx>
-#include <svtools/smplhint.hxx>
-#include <i18npool/mslangid.hxx>
-#include <tools/string.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
+#include <rtl/logfile.hxx>
+#include <i18npool/mslangid.hxx>
+#include <tools/string.hxx>
+#include <tools/debug.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
-
-#include <rtl/logfile.hxx>
-
-#include "itemholder2.hxx"
 
+#include "itemholder1.hxx"
 
 #define CFG_READONLY_DEFAULT    sal_False
 
@@ -74,27 +62,46 @@ namespace
         : public rtl::Static<Link, CurrencyChangeLink> {};
 }
 
+com::sun::star::lang::Locale lcl_str_to_locale( const ::rtl::OUString rStr )
+{
+    com::sun::star::lang::Locale aRet;
+    if ( rStr.getLength() )
+    {
+        aRet = com::sun::star::lang::Locale();
+        sal_Int32 nSep = rStr.indexOf('-');
+        if (nSep < 0)
+            aRet.Language = rStr;
+        else
+        {
+            aRet.Language = rStr.copy(0, nSep);
+            if (nSep < rStr.getLength())
+                aRet.Country = rStr.copy(nSep+1, rStr.getLength() - (nSep+1));
+        }
+    }
+
+    return aRet;
+}
+
 class SvtSysLocaleOptions_Impl : public utl::ConfigItem
 {
+        Locale                  m_aRealLocale;
+        Locale                  m_aRealUILocale;
+        LanguageType            m_eRealLanguage;
+        LanguageType            m_eRealUILanguage;
         OUString                m_aLocaleString;    // en-US or de-DE or empty for SYSTEM
-        LanguageType            m_eLocaleLanguageType;  // same for convenience access
+        OUString                m_aUILocaleString;    // en-US or de-DE or empty for SYSTEM
         OUString                m_aCurrencyString;  // USD-en-US or EUR-de-DE
-        SvtBroadcaster          m_aBroadcaster;
         ULONG                   m_nBlockedHint;     // pending hints
-        sal_Int32               m_nBroadcastBlocked;     // broadcast only if this is 0
         sal_Bool                m_bDecimalSeparator; //use decimal separator same as locale
 
-
         sal_Bool                m_bROLocale;
+        sal_Bool                m_bROUILocale;
         sal_Bool                m_bROCurrency;
         sal_Bool                m_bRODecimalSeparator;
 
-    static  const Sequence< /* const */ OUString >  GetPropertyNames();
-
-            void                UpdateMiscSettings_Impl();
-            ULONG               ChangeLocaleSettings();
-            void                ChangeDefaultCurrency() const;
-            void                Broadcast( ULONG nHint );
+        static  const Sequence< /* const */ OUString >  GetPropertyNames();
+        void                    MakeRealLocale();
+        void                    MakeRealUILocale();
 
 public:
                                 SvtSysLocaleOptions_Impl();
@@ -106,8 +113,10 @@ public:
             const OUString&     GetLocaleString() const
                                     { return m_aLocaleString; }
             void                SetLocaleString( const OUString& rStr );
-            LanguageType        GetLocaleLanguageType() const
-                                    { return m_eLocaleLanguageType; }
+
+            const OUString&     GetUILocaleString() const
+                                    { return m_aUILocaleString; }
+            void                SetUILocaleString( const OUString& rStr );
 
             const OUString&     GetCurrencyString() const
                                     { return m_aCurrencyString; }
@@ -116,30 +125,34 @@ public:
             sal_Bool            IsDecimalSeparatorAsLocale() const { return m_bDecimalSeparator;}
             void                SetDecimalSeparatorAsLocale( sal_Bool bSet);
 
-            SvtBroadcaster&     GetBroadcaster()
-                                    { return m_aBroadcaster; }
-            void                BlockBroadcasts( BOOL bBlock );
             sal_Bool            IsReadOnly( SvtSysLocaleOptions::EOption eOption ) const;
+            const Locale&       GetRealLocale() { return m_aRealLocale; }
+            const Locale&       GetRealUILocale() { return m_aRealUILocale; }
+            LanguageType        GetRealLanguage() { return m_eRealLanguage; }
+            LanguageType        GetRealUILanguage() { return m_eRealUILanguage; }
 };
 
 
-#define ROOTNODE_SYSLOCALE  OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/L10N"))
+#define ROOTNODE_SYSLOCALE              OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/L10N"))
 
-#define PROPERTYNAME_LOCALE         OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale"))
-#define PROPERTYNAME_CURRENCY       OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupCurrency"))
-#define PROPERTYNAME_DECIMALSEPARATOR OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalSeparatorAsLocale"))
+#define PROPERTYNAME_LOCALE             OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale"))
+#define PROPERTYNAME_UILOCALE           OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale"))
+#define PROPERTYNAME_CURRENCY           OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupCurrency"))
+#define PROPERTYNAME_DECIMALSEPARATOR   OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalSeparatorAsLocale"))
 
-#define PROPERTYHANDLE_LOCALE       0
-#define PROPERTYHANDLE_CURRENCY     1
-#define PROPERTYHANDLE_DECIMALSEPARATOR 2
+#define PROPERTYHANDLE_LOCALE           0
+#define PROPERTYHANDLE_UILOCALE         1
+#define PROPERTYHANDLE_CURRENCY         2
+#define PROPERTYHANDLE_DECIMALSEPARATOR 3
 
-#define PROPERTYCOUNT               3
+#define PROPERTYCOUNT                   4
 
 const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
 {
     static const OUString pProperties[] =
     {
         PROPERTYNAME_LOCALE,
+        PROPERTYNAME_UILOCALE,
         PROPERTYNAME_CURRENCY,
         PROPERTYNAME_DECIMALSEPARATOR
     };
@@ -147,22 +160,19 @@ const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
     return seqPropertyNames;
 }
 
-
 // -----------------------------------------------------------------------
 
 SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
     : ConfigItem( ROOTNODE_SYSLOCALE )
     , m_nBlockedHint( 0 )
-    , m_nBroadcastBlocked( 0 )
     , m_bDecimalSeparator( sal_True )
     , m_bROLocale(CFG_READONLY_DEFAULT)
+    , m_bROUILocale(CFG_READONLY_DEFAULT)
     , m_bROCurrency(CFG_READONLY_DEFAULT)
     , m_bRODecimalSeparator(sal_False)
 
 {
-    if ( !IsValidConfigMgr() )
-        ChangeLocaleSettings();     // assume SYSTEM defaults during Setup
-    else
+    if ( IsValidConfigMgr() )
     {
         const Sequence< OUString > aNames = GetPropertyNames();
         Sequence< Any > aValues = GetProperties( aNames );
@@ -192,6 +202,18 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
                                 m_bROLocale = pROStates[nProp];
                             }
                             break;
+                        case PROPERTYHANDLE_UILOCALE :
+                            {
+                                OUString aStr;
+                                if ( pValues[nProp] >>= aStr )
+                                    m_aUILocaleString = aStr;
+                                else
+                                {
+                                    DBG_ERRORFILE( "Wrong property type!" );
+                                }
+                                m_bROUILocale = pROStates[nProp];
+                            }
+                            break;
                         case PROPERTYHANDLE_CURRENCY :
                             {
                                 OUString aStr;
@@ -222,10 +244,12 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
                 }
             }
         }
-        UpdateMiscSettings_Impl();
-        ChangeLocaleSettings();
+//        UpdateMiscSettings_Impl();
         EnableNotification( aNames );
     }
+
+    MakeRealLocale();
+    MakeRealUILocale();
 }
 
 
@@ -235,15 +259,35 @@ SvtSysLocaleOptions_Impl::~SvtSysLocaleOptions_Impl()
         Commit();
 }
 
+void SvtSysLocaleOptions_Impl::MakeRealLocale()
+{
+    m_aRealLocale = lcl_str_to_locale( m_aLocaleString );
+    if ( m_aRealLocale.Language.getLength() )
+    {
+        m_eRealLanguage = MsLangId::convertLocaleToLanguage( m_aRealLocale );
+    }
+    else
+    {
+        m_eRealLanguage = MsLangId::getSystemLanguage();
+        MsLangId::convertLanguageToLocale( m_eRealLanguage, m_aRealLocale );
+    }
+}
 
-void SvtSysLocaleOptions_Impl::BlockBroadcasts( BOOL bBlock )
+void SvtSysLocaleOptions_Impl::MakeRealUILocale()
 {
-    if ( bBlock )
-        ++m_nBroadcastBlocked;
-    else if ( m_nBroadcastBlocked )
+    if ( !m_aRealUILocale.Language.getLength() )
     {
-        if ( --m_nBroadcastBlocked == 0 )
-            Broadcast( 0 );
+        // as we can't switch UILocale at runtime, we only store changes in the configuration
+        m_aRealUILocale = lcl_str_to_locale( m_aUILocaleString );
+        if ( m_aRealUILocale.Language.getLength() )
+        {
+            m_eRealUILanguage = MsLangId::convertLocaleToLanguage( m_aRealUILocale );
+        }
+        else
+        {
+            m_eRealUILanguage = MsLangId::getSystemUILanguage();
+            MsLangId::convertLanguageToLocale( m_eRealUILanguage, m_aRealUILocale );
+        }
     }
 }
 
@@ -257,6 +301,11 @@ sal_Bool SvtSysLocaleOptions_Impl::IsReadOnly( SvtSysLocaleOptions::EOption eOpt
                 bReadOnly = m_bROLocale;
                 break;
             }
+        case SvtSysLocaleOptions::E_UILOCALE :
+            {
+                bReadOnly = m_bROUILocale;
+                break;
+            }
         case SvtSysLocaleOptions::E_CURRENCY :
             {
                 bReadOnly = m_bROCurrency;
@@ -267,25 +316,6 @@ sal_Bool SvtSysLocaleOptions_Impl::IsReadOnly( SvtSysLocaleOptions::EOption eOpt
 }
 
 
-void SvtSysLocaleOptions_Impl::Broadcast( ULONG nHint )
-{
-    if ( m_nBroadcastBlocked )
-        m_nBlockedHint |= nHint;
-    else
-    {
-        nHint |= m_nBlockedHint;
-        m_nBlockedHint = 0;
-        if ( nHint )
-        {
-            if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
-                ChangeDefaultCurrency();
-            SfxSimpleHint aHint( nHint );
-            GetBroadcaster().Broadcast( aHint );
-        }
-    }
-}
-
-
 void SvtSysLocaleOptions_Impl::Commit()
 {
     const Sequence< OUString > aOrgNames = GetPropertyNames();
@@ -312,9 +342,19 @@ void SvtSysLocaleOptions_Impl::Commit()
                     }
                 }
                 break;
+            case PROPERTYHANDLE_UILOCALE :
+                {
+                    if (!m_bROUILocale)
+                    {
+                        pNames[nRealCount] = aOrgNames[nProp];
+                        pValues[nRealCount] <<= m_aUILocaleString;
+                        ++nRealCount;
+                    }
+                }
+                break;
             case PROPERTYHANDLE_CURRENCY :
                 {
-                    if (!m_bROLocale)
+                    if (!m_bROCurrency)
                     {
                         pNames[nRealCount] = aOrgNames[nProp];
                         pValues[nRealCount] <<= m_aCurrencyString;
@@ -346,36 +386,38 @@ void SvtSysLocaleOptions_Impl::SetLocaleString( const OUString& rStr )
     if (!m_bROLocale && rStr != m_aLocaleString )
     {
         m_aLocaleString = rStr;
+        MakeRealLocale();
+        MsLangId::setConfiguredSystemLanguage( m_eRealLanguage );
         SetModified();
         ULONG nHint = SYSLOCALEOPTIONS_HINT_LOCALE;
-        nHint |= ChangeLocaleSettings();
-        Broadcast( nHint );
+        if ( !m_aCurrencyString.getLength() )
+            nHint |= SYSLOCALEOPTIONS_HINT_CURRENCY;
+        NotifyListeners( nHint );
     }
 }
 
-
-ULONG SvtSysLocaleOptions_Impl::ChangeLocaleSettings()
+void SvtSysLocaleOptions_Impl::SetUILocaleString( const OUString& rStr )
 {
-    // An empty config value denotes SYSTEM locale
-    if ( m_aLocaleString.getLength() )
-        m_eLocaleLanguageType = MsLangId::convertIsoStringToLanguage( m_aLocaleString );
-    else
-        m_eLocaleLanguageType = LANGUAGE_SYSTEM;
-    ULONG nHint = 0;
-    // new locale and no fixed currency => locale default currency might change
-    if ( !m_aCurrencyString.getLength() )
-        nHint |= SYSLOCALEOPTIONS_HINT_CURRENCY;
-    return nHint;
+    if (!m_bROUILocale && rStr != m_aUILocaleString )
+    {
+        m_aUILocaleString = rStr;
+/*
+        // as we can't switch UILocale at runtime, we only store changes in the configuration
+        MakeRealUILocale();
+        MsLangId::setConfiguredSystemLanguage( m_eRealUILanguage );
+        SetModified();
+        NotifyListeners( SYSLOCALEOPTIONS_HINT_UILOCALE );
+*/
+    }
 }
 
-
 void SvtSysLocaleOptions_Impl::SetCurrencyString( const OUString& rStr )
 {
     if (!m_bROCurrency && rStr != m_aCurrencyString )
     {
         m_aCurrencyString = rStr;
         SetModified();
-        Broadcast( SYSLOCALEOPTIONS_HINT_CURRENCY );
+        NotifyListeners( SYSLOCALEOPTIONS_HINT_CURRENCY );
     }
 }
 
@@ -385,19 +427,10 @@ void SvtSysLocaleOptions_Impl::SetDecimalSeparatorAsLocale( sal_Bool bSet)
     {
         m_bDecimalSeparator = bSet;
         SetModified();
-        UpdateMiscSettings_Impl();
+        NotifyListeners( SYSLOCALEOPTIONS_HINT_DECSEP );
     }
 }
 
-
-void SvtSysLocaleOptions_Impl::ChangeDefaultCurrency() const
-{
-    const Link& rLink = SvtSysLocaleOptions::GetCurrencyChangeLink();
-    if ( rLink.IsSet() )
-        rLink.Call( NULL );
-}
-
-
 void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPropertyNames )
 {
     ULONG nHint = 0;
@@ -412,7 +445,17 @@ void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPrope
             seqValues[nProp] >>= m_aLocaleString;
             m_bROLocale = seqROStates[nProp];
             nHint |= SYSLOCALEOPTIONS_HINT_LOCALE;
-            nHint |= ChangeLocaleSettings();
+            if ( !m_aCurrencyString.getLength() )
+                nHint |= SYSLOCALEOPTIONS_HINT_CURRENCY;
+            MakeRealLocale();
+        }
+        if( seqPropertyNames[nProp] == PROPERTYNAME_UILOCALE )
+        {
+            DBG_ASSERT( seqValues[nProp].getValueTypeClass() == TypeClass_STRING, "Locale property type" );
+            seqValues[nProp] >>= m_aUILocaleString;
+            m_bROUILocale = seqROStates[nProp];
+            nHint |= SYSLOCALEOPTIONS_HINT_UILOCALE;
+            MakeRealUILocale();
         }
         else if( seqPropertyNames[nProp] == PROPERTYNAME_CURRENCY )
         {
@@ -425,22 +468,10 @@ void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPrope
         {
             seqValues[nProp] >>= m_bDecimalSeparator;
             m_bRODecimalSeparator = seqROStates[nProp];
-            UpdateMiscSettings_Impl();
         }
     }
     if ( nHint )
-        Broadcast( nHint );
-}
-/* -----------------10.02.2004 15:25-----------------
-
- --------------------------------------------------*/
-void SvtSysLocaleOptions_Impl::UpdateMiscSettings_Impl()
-{
-    AllSettings aAllSettings( Application::GetSettings() );
-    MiscSettings aMiscSettings = aAllSettings.GetMiscSettings();
-    aMiscSettings.SetEnableLocalizedDecimalSep(m_bDecimalSeparator);
-    aAllSettings.SetMiscSettings( aMiscSettings );
-    Application::SetSettings( aAllSettings );
+        NotifyListeners( nHint );
 }
 
 // ====================================================================
@@ -450,18 +481,20 @@ SvtSysLocaleOptions::SvtSysLocaleOptions()
     MutexGuard aGuard( GetMutex() );
     if ( !pOptions )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtSysLocaleOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "svl ( ??? ) ::SvtSysLocaleOptions_Impl::ctor()");
         pOptions = new SvtSysLocaleOptions_Impl;
 
-        ItemHolder2::holdConfigItem(E_SYSLOCALEOPTIONS);
+        ItemHolder1::holdConfigItem(E_SYSLOCALEOPTIONS);
     }
     ++nRefCount;
+    pOptions->AddListener(this);
 }
 
 
 SvtSysLocaleOptions::~SvtSysLocaleOptions()
 {
     MutexGuard aGuard( GetMutex() );
+    pOptions->RemoveListener(this);
     if ( !--nRefCount )
     {
         delete pOptions;
@@ -480,7 +513,7 @@ Mutex& SvtSysLocaleOptions::GetMutex()
         if( !pMutex )
         {
             // #i77768# Due to a static reference in the toolkit lib
-            // we need a mutex that lives longer than the svtools library.
+            // we need a mutex that lives longer than the svl library.
             // Otherwise the dtor would use a destructed mutex!!
             pMutex = new Mutex;
         }
@@ -503,41 +536,37 @@ void SvtSysLocaleOptions::Commit()
 }
 
 
-BOOL SvtSysLocaleOptions::AddListener( SvtListener& rLst )
+void SvtSysLocaleOptions::BlockBroadcasts( bool bBlock )
 {
     MutexGuard aGuard( GetMutex() );
-    return rLst.StartListening( pOptions->GetBroadcaster() );
+    pOptions->BlockBroadcasts( bBlock );
 }
 
 
-BOOL SvtSysLocaleOptions::RemoveListener( SvtListener& rLst )
+const OUString& SvtSysLocaleOptions::GetLocaleConfigString() const
 {
     MutexGuard aGuard( GetMutex() );
-    return rLst.EndListening( pOptions->GetBroadcaster() );
+    return pOptions->GetLocaleString();
 }
 
-
-void SvtSysLocaleOptions::BlockBroadcasts( BOOL bBlock )
+void SvtSysLocaleOptions::SetLocaleConfigString( const OUString& rStr )
 {
     MutexGuard aGuard( GetMutex() );
-    pOptions->BlockBroadcasts( bBlock );
+    pOptions->SetLocaleString( rStr );
 }
 
-
-const OUString& SvtSysLocaleOptions::GetLocaleConfigString() const
+const OUString& SvtSysLocaleOptions::GetUILocaleConfigString() const
 {
     MutexGuard aGuard( GetMutex() );
-    return pOptions->GetLocaleString();
+    return pOptions->GetUILocaleString();
 }
 
-
-void SvtSysLocaleOptions::SetLocaleConfigString( const OUString& rStr )
+void SvtSysLocaleOptions::SetUILocaleConfigString( const OUString& rStr )
 {
     MutexGuard aGuard( GetMutex() );
-    pOptions->SetLocaleString( rStr );
+    pOptions->SetUILocaleString( rStr );
 }
 
-
 const OUString& SvtSysLocaleOptions::GetCurrencyConfigString() const
 {
     MutexGuard aGuard( GetMutex() );
@@ -552,11 +581,6 @@ void SvtSysLocaleOptions::SetCurrencyConfigString( const OUString& rStr )
 }
 
 
-LanguageType SvtSysLocaleOptions::GetLocaleLanguageType() const
-{
-    MutexGuard aGuard( GetMutex() );
-    return pOptions->GetLocaleLanguageType();
-}
 
 /*-- 11.02.2004 13:31:41---------------------------------------------------
 
@@ -635,3 +659,47 @@ const Link& SvtSysLocaleOptions::GetCurrencyChangeLink()
     return CurrencyChangeLink::get();
 }
 
+
+void SvtSysLocaleOptions::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 nHint  )
+{
+    if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
+    {
+        const Link& rLink = GetCurrencyChangeLink();
+        if ( rLink.IsSet() )
+            rLink.Call( NULL );
+    }
+
+    ::utl::detail::Options::ConfigurationChanged( p, nHint );
+}
+
+com::sun::star::lang::Locale SvtSysLocaleOptions::GetLocale() const
+{
+    return lcl_str_to_locale( GetLocaleConfigString() );
+}
+
+com::sun::star::lang::Locale SvtSysLocaleOptions::GetUILocale() const
+{
+    return lcl_str_to_locale( GetUILocaleConfigString() );
+}
+
+com::sun::star::lang::Locale SvtSysLocaleOptions::GetRealLocale() const
+{
+    return pOptions->GetRealLocale();
+}
+
+com::sun::star::lang::Locale SvtSysLocaleOptions::GetRealUILocale() const
+{
+    return pOptions->GetRealUILocale();
+}
+
+LanguageType SvtSysLocaleOptions::GetRealLanguage() const
+{
+    return pOptions->GetRealLanguage();
+}
+
+LanguageType SvtSysLocaleOptions::GetRealUILanguage() const
+{
+    return pOptions->GetRealUILanguage();
+}
+
+
diff --git a/svtools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx
index a0c74ef84aac..c2c79120995f 100644
--- a/svtools/source/config/undoopt.cxx
+++ b/unotools/source/config/undoopt.cxx
@@ -29,13 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
+#include "precompiled_unotools.hxx"
 
-#include <svtools/undoopt.hxx>
+#include <unotools/undoopt.hxx>
 #include "rtl/instance.hxx"
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
@@ -43,11 +39,9 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/smplhint.hxx>
-#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/logfile.hxx>
-#include "itemholder2.hxx"
+#include "itemholder1.hxx"
 
 using namespace utl;
 using namespace rtl;
@@ -58,7 +52,7 @@ static sal_Int32           nRefCount = 0;
 
 #define STEPS 0
 
-class SvtUndoOptions_Impl : public utl::ConfigItem, public SfxBroadcaster
+class SvtUndoOptions_Impl : public utl::ConfigItem
 {
     sal_Int32               nUndoCount;
     Sequence< rtl::OUString > m_aPropertyNames;
@@ -100,8 +94,7 @@ void SvtUndoOptions_Impl::Commit()
     }
 
     PutProperties( m_aPropertyNames, aValues );
-    //broadcast changes
-    Broadcast(SfxSimpleHint(SFX_HINT_UNDO_OPTIONS_CHANGED));
+    NotifyListeners(0);
 }
 
 // -----------------------------------------------------------------------
@@ -158,8 +151,6 @@ void SvtUndoOptions_Impl::Load()
 void SvtUndoOptions_Impl::Notify( const Sequence<rtl::OUString>& )
 {
     Load();
-    //broadcast changes
-    Broadcast(SfxSimpleHint(SFX_HINT_UNDO_OPTIONS_CHANGED));
 }
 
 // -----------------------------------------------------------------------
@@ -177,14 +168,14 @@ SvtUndoOptions::SvtUndoOptions()
     ::osl::MutexGuard aGuard( LocalSingleton::get() );
     if ( !pOptions )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtUndoOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtUndoOptions_Impl::ctor()");
         pOptions = new SvtUndoOptions_Impl;
 
-        ItemHolder2::holdConfigItem(E_UNDOOPTIONS);
+        ItemHolder1::holdConfigItem(E_UNDOOPTIONS);
     }
     ++nRefCount;
     pImp = pOptions;
-    StartListening(*pImp);
+    pImp->AddListener(this);
 }
 
 // -----------------------------------------------------------------------
@@ -193,7 +184,7 @@ SvtUndoOptions::~SvtUndoOptions()
 {
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( LocalSingleton::get() );
-    EndListening(*pImp);
+    pImp->RemoveListener(this);
     if ( !--nRefCount )
     {
         if ( pOptions->IsModified() )
@@ -211,10 +202,3 @@ sal_Int32 SvtUndoOptions::GetUndoCount() const
 {
     return pImp->GetUndoCount();
 }
-
-void SvtUndoOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
-    Broadcast( rHint );
-}
-
diff --git a/svtools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 4eafbefe54a3..e06d6a794e20 100644
--- a/svtools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -29,25 +29,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#ifdef  SVL_DLLIMPLEMENTATION
-#undef  SVL_DLLIMPLEMENTATION
-#endif
-#define SVT_DLLIMPLEMENTATION
+#include "precompiled_unotools.hxx"
 
-#include <svtools/useroptions.hxx>
-#include "configitems/useroptions_const.hxx"
+#include <unotools/useroptions.hxx>
+#include <unotools/useroptions_const.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/smplhint.hxx>
 #include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/logfile.hxx>
-#include "itemholder2.hxx"
+#include "itemholder1.hxx"
 
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -60,7 +54,7 @@
 #include <com/sun/star/util/ChangesEvent.hpp>
 #include <comphelper/configurationhelper.hxx>
 #include <unotools/processfactory.hxx>
-#include <loghelper.hxx>
+#include <unotools/loghelper.hxx>
 
 using namespace utl;
 using namespace rtl;
@@ -87,7 +81,7 @@ class SvtUserConfigChangeListener_Impl : public cppu::WeakImplHelper1
     virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException);
 };
 
-class SvtUserOptions_Impl : public SfxBroadcaster
+class SvtUserOptions_Impl : public utl::ConfigurationBroadcaster
 {
 public:
     SvtUserOptions_Impl();
@@ -778,8 +772,9 @@ void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment )
 
 void SvtUserOptions_Impl::Notify()
 {
-    Broadcast( SfxSimpleHint( SFX_HINT_USER_OPTIONS_CHANGED ) );
+    NotifyListeners(0);
 }
+
 // -----------------------------------------------------------------------
 
 sal_Bool SvtUserOptions_Impl::IsTokenReadonly( USHORT nToken ) const
@@ -938,14 +933,14 @@ SvtUserOptions::SvtUserOptions()
 
     if ( !pOptions )
     {
-        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtUserOptions_Impl::ctor()");
+        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtUserOptions_Impl::ctor()");
         pOptions = new SvtUserOptions_Impl;
 
-        ItemHolder2::holdConfigItem(E_USEROPTIONS);
+        ItemHolder1::holdConfigItem(E_USEROPTIONS);
     }
     ++nRefCount;
     pImp = pOptions;
-    StartListening( *pImp);
+    pImp->AddListener(this);
 }
 
 // -----------------------------------------------------------------------
@@ -954,7 +949,7 @@ SvtUserOptions::~SvtUserOptions()
 {
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( GetInitMutex() );
-
+    pImp->RemoveListener(this);
     if ( !--nRefCount )
     {
         //if ( pOptions->IsModified() )
@@ -1303,11 +1298,3 @@ sal_Bool SvtUserOptions::IsTokenReadonly( USHORT nToken ) const
     ::osl::MutexGuard aGuard( GetInitMutex() );
     return pImp->GetToken( nToken );
 }
-/* -----------------07.07.2003 09:30-----------------
-
- --------------------------------------------------*/
-void SvtUserOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
-    Broadcast( rHint );
-}
diff --git a/svtools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index d4c8d65dbe04..9ef8fc45d570 100644
--- a/svtools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 #include <hash_map>
diff --git a/svtools/source/config/workingsetoptions.cxx b/unotools/source/config/workingsetoptions.cxx
index d2c1007a70de..6b17a63dad4d 100644
--- a/svtools/source/config/workingsetoptions.cxx
+++ b/unotools/source/config/workingsetoptions.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
@@ -37,7 +37,7 @@
 //  includes
 //_________________________________________________________________________________________________________________
 
-#include <svtools/workingsetoptions.hxx>
+#include <unotools/workingsetoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index 36886a533413..b1c3f1e31e2d 100644
--- a/svtools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -29,17 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 
-#include "xmlaccelcfg.hxx"
+#include <unotools/xmlaccelcfg.hxx>
 
 #include <vector>
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <cppuhelper/implbase1.hxx>
 
@@ -200,7 +194,7 @@ void AttributeListImpl::clear()
     ::std::vector<struct TagAttribute> dummy;
     m_pImpl->vecAttribute.swap( dummy );
 
-    assert( ! getLength() );
+    OSL_ASSERT( ! getLength() );
 }
 
 // ------------------------------------------------------------------
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 1d83761b5cea..b56175af7e41 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -71,7 +71,7 @@ CalendarWrapper::CalendarWrapper(
         }
         catch ( Exception& e )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             ByteString aMsg( "CalendarWrapper ctor: Exception caught\n" );
             aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
             DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -96,7 +96,7 @@ CalendarWrapper::CalendarWrapper(
         }
         catch ( Exception& e )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             ByteString aMsg( "getComponentInstance: Exception caught\n" );
             aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
             DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -122,7 +122,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale&
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "loadDefaultCalendar: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -142,7 +142,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "loadCalendar: Exception caught\nrequested: " );
         aMsg += ByteString( String( rUniqueID ), RTL_TEXTENCODING_UTF8 );
         aMsg += "   Locale: ";
@@ -167,7 +167,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getLoadedCalendar: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -188,7 +188,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getAllCalendars: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -209,7 +209,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getUniqueID: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -230,7 +230,7 @@ void CalendarWrapper::setDateTime( double nTimeInDays )
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "setDateTime: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -250,7 +250,7 @@ double CalendarWrapper::getDateTime() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getDateTime: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -280,7 +280,7 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis(
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "setLocalDateTime: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -352,7 +352,7 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays )
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "setLocalDateTime: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -378,7 +378,7 @@ double CalendarWrapper::getLocalDateTime() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getLocalDateTime: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -399,7 +399,7 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue )
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "setValue: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -419,7 +419,7 @@ sal_Bool CalendarWrapper::isValid() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "isValid: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -440,7 +440,7 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getValue: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -461,7 +461,7 @@ void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount )
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "addValue: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -481,7 +481,7 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getFirstDayOfWeek: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -502,7 +502,7 @@ void CalendarWrapper::setFirstDayOfWeek( sal_Int16 nDay )
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "setFirstDayOfWeek: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -522,7 +522,7 @@ void CalendarWrapper::setMinimumNumberOfDaysForFirstWeek( sal_Int16 nDays )
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "setMinimumNumberOfDaysForFirstWeek: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -542,7 +542,7 @@ sal_Int16 CalendarWrapper::getMinimumNumberOfDaysForFirstWeek() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getMinimumNumberOfDaysForFirstWeek: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -563,7 +563,7 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getNumberOfMonthsInYear: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -584,7 +584,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getNumberOfDaysInWeek: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -605,7 +605,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getMonths: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -626,7 +626,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getDays: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -647,7 +647,7 @@ String CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_Int
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getDisplayName: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -670,7 +670,7 @@ String CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_In
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getDisplayString: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index c1b6b4bc155c..5b411d1bb519 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -538,7 +538,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "parseAnyToken: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -570,7 +570,7 @@ sal_Int32 CharClass::getStringType( const String& rStr, xub_StrLen nPos, xub_Str
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "parsePredefinedToken: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 074ff7af716a..fa70cc3dda81 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1991,7 +1991,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
         nCheck = nLocaleDataChecking;
         if (!nCheck)
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             nCheck = 1;
 #else
             const char* pEnv = getenv( "OOO_ENABLE_LOCALE_DATA_CHECKS");
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index bd33e447471f..7647a6abc345 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -191,7 +191,7 @@ void TransliterationWrapper::loadModuleImpl() const
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "loadModuleImpl: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -218,7 +218,7 @@ void TransliterationWrapper::loadModuleByImplName(
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "loadModuleByImplName: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -244,7 +244,7 @@ sal_Bool TransliterationWrapper::equals(
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "equals: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -269,7 +269,7 @@ sal_Int32 TransliterationWrapper::compareSubstring(
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "compareSubstring: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -292,7 +292,7 @@ sal_Int32 TransliterationWrapper::compareString( const String& rStr1, const Stri
     }
     catch ( Exception& e )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "compareString: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
diff --git a/vcl/source/gdi/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 565c92740dad..5c4f902fbd55 100644
--- a/vcl/source/gdi/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-#include <vcl/fontcvt.hxx>
-#include <vcl/outdev.h>
+#include "precompiled_unotools.hxx"
+#include <unotools/fontcvt.hxx>
+#include <unotools/fontdefs.hxx>
 
 #ifndef _STLP_MAP
 #include <map>
@@ -1350,13 +1350,13 @@ StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly)
 
 //=======================================================================
 
-sal_Unicode ImplRecodeChar( const ImplCvtChar* pConversion, sal_Unicode cChar )
+sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
 {
     sal_Unicode cRetVal = 0;
-    if( pConversion->mpCvtFunc )
+    if( mpCvtFunc )
     {
         // use a conversion function for recoding
-        cRetVal = pConversion->mpCvtFunc( cChar );
+        cRetVal = mpCvtFunc( cChar );
     }
     else
     {
@@ -1367,7 +1367,7 @@ sal_Unicode ImplRecodeChar( const ImplCvtChar* pConversion, sal_Unicode cChar )
             cIndex -= 0xF000;
         // recode the symbol
         if( cIndex>=0x0020 && cIndex<=0x00FF )
-            cRetVal = pConversion->mpCvtTab[ cIndex - 0x0020 ];
+            cRetVal = mpCvtTab[ cIndex - 0x0020 ];
     }
 
     return cRetVal ? cRetVal : cChar;
@@ -1377,8 +1377,7 @@ sal_Unicode ImplRecodeChar( const ImplCvtChar* pConversion, sal_Unicode cChar )
 
 // recode the string assuming the character codes are symbol codes
 // from an traditional symbol font (i.e. U+F020..U+F0FF)
-void ImplRecodeString( const ImplCvtChar* pConversion, String& rStr,
-           xub_StrLen nIndex, xub_StrLen nLen )
+void ConvertChar::RecodeString( String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const
 {
     ULONG nLastIndex = (ULONG)nIndex + nLen;
     if( nLastIndex > rStr.Len() )
@@ -1393,7 +1392,7 @@ void ImplRecodeString( const ImplCvtChar* pConversion, String& rStr,
             continue;
 
         // recode a symbol
-        sal_Unicode cNew = ImplRecodeChar( pConversion, cOrig );
+        sal_Unicode cNew = RecodeChar( cOrig );
         if( cOrig != cNew )
             rStr.SetChar( nIndex, cNew );
     }
@@ -1401,7 +1400,7 @@ void ImplRecodeString( const ImplCvtChar* pConversion, String& rStr,
 
 //=======================================================================
 
-struct RecodeTable { const char* pOrgName; ImplCvtChar aCvt;};
+struct RecodeTable { const char* pOrgName; ConvertChar aCvt;};
 
 static RecodeTable aRecodeTable[] =
 {
@@ -1427,22 +1426,17 @@ static RecodeTable aRecodeTable[] =
     {"mtextra",         {aMTExtraTab, "StarSymbol", NULL}}
 };
 
-static ImplCvtChar aImplStarSymbolCvt = { NULL, "StarBats", ImplStarSymbolToStarBats };
-#if 0
-// not used
-static ImplCvtChar aImplDingBatsCvt   = { aMonotypeSortsTab, "StarSymbol", NULL };
-#endif
+static ConvertChar aImplStarSymbolCvt = { NULL, "StarBats", ImplStarSymbolToStarBats };
 
 // -----------------------------------------------------------------------
 
-const ImplCvtChar* ImplGetRecodeData( const String& rOrgFontName,
-                                      const String& rMapFontName )
+const ConvertChar* ConvertChar::GetRecodeData( const String& rOrgFontName, const String& rMapFontName )
 {
-    const ImplCvtChar* pCvt = NULL;
+    const ConvertChar* pCvt = NULL;
     String aOrgName( rOrgFontName );
-    ImplGetEnglishSearchFontName( aOrgName );
+    GetEnglishSearchFontName( aOrgName );
     String aMapName( rMapFontName );
-    ImplGetEnglishSearchFontName( aMapName );
+    GetEnglishSearchFontName( aMapName );
 
     if( aMapName.EqualsAscii( "starsymbol" )
      || aMapName.EqualsAscii( "opensymbol" ) )
@@ -1471,10 +1465,10 @@ const ImplCvtChar* ImplGetRecodeData( const String& rOrgFontName,
 FontToSubsFontConverter CreateFontToSubsFontConverter(
     const String& rOrgName, ULONG nFlags )
 {
-    const ImplCvtChar* pCvt = NULL;
+    const ConvertChar* pCvt = NULL;
 
     String aName = rOrgName;
-    ImplGetEnglishSearchFontName( aName );
+    GetEnglishSearchFontName( aName );
 
     if ( nFlags & FONTTOSUBSFONT_IMPORT )
     {
@@ -1511,7 +1505,7 @@ sal_Unicode ConvertFontToSubsFontChar(
     FontToSubsFontConverter hConverter, sal_Unicode cChar )
 {
     if ( hConverter )
-        return ImplRecodeChar( (ImplCvtChar*)hConverter, cChar );
+        return ((ConvertChar*)hConverter)->RecodeChar( cChar );
     else
         return cChar;
 }
@@ -1523,6 +1517,7 @@ String GetFontToSubsFontName( FontToSubsFontConverter hConverter )
     if ( !hConverter )
         return String();
 
-    const char* pName = ((ImplCvtChar*)hConverter)->mpSubsFontName;
+    const char* pName = ((ConvertChar*)hConverter)->mpSubsFontName;
     return String::CreateFromAscii( pName );
 }
+
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
new file mode 100644
index 000000000000..15e67c44f001
--- /dev/null
+++ b/unotools/source/misc/fontdefs.cxx
@@ -0,0 +1,596 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_unotools.hxx"
+#include <unotools/fontdefs.hxx>
+#include <unotools/fontcfg.hxx>
+#include <hash_map>
+
+struct ImplLocalizedFontName
+{
+    const char*         mpEnglishName;
+    const sal_Unicode*  mpLocalizedNames;
+};
+
+static sal_Unicode const aBatang[] = { 0xBC14, 0xD0D5, 0, 0 };
+static sal_Unicode const aBatangChe[] = { 0xBC14, 0xD0D5, 0xCCB4, 0, 0 };
+static sal_Unicode const aGungsuh[] = { 0xAD81, 0xC11C, 0, 0 };
+static sal_Unicode const aGungsuhChe[] = { 0xAD81, 0xC11C, 0xCCB4, 0, 0 };
+static sal_Unicode const aGulim[] = { 0xAD74, 0xB9BC, 0, 0 };
+static sal_Unicode const aGulimChe[] = { 0xAD74, 0xB9BC, 0xCCB4, 0, 0 };
+static sal_Unicode const aDotum[] = { 0xB3CB, 0xC6C0, 0, 0 };
+static sal_Unicode const aDotumChe[] = { 0xB3CB, 0xC6C0, 0xCCB4, 0, 0 };
+static sal_Unicode const aSimSun[] = { 0x5B8B, 0x4F53, 0, 0 };
+static sal_Unicode const aNSimSun[] = { 0x65B0, 0x5B8B, 0x4F53, 0, 0 };
+static sal_Unicode const aSimHei[] = { 0x9ED1, 0x4F53, 0, 0 };
+static sal_Unicode const aSimKai[] = { 0x6977, 0x4F53, 0, 0 };
+static sal_Unicode const azycjkSun[] = { 0x4E2D, 0x6613, 0x5B8B, 0x4F53, 0, 0 };
+static sal_Unicode const azycjkHei[] = { 0x4E2D, 0x6613, 0x9ED1, 0x4F53, 0, 0 };
+static sal_Unicode const azycjkKai[] = { 0x4E2D, 0x6613, 0x6977, 0x4F53, 0, 0 };
+static sal_Unicode const aFZHei[] = { 0x65B9, 0x6B63, 0x9ED1, 0x4F53, 0, 0 };
+static sal_Unicode const aFZKai[] = { 0x65B9, 0x6B63, 0x6977, 0x4F53, 0, 0 };
+static sal_Unicode const aFZSongYI[] = { 0x65B9, 0x6B63, 0x5B8B, 0x4E00, 0, 0 };
+static sal_Unicode const aFZShuSong[] = { 0x65B9, 0x6B63, 0x4E66, 0x5B8B, 0, 0 };
+static sal_Unicode const aFZFangSong[] = { 0x65B9, 0x6B63, 0x4EFF, 0x5B8B, 0, 0 };
+// Attention: this fonts includes the wrong encoding vector - so we double the names with correct and wrong encoding
+// First one is the GB-Encoding (we think the correct one), second is the big5 encoded name
+static sal_Unicode const aMHei[] = { 'm', 0x7B80, 0x9ED1, 0, 'm', 0x6F60, 0x7AAA, 0, 0 };
+static sal_Unicode const aMKai[] = { 'm', 0x7B80, 0x6977, 0x566C, 0, 'm', 0x6F60, 0x7FF1, 0x628E, 0, 0 };
+static sal_Unicode const aMSong[] = { 'm', 0x7B80, 0x5B8B, 0, 'm', 0x6F60, 0x51BC, 0, 0 };
+static sal_Unicode const aCFangSong[] = { 'm', 0x7B80, 0x592B, 0x5B8B, 0, 'm', 0x6F60, 0x6E98, 0x51BC, 0, 0 };
+static sal_Unicode const aMingLiU[] = { 0x7D30, 0x660E, 0x9AD4, 0, 0 };
+static sal_Unicode const aPMingLiU[] = { 0x65B0, 0x7D30, 0x660E, 0x9AD4, 0, 0 };
+static sal_Unicode const aHei[] = { 0x6865, 0, 0 };
+static sal_Unicode const aKai[] = { 0x6B61, 0, 0 };
+static sal_Unicode const aMing[] = { 0x6D69, 0x6E67, 0, 0 };
+static sal_Unicode const aMSGothic[] = { 'm','s',       0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
+static sal_Unicode const aMSPGothic[] = { 'm','s','p',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
+static sal_Unicode const aMSMincho[] = { 'm', 's',      0x660E, 0x671D, 0 };
+static sal_Unicode const aMSPMincho[] = { 'm','s','p',  0x660E, 0x671D, 0 };
+static sal_Unicode const aMeiryo[]    = { 0x30e1, 0x30a4, 0x30ea, 0x30aa, 0 };
+static sal_Unicode const aHGMinchoL[] = { 'h','g',      0x660E, 0x671D, 'l', 0, 0 };
+static sal_Unicode const aHGGothicB[] = { 'h','g',      0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 0 };
+static sal_Unicode const aHGPMinchoL[] = { 'h','g','p', 0x660E, 0x671D, 'l', 0 };
+static sal_Unicode const aHGPGothicB[] = { 'h','g','p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 0 };
+static sal_Unicode const aHGMinchoLSun[] = { 'h','g',   0x660E, 0x671D, 'l', 's', 'u', 'n', 0 };
+static sal_Unicode const aHGPMinchoLSun[] = { 'h','g','p', 0x660E, 0x671D, 'l', 's', 'u', 'n', 0 };
+static sal_Unicode const aHGGothicBSun[] = { 'h', 'g', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
+static sal_Unicode const aHGPGothicBSun[] = { 'h', 'g', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
+static sal_Unicode const aHGHeiseiMin[] = { 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 0, 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 'w', '3', 'x', '1', '2', 0, 0 };
+static sal_Unicode const aIPAMincho[] =  { 'i', 'p', 'a', 0x660E, 0x671D, 0 };
+static sal_Unicode const aIPAPMincho[] = { 'i', 'p', 'a', 'p', 0x660E, 0x671D, 0 };
+static sal_Unicode const aIPAGothic[] =  { 'i', 'p', 'a',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
+static sal_Unicode const aIPAPGothic[] =  { 'i', 'p', 'a', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
+static sal_Unicode const aIPAUIGothic[] =  { 'i', 'p', 'a', 'u', 'i', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
+static sal_Unicode const aSazanamiMincho[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x660E, 0x671D, 0, 0 };
+static sal_Unicode const aSazanamiGothic[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
+static sal_Unicode const aKochiMincho[] = { 0x6771, 0x98A8, 0x660E, 0x671D, 0, 0 };
+static sal_Unicode const aKochiGothic[] = { 0x6771, 0x98A8, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
+static sal_Unicode const aSunDotum[] = { 0xC36C, 0xB3CB, 0xC6C0, 0, 0 };
+static sal_Unicode const aSunGulim[] = { 0xC36C, 0xAD74, 0xB9BC, 0, 0 };
+static sal_Unicode const aSunBatang[] = { 0xC36C, 0xBC14, 0xD0D5, 0, 0 };
+static sal_Unicode const aBaekmukDotum[] = { 0xBC31, 0xBB35, 0xB3CB, 0xC6C0, 0, 0 };
+static sal_Unicode const aBaekmukGulim[] = { 0xBC31, 0xBB35, 0xAD74, 0xB9BC, 0, 0 };
+static sal_Unicode const aBaekmukBatang[] = { 0xBC31, 0xBB35, 0xBC14, 0xD0D5, 0, 0 };
+static sal_Unicode const aFzMingTi[] = { 0x65B9, 0x6B63, 0x660E, 0x9AD4, 0, 0 };
+static sal_Unicode const aFzHeiTiTW[]= { 0x65B9, 0x6B63, 0x9ED1, 0x9AD4, 0, 0 };
+static sal_Unicode const aFzKaiTiTW[]= { 0x65B9, 0x6B63, 0x6977, 0x9AD4, 0, 0 };
+static sal_Unicode const aFzHeiTiCN[]= { 0x65B9, 0x6B63, 0x9ED1, 0x4F53, 0, 0 };
+static sal_Unicode const aFzKaiTiCN[]= { 0x65B9, 0x6B63, 0x6977, 0x4F53, 0, 0 };
+static sal_Unicode const aFzSongTi[] = { 0x65B9, 0x6B63, 0x5B8B, 0x4F53, 0, 0 };
+static sal_Unicode const aHYMyeongJoExtra[]         = { 'h', 'y', 0xACAC, 0xBA85, 0xC870, 0, 0 };
+static sal_Unicode const aHYSinMyeongJoMedium[]     = { 'h', 'y', 0xC2E0, 0xBA85, 0xC870, 0, 0 };
+static sal_Unicode const aHYGothicMedium[]          = { 'h', 'y', 0xC911, 0xACE0, 0xB515, 0, 0 };
+static sal_Unicode const aHYGraphicMedium[]         = { 'h', 'y', 0xADF8, 0xB798, 0xD53D, 'm', 0, 0 };
+static sal_Unicode const aHYGraphic[]               = { 'h', 'y', 0xADF8, 0xB798, 0xD53D, 0, 0 };
+static sal_Unicode const aNewGulim[]                = { 0xC0C8, 0xAD74, 0xB9BC, 0, 0 };
+static sal_Unicode const aSunGungseo[]              = { 0xC36C, 0xAD81, 0xC11C, 0, 0 };
+static sal_Unicode const aHYGungSoBold[]            = { 'h','y', 0xAD81, 0xC11C, 'b', 0, 0 };
+static sal_Unicode const aHYGungSo[]                 = { 'h','y', 0xAD81, 0xC11C, 0, 0 };
+static sal_Unicode const aSunHeadLine[]             = { 0xC36C, 0xD5E4, 0xB4DC, 0xB77C, 0xC778, 0, 0 };
+static sal_Unicode const aHYHeadLineMedium[]        = { 'h', 'y', 0xD5E4, 0xB4DC, 0xB77C, 0xC778, 'm', 0, 0 };
+static sal_Unicode const aHYHeadLine[]              = { 'h', 'y', 0xD5E4, 0xB4DC, 0xB77C, 0xC778, 0, 0 };
+static sal_Unicode const aYetR[]                    = { 0xD734, 0xBA3C, 0xC61B, 0xCCB4, 0, 0 };
+static sal_Unicode const aHYGothicExtra[]           = { 'h', 'y', 0xACAC, 0xACE0, 0xB515, 0, 0 };
+static sal_Unicode const aSunMokPan[]               = { 0xC36C, 0xBAA9, 0xD310, 0, 0 };
+static sal_Unicode const aSunYeopseo[]              = { 0xC36C, 0xC5FD, 0xC11C, 0, 0 };
+static sal_Unicode const aSunBaekSong[]              = { 0xC36C, 0xBC31, 0xC1A1, 0, 0 };
+static sal_Unicode const aHYPostLight[]             = { 'h', 'y', 0xC5FD, 0xC11C, 'l', 0, 0 };
+static sal_Unicode const aHYPost[]                  = { 'h', 'y', 0xC5FD, 0xC11C, 0, 0 };
+static sal_Unicode const aMagicR[]                  = { 0xD734, 0xBA3C, 0xB9E4, 0xC9C1, 0xCCB4, 0, 0 };
+static sal_Unicode const aSunCrystal[]              = { 0xC36C, 0xD06C, 0xB9AC, 0xC2A4, 0xD0C8, 0, 0 };
+static sal_Unicode const aSunSaemmul[]              = { 0xC36C, 0xC0D8, 0xBB3C, 0, 0 };
+static sal_Unicode const aHaansoftBatang[]          = { 0xD55C, 0xCEF4, 0xBC14, 0xD0D5, 0, 0 };
+static sal_Unicode const aHaansoftDotum[]           = { 0xD55C, 0xCEF4, 0xB3CB, 0xC6C0, 0, 0 };
+static sal_Unicode const aHyhaeseo[]                = { 0xD55C, 0xC591, 0xD574, 0xC11C, 0, 0 };
+static sal_Unicode const aMDSol[]                   = { 'm', 'd', 0xC194, 0xCCB4, 0, 0 };
+static sal_Unicode const aMDGaesung[]               = { 'm', 'd', 0xAC1C, 0xC131, 0xCCB4, 0, 0 };
+static sal_Unicode const aMDArt[]                   = { 'm', 'd', 0xC544, 0xD2B8, 0xCCB4, 0, 0 };
+static sal_Unicode const aMDAlong[]                 = { 'm', 'd', 0xC544, 0xB871, 0xCCB4, 0, 0 };
+static sal_Unicode const aMDEasop[]                 = { 'm', 'd', 0xC774, 0xC19D, 0xCCB4, 0, 0 };
+static sal_Unicode const aHYShortSamulMedium[]      = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 'm', 0 };
+static sal_Unicode const aHYShortSamul[]            = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 0 };
+static sal_Unicode const aHGGothicE[]               = { 'h','g', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
+static sal_Unicode const aHGPGothicE[]              = { 'h','g','p', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
+static sal_Unicode const aHGSGothicE[]              = { 'h','g','s', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
+static sal_Unicode const aHGGothicM[]               = { 'h','g', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
+static sal_Unicode const aHGPGothicM[]              = { 'h','g','p', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
+static sal_Unicode const aHGSGothicM[]              = { 'h','g','s', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
+static sal_Unicode const aHGGyoshotai[]             = { 'h','g', 0x884C, 0x66F8, 0x4F53, 0 };
+static sal_Unicode const aHGPGyoshotai[]            = { 'h','g','p', 0x884C, 0x66F8, 0x4F53, 0 };
+static sal_Unicode const aHGSGyoshotai[]            = { 'h','g','s', 0x884C, 0x66F8, 0x4F53, 0 };
+static sal_Unicode const aHGKyokashotai[]           = { 'h','g', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
+static sal_Unicode const aHGPKyokashotai[]          = { 'h','g','p', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
+static sal_Unicode const aHGSKyokashotai[]          = { 'h','g','s', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
+static sal_Unicode const aHGMinchoB[]               = { 'h','g', 0x660E, 0x671D, 'b', 0 };
+static sal_Unicode const aHGPMinchoB[]              = { 'h','g','p', 0x660E, 0x671D, 'b', 0 };
+static sal_Unicode const aHGSMinchoB[]              = { 'h','g','s', 0x660E, 0x671D, 'b', 0 };
+static sal_Unicode const aHGMinchoE[]               = { 'h','g', 0x660E, 0x671D, 'e', 0 };
+static sal_Unicode const aHGPMinchoE[]              = { 'h','g','p', 0x660E, 0x671D, 'e', 0 };
+static sal_Unicode const aHGSMinchoE[]              = { 'h','g','s', 0x660E, 0x671D, 'e', 0 };
+static sal_Unicode const aHGSoeiKakupoptai[]        = { 'h','g', 0x5275,0x82F1,0x89D2,0xFF8E,
+                            0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0};
+static sal_Unicode const aHGPSoeiKakupoptai[]       = { 'h','g', 'p', 0x5275,0x82F1,0x89D2,0xFF8E,
+                            0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0};
+static sal_Unicode const aHGSSoeiKakupoptai[]       = { 'h','g', 's', 0x5275,0x82F1,0x89D2,0xFF8E,
+                            0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0};
+static sal_Unicode const aHGSoeiPresenceEB[]        = { 'h','g', 0x5275,0x82F1,0xFF8C,0xFF9F,
+                            0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
+static sal_Unicode const aHGPSoeiPresenceEB[]       = { 'h','g','p', 0x5275,0x82F1,0xFF8C,0xFF9F,
+                            0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
+static sal_Unicode const aHGSSoeiPresenceEB[]       = { 'h','g','s', 0x5275,0x82F1,0xFF8C,0xFF9F,
+                            0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
+static sal_Unicode const aHGSoeiKakugothicUB[]      = { 'h','g', 0x5275,0x82F1,0x89D2,0xFF7A,
+                            0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
+static sal_Unicode const aHGPSoeiKakugothicUB[]     = { 'h','g','p', 0x5275,0x82F1,0x89D2,0xFF7A,
+                            0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
+static sal_Unicode const aHGSSoeiKakugothicUB[]     = { 'h','g','s', 0x5275,0x82F1,0x89D2,0xFF7A,
+                            0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
+static sal_Unicode const aHGSeikaishotaiPRO[]       = { 'h','g', 0x6B63,0x6977,0x66F8,0x4F53, '-','p','r','o',0};
+static sal_Unicode const aHGMaruGothicMPRO[]        = { 'h','g', 0x4E38,0xFF7A,0xFF9E,0xFF7C,0xFF6F,0xFF78, '-','p','r','o',0};
+static sal_Unicode const aHiraginoMinchoPro[]       = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x660E, 0x671D, 'p','r','o',0};
+static sal_Unicode const aHiraginoMinchoProN[]      = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x660E, 0x671D, 'p','r','o','n',0};
+static sal_Unicode const aHiraginoKakuGothicPro[]   = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x89D2, 0x30B4, 'p','r','o',0};
+static sal_Unicode const aHiraginoKakuGothicProN[]  = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x89D2, 0x30B4, 'p','r','o','n',0};
+static sal_Unicode const aHiraginoMaruGothicPro[]   = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x4E38, 0x30B4, 'p','r','o',0};
+static sal_Unicode const aHiraginoMaruGothicProN[]  = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x4E38, 0x30B4, 'p','r','o','n',0};
+
+
+static ImplLocalizedFontName aImplLocalizedNamesList[] =
+{
+{   "batang",               aBatang },
+{   "batangche",            aBatangChe },
+{   "gungshu",              aGungsuh },
+{   "gungshuche",           aGungsuhChe },
+{   "gulim",                aGulim },
+{   "gulimche",             aGulimChe },
+{   "dotum",                aDotum },
+{   "dotumche",             aDotumChe },
+{   "simsun",               aSimSun },
+{   "nsimsun",              aNSimSun },
+{   "simhei",               aSimHei },
+{   "simkai",               aSimKai },
+{   "zycjksun",             azycjkSun },
+{   "zycjkhei",             azycjkHei },
+{   "zycjkkai",             azycjkKai },
+{   "fzhei",                aFZHei },
+{   "fzkai",                aFZKai },
+{   "fzsong",               aFZSongYI },
+{   "fzshusong",            aFZShuSong },
+{   "fzfangsong",           aFZFangSong },
+{   "mhei",                 aMHei },
+{   "mkai",                 aMKai },
+{   "msong",                aMSong },
+{   "cfangsong",            aCFangSong },
+{   "mingliu",              aMingLiU },
+{   "pmingliu",             aPMingLiU },
+{   "hei",                  aHei },
+{   "kai",                  aKai },
+{   "ming",                 aMing },
+{   "msgothic",             aMSGothic },
+{   "mspgothic",            aMSPGothic },
+{   "msmincho",             aMSMincho },
+{   "mspmincho",            aMSPMincho },
+{   "meiryo",               aMeiryo },
+{   "hgminchol",            aHGMinchoL },
+{   "hggothicb",            aHGGothicB },
+{   "hgpminchol",           aHGPMinchoL },
+{   "hgpgothicb",           aHGPGothicB },
+{   "hgmincholsun",         aHGMinchoLSun },
+{   "hggothicbsun",         aHGGothicBSun },
+{   "hgpmincholsun",        aHGPMinchoLSun },
+{   "hgpgothicbsun",        aHGPGothicBSun },
+{   "hgheiseimin",          aHGHeiseiMin },
+{   "ipamincho",            aIPAMincho },
+{   "ipapmincho",           aIPAPMincho },
+{   "ipagothic",            aIPAGothic },
+{   "ipapgothic",           aIPAPGothic },
+{   "ipauigothic",          aIPAUIGothic },
+{   "sazanamimincho",       aSazanamiMincho },
+{   "sazanamigothic",       aSazanamiGothic },
+{   "kochimincho",          aKochiMincho },
+{   "kochigothic",          aKochiGothic },
+{   "sundotum",             aSunDotum },
+{   "sungulim",             aSunGulim },
+{   "sunbatang",            aSunBatang },
+{   "baekmukdotum",         aBaekmukDotum },
+{   "baekmukgulim",         aBaekmukGulim },
+{   "baekmukbatang",        aBaekmukBatang },
+{   "fzheiti",              aFzHeiTiCN },
+{   "fzheiti",              aFzHeiTiTW },
+{   "fzkaiti",              aFzKaiTiCN },
+{   "fzkaitib",             aFzKaiTiTW },
+{   "fzmingtib",            aFzMingTi },
+{   "fzsongti",             aFzSongTi },
+{   "hymyeongjoextra",      aHYMyeongJoExtra },
+{   "hysinmyeongjomedium",  aHYSinMyeongJoMedium },
+{   "hygothicmedium",       aHYGothicMedium },
+{   "hygraphicmedium",      aHYGraphicMedium },
+{   "hygraphic",            aHYGraphic },
+{   "newgulim",             aNewGulim },
+{   "sungungseo",           aSunGungseo },
+{   "hygungsobold",         aHYGungSoBold },
+{   "hygungso",             aHYGungSo },
+{   "sunheadline",          aSunHeadLine },
+{   "hyheadlinemedium",     aHYHeadLineMedium },
+{   "hyheadline",           aHYHeadLine },
+{   "yetr",                 aYetR },
+{   "hygothicextra",        aHYGothicExtra },
+{   "sunmokpan",            aSunMokPan },
+{   "sunyeopseo",           aSunYeopseo },
+{   "sunbaeksong",          aSunBaekSong },
+{   "hypostlight",          aHYPostLight },
+{   "hypost",               aHYPost },
+{   "magicr",               aMagicR },
+{   "suncrystal",           aSunCrystal },
+{   "sunsaemmul",           aSunSaemmul },
+{   "hyshortsamulmedium",   aHYShortSamulMedium },
+{   "hyshortsamul",         aHYShortSamul },
+{   "haansoftbatang",       aHaansoftBatang },
+{   "haansoftdotum",        aHaansoftDotum },
+{   "hyhaeseo",             aHyhaeseo },
+{   "mdsol",                aMDSol },
+{   "mdgaesung",            aMDGaesung },
+{   "mdart",                aMDArt },
+{   "mdalong",              aMDAlong },
+{   "mdeasop",              aMDEasop },
+{   "hggothice",            aHGGothicE },
+{   "hgpgothice",           aHGPGothicE },
+{   "hgpothice",            aHGSGothicE },
+{   "hggothicm",            aHGGothicM },
+{   "hgpgothicm",           aHGPGothicM },
+{   "hgpgothicm",           aHGSGothicM },
+{   "hggyoshotai",          aHGGyoshotai },
+{   "hgpgyoshotai",         aHGPGyoshotai },
+{   "hgsgyoshotai",         aHGSGyoshotai },
+{   "hgkyokashotai",        aHGKyokashotai },
+{   "hgpkyokashotai",       aHGPKyokashotai },
+{   "hgskyokashotai",       aHGSKyokashotai },
+{   "hgminchob",            aHGMinchoB },
+{   "hgpminchob",           aHGPMinchoB },
+{   "hgsminchob",           aHGSMinchoB },
+{   "hgminchoe",            aHGMinchoE },
+{   "hgpminchoe",           aHGPMinchoE },
+{   "hgsminchoe",           aHGSMinchoE },
+{   "hgsoeikakupoptai",     aHGSoeiKakupoptai },
+{   "hgpsoeikakupopta",     aHGPSoeiKakupoptai },
+{   "hgssoeikakupopta",     aHGSSoeiKakupoptai },
+{   "hgsoeipresenceeb",     aHGSoeiPresenceEB },
+{   "hgpsoeipresenceeb",    aHGPSoeiPresenceEB },
+{   "hgssoeipresenceeb",    aHGSSoeiPresenceEB },
+{   "hgsoeikakugothicub",   aHGSoeiKakugothicUB },
+{   "hgpsoeikakugothicub",  aHGPSoeiKakugothicUB },
+{   "hgssoeikakugothicub",  aHGSSoeiKakugothicUB },
+{   "hgseikaishotaipro",    aHGSeikaishotaiPRO },
+{   "hgmarugothicmpro",     aHGMaruGothicMPRO },
+{   "hiraginominchopro",    aHiraginoMinchoPro },
+{   "hiraginominchopron",   aHiraginoMinchoProN },
+{   "hiraginokakugothicpro", aHiraginoKakuGothicPro },
+{   "hiraginokakugothicpron", aHiraginoKakuGothicProN },
+{   "hiraginomarugothicpro", aHiraginoMaruGothicPro },
+{   "hiraginomarugothicpron", aHiraginoMaruGothicProN },
+{   NULL,                   NULL },
+};
+
+// -----------------------------------------------------------------------
+
+void GetEnglishSearchFontName( String& rName )
+{
+    bool        bNeedTranslation = false;
+    xub_StrLen  nLen = rName.Len();
+
+    // Remove trailing whitespaces
+    xub_StrLen i = nLen;
+    while ( i && (rName.GetChar( i-1 ) < 32) )
+        i--;
+    if ( i != nLen )
+        rName.Erase( i );
+
+    // Remove Script at the end
+    // Scriptname must be the last part of the fontname and
+    // looks like "fontname (scriptname)". So there can only be a
+    // script name at the and of the fontname, when the last char is ')'
+    if ( (nLen >= 3) && rName.GetChar( nLen-1 ) == ')' )
+    {
+        int nOpen = 1;
+        xub_StrLen nTempLen = nLen-2;
+        while ( nTempLen )
+        {
+            if ( rName.GetChar( nTempLen ) == '(' )
+            {
+                nOpen--;
+                if ( !nOpen )
+                {
+                    // Remove Space at the end
+                    if ( nTempLen && (rName.GetChar( nTempLen-1 ) == ' ') )
+                        nTempLen--;
+                    rName.Erase( nTempLen );
+                    nLen = nTempLen;
+                    break;
+                }
+            }
+            if ( rName.GetChar( nTempLen ) == ')' )
+                nOpen++;
+            nTempLen--;
+        }
+    }
+
+    // remove all whitespaces and converts to lower case ASCII
+    // TODO: better transliteration to ASCII e.g. all digits
+    i = 0;
+    while ( i < nLen )
+    {
+        sal_Unicode c = rName.GetChar( i );
+        if ( c > 127 )
+        {
+            // Translate to Lowercase-ASCII
+            // FullWidth-ASCII to half ASCII
+            if ( (c >= 0xFF00) && (c <= 0xFF5E) )
+            {
+                c -= 0xFF00-0x0020;
+                // Upper to Lower
+                if ( (c >= 'A') && (c <= 'Z') )
+                    c += 'a' - 'A';
+                rName.SetChar( i, c );
+            }
+            else
+            {
+                // Only Fontnames with None-Ascii-Characters must be translated
+                bNeedTranslation = true;
+            }
+        }
+        // not lowercase Ascii
+        else if ( !((c >= 'a') && (c <= 'z')) )
+        {
+            // To Lowercase-Ascii
+            if ( (c >= 'A') && (c <= 'Z') )
+            {
+                c += 'a' - 'A';
+                rName.SetChar( i, c );
+            }
+            else if( ((c < '0') || (c > '9')) && (c != ';') ) // not 0-9 or semicolon
+            {
+                // Remove white spaces and special characters
+                rName.Erase( i, 1 );
+                nLen--;
+                continue;
+            }
+        }
+
+        i++;
+    }
+
+    // translate normalized localized name to its normalized English ASCII name
+    if( bNeedTranslation )
+    {
+        typedef std::hash_map<const String, const char*,FontNameHash> FontNameDictionary;
+        static FontNameDictionary aDictionary( sizeof(aImplLocalizedNamesList) / sizeof(*aImplLocalizedNamesList) );
+        // the font name dictionary needs to be intialized once
+        if( aDictionary.empty() )
+        {
+            // TODO: check if all dictionary entries are already normalized?
+            const ImplLocalizedFontName* pList = aImplLocalizedNamesList;
+            for(; pList->mpEnglishName; ++pList )
+                aDictionary[ pList->mpLocalizedNames ] = pList->mpEnglishName;
+        }
+
+        FontNameDictionary::const_iterator it = aDictionary.find( rName );
+        if( it != aDictionary.end() )
+            rName.AssignAscii( it->second );
+    }
+}
+
+// -----------------------------------------------------------------------
+
+String GetNextFontToken( const String& rTokenStr, xub_StrLen& rIndex )
+{
+    // check for valid start index
+    int nStringLen = rTokenStr.Len();
+    if( rIndex >= nStringLen )
+    {
+        rIndex = STRING_NOTFOUND;
+        return String();
+    }
+
+    // find the next token delimiter and return the token substring
+    const sal_Unicode* pStr = rTokenStr.GetBuffer() + rIndex;
+    const sal_Unicode* pEnd = rTokenStr.GetBuffer() + nStringLen;
+    for(; pStr < pEnd; ++pStr )
+        if( (*pStr == ';') || (*pStr == ',') )
+            break;
+
+    xub_StrLen nTokenStart = rIndex;
+    xub_StrLen nTokenLen;
+    if( pStr < pEnd )
+    {
+        rIndex = sal::static_int_cast<xub_StrLen>(pStr - rTokenStr.GetBuffer());
+        nTokenLen = rIndex - nTokenStart;
+        ++rIndex; // skip over token separator
+    }
+    else
+    {
+        // no token delimiter found => handle last token
+        rIndex = STRING_NOTFOUND;
+        nTokenLen = STRING_LEN;
+
+        // optimize if the token string consists of just one token
+        if( !nTokenStart )
+            return rTokenStr;
+    }
+
+    return String( rTokenStr, nTokenStart, nTokenLen );
+}
+
+// TODO: get rid of this in another incompatible build with SW project.
+// SW's WW8 and RTF filters still use this (from fontcvt.hxx)
+String GetFontToken( const String& rTokenStr, xub_StrLen nToken, xub_StrLen& rIndex )
+{
+    // skip nToken Tokens
+    for( xub_StrLen i = 0; (i < nToken) && (rIndex != STRING_NOTFOUND); ++i )
+        GetNextFontToken( rTokenStr, rIndex );
+
+    return GetNextFontToken( rTokenStr, rIndex );
+}
+
+// =======================================================================
+
+static bool ImplIsFontToken( const String& rName, const String& rToken )
+{
+    String      aTempName;
+    xub_StrLen  nIndex = 0;
+    do
+    {
+        aTempName = GetNextFontToken( rName, nIndex );
+        if ( rToken == aTempName )
+            return true;
+    }
+    while ( nIndex != STRING_NOTFOUND );
+
+    return false;
+}
+
+// -----------------------------------------------------------------------
+
+static void ImplAppendFontToken( String& rName, const String& rNewToken )
+{
+    if ( rName.Len() )
+    {
+        rName.Append( ';' );
+        rName.Append( rNewToken );
+    }
+    else
+        rName = rNewToken;
+}
+
+void AddTokenFontName( String& rName, const String& rNewToken )
+{
+    if ( !ImplIsFontToken( rName, rNewToken ) )
+        ImplAppendFontToken( rName, rNewToken );
+}
+
+
+
+// =======================================================================
+
+String GetSubsFontName( const String& rName, ULONG nFlags )
+{
+    String aName;
+
+    xub_StrLen nIndex = 0;
+    String aOrgName = GetNextFontToken( rName, nIndex );
+    GetEnglishSearchFontName( aOrgName );
+
+    // #93662# do not try to replace StarSymbol with MS only font
+    if( nFlags == (SUBSFONT_MS|SUBSFONT_ONLYONE)
+    &&  ( aOrgName.EqualsAscii( "starsymbol" )
+      ||  aOrgName.EqualsAscii( "opensymbol" ) ) )
+        return aName;
+
+    const utl::FontNameAttr* pAttr = utl::FontSubstConfiguration::get()->getSubstInfo( aOrgName );
+    if ( pAttr )
+    {
+        for( int i = 0; i < 3; i++ )
+        {
+            const ::std::vector< String >* pVector = NULL;
+            switch( i )
+            {
+                case 0:
+                    if( nFlags & SUBSFONT_MS  &&  pAttr->MSSubstitutions.size() )
+                        pVector = &pAttr->MSSubstitutions;
+                    break;
+                case 1:
+                    if( nFlags & SUBSFONT_PS  &&  pAttr->PSSubstitutions.size() )
+                        pVector = &pAttr->PSSubstitutions;
+                    break;
+                case 2:
+                    if( nFlags & SUBSFONT_HTML  &&  pAttr->HTMLSubstitutions.size() )
+                        pVector = &pAttr->HTMLSubstitutions;
+                    break;
+            }
+            if( ! pVector )
+                continue;
+            for( ::std::vector< String >::const_iterator it = pVector->begin(); it != pVector->end(); ++it )
+                if( ! ImplIsFontToken( rName, *it ) )
+                {
+                    ImplAppendFontToken( aName, *it );
+                    if( nFlags & SUBSFONT_ONLYONE )
+                    {
+                        i = 4;
+                        break;
+                    }
+                }
+        }
+    }
+
+    return aName;
+}
+
+// -----------------------------------------------------------------------
+
+// TODO: use a more generic String hash
+int FontNameHash::operator()( const String& rStr ) const
+{
+    // this simple hash just has to be good enough for font names
+    int nHash = 0;
+    const int nLen = rStr.Len();
+    const sal_Unicode* p = rStr.GetBuffer();
+    switch( nLen )
+    {
+        default: nHash = (p[0]<<16) - (p[1]<<8) + p[2];
+                 nHash += nLen;
+                 p += nLen - 3;
+                 // fall through
+        case 3:  nHash += (p[2]<<16);   // fall through
+        case 2:  nHash += (p[1]<<8);    // fall through
+        case 1:  nHash += p[0];         // fall through
+        case 0:  break;
+    };
+
+    return nHash;
+}
+
diff --git a/unotools/source/misc/makefile.mk b/unotools/source/misc/makefile.mk
index 8e505e41aaac..d588a216c159 100644
--- a/unotools/source/misc/makefile.mk
+++ b/unotools/source/misc/makefile.mk
@@ -45,7 +45,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 SLOFILES=	$(SLO)$/atom.obj \
             $(SLO)$/datetime.obj \
+            $(SLO)$/syslocale.obj \
             $(SLO)$/eventlisteneradapter.obj \
+            $(SLO)$/fontcvt.obj \
+            $(SLO)$/fontdefs.obj \
             $(SLO)$/desktopterminationobserver.obj \
             $(SLO)$/sharedunocomponent.obj \
             $(SLO)$/componentresmodule.obj
diff --git a/svtools/source/syslocale/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 9811d97fd964..8e9d75c6ce0c 100644
--- a/svtools/source/syslocale/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -29,20 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_unotools.hxx"
 #ifndef GCC
 #endif
 
-#include <svtools/syslocale.hxx>
-#include <broadcast.hxx>
-#include <listener.hxx>
-#include <svtools/smplhint.hxx>
-#include <vcl/svapp.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/string.hxx>
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
-
+#include <i18npool/mslangid.hxx>
 
 using namespace osl;
 using namespace com::sun::star;
@@ -52,39 +48,34 @@ SvtSysLocale_Impl*  SvtSysLocale::pImpl = NULL;
 sal_Int32           SvtSysLocale::nRefCount = 0;
 
 
-class SvtSysLocale_Impl : public SvtListener
+class SvtSysLocale_Impl : public utl::ConfigurationListener
 {
-    friend class SvtSysLocale;
-
+public:
         SvtSysLocaleOptions     aSysLocaleOptions;
         LocaleDataWrapper*      pLocaleData;
         CharClass*              pCharClass;
 
-public:
-                                SvtSysLocale_Impl();
-    virtual                     ~SvtSysLocale_Impl();
-
-    virtual void                Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
-
-    CharClass*                  GetCharClass();
+                                    SvtSysLocale_Impl();
+    virtual                         ~SvtSysLocale_Impl();
 
+    CharClass*                      GetCharClass();
+    virtual void                    ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 };
 
-
 // -----------------------------------------------------------------------
 
 SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL)
 {
-    const lang::Locale& rLocale = Application::GetSettings().GetLocale();
-    pLocaleData = new LocaleDataWrapper(
-        ::comphelper::getProcessServiceFactory(), rLocale );
-    aSysLocaleOptions.AddListener( *this );
+    pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aSysLocaleOptions.GetRealLocale() );
+
+    // listen for further changes
+    aSysLocaleOptions.AddListener( this );
 }
 
 
 SvtSysLocale_Impl::~SvtSysLocale_Impl()
 {
-    aSysLocaleOptions.RemoveListener( *this );
+    aSysLocaleOptions.RemoveListener( this );
     delete pCharClass;
     delete pLocaleData;
 }
@@ -92,25 +83,21 @@ SvtSysLocale_Impl::~SvtSysLocale_Impl()
 CharClass* SvtSysLocale_Impl::GetCharClass()
 {
     if ( !pCharClass )
-    {
-        const lang::Locale& rLocale = Application::GetSettings().GetLocale();
-        pCharClass = new CharClass(::comphelper::getProcessServiceFactory(), rLocale );
-    }
+        pCharClass = new CharClass(::comphelper::getProcessServiceFactory(), aSysLocaleOptions.GetRealLocale() );
     return pCharClass;
 }
-void SvtSysLocale_Impl::Notify( SvtBroadcaster&, const SfxHint& rHint )
+
+void SvtSysLocale_Impl::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 nHint )
 {
-    const SfxSimpleHint* p = PTR_CAST( SfxSimpleHint, &rHint );
-    if( p && (p->GetId() & SYSLOCALEOPTIONS_HINT_LOCALE) )
+    MutexGuard aGuard( SvtSysLocale::GetMutex() );
+    if ( nHint & SYSLOCALEOPTIONS_HINT_LOCALE )
     {
-        MutexGuard aGuard( SvtSysLocale::GetMutex() );
-        const lang::Locale& rLocale = Application::GetSettings().GetLocale();
-        pLocaleData->setLocale( rLocale );
-        GetCharClass()->setLocale( rLocale );
+        com::sun::star::lang::Locale aLocale( aSysLocaleOptions.GetRealLocale() );
+        pLocaleData->setLocale( aLocale );
+        GetCharClass()->setLocale( aLocale );
     }
 }
 
-
 // ====================================================================
 
 SvtSysLocale::SvtSysLocale()
@@ -143,7 +130,7 @@ Mutex& SvtSysLocale::GetMutex()
         if( !pMutex )
         {
             // #i77768# Due to a static reference in the toolkit lib
-            // we need a mutex that lives longer than the svtools library.
+            // we need a mutex that lives longer than the svl library.
             // Otherwise the dtor would use a destructed mutex!!
             pMutex = new Mutex;
         }
@@ -174,3 +161,30 @@ const CharClass* SvtSysLocale::GetCharClassPtr() const
 {
     return pImpl->GetCharClass();
 }
+
+SvtSysLocaleOptions& SvtSysLocale::GetOptions() const
+{
+    return pImpl->aSysLocaleOptions;
+}
+
+com::sun::star::lang::Locale SvtSysLocale::GetLocale() const
+{
+    return pImpl->aSysLocaleOptions.GetRealLocale();
+}
+
+LanguageType SvtSysLocale::GetLanguage() const
+{
+    return pImpl->aSysLocaleOptions.GetRealLanguage();
+}
+
+com::sun::star::lang::Locale SvtSysLocale::GetUILocale() const
+{
+    return pImpl->aSysLocaleOptions.GetRealUILocale();
+}
+
+LanguageType SvtSysLocale::GetUILanguage() const
+{
+    return pImpl->aSysLocaleOptions.GetRealUILanguage();
+}
+
+
diff --git a/unotools/source/property/propertysetinfo.cxx b/unotools/source/property/propertysetinfo.cxx
index b8b5f8bb5125..ced5ae10a9d7 100644
--- a/unotools/source/property/propertysetinfo.cxx
+++ b/unotools/source/property/propertysetinfo.cxx
@@ -79,7 +79,7 @@ void PropertyMapImpl::add( PropertyMapEntry* pMap ) throw()
     {
         OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         PropertyMap::iterator aIter = maPropertyMap.find( aName );
         if( aIter != maPropertyMap.end() )
         {
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx
index 6687669fd875..84a324f3eb4c 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/test/domtest.cxx
@@ -30,7 +30,7 @@
 
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <rtl/ref.hxx>
 #include <osl/file.hxx>
diff --git a/unoxml/test/makefile.mk b/unoxml/test/makefile.mk
index 781f8a46bf96..3df2aa5d0d28 100644
--- a/unoxml/test/makefile.mk
+++ b/unoxml/test/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Common ----------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:tests by codegen.pl 
+# auto generated Target:tests by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/domtest.obj
 
@@ -66,6 +66,7 @@ SHL1STDLIBS= \
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
     $(CPPUNITLIB)	 \
+        $(TESTSHL2LIB)    \
     $(CPPULIB)	\
     $(SAXLIB) \
     $(SALLIB)\
@@ -74,18 +75,18 @@ SHL1STDLIBS= \
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map 
+SHL1VERSIONMAP = export.map
 
 # END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS) 
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk 
+.INCLUDE : _cppunit.mk
 
 # --- Fake uno bootstrap ------------------------
 
@@ -100,7 +101,7 @@ $(MISC)$/unoxml_unittest_succeeded : $(SHL1TARGETN) $(BIN)$/unoxml_unittest_test
         @echo ----------------------------------------------------------
         @echo - start unit test on library $(SHL1TARGETN)
         @echo ----------------------------------------------------------
-        testshl2 -forward $(BIN)$/ -sf $(mktmp ) $(SHL1TARGETN)
+                $(TESTSHL2) -forward $(BIN)$/ -sf $(mktmp ) $(SHL1TARGETN)
         $(TOUCH) $@
 
 ALLTAR : $(MISC)$/unoxml_unittest_succeeded
diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
index 699814efef32..caa7acc891b0 100644
--- a/uui/source/cookiedg.cxx
+++ b/uui/source/cookiedg.cxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/httpcook.hxx>
+#include <svl/httpcook.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 996fd24e531d..2db6cc79ac57 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -113,8 +113,8 @@
 #include "vos/mutex.hxx"
 #include "tools/rcid.h"
 #include "vcl/svapp.hxx"
-#include "svtools/svtools.hrc"
-#include "svtools/httpcook.hxx"
+#include "svl/svtools.hrc"
+#include "svl/httpcook.hxx"
 #include "svtools/sfxecode.hxx"
 #include "toolkit/helper/vclunohelper.hxx"
 #include "comphelper/sequenceashashmap.hxx"
@@ -140,7 +140,7 @@
 #include "loginerr.hxx"
 
 #include <comphelper/processfactory.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 using namespace com::sun;
 
 namespace csss = ::com::sun::star::security;
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 08624a3dda4e..a9960a58e3f2 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -32,7 +32,7 @@
 #define UUI_IDS_HRC
 
 #ifndef _SOLAR_HRC
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 #endif
 #ifndef _ERRCODE_HXX
 #include "tools/errcode.hxx"
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 17280ecbbac1..1415d18b1b0e 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -33,7 +33,7 @@
 
 #include <vcl/dialog.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <vcl/button.hxx>
 
 namespace com {
diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst
index a38a6dcbd6bb..07cc9ac50173 100644
--- a/vbahelper/prj/build.lst
+++ b/vbahelper/prj/build.lst
@@ -1,4 +1,4 @@
-vba	vbahelper	:	oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL
+vba	vbahelper	:	filter oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
 #vba	vbahelper\inc								nmake	-	all	vba_inc NULL
 vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 9f5c78e71858..1f898565c303 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
 #include "vbacommandbars.hxx"
-#include <svx/msvbahelper.hxx>
+#include <filter/msfilter/msvbahelper.hxx>
 
 // start basic includes
 #include <basic/sbx.hxx>
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index a10767998b28..999eb8b99ece 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -35,7 +35,7 @@
 #include "vbacommandbarcontrol.hxx"
 #include "vbacommandbarcontrols.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <svx/msvbahelper.hxx>
+#include <filter/msfilter/msvbahelper.hxx>
 
 using namespace com::sun::star;
 using namespace ooo::vba;
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 76ac70c627b4..ca3a3b5d729f 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -47,11 +47,10 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
-//#include <svtools/itempool.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/viewfac.hxx>
 
diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk
index 33c0ca1f2960..39bfac956288 100644
--- a/vbahelper/util/makefile.mk
+++ b/vbahelper/util/makefile.mk
@@ -61,7 +61,7 @@ SHL1STDLIBS=       \
         $(VCLLIB) \
         $(SVTOOLLIB)    \
         $(TKLIB) \
-        $(SVXMSFILTERLIB) \
+        $(MSFILTERLIB) 
 
 SHL1DEPN=
 SHL1IMPLIB= i$(TARGET_HELPER)
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index 1d1eb3cb6bd3..5ddd96dae34d 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.h
@@ -121,6 +121,7 @@ public:
     virtual BOOL                PostEvent( void* pData );
     virtual void                SetTitle( const XubString& rTitle );
     virtual void                SetIcon( USHORT nIcon );
+    virtual void                SetRepresentedURL( const rtl::OUString& );
     virtual void                SetMenu( SalMenu* pSalMenu );
     virtual void                DrawMenuBar();
     virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
@@ -140,7 +141,7 @@ public:
     virtual void                SetPointer( PointerStyle ePointerStyle );
     virtual void                CaptureMouse( BOOL bMouse );
     virtual void                SetPointerPos( long nX, long nY );
-    virtual void                Flush( void);
+    virtual void                Flush( void );
     virtual void                Flush( const Rectangle& );
     virtual void                Sync();
     virtual void                SetInputContext( SalInputContext* pContext );
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h
index 7fd4d96c4a45..e823837e7af6 100755
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/aqua/inc/salframeview.h
@@ -132,7 +132,11 @@
 -(void)moveWordForwardAndModifySelection: (id)aSender;
 -(void)moveWordRightAndModifySelection: (id)aSender;
 -(void)moveToEndOfLine: (id)aSender;
+-(void)moveToRightEndOfLine: (id)aSender;
+-(void)moveToLeftEndOfLine: (id)aSender;
 -(void)moveToEndOfLineAndModifySelection: (id)aSender;
+-(void)moveToRightEndOfLineAndModifySelection: (id)aSender;
+-(void)moveToLeftEndOfLineAndModifySelection: (id)aSender;
 -(void)moveToBeginningOfLine: (id)aSender;
 -(void)moveToBeginningOfLineAndModifySelection: (id)aSender;
 -(void)moveToEndOfParagraph: (id)aSender;
@@ -144,8 +148,10 @@
 -(void)moveParagraphBackward: (id)aSender;
 -(void)moveParagraphBackwardAndModifySelection: (id)aSender;
 -(void)moveToEndOfDocument: (id)aSender;
+-(void)scrollToEndOfDocument: (id)aSender;
 -(void)moveToEndOfDocumentAndModifySelection: (id)aSender;
 -(void)moveToBeginningOfDocument: (id)aSender;
+-(void)scrollToBeginningOfDocument: (id)aSender;
 -(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender;
 -(void)insertNewline: (id)aSender;
 -(void)deleteBackward: (id)aSender;
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index 2bb1429bc9fe..f20a67a85f29 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx
@@ -102,12 +102,12 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
             break;
 
         case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-/*        {
+        {
             Reference< XAccessible > xAccessible( getAccessible(aEvent) );
             detachRecursive(xAccessible);
             attachRecursive(xAccessible);
         }
-*/
+
             OSL_TRACE( "Invalidate all children called\n" );
             break;
         default:
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index e4037df0c4aa..4ec3339d5372 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -69,7 +69,7 @@
 #import "apple_remote/RemoteMainController.h"
 #include "apple_remote/RemoteControl.h"
 #include "postmac.h"
-
+#include <tools/solarmutex.hxx>
 
 using namespace std;
 using namespace ::com::sun::star;
@@ -472,6 +472,7 @@ AquaSalInstance::AquaSalInstance()
 {
     mpSalYieldMutex = new SalYieldMutex;
     mpSalYieldMutex->acquire();
+    ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
     maMainThread = vos::OThread::getCurrentIdentifier();
     mbWaitingYield = false;
     maUserEventListMutex = osl_createMutex();
@@ -482,6 +483,7 @@ AquaSalInstance::AquaSalInstance()
 
 AquaSalInstance::~AquaSalInstance()
 {
+    ::tools::SolarMutex::SetSolarMutex( 0 );
     mpSalYieldMutex->release();
     delete mpSalYieldMutex;
     osl_destroyMutex( maUserEventListMutex );
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index b942c97cead1..7fe3b93ef2e8 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -54,10 +54,7 @@
 #include "boost/assert.hpp"
 #include "vcl/svapp.hxx"
 #include "rtl/ustrbuf.hxx"
-
-#include <premac.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <postmac.h>
+#include "osl/file.h"
 
 using namespace std;
 
@@ -329,8 +326,25 @@ void AquaSalFrame::SetTitle(const XubString& rTitle)
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::SetIcon( USHORT nIcon )
+void AquaSalFrame::SetIcon( USHORT )
+{
+}
+
+// -----------------------------------------------------------------------
+
+void AquaSalFrame::SetRepresentedURL( const rtl::OUString& i_rDocURL )
 {
+    if( i_rDocURL.indexOfAsciiL( "file:", 5 ) == 0 )
+    {
+        rtl::OUString aSysPath;
+        osl_getSystemPathFromFileURL( i_rDocURL.pData, &aSysPath.pData );
+        NSString* pStr = CreateNSString( aSysPath );
+        if( pStr )
+        {
+            [pStr autorelease];
+            [mpWindow setRepresentedFilename: pStr];
+        }
+    }
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index aabc287dc885..51f1b1a3b63c 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1065,21 +1065,41 @@ private:
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0  modifiers: 0];
 }
 
+-(void)moveToRightEndOfLine: (id)aSender
+{
+    [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0  modifiers: 0];
+}
+
 -(void)moveToEndOfLineAndModifySelection: (id)aSender
 {
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0  modifiers: 0];
 }
 
+-(void)moveToRightEndOfLineAndModifySelection: (id)aSender
+{
+    [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0  modifiers: 0];
+}
+
 -(void)moveToBeginningOfLine: (id)aSender
 {
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
 }
 
+-(void)moveToLeftEndOfLine: (id)aSender
+{
+    [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
+}
+
 -(void)moveToBeginningOfLineAndModifySelection: (id)aSender
 {
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
 }
 
+-(void)moveToLeftEndOfLineAndModifySelection: (id)aSender
+{
+    [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
+}
+
 -(void)moveToEndOfParagraph: (id)aSender
 {
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0  modifiers: 0];
@@ -1125,6 +1145,12 @@ private:
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
+-(void)scrollToEndOfDocument: (id)aSender
+{
+    // this is not exactly what we should do, but it makes "End" and "Shift-End" behave consistent
+    [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0  modifiers: 0];
+}
+
 -(void)moveToEndOfDocumentAndModifySelection: (id)aSender
 {
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0  modifiers: 0];
@@ -1135,6 +1161,12 @@ private:
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
+-(void)scrollToBeginningOfDocument: (id)aSender
+{
+    // this is not exactly what we should do, but it makes "Home" and "Shift-Home" behave consistent
+    [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0  modifiers: 0];
+}
+
 -(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender
 {
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0  modifiers: 0];
@@ -1462,6 +1494,9 @@ private:
 {
     if( AquaSalFrame::isAlive( mpFrame ) )
     {
+        #if OSL_DEBUG_LEVEL > 1
+        // fprintf( stderr, "SalFrameView: doCommandBySelector %s\n", (char*)aSelector );
+        #endif
         if( (mpFrame->mnICOptions & SAL_INPUTCONTEXT_TEXT) != 0 &&
             aSelector != NULL && [self respondsToSelector: aSelector] )
         {
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index f34db3a2a5db..c5f032dfff82 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -65,6 +65,7 @@ private:
     SAL_DLLPRIVATE         Dialog (const Dialog &);
     SAL_DLLPRIVATE         Dialog & operator= (const Dialog &);
 
+    DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void* );
 protected:
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
diff --git a/vcl/inc/vcl/fldunit.hxx b/vcl/inc/vcl/fldunit.hxx
index 98bc27cbadba..7417342d95be 100644
--- a/vcl/inc/vcl/fldunit.hxx
+++ b/vcl/inc/vcl/fldunit.hxx
@@ -31,14 +31,6 @@
 #ifndef _VCL_FLDUNIT_HXX
 #define _VCL_FLDUNIT_HXX
 
-// --------------
-// - FieldTypes -
-// --------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
-                 FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
-                 FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
-                 FUNIT_PERCENT, FUNIT_100TH_MM };
+#include <tools/fldunit.hxx>
 
 #endif // _VCL_FLDUNIT_HXX
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx
index dfbcb366fe6a..92761eabdf3c 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/vcl/impimagetree.hxx
@@ -54,14 +54,17 @@ public:
 
     ~ImplImageTree();
 
+    // check whether the icon style is installed
+    bool checkStyle(rtl::OUString const & style);
+
     bool loadImage(
         rtl::OUString const & name, rtl::OUString const & style,
-        BitmapEx & bitmap, bool localized = false);
+        BitmapEx & bitmap, bool localized = false );
 
     void shutDown();
         // a crude form of life cycle control (called from DeInitVCL; otherwise,
         // if the ImplImageTree singleton were destroyed during exit that would
-        // be too late for the destructors of the bitmaps in m_cache)
+        // be too late for the destructors of the bitmaps in m_iconCache)
 
 private:
     typedef std::list<
@@ -71,20 +74,23 @@ private:
                 com::sun::star::container::XNameAccess > > > Zips;
 
     typedef std::hash_map<
-        rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > Cache;
+        rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache;
+    typedef std::hash_map<
+        rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
 
     rtl::OUString m_style;
     Zips m_zips;
-    Cache m_cache;
+    CheckStyleCache m_checkStyleCache;
+    IconCache m_iconCache;
 
-    void setStyle(rtl::OUString const & style);
+    void setStyle(rtl::OUString const & style );
 
     void resetZips();
 
-    bool cacheLookup(
-        rtl::OUString const & name, bool localized, BitmapEx & bitmap);
+    bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists );
+    bool iconCacheLookup( rtl::OUString const & name, bool localized, BitmapEx & bitmap );
 
-    bool find(std::vector< rtl::OUString > const & paths, BitmapEx & bitmap);
+    bool find(std::vector< rtl::OUString > const & paths, BitmapEx & bitmap );
 };
 
 typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef;
diff --git a/vcl/inc/vcl/mapunit.hxx b/vcl/inc/vcl/mapunit.hxx
index 6ba500f4fdb7..c50ba49c17bb 100644
--- a/vcl/inc/vcl/mapunit.hxx
+++ b/vcl/inc/vcl/mapunit.hxx
@@ -31,14 +31,6 @@
 #ifndef _VCL_MAPUNIT_HXX
 #define _VCL_MAPUNIT_HXX
 
-// -----------------
-// - MapMode-Types -
-// -----------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
-               MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
-               MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT,
-               MAP_RELATIVE, MAP_REALAPPFONT, MAP_LASTENUMDUMMY };
+#include <tools/mapunit.hxx>
 
 #endif  // _VCL_MAPUNIT_HXX
diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h
index af671e24ee0a..67dc256ce11c 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/vcl/outdev.h
@@ -31,7 +31,7 @@
 #ifndef _SV_OUTDEV_H
 #define _SV_OUTDEV_H
 
-#include <vcl/sv.h>
+#include <tools/solar.h>
 #include <vcl/outfont.hxx>
 
 #include <vector>
@@ -44,13 +44,6 @@ class VirtualDevice;
 class ImplServerGraphics;
 class ImplGetDevFontList;
 class GetDevSizeList;
-namespace vcl {
-class FontSubstConfiguration;
-}
-
-// -----------------------------------------------------------------------
-
-void ImplGetEnglishSearchFontName( String& rName );
 
 // -----------------------
 // - ImplDevFontListData -
@@ -80,7 +73,7 @@ public:
     int                 GetMinQuality() const    { return mnMinQuality; }
 
     bool                AddFontFace( ImplFontData* );
-    void                InitMatchData( const vcl::FontSubstConfiguration&,
+    void                InitMatchData( const utl::FontSubstConfiguration&,
                             const String& rSearchName );
     ImplFontData*       FindBestFontFace( const ImplFontSelectData& rFSD ) const;
 
@@ -106,24 +99,6 @@ friend class ImplDevFontList; // TODO: remove soon
 };
 
 
-// ---------------
-// - ImplCvtChar -
-// ---------------
-
-class ImplCvtChar
-{
-public:
-    const sal_Unicode*  mpCvtTab;
-    const char*         mpSubsFontName;
-    sal_Unicode         (*mpCvtFunc)( sal_Unicode );
-};
-
-sal_Unicode ImplRecodeChar( const ImplCvtChar* pCvtData, sal_Unicode c );
-void ImplRecodeString( const ImplCvtChar* pCvtData, String& rStr,
-                       xub_StrLen nIndex, xub_StrLen nLen );
-const ImplCvtChar* ImplGetRecodeData( const String& rOrgFontName,
-                                      const String& rMapFontName );
-
 // ----------------------
 // - ImplGetDevFontList -
 // ----------------------
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 130492a2bd0c..1e1f784f0f49 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -45,6 +45,7 @@
 #include <tools/poly.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <com/sun/star/uno/Reference.h>
+#include <unotools/fontdefs.hxx>
 
 #include <vector>
 
@@ -264,31 +265,6 @@ struct KerningPair
 #define FONT_SUBSTITUTE_ALWAYS          ((USHORT)0x0001)
 #define FONT_SUBSTITUTE_SCREENONLY      ((USHORT)0x0002)
 
-// Default-Font
-#define DEFAULTFONT_SANS_UNICODE        ((USHORT)1)
-#define DEFAULTFONT_SANS                ((USHORT)2)
-#define DEFAULTFONT_SERIF               ((USHORT)3)
-#define DEFAULTFONT_FIXED               ((USHORT)4)
-#define DEFAULTFONT_SYMBOL              ((USHORT)5)
-#define DEFAULTFONT_UI_SANS             ((USHORT)1000)
-#define DEFAULTFONT_UI_FIXED            ((USHORT)1001)
-#define DEFAULTFONT_LATIN_TEXT          ((USHORT)2000)
-#define DEFAULTFONT_LATIN_PRESENTATION  ((USHORT)2001)
-#define DEFAULTFONT_LATIN_SPREADSHEET   ((USHORT)2002)
-#define DEFAULTFONT_LATIN_HEADING       ((USHORT)2003)
-#define DEFAULTFONT_LATIN_DISPLAY       ((USHORT)2004)
-#define DEFAULTFONT_LATIN_FIXED         ((USHORT)2005)
-#define DEFAULTFONT_CJK_TEXT            ((USHORT)3000)
-#define DEFAULTFONT_CJK_PRESENTATION    ((USHORT)3001)
-#define DEFAULTFONT_CJK_SPREADSHEET     ((USHORT)3002)
-#define DEFAULTFONT_CJK_HEADING         ((USHORT)3003)
-#define DEFAULTFONT_CJK_DISPLAY         ((USHORT)3004)
-#define DEFAULTFONT_CTL_TEXT            ((USHORT)4000)
-#define DEFAULTFONT_CTL_PRESENTATION    ((USHORT)4001)
-#define DEFAULTFONT_CTL_SPREADSHEET     ((USHORT)4002)
-#define DEFAULTFONT_CTL_HEADING         ((USHORT)4003)
-#define DEFAULTFONT_CTL_DISPLAY         ((USHORT)4004)
-
 #define DEFAULTFONT_FLAGS_ONLYONE       ((ULONG)0x00000001)
 
 enum OutDevType { OUTDEV_DONTKNOW, OUTDEV_WINDOW, OUTDEV_PRINTER, OUTDEV_VIRDEV };
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx
index 88316130cc3a..b72e78994a75 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/vcl/outfont.hxx
@@ -32,9 +32,9 @@
 #include <tools/list.hxx>
 #include <i18npool/lang.h>
 #include <tools/gen.hxx>
-#include <vcl/sv.h>
+#include <tools/solar.h>
 #include <vcl/dllapi.h>
-
+#include <unotools/fontdefs.hxx>
 #include <vcl/vclenum.hxx>
 
 #include <hash_map>
@@ -48,14 +48,10 @@ class ImplPreMatchFontSubstitution;
 class ImplGlyphFallbackFontSubstitution;
 class ImplFontSelectData;
 class Font;
-class ImplCvtChar;
+class ConvertChar;
 struct FontMatchStatus;
 class OutputDevice;
 
-namespace vcl {
-  struct FontNameAttr;
-}
-
 // ----------------------
 // - ImplFontAttributes -
 // ----------------------
@@ -185,8 +181,6 @@ public: // TODO: change to private
     ImplFontEntry*      mpFontEntry;        // pointer to the resulting FontCache entry
 };
 
-struct FontNameHash { int operator()(const String&) const; };
-
 // -------------------
 // - ImplDevFontList -
 // -------------------
@@ -238,7 +232,7 @@ protected:
 
     ImplDevFontListData*    ImplFindByTokenNames( const String& ) const;
     ImplDevFontListData*    ImplFindByAliasName( const String& rSearchName, const String& rShortName ) const;
-    ImplDevFontListData*    ImplFindBySubstFontAttr( const vcl::FontNameAttr& ) const;
+    ImplDevFontListData*    ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
     ImplDevFontListData*    ImplFindByAttributes( ULONG nSearchType, FontWeight, FontWidth,
                                 FontFamily, FontItalic, const String& rSearchFamily ) const;
     ImplDevFontListData*    FindDefaultFont() const;
@@ -337,7 +331,7 @@ public:
 public: // TODO: make data members private
     ImplFontSelectData  maFontSelData;      // FontSelectionData
     ImplFontMetricData  maMetric;           // Font Metric
-    const ImplCvtChar*  mpConversion;       // used e.g. for StarBats->StarSymbol
+    const ConvertChar*  mpConversion;       // used e.g. for StarBats->StarSymbol
     long                mnLineHeight;
     ULONG               mnRefCount;
     USHORT              mnSetFontFlags;     // Flags returned by SalGraphics::SetFont()
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index a4a6c4d53170..dbfaf9eda18d 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -547,6 +547,7 @@ The following structure describes the permissions used in PDF security
          */
         PDFWriter::ExportDataFormat     SubmitFormat;
         bool                            AllowDuplicateFieldNames;
+        bool                            FieldsUseSystemFonts;
         /* the following data members are used to customize the PDF viewer
            preferences
          */
@@ -592,6 +593,7 @@ The following structure describes the permissions used in PDF security
                 EmbedStandardFonts( false ),
                 SubmitFormat( PDFWriter::FDF ),
                 AllowDuplicateFieldNames( false ),
+                FieldsUseSystemFonts( true ),
                 PDFDocumentMode( PDFWriter::ModeDefault ),
                 PDFDocumentAction( PDFWriter::ActionDefault ),
                 Zoom( 100 ),
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 2a10353bee94..d9be75369a5d 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -37,6 +37,7 @@
 #include <tools/debug.hxx>
 #include <vcl/salgtype.hxx>
 #include <tools/color.hxx>
+#include <tools/gen.hxx>
 #include <vcl/sv.h>
 #include <vcl/dllapi.h>
 
@@ -49,14 +50,6 @@ typedef HPBYTE      Scanline;
 typedef const BYTE* ConstHPBYTE;
 typedef ConstHPBYTE ConstScanline;
 
-// --------------------
-// - Helper functions -
-// --------------------
-
-inline long MinMax( long nVal, long nMin, long nMax );
-inline long AlignedWidth4Bytes( long nWidthBits );
-inline long FRound( double fVal );
-
 // ------------------
 // - Bitmap formats -
 // ------------------
@@ -292,29 +285,6 @@ struct VCL_DLLPUBLIC BitmapBuffer
 VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
                                                ULONG nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL );
 
-// ---------------
-// - Inlines -
-// ---------------
-
-inline long MinMax( long nVal, long nMin, long nMax )
-{
-    return( nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin );
-}
-
-// ------------------------------------------------------------------
-
-inline long AlignedWidth4Bytes( long nWidthBits )
-{
-    return( ( ( nWidthBits + 31 ) >> 5 ) << 2 );
-}
-
-// ------------------------------------------------------------------
-
-inline long FRound( double fVal )
-{
-    return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
-}
-
 // ------------------------------------------------------------------
 
 inline BitmapColor::BitmapColor() :
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx
index 0e3f4e94a0b3..b95f7036ad19 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/vcl/salframe.hxx
@@ -170,6 +170,7 @@ public:
 
     virtual void                SetTitle( const XubString& rTitle ) = 0;
     virtual void                SetIcon( USHORT nIcon ) = 0;
+    virtual void                SetRepresentedURL( const rtl::OUString& );
     virtual void                    SetMenu( SalMenu *pSalMenu ) = 0;
     virtual void                    DrawMenuBar() = 0;
 
diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/vcl/salsession.hxx
index 05aa76cb0f56..bdc698fc63fd 100644
--- a/vcl/inc/vcl/salsession.hxx
+++ b/vcl/inc/vcl/salsession.hxx
@@ -37,7 +37,8 @@ enum SalSessionEventType
 {
     Interaction,
     SaveRequest,
-    ShutdownCancel
+    ShutdownCancel,
+    Quit
 };
 
 struct SalSessionEvent
@@ -78,6 +79,13 @@ struct SalSessionShutdownCancelEvent : public SalSessionEvent
     {}
 };
 
+struct SalSessionQuitEvent : public SalSessionEvent
+{
+    SalSessionQuitEvent()
+            : SalSessionEvent( Quit )
+    {}
+};
+
 typedef void(*SessionProc)( SalSessionEvent *pEvent);
 
 class VCL_DLLPUBLIC SalSession
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index decb7d01b2d4..61a970b738e0 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -38,6 +38,7 @@
 #include "vcl/accel.hxx"
 #include "vcl/wall.hxx"
 #include "com/sun/star/lang/Locale.hpp"
+#include <unotools/syslocale.hxx>
 
 class CollatorWrapper;
 class LocaleDataWrapper;
@@ -521,9 +522,10 @@ private:
 #define STYLE_SYMBOLS_HICONTRAST    ((ULONG)2)
 #define STYLE_SYMBOLS_INDUSTRIAL    ((ULONG)3)
 #define STYLE_SYMBOLS_CRYSTAL       ((ULONG)4)
-#define STYLE_SYMBOLS_TANGO     ((ULONG)5)
-#define STYLE_SYMBOLS_CLASSIC       ((ULONG)6)
-#define STYLE_SYMBOLS_THEMES_MAX    ((ULONG)6)
+#define STYLE_SYMBOLS_TANGO         ((ULONG)5)
+#define STYLE_SYMBOLS_OXYGEN        ((ULONG)6)
+#define STYLE_SYMBOLS_CLASSIC       ((ULONG)7)
+#define STYLE_SYMBOLS_THEMES_MAX    ((ULONG)8)
 
 #define STYLE_CURSOR_NOBLINKTIME    ((ULONG)0xFFFFFFFF)
 
@@ -947,6 +949,8 @@ public:
     void                            SetPreferredSymbolsStyleName( const ::rtl::OUString &rName );
     ULONG                           GetPreferredSymbolsStyle() const
                                         { return mpData->mnPreferredSymbolsStyle; }
+    // check whether the symbols style is supported (icons are installed)
+    bool                            CheckSymbolStyle( ULONG nStyle ) const;
     ULONG                           GetAutoSymbolsStyle() const;
 
     ULONG                           GetCurrentSymbolsStyle() const;
@@ -993,7 +997,6 @@ class ImplMiscData
 
 private:
     ULONG                           mnRefCount;
-    USHORT                          mnTwoDigitYearStart;
     USHORT                          mnEnableATT;
     BOOL                            mbEnableLocalizedDecimalSep;
     USHORT                          mnDisablePrinting;
@@ -1015,10 +1018,6 @@ public:
                                     MiscSettings( const MiscSettings& rSet );
                                     ~MiscSettings();
 
-    void                            SetTwoDigitYearStart( USHORT nYearStart )
-                                        { CopyData(); mpData->mnTwoDigitYearStart = nYearStart; }
-    USHORT                          GetTwoDigitYearStart() const
-                                        { return mpData->mnTwoDigitYearStart; }
     void                            SetEnableATToolSupport( BOOL bEnable );
     BOOL                            GetEnableATToolSupport() const;
     void                            SetDisablePrinting( BOOL bEnable );
@@ -1141,7 +1140,7 @@ public:
 // -----------------------
 // - ImplAllSettingsData -
 // -----------------------
-
+class LocaleConfigurationListener;
 class ImplAllSettingsData
 {
     friend class    AllSettings;
@@ -1171,6 +1170,8 @@ private:
     CollatorWrapper*                        mpUICollatorWrapper;
     vcl::I18nHelper*                        mpI18nHelper;
     vcl::I18nHelper*                        mpUII18nHelper;
+    LocaleConfigurationListener*            mpLocaleCfgListener;
+    SvtSysLocale                            maSysLocale;
 };
 
 // ---------------
@@ -1287,6 +1288,8 @@ public:
     BOOL                                    operator ==( const AllSettings& rSet ) const;
     BOOL                                    operator !=( const AllSettings& rSet ) const
                                                 { return !(*this == rSet); }
+    static void                             LocaleSettingsChanged( sal_uInt32 nHint );
+    SvtSysLocale&                           GetSysLocale() { return mpData->maSysLocale; }
 };
 
 #endif // _SV_SETTINGS_HXX
diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx
index 5d970f060448..17ad1aa28c1a 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/vcl/svdata.hxx
@@ -44,6 +44,7 @@
 #include <tools/debug.hxx>
 #include <vcl/dllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
+#include <unotools/options.hxx>
 
 namespace com {
 namespace sun {
@@ -114,11 +115,17 @@ class VclEventListeners2;
 
 namespace vos { class OMutex; }
 namespace vos { class OCondition; }
-namespace vcl { class DisplayConnection; class FontSubstConfiguration; class SettingsConfigItem; class DefaultFontConfiguration; class DeleteOnDeinitBase; }
+namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; }
+namespace utl { class DefaultFontConfiguration; class FontSubstConfiguration; }
 
 // -----------------
 // - ImplSVAppData -
 // -----------------
+class LocaleConfigurationListener : public utl::ConfigurationListener
+{
+public:
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
+};
 
 struct ImplSVAppData
 {
@@ -131,21 +138,22 @@ struct ImplSVAppData
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    mxMSF;
     String*                 mpMSFTempFileName;
-    AllSettings*            mpSettings;                     // Application settings
-    VclEventListeners*      mpEventListeners;               // listeners for vcl events (eg, extended toolkit)
-    VclEventListeners*      mpKeyListeners;                 // listeners for key events only (eg, extended toolkit)
-    ImplAccelManager*       mpAccelMgr;                     // Accelerator Manager
-    XubString*              mpAppName;                      // Application name
-    XubString*              mpAppFileName;                  // Abs. Application FileName
-    XubString*              mpDisplayName;                  // Application Display Name
-    String*                 mpFontPath;                     // Additional Fontpath
-    Help*                   mpHelp;                         // Application help
-    PopupMenu*              mpActivePopupMenu;              // Actives Popup-Menu (in Execute)
-    UniqueIdContainer*      mpUniqueIdCont;                 // Fuer Eindeutige Id's
-    ImplIdleMgr*            mpIdleMgr;                      // Idle-Manager
-    ImplWheelWindow*        mpWheelWindow;                  // WheelWindow
-    ImplHotKey*             mpFirstHotKey;                  // HotKey-Verwaltung
-    ImplEventHook*          mpFirstEventHook;               // Event-Hooks
+    AllSettings*            mpSettings;         // Application settings
+    LocaleConfigurationListener* mpCfgListener;
+    VclEventListeners*      mpEventListeners;   // listeners for vcl events (eg, extended toolkit)
+    VclEventListeners*      mpKeyListeners;     // listeners for key events only (eg, extended toolkit)
+    ImplAccelManager*       mpAccelMgr;         // Accelerator Manager
+    XubString*              mpAppName;          // Application name
+    XubString*              mpAppFileName;      // Abs. Application FileName
+    XubString*              mpDisplayName;      // Application Display Name
+    String*                 mpFontPath;         // Additional Fontpath
+    Help*                   mpHelp;             // Application help
+    PopupMenu*              mpActivePopupMenu;  // Actives Popup-Menu (in Execute)
+    UniqueIdContainer*      mpUniqueIdCont;     // Fuer Eindeutige Id's
+    ImplIdleMgr*            mpIdleMgr;          // Idle-Manager
+    ImplWheelWindow*        mpWheelWindow;      // WheelWindow
+    ImplHotKey*             mpFirstHotKey;      // HotKey-Verwaltung
+    ImplEventHook*          mpFirstEventHook;   // Event-Hooks
     VclEventListeners2*     mpPostYieldListeners;           // post yield listeners
     ULONG                   mnLastInputTime;                // GetLastInputTime()
     USHORT                  mnDispatchLevel;                // DispatchLevel
@@ -200,8 +208,8 @@ struct ImplSVGDIData
     long                    mnAppFontX;         // AppFont X-Numenator for 40/tel Width + DialogScaleX
     long                    mnAppFontY;         // AppFont Y-Numenator for 80/tel Height
     BOOL                    mbFontSubChanged;   // TRUE: FontSubstitution wurde zwischen Begin/End geaendert
-    vcl::DefaultFontConfiguration* mpDefaultFontConfiguration;
-    vcl::FontSubstConfiguration* mpFontSubstConfiguration;
+    utl::DefaultFontConfiguration* mpDefaultFontConfiguration;
+    utl::FontSubstConfiguration* mpFontSubstConfiguration;
     bool                    mbPrinterPullModel; // true: use pull model instead of normal push model when printing
     bool                    mbNativeFontConfig; // true: do not override UI font
     bool                    mbNoXORClipping;    // true: do not use XOR to achieve clipping effects
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index 99a340ae4a58..d590cfe0a37e 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -201,6 +201,10 @@ public:
 
     void            SetIcon( USHORT nIcon );
     USHORT          GetIcon() const { return mnIcon; }
+    // for systems like MacOSX which can display the URL a document is loaded from
+    // separately from the window title
+    void            SetRepresentedURL( const rtl::OUString& );
+    const rtl::OUString& GetRepresentedURL() const;
 
     void            SetZLevel( BYTE nLevel );
     BYTE            GetZLevel() const;
diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h
index 52a0db40b226..2dee85ab6b82 100644
--- a/vcl/inc/vcl/toolbox.h
+++ b/vcl/inc/vcl/toolbox.h
@@ -51,6 +51,7 @@
 #define TB_LARGEIMAGESIZE            26
 #define TB_LARGEIMAGESIZE_INDUSTRIAL 24
 #define TB_LARGEIMAGESIZE_CRYSTAL    22
+#define TB_LARGEIMAGESIZE_OXYGEN     22
 
 class Window;
 
diff --git a/vcl/inc/vcl/wintypes.hxx b/vcl/inc/vcl/wintypes.hxx
index 968f0e1d255f..9e84648fb6a8 100644
--- a/vcl/inc/vcl/wintypes.hxx
+++ b/vcl/inc/vcl/wintypes.hxx
@@ -30,308 +30,7 @@
 #ifndef _SV_WINTYPES_HXX
 #define _SV_WINTYPES_HXX
 
-#include <vcl/sv.h>
-#include <sal/types.h>
-
-// ----------------
-// - Window-Types -
-// ----------------
-
-typedef USHORT WindowType;
-#define WINDOW_BASE                 0x0100
-#define WINDOW_FIRST                (WINDOW_BASE + 0x30)
-#define WINDOW_MESSBOX              (WINDOW_FIRST)
-#define WINDOW_INFOBOX              (WINDOW_FIRST + 0x01)
-#define WINDOW_WARNINGBOX           (WINDOW_FIRST + 0x02)
-#define WINDOW_ERRORBOX             (WINDOW_FIRST + 0x03)
-#define WINDOW_QUERYBOX             (WINDOW_FIRST + 0x04)
-#define WINDOW_WINDOW               (WINDOW_FIRST + 0x05)
-#define WINDOW_SYSWINDOW            (WINDOW_FIRST + 0x06)
-#define WINDOW_WORKWINDOW           (WINDOW_FIRST + 0x07)
-// #define WINDOW_MDIWINDOW            (WINDOW_FIRST + 0x08)
-#define WINDOW_FLOATINGWINDOW       (WINDOW_FIRST + 0x09)
-#define WINDOW_DIALOG               (WINDOW_FIRST + 0x0a)
-#define WINDOW_MODELESSDIALOG       (WINDOW_FIRST + 0x0b)
-#define WINDOW_MODALDIALOG          (WINDOW_FIRST + 0x0c)
-#define WINDOW_SYSTEMDIALOG         (WINDOW_FIRST + 0x0d)
-#define WINDOW_PATHDIALOG           (WINDOW_FIRST + 0x0e)
-#define WINDOW_FILEDIALOG           (WINDOW_FIRST + 0x0f)
-#define WINDOW_PRINTERSETUPDIALOG   (WINDOW_FIRST + 0x10)
-#define WINDOW_PRINTDIALOG          (WINDOW_FIRST + 0x11)
-#define WINDOW_COLORDIALOG          (WINDOW_FIRST + 0x12)
-#define WINDOW_FONTDIALOG           (WINDOW_FIRST + 0x13)
-#define WINDOW_CONTROL              (WINDOW_FIRST + 0x14)
-#define WINDOW_BUTTON               (WINDOW_FIRST + 0x15)
-#define WINDOW_PUSHBUTTON           (WINDOW_FIRST + 0x16)
-#define WINDOW_OKBUTTON             (WINDOW_FIRST + 0x17)
-#define WINDOW_CANCELBUTTON         (WINDOW_FIRST + 0x18)
-#define WINDOW_HELPBUTTON           (WINDOW_FIRST + 0x19)
-#define WINDOW_IMAGEBUTTON          (WINDOW_FIRST + 0x1a)
-#define WINDOW_MENUBUTTON           (WINDOW_FIRST + 0x1b)
-#define WINDOW_MOREBUTTON           (WINDOW_FIRST + 0x1c)
-#define WINDOW_SPINBUTTON           (WINDOW_FIRST + 0x1d)
-#define WINDOW_RADIOBUTTON          (WINDOW_FIRST + 0x1e)
-#define WINDOW_IMAGERADIOBUTTON     (WINDOW_FIRST + 0x1f)
-#define WINDOW_CHECKBOX             (WINDOW_FIRST + 0x20)
-#define WINDOW_TRISTATEBOX          (WINDOW_FIRST + 0x21)
-#define WINDOW_EDIT                 (WINDOW_FIRST + 0x22)
-#define WINDOW_MULTILINEEDIT        (WINDOW_FIRST + 0x23)
-#define WINDOW_COMBOBOX             (WINDOW_FIRST + 0x24)
-#define WINDOW_LISTBOX              (WINDOW_FIRST + 0x25)
-#define WINDOW_MULTILISTBOX         (WINDOW_FIRST + 0x26)
-#define WINDOW_FIXEDTEXT            (WINDOW_FIRST + 0x27)
-#define WINDOW_FIXEDLINE            (WINDOW_FIRST + 0x28)
-#define WINDOW_FIXEDBITMAP          (WINDOW_FIRST + 0x29)
-#define WINDOW_FIXEDIMAGE           (WINDOW_FIRST + 0x2a)
-#define WINDOW_GROUPBOX             (WINDOW_FIRST + 0x2c)
-#define WINDOW_SCROLLBAR            (WINDOW_FIRST + 0x2d)
-#define WINDOW_SCROLLBARBOX         (WINDOW_FIRST + 0x2e)
-#define WINDOW_SPLITTER             (WINDOW_FIRST + 0x2f)
-#define WINDOW_SPLITWINDOW          (WINDOW_FIRST + 0x30)
-#define WINDOW_SPINFIELD            (WINDOW_FIRST + 0x31)
-#define WINDOW_PATTERNFIELD         (WINDOW_FIRST + 0x32)
-#define WINDOW_NUMERICFIELD         (WINDOW_FIRST + 0x33)
-#define WINDOW_METRICFIELD          (WINDOW_FIRST + 0x34)
-#define WINDOW_CURRENCYFIELD        (WINDOW_FIRST + 0x35)
-#define WINDOW_DATEFIELD            (WINDOW_FIRST + 0x36)
-#define WINDOW_TIMEFIELD            (WINDOW_FIRST + 0x37)
-#define WINDOW_PATTERNBOX           (WINDOW_FIRST + 0x38)
-#define WINDOW_NUMERICBOX           (WINDOW_FIRST + 0x39)
-#define WINDOW_METRICBOX            (WINDOW_FIRST + 0x3a)
-#define WINDOW_CURRENCYBOX          (WINDOW_FIRST + 0x3b)
-#define WINDOW_DATEBOX              (WINDOW_FIRST + 0x3c)
-#define WINDOW_TIMEBOX              (WINDOW_FIRST + 0x3d)
-#define WINDOW_LONGCURRENCYFIELD    (WINDOW_FIRST + 0x3e)
-#define WINDOW_LONGCURRENCYBOX      (WINDOW_FIRST + 0x3f)
-#define WINDOW_TOOLBOX              (WINDOW_FIRST + 0x41)
-#define WINDOW_DOCKINGWINDOW        (WINDOW_FIRST + 0x42)
-#define WINDOW_STATUSBAR            (WINDOW_FIRST + 0x43)
-#define WINDOW_TABPAGE              (WINDOW_FIRST + 0x44)
-#define WINDOW_TABCONTROL           (WINDOW_FIRST + 0x45)
-#define WINDOW_TABDIALOG            (WINDOW_FIRST + 0x46)
-#define WINDOW_BORDERWINDOW         (WINDOW_FIRST + 0x47)
-#define WINDOW_BUTTONDIALOG         (WINDOW_FIRST + 0x48)
-#define WINDOW_SYSTEMCHILDWINDOW    (WINDOW_FIRST + 0x49)
-#define WINDOW_FIXEDBORDER          (WINDOW_FIRST + 0x4a)
-#define WINDOW_SLIDER               (WINDOW_FIRST + 0x4b)
-#define WINDOW_MENUBARWINDOW        (WINDOW_FIRST + 0x4c)
-#define WINDOW_TREELISTBOX          (WINDOW_FIRST + 0x4d)
-#define WINDOW_HELPTEXTWINDOW       (WINDOW_FIRST + 0x4e)
-#define WINDOW_INTROWINDOW          (WINDOW_FIRST + 0x4f)
-#define WINDOW_LISTBOXWINDOW        (WINDOW_FIRST + 0x50)
-#define WINDOW_DOCKINGAREA          (WINDOW_FIRST + 0x51)
-#define WINDOW_LAST                 (WINDOW_DOCKINGAREA)
-
-
-// ---------------
-// - Window-Bits -
-// ---------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-typedef sal_Int64 WinBits;
-
-// Window-Bits fuer Window
-#define WB_CLIPCHILDREN         ((WinBits)0x00000001)
-#define WB_DIALOGCONTROL        ((WinBits)0x00000002)
-#define WB_NODIALOGCONTROL      ((WinBits)0x00000004)
-#define WB_BORDER               ((WinBits)0x00000008)
-#define WB_NOBORDER             ((WinBits)0x00000010)
-#define WB_SIZEABLE             ((WinBits)0x00000020)
-#define WB_3DLOOK               ((WinBits)0x00000040)
-#define WB_AUTOSIZE             ((WinBits)0x00000080)
-
-// Window-Bits fuer SystemWindows
-#define WB_MOVEABLE             ((WinBits)0x00000100)
-#define WB_ROLLABLE             ((WinBits)0x00000200)
-#define WB_CLOSEABLE            ((WinBits)0x00000400)
-#define WB_STANDALONE           ((WinBits)0x00000800)
-#define WB_APP                  ((WinBits)0x00001000)
-#define WB_PINABLE              ((WinBits)0x00002000)
-#define WB_SYSTEMWINDOW         ((WinBits)SAL_CONST_INT64(0x40000000))
-// warning: do not confuse WB_SYSTEMCHILDWINDOW with the SystemChildWindow class
-
-// the SystemChildWindow class was there first and is a very specialized
-// sytem child window type for plugged applications. The SystemChildWindow class
-// explicitly should never use the WB_SYSTEMCHILDWINDOW WinBit
-
-// WB_SYSTEMCHILDWINDOW on the other hand is to be used on system windows
-// which should be created as system child windows with (more or less)
-// normal event handling
-#define WB_SYSTEMCHILDWINDOW    ((WinBits)SAL_CONST_INT64(0x8000000000))
-#define WB_SIZEMOVE             (WB_SIZEABLE | WB_MOVEABLE)
-
-// Standard-Window-Bits fuer ChildWindows
-#define WB_TABSTOP              ((WinBits)0x00000100)
-#define WB_NOTABSTOP            ((WinBits)0x00000200)
-#define WB_GROUP                ((WinBits)0x00000400)
-#define WB_NOGROUP              ((WinBits)0x00000800)
-#define WB_HORZ                 ((WinBits)0x00001000)
-#define WB_VERT                 ((WinBits)0x00002000)
-#define WB_LEFT                 ((WinBits)0x00004000)
-#define WB_CENTER               ((WinBits)0x00008000)
-#define WB_RIGHT                ((WinBits)0x00010000)
-#define WB_TOP                  ((WinBits)0x00020000)
-#define WB_VCENTER              ((WinBits)0x00040000)
-#define WB_BOTTOM               ((WinBits)0x00080000)
-#define WB_DRAG                 ((WinBits)0x00100000)
-#define WB_SPIN                 ((WinBits)0x00200000)
-#define WB_REPEAT               ((WinBits)0x00400000)
-#define WB_NOPOINTERFOCUS       ((WinBits)0x00800000)
-#define WB_WORDBREAK            ((WinBits)0x01000000)
-#define WB_NOLABEL              ((WinBits)0x02000000)
-#define WB_SORT                 ((WinBits)0x04000000)
-#define WB_DROPDOWN             ((WinBits)0x08000000)
-#define WB_AUTOHSCROLL          ((WinBits)SAL_CONST_INT64(0x10000000))
-#define WB_DOCKABLE             ((WinBits)SAL_CONST_INT64(0x20000000))
-#define WB_AUTOVSCROLL          ((WinBits)SAL_CONST_INT64(0x40000000))
-#define WB_HYPHENATION          (((WinBits)SAL_CONST_INT64(0x80000000)) | WB_WORDBREAK)
-#define WB_CHILDDLGCTRL         ((WinBits)SAL_CONST_INT64(0x100000000000))
-
-// system floating window
-#define WB_SYSTEMFLOATWIN       ((WinBits)SAL_CONST_INT64(0x100000000))
-#define WB_INTROWIN             ((WinBits)SAL_CONST_INT64(0x200000000))
-#define WB_NOSHADOW             ((WinBits)SAL_CONST_INT64(0x400000000))
-#define WB_TOOLTIPWIN           ((WinBits)SAL_CONST_INT64(0x800000000))
-#define WB_OWNERDRAWDECORATION  ((WinBits)SAL_CONST_INT64(0x2000000000))
-#define WB_DEFAULTWIN           ((WinBits)SAL_CONST_INT64(0x4000000000))
-#define WB_NEEDSFOCUS           ((WinBits)SAL_CONST_INT64(0x1000000000))
-
-#define WB_HIDE                 ((WinBits)SAL_CONST_INT64(0x80000000))
-#define WB_HSCROLL              WB_HORZ
-#define WB_VSCROLL              WB_VERT
-#define WB_TOPIMAGE             WB_TOP
-
-// Window-Bits for PushButtons
-#define WB_DEFBUTTON            ((WinBits)0x10000000)
-#define WB_NOLIGHTBORDER        ((WinBits)0x20000000)
-#define WB_RECTSTYLE            ((WinBits)0x08000000)
-#define WB_SMALLSTYLE           ((WinBits)0x04000000)
-#define WB_TOGGLE               ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_BEVELBUTTON          ((WinBits)SAL_CONST_INT64(0x2000000000))
-
-// Window-Bits for FixedText
-#define WB_PATHELLIPSIS         ((WinBits)0x00100000)
-#define WB_EXTRAOFFSET          ((WinBits)0x02000000)
-#define WB_NOMULTILINE          ((WinBits)0x10000000)
-#define WB_INFO                 ((WinBits)0x20000000)
-
-// Window-Bits for CheckBox
-#define WB_CBLINESTYLE          ((WinBits)SAL_CONST_INT64(0x2000000000))
-
-// Window-Bits for Edit
-#define WB_PASSWORD             ((WinBits)0x01000000)
-#define WB_READONLY             ((WinBits)0x02000000)
-#define WB_NOHIDESELECTION      ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_FORCECTRLBACKGROUND  ((WinBits)0x80000000)
-
-// Window-Bits for MultiLineEdit
-#define WB_IGNORETAB            ((WinBits)0x20000000)
-
-// Window-Bits for ListBox and MultiListBox
-#define WB_SIMPLEMODE           ((WinBits)0x20000000)
-
-// Window-Bits for FixedBitmap
-#define WB_FAST                 ((WinBits)0x04000000)
-#define WB_SCALE                ((WinBits)0x08000000)
-#define WB_TOPLEFTVISIBLE       ((WinBits)0x10000000)
-
-// Window-Bits for ToolBox
-#define WB_LINESPACING          ((WinBits)0x01000000)
-#define WB_SCROLL               ((WinBits)0x02000000)
-#define WB_FORCETABCYCLE        ((WinBits)0x04000000)
-
-// Window-Bits for TabControl
-#define WB_SINGLELINE           ((WinBits)0x02000000)
-
-// Window-Bits for DockingWindows
-#define WB_DOCKBORDER           ((WinBits)0x00001000)
-
-// Window-Bits for SplitWindow
-#define WB_NOSPLITDRAW          ((WinBits)0x01000000)
-#define WB_FLATSPLITDRAW        ((WinBits)0x02000000)
-
-// Window-Bits for MessageBoxen
-#define WB_OK                   ((WinBits)0x00100000)
-#define WB_OK_CANCEL            ((WinBits)0x00200000)
-#define WB_YES_NO               ((WinBits)0x00400000)
-#define WB_YES_NO_CANCEL        ((WinBits)0x00800000)
-#define WB_RETRY_CANCEL         ((WinBits)0x01000000)
-#define WB_DEF_OK               ((WinBits)0x02000000)
-#define WB_DEF_CANCEL           ((WinBits)0x04000000)
-#define WB_DEF_RETRY            ((WinBits)0x08000000)
-#define WB_DEF_YES              ((WinBits)SAL_CONST_INT64(0x10000000))
-#define WB_DEF_NO               ((WinBits)SAL_CONST_INT64(0x20000000))
-#define WB_ABORT_RETRY_IGNORE  ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_DEF_IGNORE          ((WinBits)SAL_CONST_INT64(0x2000000000))
-
-// Standard-WinBits
-#define WB_STDWORK              (WB_SIZEMOVE | WB_CLOSEABLE)
-#define WB_STDDOCKWIN           (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDFLOATWIN          (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
-#define WB_STDDIALOG            (WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDMODELESS          (WB_STDDIALOG)
-#define WB_STDMODAL             (WB_STDDIALOG)
-#define WB_STDTABDIALOG         (WB_STDDIALOG)
-#define WB_STDTABCONTROL        0
-
-// For TreeListBox
-#define WB_HASBUTTONS           ((WinBits)0x00800000)
-#define WB_HASLINES             ((WinBits)0x01000000)
-#define WB_HASLINESATROOT       ((WinBits)0x02000000)
-
-// For FileOpen Dialog
-#define WB_PATH                 ((WinBits)0x00100000)
-#define WB_OPEN                 ((WinBits)0x00200000)
-#define WB_SAVEAS               ((WinBits)0x00400000)
-
-// For Slider
-// Window-Bits for TabControl
-#define WB_SLIDERSET            ((WinBits)0x02000000)
-
-
-// --------------------
-// - extended WinBits -
-// --------------------
-#define WB_EXT_DOCUMENT         ((WinBits)0x00000001)
-#define WB_EXT_DOCMODIFIED      ((WinBits)0x00000002)
-
-// ---------------
-// - WindowAlign -
-// ---------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum WindowAlign { WINDOWALIGN_LEFT, WINDOWALIGN_TOP, WINDOWALIGN_RIGHT, WINDOWALIGN_BOTTOM };
-enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_BOTTOM,
-                  IMAGEALIGN_LEFT_TOP, IMAGEALIGN_LEFT_BOTTOM, IMAGEALIGN_TOP_LEFT,
-                  IMAGEALIGN_TOP_RIGHT, IMAGEALIGN_RIGHT_TOP, IMAGEALIGN_RIGHT_BOTTOM,
-                  IMAGEALIGN_BOTTOM_LEFT, IMAGEALIGN_BOTTOM_RIGHT, IMAGEALIGN_CENTER };
-enum SymbolAlign { SYMBOLALIGN_LEFT, SYMBOLALIGN_RIGHT };
-
-// ------------
-// - TriState -
-// ------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum TriState { STATE_NOCHECK, STATE_CHECK, STATE_DONTKNOW };
-
-
-// ----------------------
-// - ButtonDialog-Types -
-// ----------------------
-
-typedef USHORT StandardButtonType;
-#define BUTTON_OK           ((StandardButtonType)0)
-#define BUTTON_CANCEL       ((StandardButtonType)1)
-#define BUTTON_YES          ((StandardButtonType)2)
-#define BUTTON_NO           ((StandardButtonType)3)
-#define BUTTON_RETRY        ((StandardButtonType)4)
-#define BUTTON_HELP         ((StandardButtonType)5)
-#define BUTTON_CLOSE        ((StandardButtonType)6)
-#define BUTTON_MORE         ((StandardButtonType)7)
-#define BUTTON_IGNORE       ((StandardButtonType)8)
-#define BUTTON_ABORT        ((StandardButtonType)9)
-#define BUTTON_LESS         ((StandardButtonType)10)
-#define BUTTON_COUNT        11
+#include <tools/wintypes.hxx>
 
 #endif // _SV_WINTYPES_HXX
 
diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx
index d4d324ad469c..633ad4137aff 100644
--- a/vcl/os2/source/app/salinst.cxx
+++ b/vcl/os2/source/app/salinst.cxx
@@ -55,6 +55,7 @@
 #include <salbmp.h>
 #include <vcl/salimestatus.hxx>
 #include <vcl/timer.hxx>
+#include <tools/solarmutex.hxx>
 
 // =======================================================================
 
@@ -501,12 +502,14 @@ Os2SalInstance::Os2SalInstance()
     mpSalWaitMutex          = new vos::OMutex;
     mnYieldWaitCount         = 0;
     mpSalYieldMutex->acquire();
+    ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
 }
 
 // -----------------------------------------------------------------------
 
 Os2SalInstance::~Os2SalInstance()
 {
+    ::tools::SolarMutex::SetSolarMutex( 0 );
     mpSalYieldMutex->release();
     delete mpSalYieldMutex;
     delete mpSalWaitMutex;
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 908dd1eafd72..5d2aaf90c6f7 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools transex3 icc SO:print_header cpputools NULL
+vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools transex3 icc SO:print_header cpputools shell NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\inc									nmake	-	all	vc_inc NULL
 vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 9d398aef10cd..516b23dd76be 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -61,6 +61,13 @@ void SalFrame::Flush( const Rectangle& )
 
 // -----------------------------------------------------------------------
 
+void SalFrame::SetRepresentedURL( const rtl::OUString& )
+{
+    // currently this is Mac only functionality
+}
+
+// -----------------------------------------------------------------------
+
 SalInstance::~SalInstance()
 {
 }
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index ed8e355c2071..e82e93a9ccca 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -38,6 +38,7 @@
 #include <tools/debug.hxx>
 #include <com/sun/star/frame/XSessionManagerClient.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/frame/XSessionManagerListener2.hpp>
 
 #include <list>
 
@@ -81,6 +82,7 @@ class VCLSession : public cppu::WeakComponentImplHelper1 < XSessionManagerClient
     void callSaveRequested( bool bShutdown, bool bCancelable );
     void callShutdownCancelled();
     void callInteractionGranted( bool bGranted );
+    void callQuit();
 public:
     VCLSession();
     virtual ~VCLSession();
@@ -199,6 +201,27 @@ void VCLSession::callShutdownCancelled()
     Application::AcquireSolarMutex( nAcquireCount );
 }
 
+void VCLSession::callQuit()
+{
+    std::list< Listener > aListeners;
+    {
+        osl::MutexGuard aGuard( m_aMutex );
+        // copy listener list since calling a listener may remove it.
+        aListeners = m_aListeners;
+        // set back interaction state
+        m_bInteractionRequested = m_bInteractionDone = m_bInteractionGranted = false;
+    }
+
+    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
+    {
+        Reference< XSessionManagerListener2 > xListener2( it->m_xListener, UNO_QUERY );
+        if( xListener2.is() )
+            xListener2->doQuit();
+    }
+    Application::AcquireSolarMutex( nAcquireCount );
+}
+
 void VCLSession::SalSessionEventProc( SalSessionEvent* pEvent )
 {
     switch( pEvent->m_eType )
@@ -218,6 +241,9 @@ void VCLSession::SalSessionEventProc( SalSessionEvent* pEvent )
         case ShutdownCancel:
             pOneInstance->callShutdownCancelled();
             break;
+        case Quit:
+            pOneInstance->callQuit();
+            break;
     }
 }
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 6aa453563596..bd90d8824d91 100644..100755
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -37,14 +37,17 @@
 #include "vcl/event.hxx"
 #include "vcl/settings.hxx"
 #include "vcl/i18nhelp.hxx"
-#include "vcl/fontcfg.hxx"
+#include "unotools/fontcfg.hxx"
 #include "vcl/configsettings.hxx"
 #include "vcl/gradient.hxx"
 #include "vcl/unohelp.hxx"
+#include "vcl/bitmapex.hxx"
+#include "vcl/impimagetree.hxx"
 #include "unotools/localedatawrapper.hxx"
 #include "unotools/collatorwrapper.hxx"
 #include "unotools/configmgr.hxx"
 #include "unotools/confignode.hxx"
+#include <unotools/syslocaleoptions.hxx>
 
 #ifdef WNT
 #include "tools/prewin.h"
@@ -66,7 +69,6 @@ DBG_NAME( AllSettings )
                                  STYLE_OPTION_NOMNEMONICS)
 
 // =======================================================================
-
 ImplMachineData::ImplMachineData()
 {
     mnRefCount                  = 1;
@@ -549,7 +551,7 @@ void ImplStyleData::SetStandardStyles()
     Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
     aStdFont.SetCharSet( gsl_getSystemTextEncoding() );
     aStdFont.SetWeight( WEIGHT_NORMAL );
-    aStdFont.SetName( vcl::DefaultFontConfiguration::get()->getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) );
+    aStdFont.SetName( utl::DefaultFontConfiguration::get()->getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) );
     maAppFont                   = aStdFont;
     maHelpFont                  = aStdFont;
     maMenuFont                  = aStdFont;
@@ -706,6 +708,7 @@ void StyleSettings::Set3DColors( const Color& rColor )
         case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" );
         case STYLE_SYMBOLS_CRYSTAL:    return ::rtl::OUString::createFromAscii( "crystal" );
         case STYLE_SYMBOLS_TANGO:      return ::rtl::OUString::createFromAscii( "tango" );
+        case STYLE_SYMBOLS_OXYGEN:     return ::rtl::OUString::createFromAscii( "oxygen" );
         case STYLE_SYMBOLS_CLASSIC:    return ::rtl::OUString::createFromAscii( "classic" );
     }
 
@@ -726,6 +729,8 @@ ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) cons
         return STYLE_SYMBOLS_CRYSTAL;
     else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
         return STYLE_SYMBOLS_TANGO;
+    else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
+        return STYLE_SYMBOLS_OXYGEN;
     else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) )
         return STYLE_SYMBOLS_CLASSIC;
 
@@ -759,12 +764,12 @@ ULONG StyleSettings::GetCurrentSymbolsStyle() const
     // style selected in Tools -> Options... -> OpenOffice.org -> View
     ULONG nStyle = GetSymbolsStyle();
 
-    if ( nStyle == STYLE_SYMBOLS_AUTO )
+    if ( nStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nStyle) ) )
     {
         // the preferred style can be read from the desktop setting by the desktop native widgets modules
         ULONG nPreferredStyle = GetPreferredSymbolsStyle();
 
-        if ( nPreferredStyle == STYLE_SYMBOLS_AUTO )
+        if ( nPreferredStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nPreferredStyle) ) )
         {
 
             // use a hardcoded desktop-specific fallback if no preferred style has been detected
@@ -780,7 +785,10 @@ ULONG StyleSettings::GetCurrentSymbolsStyle() const
             nPreferredStyle = snFallbackDesktopStyle;
         }
 
-        nStyle = GetHighContrastMode()? STYLE_SYMBOLS_HICONTRAST: nPreferredStyle;
+        if (GetHighContrastMode() && CheckSymbolStyle (STYLE_SYMBOLS_HICONTRAST) )
+            nStyle = STYLE_SYMBOLS_HICONTRAST;
+        else
+            nStyle = nPreferredStyle;
     }
 
     return nStyle;
@@ -814,6 +822,33 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const
             nRet = STYLE_SYMBOLS_TANGO;
         else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
             nRet = STYLE_SYMBOLS_CRYSTAL;
+        else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
+            nRet = STYLE_SYMBOLS_OXYGEN;
+    }
+
+    // falback to any existing style
+    if ( ! CheckSymbolStyle (nRet) )
+    {
+        for ( ULONG n = 0 ; n <= STYLE_SYMBOLS_THEMES_MAX  ; n++ )
+        {
+            ULONG nStyleToCheck = n;
+
+            // auto is not a real theme => can't be fallback
+            if ( nStyleToCheck == STYLE_SYMBOLS_AUTO )
+                continue;
+
+            // will check hicontrast in the end
+            if ( nStyleToCheck == STYLE_SYMBOLS_HICONTRAST )
+                continue;
+            if ( nStyleToCheck == STYLE_SYMBOLS_THEMES_MAX )
+                nStyleToCheck = STYLE_SYMBOLS_HICONTRAST;
+
+            if ( CheckSymbolStyle ( nStyleToCheck ) )
+            {
+                nRet = nStyleToCheck;
+                n = STYLE_SYMBOLS_THEMES_MAX;
+            }
+        }
     }
 
     return nRet;
@@ -821,6 +856,14 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const
 
 // -----------------------------------------------------------------------
 
+bool StyleSettings::CheckSymbolStyle( ULONG nStyle ) const
+{
+    static ImplImageTreeSingletonRef aImageTree;
+    return aImageTree->checkStyle( ImplSymbolsStyleToName( nStyle ) );
+}
+
+// -----------------------------------------------------------------------
+
 void StyleSettings::SetStandardStyles()
 {
     CopyData();
@@ -1069,7 +1112,6 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
 ImplMiscData::ImplMiscData()
 {
     mnRefCount                  = 1;
-    mnTwoDigitYearStart         = 1930;
     mnEnableATT                 = sal::static_int_cast<USHORT>(~0U);
     mnDisablePrinting           = sal::static_int_cast<USHORT>(~0U);
     static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set default without UI
@@ -1081,7 +1123,6 @@ ImplMiscData::ImplMiscData()
 ImplMiscData::ImplMiscData( const ImplMiscData& rData )
 {
     mnRefCount                  = 1;
-    mnTwoDigitYearStart         = rData.mnTwoDigitYearStart;
     mnEnableATT                 = rData.mnEnableATT;
     mnDisablePrinting           = rData.mnDisablePrinting;
     mbEnableLocalizedDecimalSep = rData.mbEnableLocalizedDecimalSep;
@@ -1155,8 +1196,7 @@ BOOL MiscSettings::operator ==( const MiscSettings& rSet ) const
     if ( mpData == rSet.mpData )
         return TRUE;
 
-    if ( (mpData->mnTwoDigitYearStart   == rSet.mpData->mnTwoDigitYearStart ) &&
-         (mpData->mnEnableATT           == rSet.mpData->mnEnableATT ) &&
+    if ( (mpData->mnEnableATT           == rSet.mpData->mnEnableATT ) &&
          (mpData->mnDisablePrinting     == rSet.mpData->mnDisablePrinting ) &&
          (mpData->mbEnableLocalizedDecimalSep == rSet.mpData->mbEnableLocalizedDecimalSep ) )
         return TRUE;
@@ -1513,28 +1553,20 @@ BOOL HelpSettings::operator ==( const HelpSettings& rSet ) const
 
 // =======================================================================
 
-static BOOL ImplCompareLocales( const ::com::sun::star::lang::Locale& L1, const ::com::sun::star::lang::Locale& L2 )
-{
-    return ( ( L1.Language == L2.Language ) &&
-             ( L1.Country == L2.Country ) &&
-             ( L1.Variant == L2.Variant ) );
-}
-
-// =======================================================================
-
 ImplAllSettingsData::ImplAllSettingsData()
 {
     mnRefCount                  = 1;
     mnSystemUpdate              = SETTINGS_ALLSETTINGS;
     mnWindowUpdate              = SETTINGS_ALLSETTINGS;
     meLanguage                  = LANGUAGE_SYSTEM;
-    meUILanguage                = LANGUAGE_SYSTEM;
+    meUILanguage                  = LANGUAGE_SYSTEM;
     mpLocaleDataWrapper         = NULL;
     mpUILocaleDataWrapper       = NULL;
     mpCollatorWrapper           = NULL;
     mpUICollatorWrapper         = NULL;
     mpI18nHelper                = NULL;
     mpUII18nHelper              = NULL;
+    maMiscSettings.SetEnableLocalizedDecimalSep( maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() );
 }
 
 // -----------------------------------------------------------------------
@@ -1546,15 +1578,12 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) :
     maMiscSettings( rData.maMiscSettings ),
     maNotificationSettings( rData.maNotificationSettings ),
     maHelpSettings( rData.maHelpSettings ),
-    maLocale( rData.maLocale ),
-    maUILocale( rData.maUILocale )
-
+    maLocale( rData.maLocale )
 {
     mnRefCount                  = 1;
     mnSystemUpdate              = rData.mnSystemUpdate;
     mnWindowUpdate              = rData.mnWindowUpdate;
     meLanguage                  = rData.meLanguage;
-    meUILanguage                = rData.meUILanguage;
     // Pointer couldn't shared and objects haven't a copy ctor
     // So we create the cache objects new, if the GetFunction is
     // called
@@ -1750,11 +1779,7 @@ ULONG AllSettings::Update( ULONG nFlags, const AllSettings& rSet )
 
     if ( nFlags & SETTINGS_UILOCALE )
     {
-        if ( mpData->meUILanguage || rSet.mpData->meUILanguage )
-        {
-            SetUILanguage( rSet.mpData->meUILanguage );
-            nChangeFlags |= SETTINGS_UILOCALE;
-        }
+        // UILocale can't be changed
     }
 
     return nChangeFlags;
@@ -1793,9 +1818,6 @@ ULONG AllSettings::GetChangeFlags( const AllSettings& rSet ) const
     if ( mpData->meLanguage || rSet.mpData->meLanguage )
         nChangeFlags |= SETTINGS_LOCALE;
 
-    if ( mpData->meUILanguage || rSet.mpData->meUILanguage )
-        nChangeFlags |= SETTINGS_UILOCALE;
-
     return nChangeFlags;
 }
 
@@ -1817,18 +1839,13 @@ BOOL AllSettings::operator ==( const AllSettings& rSet ) const
          (mpData->maNotificationSettings    == rSet.mpData->maNotificationSettings) &&
          (mpData->maHelpSettings            == rSet.mpData->maHelpSettings)         &&
          (mpData->mnSystemUpdate            == rSet.mpData->mnSystemUpdate)         &&
+         (mpData->maLocale                  == rSet.mpData->maLocale)               &&
          (mpData->mnWindowUpdate            == rSet.mpData->mnWindowUpdate) )
     {
-        // special treatment for Locale, because maLocale is only
-        // initialized after first call of GetLocale().
-        ::com::sun::star::lang::Locale aEmptyLocale;
-        if ( ( ImplCompareLocales( mpData->maLocale, aEmptyLocale ) && ImplCompareLocales( rSet.mpData->maLocale, aEmptyLocale ) )
-            || ImplCompareLocales( GetLocale(), rSet.GetLocale() ) )
-        {
-            return TRUE;
-        }
+        return TRUE;
     }
-    return FALSE;
+    else
+        return FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -1857,70 +1874,39 @@ void AllSettings::SetLocale( const ::com::sun::star::lang::Locale& rLocale )
 
 // -----------------------------------------------------------------------
 
-void AllSettings::SetUILocale( const ::com::sun::star::lang::Locale& rLocale )
+void AllSettings::SetUILocale( const ::com::sun::star::lang::Locale& )
 {
-    CopyData();
-
-    mpData->maUILocale = rLocale;
-
-    if ( !rLocale.Language.getLength() )
-        mpData->meUILanguage = LANGUAGE_SYSTEM;
-    else
-        mpData->meUILanguage = MsLangId::convertLocaleToLanguage( rLocale );
-    if ( mpData->mpUILocaleDataWrapper )
-    {
-        delete mpData->mpUILocaleDataWrapper;
-        mpData->mpUILocaleDataWrapper = NULL;
-    }
-    if ( mpData->mpUII18nHelper )
-    {
-        delete mpData->mpUII18nHelper;
-        mpData->mpUII18nHelper = NULL;
-    }
+    // there is only one UILocale per process
 }
 
 // -----------------------------------------------------------------------
 
 void AllSettings::SetLanguage( LanguageType eLang )
 {
-    CopyData();
-
-    mpData->meLanguage = eLang;
-
-    // Will be calculated in GetLocale()
-    mpData->maLocale = ::com::sun::star::lang::Locale();
-    if ( mpData->mpLocaleDataWrapper )
-    {
-        delete mpData->mpLocaleDataWrapper;
-        mpData->mpLocaleDataWrapper = NULL;
-    }
-    if ( mpData->mpI18nHelper )
+    if ( eLang != mpData->meLanguage )
     {
-        delete mpData->mpI18nHelper;
-        mpData->mpI18nHelper = NULL;
+        CopyData();
+
+        mpData->meLanguage = eLang;
+        MsLangId::convertLanguageToLocale( GetLanguage(), ((AllSettings*)this)->mpData->maLocale );
+        if ( mpData->mpLocaleDataWrapper )
+        {
+            delete mpData->mpLocaleDataWrapper;
+            mpData->mpLocaleDataWrapper = NULL;
+        }
+        if ( mpData->mpI18nHelper )
+        {
+            delete mpData->mpI18nHelper;
+            mpData->mpI18nHelper = NULL;
+        }
     }
 }
 
 // -----------------------------------------------------------------------
 
-void AllSettings::SetUILanguage( LanguageType eLang  )
+void AllSettings::SetUILanguage( LanguageType  )
 {
-    CopyData();
-
-    mpData->meUILanguage = eLang;
-
-    // Will be calculated in GetUILocale()
-    mpData->maUILocale = ::com::sun::star::lang::Locale();
-    if ( mpData->mpUILocaleDataWrapper )
-    {
-        delete mpData->mpUILocaleDataWrapper;
-        mpData->mpUILocaleDataWrapper = NULL;
-    }
-    if ( mpData->mpUII18nHelper )
-    {
-        delete mpData->mpUII18nHelper;
-        mpData->mpUII18nHelper = NULL;
-    }
+    // there is only one UILanguage per process
 }
 
 // -----------------------------------------------------------------------
@@ -1973,8 +1959,7 @@ BOOL AllSettings::GetLayoutRTL() const
 const ::com::sun::star::lang::Locale& AllSettings::GetLocale() const
 {
     if ( !mpData->maLocale.Language.getLength() )
-        MsLangId::convertLanguageToLocale( GetLanguage(),
-                ((AllSettings*)this)->mpData->maLocale );
+        mpData->maLocale = mpData->maSysLocale.GetLocale();
 
     return mpData->maLocale;
 }
@@ -1983,9 +1968,9 @@ const ::com::sun::star::lang::Locale& AllSettings::GetLocale() const
 
 const ::com::sun::star::lang::Locale& AllSettings::GetUILocale() const
 {
+    // the UILocale is never changed
     if ( !mpData->maUILocale.Language.getLength() )
-        MsLangId::convertLanguageToLocale( GetUILanguage(),
-                ((AllSettings*)this)->mpData->maUILocale );
+        mpData->maUILocale = mpData->maSysLocale.GetUILocale();
 
     return mpData->maUILocale;
 }
@@ -1994,8 +1979,9 @@ const ::com::sun::star::lang::Locale& AllSettings::GetUILocale() const
 
 LanguageType AllSettings::GetLanguage() const
 {
+    // meLanguage == LANGUAGE_SYSTEM means: use settings from SvtSysLocale
     if ( mpData->meLanguage == LANGUAGE_SYSTEM )
-        return MsLangId::getSystemLanguage();
+        return mpData->maSysLocale.GetLanguage();
 
     return mpData->meLanguage;
 }
@@ -2004,10 +1990,8 @@ LanguageType AllSettings::GetLanguage() const
 
 LanguageType AllSettings::GetUILanguage() const
 {
-    if ( mpData->meUILanguage == LANGUAGE_SYSTEM )
-        return MsLangId::getSystemUILanguage();
-
-    return mpData->meUILanguage;
+    // the UILanguage is never changed
+    return mpData->maSysLocale.GetUILanguage();
 }
 
 // -----------------------------------------------------------------------
@@ -2076,3 +2060,22 @@ const CollatorWrapper& AllSettings::GetUICollatorWrapper() const
 }
 */
 
+void AllSettings::LocaleSettingsChanged( sal_uInt32 nHint )
+{
+    AllSettings aAllSettings( Application::GetSettings() );
+    if ( nHint & SYSLOCALEOPTIONS_HINT_DECSEP )
+    {
+        MiscSettings aMiscSettings = aAllSettings.GetMiscSettings();
+        BOOL bIsDecSepAsLocale = aAllSettings.mpData->maSysLocale.GetOptions().IsDecimalSeparatorAsLocale();
+        if ( aMiscSettings.GetEnableLocalizedDecimalSep() != bIsDecSepAsLocale )
+        {
+            aMiscSettings.SetEnableLocalizedDecimalSep( bIsDecSepAsLocale );
+            aAllSettings.SetMiscSettings( aMiscSettings );
+        }
+    }
+
+    if ( (nHint & SYSLOCALEOPTIONS_HINT_LOCALE) )
+        aAllSettings.SetLocale( aAllSettings.mpData->maSysLocale.GetOptions().GetLocale() );
+
+    Application::SetSettings( aAllSettings );
+}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 47ffa7dffec7..7f329f2d24d5 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -76,7 +76,8 @@
 #include "vcl/salimestatus.hxx"
 
 #include <utility>
-#include "vcl/lazydelete.hxx"
+#include <vcl/lazydelete.hxx>
+#include <unotools/syslocaleoptions.hxx>
 
 using namespace ::com::sun::star::uno;
 
@@ -704,12 +705,10 @@ bool Application::ValidateSystemFont()
 
 void Application::SetSettings( const AllSettings& rSettings )
 {
-    MsLangId::setConfiguredSystemLanguage( rSettings.GetLanguage());
-    MsLangId::setConfiguredSystemUILanguage( rSettings.GetUILanguage());
     ImplSVData* pSVData = ImplGetSVData();
     if ( !pSVData->maAppData.mpSettings )
     {
-        pSVData->maAppData.mpSettings = new AllSettings();
+        GetSettings();
         *pSVData->maAppData.mpSettings = rSettings;
         ResMgr::SetDefaultLocale( rSettings.GetUILocale() );
     }
@@ -811,7 +810,12 @@ const AllSettings& Application::GetSettings()
 {
     ImplSVData* pSVData = ImplGetSVData();
     if ( !pSVData->maAppData.mpSettings )
+    {
+        pSVData->maAppData.mpCfgListener = new LocaleConfigurationListener;
         pSVData->maAppData.mpSettings = new AllSettings();
+        pSVData->maAppData.mpSettings->GetSysLocale().GetOptions().AddListener( pSVData->maAppData.mpCfgListener );
+    }
+
     return *(pSVData->maAppData.mpSettings);
 }
 
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 21e1f34c1ef5..6a61d15db4c0 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -47,7 +47,7 @@
 #include <uno/current_context.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <tools/debug.hxx>
-#include <vcl/fontcfg.hxx>
+#include <unotools/fontcfg.hxx>
 #include <vcl/configsettings.hxx>
 #include <vcl/svdata.hxx>
 #include <vcl/window.h>
@@ -523,3 +523,9 @@ Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos )
 
     return NULL;
 }
+
+void LocaleConfigurationListener::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 nHint )
+{
+    AllSettings::LocaleSettingsChanged( nHint );
+}
+
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 6c09978e37b1..310c01a40673 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -79,8 +79,8 @@
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/lang/XComponent.hpp"
 #include "rtl/logfile.hxx"
-
-#include "vcl/fontcfg.hxx"
+#include <unotools/syslocaleoptions.hxx>
+#include "unotools/fontcfg.hxx"
 #include "vcl/configsettings.hxx"
 #include "vcl/lazydelete.hxx"
 
@@ -467,6 +467,12 @@ void DeInitVCL()
 
     if ( pSVData->maAppData.mpSettings )
     {
+        if ( pSVData->maAppData.mpCfgListener )
+        {
+            pSVData->maAppData.mpSettings->GetSysLocale().GetOptions().RemoveListener( pSVData->maAppData.mpCfgListener );
+            delete pSVData->maAppData.mpCfgListener;
+        }
+
         delete pSVData->maAppData.mpSettings;
         pSVData->maAppData.mpSettings = NULL;
     }
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index b417774142d3..a7729f4ace24 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -55,6 +55,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/charclass.hxx>
+#include <unotools/misccfg.hxx>
 
 using namespace ::com::sun::star;
 
@@ -1214,7 +1215,7 @@ static BOOL ImplDateProcessKeyInput( Edit*, const KeyEvent& rKEvt, ExtDateFieldF
 
 static BOOL ImplDateGetValue( const XubString& rStr, Date& rDate, ExtDateFieldFormat eDateFormat,
                               const LocaleDataWrapper& rLocaleDataWrapper, const CalendarWrapper& rCalendarWrapper,
-                              const AllSettings& rSettings )
+                              const AllSettings& )
 {
     USHORT nDay = 0;
     USHORT nMonth = 0;
@@ -1312,7 +1313,7 @@ static BOOL ImplDateGetValue( const XubString& rStr, Date& rDate, ExtDateFieldFo
         return FALSE;
 
     Date aNewDate( nDay, nMonth, nYear );
-    DateFormatter::ExpandCentury( aNewDate, rSettings.GetMiscSettings().GetTwoDigitYearStart() );
+    DateFormatter::ExpandCentury( aNewDate, utl::MiscCfg().GetYear2000() );
     if ( aNewDate.IsValid() )
     {
         rDate = aNewDate;
@@ -1355,7 +1356,7 @@ BOOL DateFormatter::ImplDateReformat( const XubString& rStr, XubString& rOutStr,
 // -----------------------------------------------------------------------
 
 XubString DateFormatter::ImplGetDateAsText( const Date& rDate,
-                                            const AllSettings& rSettings ) const
+                                            const AllSettings& ) const
 {
     BOOL bShowCentury = FALSE;
     switch ( GetExtDateFormat() )
@@ -1379,7 +1380,7 @@ XubString DateFormatter::ImplGetDateAsText( const Date& rDate,
     if ( !bShowCentury )
     {
         // Check if I have to use force showing the century
-        USHORT nTwoDigitYearStart = rSettings.GetMiscSettings().GetTwoDigitYearStart();
+        USHORT nTwoDigitYearStart = utl::MiscCfg().GetYear2000();
         USHORT nYear = rDate.GetYear();
 
         // Wenn Jahr nicht im 2stelligen Grenzbereich liegt,
@@ -2033,7 +2034,7 @@ void DateFormatter::Reformat()
 
 void DateFormatter::ExpandCentury( Date& rDate )
 {
-    ExpandCentury( rDate, Application::GetSettings().GetMiscSettings().GetTwoDigitYearStart() );
+    ExpandCentury( rDate, utl::MiscCfg().GetYear2000() );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index 17e616d196b4..56d1c3ff5eba 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.cxx
@@ -601,7 +601,7 @@ const PDFWriterImpl::BuiltinFont PDFWriterImpl::m_aBuiltinFonts[ 14 ] = {
   "Symbol", // PSName
   1010, -293, // ascend, descend
   FAMILY_DONTKNOW, // family style
-  RTL_TEXTENCODING_SYMBOL, // charset
+  RTL_TEXTENCODING_ADOBE_SYMBOL, // charset
   PITCH_VARIABLE, // pitch
   WIDTH_NORMAL, // width type
   WEIGHT_NORMAL, // weight type
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
new file mode 100644
index 000000000000..b601caef301a
--- /dev/null
+++ b/vcl/source/gdi/configsettings.cxx
@@ -0,0 +1,205 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_vcl.hxx"
+
+#include <vcl/configsettings.hxx>
+#include <vcl/svdata.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+
+using namespace rtl;
+using namespace utl;
+using namespace vcl;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::container;
+
+#define SETTINGS_CONFIGNODE "VCL/Settings"
+
+/*
+ *  SettingsConfigItem::get
+ */
+
+SettingsConfigItem* SettingsConfigItem::get()
+{
+    ImplSVData* pSVData = ImplGetSVData();
+    if( ! pSVData->mpSettingsConfigItem )
+        pSVData->mpSettingsConfigItem = new SettingsConfigItem();
+    return pSVData->mpSettingsConfigItem;
+}
+
+/*
+ *  SettignsConfigItem constructor
+ */
+
+SettingsConfigItem::SettingsConfigItem()
+        :
+        ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( SETTINGS_CONFIGNODE ) ),
+                    CONFIG_MODE_DELAYED_UPDATE ),
+    m_aSettings( 0 )
+{
+    getValues();
+}
+
+/*
+ *  SettingsConfigItem destructor
+ */
+
+SettingsConfigItem::~SettingsConfigItem()
+{
+    if( IsModified() )
+        Commit();
+}
+
+/*
+ *  SettingsConfigItem::Commit
+ */
+
+void SettingsConfigItem::Commit()
+{
+    if( ! IsValidConfigMgr() )
+        return;
+
+    std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group;
+
+    for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group )
+    {
+        String aKeyName( group->first );
+        /*sal_Bool bAdded =*/ AddNode( OUString(), aKeyName );
+        Sequence< PropertyValue > aValues( group->second.size() );
+        PropertyValue* pValues = aValues.getArray();
+        int nIndex = 0;
+        SmallOUStrMap::const_iterator it;
+        for( it = group->second.begin(); it != group->second.end(); ++it )
+        {
+            String aName( aKeyName );
+            aName.Append( '/' );
+            aName.Append( String( it->first ) );
+            pValues[nIndex].Name    = aName;
+            pValues[nIndex].Handle  = 0;
+            pValues[nIndex].Value <<= it->second;
+            pValues[nIndex].State   = PropertyState_DIRECT_VALUE;
+            nIndex++;
+        }
+        ReplaceSetProperties( aKeyName, aValues );
+    }
+}
+
+/*
+ *  SettingsConfigItem::Notify
+ */
+
+void SettingsConfigItem::Notify( const Sequence< OUString >& )
+{
+    getValues();
+}
+
+/*
+ *  SettingsConfigItem::getValues
+ */
+void SettingsConfigItem::getValues()
+{
+    if( ! IsValidConfigMgr() )
+        return;
+
+    m_aSettings.clear();
+
+    Sequence< OUString > aNames( GetNodeNames( OUString() ) );
+    m_aSettings.resize( aNames.getLength() );
+
+    for( int j = 0; j < aNames.getLength(); j++ )
+    {
+#if OSL_DEBUG_LEVEL > 2
+        fprintf( stderr, "found settings data for \"%s\"\n",
+                 OUStringToOString( aNames.getConstArray()[j], RTL_TEXTENCODING_ASCII_US ).getStr()
+                 );
+#endif
+        String aKeyName( aNames.getConstArray()[j] );
+        Sequence< OUString > aKeys( GetNodeNames( aKeyName ) );
+        Sequence< OUString > aSettingsKeys( aKeys.getLength() );
+        const OUString* pFrom = aKeys.getConstArray();
+        OUString* pTo = aSettingsKeys.getArray();
+        for( int m = 0; m < aKeys.getLength(); m++ )
+        {
+            String aName( aKeyName );
+            aName.Append( '/' );
+            aName.Append( String( pFrom[m] ) );
+            pTo[m] = aName;
+        }
+        Sequence< Any > aValues( GetProperties( aSettingsKeys ) );
+        const Any* pValue = aValues.getConstArray();
+        for( int i = 0; i < aValues.getLength(); i++, pValue++ )
+        {
+            if( pValue->getValueTypeClass() == TypeClass_STRING )
+            {
+                const OUString* pLine = (const OUString*)pValue->getValue();
+                if( pLine->getLength() )
+                    m_aSettings[ aKeyName ][ pFrom[i] ] = *pLine;
+#if OSL_DEBUG_LEVEL > 2
+                fprintf( stderr, "   \"%s\"=\"%.30s\"\n",
+                         OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(),
+                         OUStringToOString( *pLine, RTL_TEXTENCODING_ASCII_US ).getStr()
+                         );
+#endif
+            }
+        }
+    }
+}
+
+/*
+ *  SettingsConfigItem::getDefaultFont
+ */
+
+const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const
+{
+    ::std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
+    if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() )
+    {
+        static OUString aEmpty;
+        return aEmpty;
+    }
+    return group->second.find(rKey)->second;
+}
+
+/*
+ *  SettingsConfigItem::setDefaultFont
+ */
+
+void SettingsConfigItem::setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue )
+{
+    bool bModified = m_aSettings[ rGroup ][ rKey ] != rValue;
+    if( bModified )
+    {
+        m_aSettings[ rGroup ][ rKey ] = rValue;
+        SetModified();
+    }
+}
+
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 3bbdba5dad5f..afd6181351b4 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -38,8 +38,8 @@
 #include "tools/debug.hxx"
 #include "vcl/font.hxx"
 #include "vcl/impfont.hxx"
-#include "vcl/fontcfg.hxx"
-#include "vcl/outdev.h" // just for ImplGetEnglishSearchFontName! TODO: move it
+#include "vcl/outfont.hxx"
+#include "unotools/fontcfg.hxx"
 
 #include <algorithm>
 
@@ -169,7 +169,7 @@ void Impl_Font::AskConfig()
     mbConfigLookup = true;
 
     // prepare the FontSubst configuration lookup
-    const vcl::FontSubstConfiguration* pFontSubst = vcl::FontSubstConfiguration::get();
+    const utl::FontSubstConfiguration* pFontSubst = utl::FontSubstConfiguration::get();
 
     String      aShortName;
     String      aFamilyName;
@@ -177,12 +177,12 @@ void Impl_Font::AskConfig()
     FontWeight  eWeight = WEIGHT_DONTKNOW;
     FontWidth   eWidthType = WIDTH_DONTKNOW;
     String      aMapName = maFamilyName;
-    ImplGetEnglishSearchFontName( aMapName );
-    vcl::FontSubstConfiguration::getMapName( aMapName,
+    GetEnglishSearchFontName( aMapName );
+    utl::FontSubstConfiguration::getMapName( aMapName,
         aShortName, aFamilyName, eWeight, eWidthType, nType );
 
     // lookup the font name in the configuration
-    const vcl::FontNameAttr* pFontAttr = pFontSubst->getSubstInfo( aMapName );
+    const utl::FontNameAttr* pFontAttr = pFontSubst->getSubstInfo( aMapName );
 
     // if the direct lookup failed try again with an alias name
     if ( !pFontAttr && (aShortName != aMapName) )
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 039041826124..8178204a4ffd 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -46,6 +46,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include "comphelper/processfactory.hxx"
+#include "osl/file.hxx"
 #include "osl/diagnose.h"
 #include "rtl/bootstrap.hxx"
 #include "rtl/string.h"
@@ -118,12 +119,43 @@ ImplImageTree::ImplImageTree() {}
 
 ImplImageTree::~ImplImageTree() {}
 
+bool ImplImageTree::checkStyle(rtl::OUString const & style)
+{
+    bool exists;
+
+    // using cache because setStyle is an expensive operation
+    // setStyle calls resetZips => closes any opened zip files with icons, cleans the icon cache, ...
+    if (checkStyleCacheLookup(style, exists)) {
+        return exists;
+    }
+
+    setStyle(style);
+
+    exists = false;
+    const rtl::OUString sBrandURLSuffix(RTL_CONSTASCII_USTRINGPARAM("_brand.zip"));
+    for (Zips::iterator i(m_zips.begin()); i != m_zips.end() && !exists;) {
+        ::rtl::OUString aZipURL = i->first;
+        sal_Int32 nFromIndex = aZipURL.getLength() - sBrandURLSuffix.getLength();
+        // skip brand-specific icon themes; they are incomplete and thus not useful for this check
+        if (nFromIndex < 0 || !aZipURL.match(sBrandURLSuffix, nFromIndex)) {
+            osl::File aZip(aZipURL);
+            if (aZip.open(OpenFlag_Read) == ::osl::FileBase::E_None) {
+                aZip.close();
+                exists = true;
+            }
+        }
+        ++i;
+    }
+    m_checkStyleCache[style] = exists;
+    return exists;
+}
+
 bool ImplImageTree::loadImage(
     rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap,
     bool localized)
 {
     setStyle(style);
-    if (cacheLookup(name, localized, bitmap)) {
+    if (iconCacheLookup(name, localized, bitmap)) {
         return true;
     }
     if (!bitmap.IsEmpty()) {
@@ -164,7 +196,7 @@ bool ImplImageTree::loadImage(
             rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
     }
     if (found) {
-        m_cache[name.intern()] = std::make_pair(localized, bitmap);
+        m_iconCache[name.intern()] = std::make_pair(localized, bitmap);
     }
     return found;
 }
@@ -173,7 +205,8 @@ void ImplImageTree::shutDown() {
     m_style = rtl::OUString();
         // for safety; empty m_style means "not initialized"
     m_zips.clear();
-    m_cache.clear();
+    m_iconCache.clear();
+    m_checkStyleCache.clear();
 }
 
 void ImplImageTree::setStyle(rtl::OUString const & style) {
@@ -181,7 +214,7 @@ void ImplImageTree::setStyle(rtl::OUString const & style) {
     if (style != m_style) {
         m_style = style;
         resetZips();
-        m_cache.clear();
+        m_iconCache.clear();
     }
 }
 
@@ -241,6 +274,7 @@ void ImplImageTree::resetZips() {
                 u.GetMainURL(INetURLObject::NO_DECODE),
                 css::uno::Reference< css::container::XNameAccess >()));
     }
+    if ( m_style.equals(::rtl::OUString::createFromAscii("default")) )
     {
         rtl::OUString url(
             RTL_CONSTASCII_USTRINGPARAM(
@@ -252,11 +286,23 @@ void ImplImageTree::resetZips() {
     }
 }
 
-bool ImplImageTree::cacheLookup(
+bool ImplImageTree::checkStyleCacheLookup(
+    rtl::OUString const & style, bool &exists)
+{
+    CheckStyleCache::iterator i(m_checkStyleCache.find(style));
+    if (i != m_checkStyleCache.end()) {
+        exists = i->second;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool ImplImageTree::iconCacheLookup(
     rtl::OUString const & name, bool localized, BitmapEx & bitmap)
 {
-    Cache::iterator i(m_cache.find(name));
-    if (i != m_cache.end() && i->second.first == localized) {
+    IconCache::iterator i(m_iconCache.find(name));
+    if (i != m_iconCache.end() && i->second.first == localized) {
         bitmap = i->second.second;
         return true;
     } else {
diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index c77508ea159e..421505a3d500 100644..100755
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -57,6 +57,7 @@ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
                     $(SLO)$/gfxlink.obj		\
                     $(SLO)$/print.obj		\
                     $(SLO)$/print2.obj		\
+            $(SLO)$/configsettings.obj 	\
                     $(SLO)$/sallayout.obj		\
                     $(SLO)$/image.obj		\
                     $(SLO)$/impimage.obj		\
@@ -64,10 +65,8 @@ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
                     $(SLO)$/metric.obj		\
                     $(SLO)$/pdfwriter_impl.obj	\
                     $(SLO)$/pdffontcache.obj\
-                    $(SLO)$/fontcfg.obj		\
                     $(SLO)$/bmpconv.obj		\
                     $(SLO)$/pdfextoutdevdata.obj	\
-                    $(SLO)$/fontcvt.obj		\
                     $(SLO)$/jobset.obj		\
                     $(SLO)$/impimagetree.obj		\
                     $(SLO)$/pngread.obj		\
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 5b543258cb0b..6298ff51a16a 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -1128,11 +1128,16 @@ namespace
 {
     inline int iround( float x )
     {
-        sal_Int32 a = *reinterpret_cast<const sal_Int32 *>(&x);
-        sal_Int32 exponent = (127 + 31) - ((a >> 23) & 0xFF);
-        sal_Int32 r = ((sal_Int32(a) << 8) | (1U << 31)) >> exponent;
+        union
+        {
+            float f;
+            sal_Int32 i;
+        };
+        f = x;
+        sal_Int32 exponent = (127 + 31) - ((i >> 23) & 0xFF);
+        sal_Int32 r = ((sal_Int32(i) << 8) | (1U << 31)) >> exponent;
         r &= ((exponent - 32) >> 31);
-        sal_Int32 sign = a >> 31;
+        sal_Int32 sign = i >> 31;
         return r = (r ^ sign) - sign;
     }
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index b6e0e1b8d441..51aad0790a26 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -56,10 +56,10 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bmpacc.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/edit.hxx>
-#include <vcl/fontcfg.hxx>
+#include <unotools/fontcfg.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/textlayout.hxx>
 #ifndef _OSL_FILE_H
@@ -97,6 +97,7 @@
 #include <memory>
 #include <algorithm>
 
+
 // =======================================================================
 
 DBG_NAMEEX( OutputDevice )
@@ -108,6 +109,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 using namespace ::vcl;
+using namespace ::utl;
 
 // =======================================================================
 
@@ -305,451 +307,6 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
 
 // =======================================================================
 
-struct ImplLocalizedFontName
-{
-    const char*         mpEnglishName;
-    const sal_Unicode*  mpLocalizedNames;
-};
-
-static sal_Unicode const aBatang[] = { 0xBC14, 0xD0D5, 0, 0 };
-static sal_Unicode const aBatangChe[] = { 0xBC14, 0xD0D5, 0xCCB4, 0, 0 };
-static sal_Unicode const aGungsuh[] = { 0xAD81, 0xC11C, 0, 0 };
-static sal_Unicode const aGungsuhChe[] = { 0xAD81, 0xC11C, 0xCCB4, 0, 0 };
-static sal_Unicode const aGulim[] = { 0xAD74, 0xB9BC, 0, 0 };
-static sal_Unicode const aGulimChe[] = { 0xAD74, 0xB9BC, 0xCCB4, 0, 0 };
-static sal_Unicode const aDotum[] = { 0xB3CB, 0xC6C0, 0, 0 };
-static sal_Unicode const aDotumChe[] = { 0xB3CB, 0xC6C0, 0xCCB4, 0, 0 };
-static sal_Unicode const aSimSun[] = { 0x5B8B, 0x4F53, 0, 0 };
-static sal_Unicode const aNSimSun[] = { 0x65B0, 0x5B8B, 0x4F53, 0, 0 };
-static sal_Unicode const aSimHei[] = { 0x9ED1, 0x4F53, 0, 0 };
-static sal_Unicode const aSimKai[] = { 0x6977, 0x4F53, 0, 0 };
-static sal_Unicode const azycjkSun[] = { 0x4E2D, 0x6613, 0x5B8B, 0x4F53, 0, 0 };
-static sal_Unicode const azycjkHei[] = { 0x4E2D, 0x6613, 0x9ED1, 0x4F53, 0, 0 };
-static sal_Unicode const azycjkKai[] = { 0x4E2D, 0x6613, 0x6977, 0x4F53, 0, 0 };
-static sal_Unicode const aFZHei[] = { 0x65B9, 0x6B63, 0x9ED1, 0x4F53, 0, 0 };
-static sal_Unicode const aFZKai[] = { 0x65B9, 0x6B63, 0x6977, 0x4F53, 0, 0 };
-static sal_Unicode const aFZSongYI[] = { 0x65B9, 0x6B63, 0x5B8B, 0x4E00, 0, 0 };
-static sal_Unicode const aFZShuSong[] = { 0x65B9, 0x6B63, 0x4E66, 0x5B8B, 0, 0 };
-static sal_Unicode const aFZFangSong[] = { 0x65B9, 0x6B63, 0x4EFF, 0x5B8B, 0, 0 };
-// Attention: this fonts includes the wrong encoding vector - so we double the names with correct and wrong encoding
-// First one is the GB-Encoding (we think the correct one), second is the big5 encoded name
-static sal_Unicode const aMHei[] = { 'm', 0x7B80, 0x9ED1, 0, 'm', 0x6F60, 0x7AAA, 0, 0 };
-static sal_Unicode const aMKai[] = { 'm', 0x7B80, 0x6977, 0x566C, 0, 'm', 0x6F60, 0x7FF1, 0x628E, 0, 0 };
-static sal_Unicode const aMSong[] = { 'm', 0x7B80, 0x5B8B, 0, 'm', 0x6F60, 0x51BC, 0, 0 };
-static sal_Unicode const aCFangSong[] = { 'm', 0x7B80, 0x592B, 0x5B8B, 0, 'm', 0x6F60, 0x6E98, 0x51BC, 0, 0 };
-static sal_Unicode const aMingLiU[] = { 0x7D30, 0x660E, 0x9AD4, 0, 0 };
-static sal_Unicode const aPMingLiU[] = { 0x65B0, 0x7D30, 0x660E, 0x9AD4, 0, 0 };
-static sal_Unicode const aHei[] = { 0x6865, 0, 0 };
-static sal_Unicode const aKai[] = { 0x6B61, 0, 0 };
-static sal_Unicode const aMing[] = { 0x6D69, 0x6E67, 0, 0 };
-static sal_Unicode const aMSGothic[] = { 'm','s',       0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
-static sal_Unicode const aMSPGothic[] = { 'm','s','p',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
-static sal_Unicode const aMSMincho[] = { 'm', 's',      0x660E, 0x671D, 0 };
-static sal_Unicode const aMSPMincho[] = { 'm','s','p',  0x660E, 0x671D, 0 };
-static sal_Unicode const aMeiryo[]    = { 0x30e1, 0x30a4, 0x30ea, 0x30aa, 0 };
-static sal_Unicode const aHGMinchoL[] = { 'h','g',      0x660E, 0x671D, 'l', 0, 0 };
-static sal_Unicode const aHGGothicB[] = { 'h','g',      0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 0 };
-static sal_Unicode const aHGPMinchoL[] = { 'h','g','p', 0x660E, 0x671D, 'l', 0 };
-static sal_Unicode const aHGPGothicB[] = { 'h','g','p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 0 };
-static sal_Unicode const aHGMinchoLSun[] = { 'h','g',   0x660E, 0x671D, 'l', 's', 'u', 'n', 0 };
-static sal_Unicode const aHGPMinchoLSun[] = { 'h','g','p', 0x660E, 0x671D, 'l', 's', 'u', 'n', 0 };
-static sal_Unicode const aHGGothicBSun[] = { 'h', 'g', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
-static sal_Unicode const aHGPGothicBSun[] = { 'h', 'g', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
-static sal_Unicode const aHGHeiseiMin[] = { 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 0, 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 'w', '3', 'x', '1', '2', 0, 0 };
-static sal_Unicode const aIPAMincho[] =  { 'i', 'p', 'a', 0x660E, 0x671D, 0 };
-static sal_Unicode const aIPAPMincho[] = { 'i', 'p', 'a', 'p', 0x660E, 0x671D, 0 };
-static sal_Unicode const aIPAGothic[] =  { 'i', 'p', 'a',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-static sal_Unicode const aIPAPGothic[] =  { 'i', 'p', 'a', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-static sal_Unicode const aIPAUIGothic[] =  { 'i', 'p', 'a', 'u', 'i', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-static sal_Unicode const aSazanamiMincho[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x660E, 0x671D, 0, 0 };
-static sal_Unicode const aSazanamiGothic[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
-static sal_Unicode const aKochiMincho[] = { 0x6771, 0x98A8, 0x660E, 0x671D, 0, 0 };
-static sal_Unicode const aKochiGothic[] = { 0x6771, 0x98A8, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
-static sal_Unicode const aSunDotum[] = { 0xC36C, 0xB3CB, 0xC6C0, 0, 0 };
-static sal_Unicode const aSunGulim[] = { 0xC36C, 0xAD74, 0xB9BC, 0, 0 };
-static sal_Unicode const aSunBatang[] = { 0xC36C, 0xBC14, 0xD0D5, 0, 0 };
-static sal_Unicode const aBaekmukDotum[] = { 0xBC31, 0xBB35, 0xB3CB, 0xC6C0, 0, 0 };
-static sal_Unicode const aBaekmukGulim[] = { 0xBC31, 0xBB35, 0xAD74, 0xB9BC, 0, 0 };
-static sal_Unicode const aBaekmukBatang[] = { 0xBC31, 0xBB35, 0xBC14, 0xD0D5, 0, 0 };
-static sal_Unicode const aFzMingTi[] = { 0x65B9, 0x6B63, 0x660E, 0x9AD4, 0, 0 };
-static sal_Unicode const aFzHeiTiTW[]= { 0x65B9, 0x6B63, 0x9ED1, 0x9AD4, 0, 0 };
-static sal_Unicode const aFzKaiTiTW[]= { 0x65B9, 0x6B63, 0x6977, 0x9AD4, 0, 0 };
-static sal_Unicode const aFzHeiTiCN[]= { 0x65B9, 0x6B63, 0x9ED1, 0x4F53, 0, 0 };
-static sal_Unicode const aFzKaiTiCN[]= { 0x65B9, 0x6B63, 0x6977, 0x4F53, 0, 0 };
-static sal_Unicode const aFzSongTi[] = { 0x65B9, 0x6B63, 0x5B8B, 0x4F53, 0, 0 };
-static sal_Unicode const aHYMyeongJoExtra[]         = { 'h', 'y', 0xACAC, 0xBA85, 0xC870, 0, 0 };
-static sal_Unicode const aHYSinMyeongJoMedium[]     = { 'h', 'y', 0xC2E0, 0xBA85, 0xC870, 0, 0 };
-static sal_Unicode const aHYGothicMedium[]          = { 'h', 'y', 0xC911, 0xACE0, 0xB515, 0, 0 };
-static sal_Unicode const aHYGraphicMedium[]         = { 'h', 'y', 0xADF8, 0xB798, 0xD53D, 'm', 0, 0 };
-static sal_Unicode const aHYGraphic[]               = { 'h', 'y', 0xADF8, 0xB798, 0xD53D, 0, 0 };
-static sal_Unicode const aNewGulim[]                = { 0xC0C8, 0xAD74, 0xB9BC, 0, 0 };
-static sal_Unicode const aSunGungseo[]              = { 0xC36C, 0xAD81, 0xC11C, 0, 0 };
-static sal_Unicode const aHYGungSoBold[]            = { 'h','y', 0xAD81, 0xC11C, 'b', 0, 0 };
-static sal_Unicode const aHYGungSo[]                 = { 'h','y', 0xAD81, 0xC11C, 0, 0 };
-static sal_Unicode const aSunHeadLine[]             = { 0xC36C, 0xD5E4, 0xB4DC, 0xB77C, 0xC778, 0, 0 };
-static sal_Unicode const aHYHeadLineMedium[]        = { 'h', 'y', 0xD5E4, 0xB4DC, 0xB77C, 0xC778, 'm', 0, 0 };
-static sal_Unicode const aHYHeadLine[]              = { 'h', 'y', 0xD5E4, 0xB4DC, 0xB77C, 0xC778, 0, 0 };
-static sal_Unicode const aYetR[]                    = { 0xD734, 0xBA3C, 0xC61B, 0xCCB4, 0, 0 };
-static sal_Unicode const aHYGothicExtra[]           = { 'h', 'y', 0xACAC, 0xACE0, 0xB515, 0, 0 };
-static sal_Unicode const aSunMokPan[]               = { 0xC36C, 0xBAA9, 0xD310, 0, 0 };
-static sal_Unicode const aSunYeopseo[]              = { 0xC36C, 0xC5FD, 0xC11C, 0, 0 };
-static sal_Unicode const aSunBaekSong[]              = { 0xC36C, 0xBC31, 0xC1A1, 0, 0 };
-static sal_Unicode const aHYPostLight[]             = { 'h', 'y', 0xC5FD, 0xC11C, 'l', 0, 0 };
-static sal_Unicode const aHYPost[]                  = { 'h', 'y', 0xC5FD, 0xC11C, 0, 0 };
-static sal_Unicode const aMagicR[]                  = { 0xD734, 0xBA3C, 0xB9E4, 0xC9C1, 0xCCB4, 0, 0 };
-static sal_Unicode const aSunCrystal[]              = { 0xC36C, 0xD06C, 0xB9AC, 0xC2A4, 0xD0C8, 0, 0 };
-static sal_Unicode const aSunSaemmul[]              = { 0xC36C, 0xC0D8, 0xBB3C, 0, 0 };
-static sal_Unicode const aHaansoftBatang[]          = { 0xD55C, 0xCEF4, 0xBC14, 0xD0D5, 0, 0 };
-static sal_Unicode const aHaansoftDotum[]           = { 0xD55C, 0xCEF4, 0xB3CB, 0xC6C0, 0, 0 };
-static sal_Unicode const aHyhaeseo[]                = { 0xD55C, 0xC591, 0xD574, 0xC11C, 0, 0 };
-static sal_Unicode const aMDSol[]                   = { 'm', 'd', 0xC194, 0xCCB4, 0, 0 };
-static sal_Unicode const aMDGaesung[]               = { 'm', 'd', 0xAC1C, 0xC131, 0xCCB4, 0, 0 };
-static sal_Unicode const aMDArt[]                   = { 'm', 'd', 0xC544, 0xD2B8, 0xCCB4, 0, 0 };
-static sal_Unicode const aMDAlong[]                 = { 'm', 'd', 0xC544, 0xB871, 0xCCB4, 0, 0 };
-static sal_Unicode const aMDEasop[]                 = { 'm', 'd', 0xC774, 0xC19D, 0xCCB4, 0, 0 };
-static sal_Unicode const aHYShortSamulMedium[]      = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 'm', 0 };
-static sal_Unicode const aHYShortSamul[]            = { 'h', 'y', 0xC595, 0xC740, 0xC0D8, 0xBB3C, 0 };
-static sal_Unicode const aHGGothicE[]               = { 'h','g', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
-static sal_Unicode const aHGPGothicE[]              = { 'h','g','p', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
-static sal_Unicode const aHGSGothicE[]              = { 'h','g','s', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'e', 0 };
-static sal_Unicode const aHGGothicM[]               = { 'h','g', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
-static sal_Unicode const aHGPGothicM[]              = { 'h','g','p', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
-static sal_Unicode const aHGSGothicM[]              = { 'h','g','s', 0xFF7A, 0xFF9E, 0xFF7C, 0xFF6F, 0xFF78, 'm', 0 };
-static sal_Unicode const aHGGyoshotai[]             = { 'h','g', 0x884C, 0x66F8, 0x4F53, 0 };
-static sal_Unicode const aHGPGyoshotai[]            = { 'h','g','p', 0x884C, 0x66F8, 0x4F53, 0 };
-static sal_Unicode const aHGSGyoshotai[]            = { 'h','g','s', 0x884C, 0x66F8, 0x4F53, 0 };
-static sal_Unicode const aHGKyokashotai[]           = { 'h','g', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
-static sal_Unicode const aHGPKyokashotai[]          = { 'h','g','p', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
-static sal_Unicode const aHGSKyokashotai[]          = { 'h','g','s', 0x6559, 0x79D1, 0x66F8, 0x4F53, 0 };
-static sal_Unicode const aHGMinchoB[]               = { 'h','g', 0x660E, 0x671D, 'b', 0 };
-static sal_Unicode const aHGPMinchoB[]              = { 'h','g','p', 0x660E, 0x671D, 'b', 0 };
-static sal_Unicode const aHGSMinchoB[]              = { 'h','g','s', 0x660E, 0x671D, 'b', 0 };
-static sal_Unicode const aHGMinchoE[]               = { 'h','g', 0x660E, 0x671D, 'e', 0 };
-static sal_Unicode const aHGPMinchoE[]              = { 'h','g','p', 0x660E, 0x671D, 'e', 0 };
-static sal_Unicode const aHGSMinchoE[]              = { 'h','g','s', 0x660E, 0x671D, 'e', 0 };
-static sal_Unicode const aHGSoeiKakupoptai[]        = { 'h','g', 0x5275,0x82F1,0x89D2,0xFF8E,
-                            0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0};
-static sal_Unicode const aHGPSoeiKakupoptai[]       = { 'h','g', 'p', 0x5275,0x82F1,0x89D2,0xFF8E,
-                            0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0};
-static sal_Unicode const aHGSSoeiKakupoptai[]       = { 'h','g', 's', 0x5275,0x82F1,0x89D2,0xFF8E,
-                            0xFF9F,0xFF6F,0xFF8C,0xFF9F,0x4F53,0};
-static sal_Unicode const aHGSoeiPresenceEB[]        = { 'h','g', 0x5275,0x82F1,0xFF8C,0xFF9F,
-                            0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
-static sal_Unicode const aHGPSoeiPresenceEB[]       = { 'h','g','p', 0x5275,0x82F1,0xFF8C,0xFF9F,
-                            0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
-static sal_Unicode const aHGSSoeiPresenceEB[]       = { 'h','g','s', 0x5275,0x82F1,0xFF8C,0xFF9F,
-                            0xFF9A,0xFF7E,0xFF9E,0xFF9D,0xFF7D, 'e','b',0};
-static sal_Unicode const aHGSoeiKakugothicUB[]      = { 'h','g', 0x5275,0x82F1,0x89D2,0xFF7A,
-                            0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
-static sal_Unicode const aHGPSoeiKakugothicUB[]     = { 'h','g','p', 0x5275,0x82F1,0x89D2,0xFF7A,
-                            0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
-static sal_Unicode const aHGSSoeiKakugothicUB[]     = { 'h','g','s', 0x5275,0x82F1,0x89D2,0xFF7A,
-                            0xFF9E,0xFF7C,0xFF6F,0xFF78,'u','b',0};
-static sal_Unicode const aHGSeikaishotaiPRO[]       = { 'h','g', 0x6B63,0x6977,0x66F8,0x4F53, '-','p','r','o',0};
-static sal_Unicode const aHGMaruGothicMPRO[]        = { 'h','g', 0x4E38,0xFF7A,0xFF9E,0xFF7C,0xFF6F,0xFF78, '-','p','r','o',0};
-static sal_Unicode const aHiraginoMinchoPro[]       = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x660E, 0x671D, 'p','r','o',0};
-static sal_Unicode const aHiraginoMinchoProN[]      = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x660E, 0x671D, 'p','r','o','n',0};
-static sal_Unicode const aHiraginoKakuGothicPro[]   = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x89D2, 0x30B4, 'p','r','o',0};
-static sal_Unicode const aHiraginoKakuGothicProN[]  = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x89D2, 0x30B4, 'p','r','o','n',0};
-static sal_Unicode const aHiraginoMaruGothicPro[]   = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x4E38, 0x30B4, 'p','r','o',0};
-static sal_Unicode const aHiraginoMaruGothicProN[]  = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x4E38, 0x30B4, 'p','r','o','n',0};
-
-
-static ImplLocalizedFontName aImplLocalizedNamesList[] =
-{
-{   "batang",               aBatang },
-{   "batangche",            aBatangChe },
-{   "gungshu",              aGungsuh },
-{   "gungshuche",           aGungsuhChe },
-{   "gulim",                aGulim },
-{   "gulimche",             aGulimChe },
-{   "dotum",                aDotum },
-{   "dotumche",             aDotumChe },
-{   "simsun",               aSimSun },
-{   "nsimsun",              aNSimSun },
-{   "simhei",               aSimHei },
-{   "simkai",               aSimKai },
-{   "zycjksun",             azycjkSun },
-{   "zycjkhei",             azycjkHei },
-{   "zycjkkai",             azycjkKai },
-{   "fzhei",                aFZHei },
-{   "fzkai",                aFZKai },
-{   "fzsong",               aFZSongYI },
-{   "fzshusong",            aFZShuSong },
-{   "fzfangsong",           aFZFangSong },
-{   "mhei",                 aMHei },
-{   "mkai",                 aMKai },
-{   "msong",                aMSong },
-{   "cfangsong",            aCFangSong },
-{   "mingliu",              aMingLiU },
-{   "pmingliu",             aPMingLiU },
-{   "hei",                  aHei },
-{   "kai",                  aKai },
-{   "ming",                 aMing },
-{   "msgothic",             aMSGothic },
-{   "mspgothic",            aMSPGothic },
-{   "msmincho",             aMSMincho },
-{   "mspmincho",            aMSPMincho },
-{   "meiryo",               aMeiryo },
-{   "hgminchol",            aHGMinchoL },
-{   "hggothicb",            aHGGothicB },
-{   "hgpminchol",           aHGPMinchoL },
-{   "hgpgothicb",           aHGPGothicB },
-{   "hgmincholsun",         aHGMinchoLSun },
-{   "hggothicbsun",         aHGGothicBSun },
-{   "hgpmincholsun",        aHGPMinchoLSun },
-{   "hgpgothicbsun",        aHGPGothicBSun },
-{   "hgheiseimin",          aHGHeiseiMin },
-{   "ipamincho",            aIPAMincho },
-{   "ipapmincho",           aIPAPMincho },
-{   "ipagothic",            aIPAGothic },
-{   "ipapgothic",           aIPAPGothic },
-{   "ipauigothic",          aIPAUIGothic },
-{   "sazanamimincho",       aSazanamiMincho },
-{   "sazanamigothic",       aSazanamiGothic },
-{   "kochimincho",          aKochiMincho },
-{   "kochigothic",          aKochiGothic },
-{   "sundotum",             aSunDotum },
-{   "sungulim",             aSunGulim },
-{   "sunbatang",            aSunBatang },
-{   "baekmukdotum",         aBaekmukDotum },
-{   "baekmukgulim",         aBaekmukGulim },
-{   "baekmukbatang",        aBaekmukBatang },
-{   "fzheiti",              aFzHeiTiCN },
-{   "fzheiti",              aFzHeiTiTW },
-{   "fzkaiti",              aFzKaiTiCN },
-{   "fzkaitib",             aFzKaiTiTW },
-{   "fzmingtib",            aFzMingTi },
-{   "fzsongti",             aFzSongTi },
-{   "hymyeongjoextra",      aHYMyeongJoExtra },
-{   "hysinmyeongjomedium",  aHYSinMyeongJoMedium },
-{   "hygothicmedium",       aHYGothicMedium },
-{   "hygraphicmedium",      aHYGraphicMedium },
-{   "hygraphic",            aHYGraphic },
-{   "newgulim",             aNewGulim },
-{   "sungungseo",           aSunGungseo },
-{   "hygungsobold",         aHYGungSoBold },
-{   "hygungso",             aHYGungSo },
-{   "sunheadline",          aSunHeadLine },
-{   "hyheadlinemedium",     aHYHeadLineMedium },
-{   "hyheadline",           aHYHeadLine },
-{   "yetr",                 aYetR },
-{   "hygothicextra",        aHYGothicExtra },
-{   "sunmokpan",            aSunMokPan },
-{   "sunyeopseo",           aSunYeopseo },
-{   "sunbaeksong",          aSunBaekSong },
-{   "hypostlight",          aHYPostLight },
-{   "hypost",               aHYPost },
-{   "magicr",               aMagicR },
-{   "suncrystal",           aSunCrystal },
-{   "sunsaemmul",           aSunSaemmul },
-{   "hyshortsamulmedium",   aHYShortSamulMedium },
-{   "hyshortsamul",         aHYShortSamul },
-{   "haansoftbatang",       aHaansoftBatang },
-{   "haansoftdotum",        aHaansoftDotum },
-{   "hyhaeseo",             aHyhaeseo },
-{   "mdsol",                aMDSol },
-{   "mdgaesung",            aMDGaesung },
-{   "mdart",                aMDArt },
-{   "mdalong",              aMDAlong },
-{   "mdeasop",              aMDEasop },
-{   "hggothice",            aHGGothicE },
-{   "hgpgothice",           aHGPGothicE },
-{   "hgpothice",            aHGSGothicE },
-{   "hggothicm",            aHGGothicM },
-{   "hgpgothicm",           aHGPGothicM },
-{   "hgpgothicm",           aHGSGothicM },
-{   "hggyoshotai",          aHGGyoshotai },
-{   "hgpgyoshotai",         aHGPGyoshotai },
-{   "hgsgyoshotai",         aHGSGyoshotai },
-{   "hgkyokashotai",        aHGKyokashotai },
-{   "hgpkyokashotai",       aHGPKyokashotai },
-{   "hgskyokashotai",       aHGSKyokashotai },
-{   "hgminchob",            aHGMinchoB },
-{   "hgpminchob",           aHGPMinchoB },
-{   "hgsminchob",           aHGSMinchoB },
-{   "hgminchoe",            aHGMinchoE },
-{   "hgpminchoe",           aHGPMinchoE },
-{   "hgsminchoe",           aHGSMinchoE },
-{   "hgsoeikakupoptai",     aHGSoeiKakupoptai },
-{   "hgpsoeikakupopta",     aHGPSoeiKakupoptai },
-{   "hgssoeikakupopta",     aHGSSoeiKakupoptai },
-{   "hgsoeipresenceeb",     aHGSoeiPresenceEB },
-{   "hgpsoeipresenceeb",    aHGPSoeiPresenceEB },
-{   "hgssoeipresenceeb",    aHGSSoeiPresenceEB },
-{   "hgsoeikakugothicub",   aHGSoeiKakugothicUB },
-{   "hgpsoeikakugothicub",  aHGPSoeiKakugothicUB },
-{   "hgssoeikakugothicub",  aHGSSoeiKakugothicUB },
-{   "hgseikaishotaipro",    aHGSeikaishotaiPRO },
-{   "hgmarugothicmpro",     aHGMaruGothicMPRO },
-{   "hiraginominchopro",    aHiraginoMinchoPro },
-{   "hiraginominchopron",   aHiraginoMinchoProN },
-{   "hiraginokakugothicpro", aHiraginoKakuGothicPro },
-{   "hiraginokakugothicpron", aHiraginoKakuGothicProN },
-{   "hiraginomarugothicpro", aHiraginoMaruGothicPro },
-{   "hiraginomarugothicpron", aHiraginoMaruGothicProN },
-{   NULL,                   NULL },
-};
-
-// -----------------------------------------------------------------------
-
-void ImplGetEnglishSearchFontName( String& rName )
-{
-    bool        bNeedTranslation = false;
-    xub_StrLen  nLen = rName.Len();
-
-    // Remove trailing whitespaces
-    xub_StrLen i = nLen;
-    while ( i && (rName.GetChar( i-1 ) < 32) )
-        i--;
-    if ( i != nLen )
-        rName.Erase( i );
-
-    // Remove Script at the end
-    // Scriptname must be the last part of the fontname and
-    // looks like "fontname (scriptname)". So there can only be a
-    // script name at the and of the fontname, when the last char is ')'
-    if ( (nLen >= 3) && rName.GetChar( nLen-1 ) == ')' )
-    {
-        int nOpen = 1;
-        xub_StrLen nTempLen = nLen-2;
-        while ( nTempLen )
-        {
-            if ( rName.GetChar( nTempLen ) == '(' )
-            {
-                nOpen--;
-                if ( !nOpen )
-                {
-                    // Remove Space at the end
-                    if ( nTempLen && (rName.GetChar( nTempLen-1 ) == ' ') )
-                        nTempLen--;
-                    rName.Erase( nTempLen );
-                    nLen = nTempLen;
-                    break;
-                }
-            }
-            if ( rName.GetChar( nTempLen ) == ')' )
-                nOpen++;
-            nTempLen--;
-        }
-    }
-
-    // remove all whitespaces and converts to lower case ASCII
-    // TODO: better transliteration to ASCII e.g. all digits
-    i = 0;
-    while ( i < nLen )
-    {
-        sal_Unicode c = rName.GetChar( i );
-        if ( c > 127 )
-        {
-            // Translate to Lowercase-ASCII
-            // FullWidth-ASCII to half ASCII
-            if ( (c >= 0xFF00) && (c <= 0xFF5E) )
-            {
-                c -= 0xFF00-0x0020;
-                // Upper to Lower
-                if ( (c >= 'A') && (c <= 'Z') )
-                    c += 'a' - 'A';
-                rName.SetChar( i, c );
-            }
-            else
-            {
-                // Only Fontnames with None-Ascii-Characters must be translated
-                bNeedTranslation = true;
-            }
-        }
-        // not lowercase Ascii
-        else if ( !((c >= 'a') && (c <= 'z')) )
-        {
-            // To Lowercase-Ascii
-            if ( (c >= 'A') && (c <= 'Z') )
-            {
-                c += 'a' - 'A';
-                rName.SetChar( i, c );
-            }
-            else if( ((c < '0') || (c > '9')) && (c != ';') ) // not 0-9 or semicolon
-            {
-                // Remove white spaces and special characters
-                rName.Erase( i, 1 );
-                nLen--;
-                continue;
-            }
-        }
-
-        i++;
-    }
-
-    // translate normalized localized name to its normalized English ASCII name
-    if( bNeedTranslation )
-    {
-        typedef std::hash_map<const String, const char*,FontNameHash> FontNameDictionary;
-        static FontNameDictionary aDictionary( sizeof(aImplLocalizedNamesList) / sizeof(*aImplLocalizedNamesList) );
-        // the font name dictionary needs to be intialized once
-        if( aDictionary.empty() )
-        {
-            // TODO: check if all dictionary entries are already normalized?
-            const ImplLocalizedFontName* pList = aImplLocalizedNamesList;
-            for(; pList->mpEnglishName; ++pList )
-                aDictionary[ pList->mpLocalizedNames ] = pList->mpEnglishName;
-        }
-
-        FontNameDictionary::const_iterator it = aDictionary.find( rName );
-        if( it != aDictionary.end() )
-            rName.AssignAscii( it->second );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-static String GetNextFontToken( const String& rTokenStr, xub_StrLen& rIndex )
-{
-    // check for valid start index
-    int nStringLen = rTokenStr.Len();
-    if( rIndex >= nStringLen )
-    {
-        rIndex = STRING_NOTFOUND;
-        return String();
-    }
-
-    // find the next token delimiter and return the token substring
-    const sal_Unicode* pStr = rTokenStr.GetBuffer() + rIndex;
-    const sal_Unicode* pEnd = rTokenStr.GetBuffer() + nStringLen;
-    for(; pStr < pEnd; ++pStr )
-        if( (*pStr == ';') || (*pStr == ',') )
-            break;
-
-    xub_StrLen nTokenStart = rIndex;
-    xub_StrLen nTokenLen;
-    if( pStr < pEnd )
-    {
-        rIndex = sal::static_int_cast<xub_StrLen>(pStr - rTokenStr.GetBuffer());
-        nTokenLen = rIndex - nTokenStart;
-        ++rIndex; // skip over token separator
-    }
-    else
-    {
-        // no token delimiter found => handle last token
-        rIndex = STRING_NOTFOUND;
-        nTokenLen = STRING_LEN;
-
-        // optimize if the token string consists of just one token
-        if( !nTokenStart )
-            return rTokenStr;
-    }
-
-    return String( rTokenStr, nTokenStart, nTokenLen );
-}
-
-// TODO: get rid of this in another incompatible build with SW project.
-// SW's WW8 and RTF filters still use this (from fontcvt.hxx)
-String GetFontToken( const String& rTokenStr, xub_StrLen nToken, xub_StrLen& rIndex )
-{
-    // skip nToken Tokens
-    for( xub_StrLen i = 0; (i < nToken) && (rIndex != STRING_NOTFOUND); ++i )
-        GetNextFontToken( rTokenStr, rIndex );
-
-    return GetNextFontToken( rTokenStr, rIndex );
-}
 
 // =======================================================================
 
@@ -813,8 +370,8 @@ ImplFontSubstEntry::ImplFontSubstEntry( const String& rFontName,
 {
     maSearchName        = rFontName;
     maSearchReplaceName = rSubstFontName;
-    ImplGetEnglishSearchFontName( maSearchName );
-    ImplGetEnglishSearchFontName( maSearchReplaceName );
+    GetEnglishSearchFontName( maSearchName );
+    GetEnglishSearchFontName( maSearchReplaceName );
 }
 
 // -----------------------------------------------------------------------
@@ -914,7 +471,7 @@ static void ImplFontSubstitute( String& rFontName,
 {
 #ifdef DBG_UTIL
     String aTempName = rFontName;
-    ImplGetEnglishSearchFontName( aTempName );
+    GetEnglishSearchFontName( aTempName );
     DBG_ASSERT( aTempName == rFontName, "ImplFontSubstitute() called without a searchname" );
 #endif
 
@@ -939,44 +496,6 @@ static void ImplFontSubstitute( String& rFontName,
     }
 }
 
-// =======================================================================
-
-static bool ImplIsFontToken( const String& rName, const String& rToken )
-{
-    String      aTempName;
-    xub_StrLen  nIndex = 0;
-    do
-    {
-        aTempName = GetNextFontToken( rName, nIndex );
-        if ( rToken == aTempName )
-            return true;
-    }
-    while ( nIndex != STRING_NOTFOUND );
-
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-static void ImplAppendFontToken( String& rName, const String& rNewToken )
-{
-    if ( rName.Len() )
-    {
-        rName.Append( ';' );
-        rName.Append( rNewToken );
-    }
-    else
-        rName = rNewToken;
-}
-
-// -----------------------------------------------------------------------
-
-static void ImplAddTokenFontName( String& rName, const String& rNewToken )
-{
-    if ( !ImplIsFontToken( rName, rNewToken ) )
-        ImplAppendFontToken( rName, rNewToken );
-}
-
 // -----------------------------------------------------------------------
 
 Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang,
@@ -994,7 +513,7 @@ Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang,
         MsLangId::convertLanguageToLocale( eLang, aLocale );
     }
 
-    DefaultFontConfiguration& rDefaults = *DefaultFontConfiguration::get();
+    utl::DefaultFontConfiguration& rDefaults = *utl::DefaultFontConfiguration::get();
     String aSearch = rDefaults.getUserInterfaceFont( aLocale ); // ensure a fallback
     String aDefault = rDefaults.getDefaultFont( aLocale, nType );
     if( aDefault.Len() )
@@ -1073,11 +592,11 @@ Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang,
             do
             {
                 aSearchName = GetNextFontToken( aSearch, nIndex );
-                ImplGetEnglishSearchFontName( aSearchName );
+                GetEnglishSearchFontName( aSearchName );
                 ImplDevFontListData* pFontFamily = pOutDev->mpFontList->ImplFindBySearchName( aSearchName );
                 if( pFontFamily )
                 {
-                    ImplAddTokenFontName( aName, pFontFamily->GetFamilyName() );
+                    AddTokenFontName( aName, pFontFamily->GetFamilyName() );
                     if( nFlags & DEFAULTFONT_FLAGS_ONLYONE )
                         break;
                 }
@@ -1177,61 +696,6 @@ Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang,
 
 // =======================================================================
 
-String GetSubsFontName( const String& rName, ULONG nFlags )
-{
-    String aName;
-
-    xub_StrLen nIndex = 0;
-    String aOrgName = GetNextFontToken( rName, nIndex );
-    ImplGetEnglishSearchFontName( aOrgName );
-
-    // #93662# do not try to replace StarSymbol with MS only font
-    if( nFlags == (SUBSFONT_MS|SUBSFONT_ONLYONE)
-    &&  ( aOrgName.EqualsAscii( "starsymbol" )
-      ||  aOrgName.EqualsAscii( "opensymbol" ) ) )
-        return aName;
-
-    const FontNameAttr* pAttr = FontSubstConfiguration::get()->getSubstInfo( aOrgName );
-    if ( pAttr )
-    {
-        for( int i = 0; i < 3; i++ )
-        {
-            const ::std::vector< String >* pVector = NULL;
-            switch( i )
-            {
-                case 0:
-                    if( nFlags & SUBSFONT_MS  &&  pAttr->MSSubstitutions.size() )
-                        pVector = &pAttr->MSSubstitutions;
-                    break;
-                case 1:
-                    if( nFlags & SUBSFONT_PS  &&  pAttr->PSSubstitutions.size() )
-                        pVector = &pAttr->PSSubstitutions;
-                    break;
-                case 2:
-                    if( nFlags & SUBSFONT_HTML  &&  pAttr->HTMLSubstitutions.size() )
-                        pVector = &pAttr->HTMLSubstitutions;
-                    break;
-            }
-            if( ! pVector )
-                continue;
-            for( ::std::vector< String >::const_iterator it = pVector->begin(); it != pVector->end(); ++it )
-                if( ! ImplIsFontToken( rName, *it ) )
-                {
-                    ImplAppendFontToken( aName, *it );
-                    if( nFlags & SUBSFONT_ONLYONE )
-                    {
-                        i = 4;
-                        break;
-                    }
-                }
-        }
-    }
-
-    return aName;
-}
-
-// =======================================================================
-
 static unsigned ImplIsCJKFont( const String& rFontName )
 {
     // Test, if Fontname includes CJK characters --> In this case we
@@ -1696,7 +1160,7 @@ bool ImplDevFontListData::AddFontFace( ImplFontData* pNewData )
 // -----------------------------------------------------------------------
 
 // get font attributes using the normalized font family name
-void ImplDevFontListData::InitMatchData( const vcl::FontSubstConfiguration& rFontSubst,
+void ImplDevFontListData::InitMatchData( const utl::FontSubstConfiguration& rFontSubst,
     const String& rSearchName )
 {
     String aShortName;
@@ -1835,29 +1299,6 @@ void ImplDevFontList::Clear()
     mbMatchData = false;
 }
 
-// -----------------------------------------------------------------------
-
-// TODO: use a more generic String hash
-int FontNameHash::operator()( const String& rStr ) const
-{
-    // this simple hash just has to be good enough for font names
-    int nHash = 0;
-    const int nLen = rStr.Len();
-    const sal_Unicode* p = rStr.GetBuffer();
-    switch( nLen )
-    {
-        default: nHash = (p[0]<<16) - (p[1]<<8) + p[2];
-                 nHash += nLen;
-                 p += nLen - 3;
-                 // fall through
-        case 3:  nHash += (p[2]<<16);   // fall through
-        case 2:  nHash += (p[1]<<8);    // fall through
-        case 1:  nHash += p[0];         // fall through
-        case 0:  break;
-    };
-
-    return nHash;
-}
 
 // -----------------------------------------------------------------------
 
@@ -2004,7 +1445,7 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( ImplFontSelectData&
             // call the hook to query the best matching glyph fallback font
             if( mpFallbackHook->FindFontSubstitute( rFontSelData, rMissingCodes ) )
                 // apply outdev3.cxx specific fontname normalization
-                ImplGetEnglishSearchFontName( rFontSelData.maSearchName );
+                GetEnglishSearchFontName( rFontSelData.maSearchName );
             else
                 rFontSelData.maSearchName = String();
 
@@ -2059,7 +1500,7 @@ void ImplDevFontList::Add( ImplFontData* pNewData )
     for( xub_StrLen nMapNameIndex = 0; nMapNameIndex != STRING_NOTFOUND; )
     {
         String aSearchName = pNewData->maName;
-        ImplGetEnglishSearchFontName( aSearchName );
+        GetEnglishSearchFontName( aSearchName );
 
         DevFontList::const_iterator it = maDevFontList.find( aSearchName );
         ImplDevFontListData* pFoundData = NULL;
@@ -2096,7 +1537,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const String& rSearc
 {
 #ifdef DEBUG
     String aTempName = rSearchName;
-    ImplGetEnglishSearchFontName( aTempName );
+    GetEnglishSearchFontName( aTempName );
     DBG_ASSERT( aTempName == rSearchName, "ImplDevFontList::ImplFindBySearchName() called with non-normalized name" );
 #endif
 
@@ -2151,7 +1592,7 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName )
 {
     // normalize the font fomily name and
     String aName = rFontName;
-    ImplGetEnglishSearchFontName( aName );
+    GetEnglishSearchFontName( aName );
     ImplDevFontListData* pFound = ImplFindBySearchName( aName );
     return pFound;
 }
@@ -2168,7 +1609,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames( const String& rToken
         String aSearchName = GetNextFontToken( rTokenStr, nTokenPos );
         if( !aSearchName.Len() )
             continue;
-        ImplGetEnglishSearchFontName( aSearchName );
+        GetEnglishSearchFontName( aSearchName );
         pFoundData = ImplFindBySearchName( aSearchName );
         if( pFoundData )
             break;
@@ -2179,7 +1620,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames( const String& rToken
 
 // -----------------------------------------------------------------------
 
-ImplDevFontListData* ImplDevFontList::ImplFindBySubstFontAttr( const vcl::FontNameAttr& rFontAttr ) const
+ImplDevFontListData* ImplDevFontList::ImplFindBySubstFontAttr( const utl::FontNameAttr& rFontAttr ) const
 {
     ImplDevFontListData* pFoundData = NULL;
 
@@ -2188,7 +1629,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySubstFontAttr( const vcl::FontNa
     for(; it != rFontAttr.Substitutions.end(); ++it )
     {
         String aSearchName( *it );
-        ImplGetEnglishSearchFontName( aSearchName );
+        GetEnglishSearchFontName( aSearchName );
 
         pFoundData = ImplFindBySearchName( aSearchName );
         if( pFoundData )
@@ -2934,7 +2375,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList,
         // if we found a different symbol font we need a symbol conversion table
         if( pFontData->IsSymbolFont() )
             if( aFontSelData.maTargetName != aFontSelData.maSearchName )
-                pEntry->mpConversion = ImplGetRecodeData( aFontSelData.maTargetName, aFontSelData.maSearchName );
+                pEntry->mpConversion = ConvertChar::GetRecodeData( aFontSelData.maTargetName, aFontSelData.maSearchName );
 
         // add the new entry to the cache
         maFontInstanceList[ aFontSelData ] = pEntry;
@@ -2982,7 +2423,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD,
 
 #endif
 
-        ImplGetEnglishSearchFontName( aSearchName );
+        GetEnglishSearchFontName( aSearchName );
         ImplFontSubstitute( aSearchName, nSubstFlags, pDevSpecific );
         // #114999# special emboldening for Ricoh fonts
         // TODO: smarter check for special cases by using PreMatch infrastructure?
@@ -3030,7 +2471,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD,
 #endif
         if( mpPreMatchHook )
             if( mpPreMatchHook->FindFontSubstitute( rFSD ) )
-                ImplGetEnglishSearchFontName( aSearchName );
+                GetEnglishSearchFontName( aSearchName );
 #ifdef ENABLE_GRAPHITE
         // the prematch hook uses the target name to search, but we now need
         // to restore the features to make the font selection data unique
@@ -3057,13 +2498,13 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD,
         {
             rFSD.maTargetName = GetNextFontToken( rFSD.maName, nTokenPos );
             aSearchName = rFSD.maTargetName;
-            ImplGetEnglishSearchFontName( aSearchName );
+            GetEnglishSearchFontName( aSearchName );
         }
         else
             nTokenPos = STRING_NOTFOUND;
         if( mpPreMatchHook )
             if( mpPreMatchHook->FindFontSubstitute( rFSD ) )
-                ImplGetEnglishSearchFontName( aSearchName );
+                GetEnglishSearchFontName( aSearchName );
         ImplFontSubstitute( aSearchName, nSubstFlags, pDevSpecific );
         ImplDevFontListData* pFoundData = ImplFindBySearchName( aSearchName );
         if( pFoundData )
@@ -3077,7 +2518,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD,
         nTokenPos = 0;
         rFSD.maTargetName = GetNextFontToken( rFSD.maName, nTokenPos );
         aSearchName = rFSD.maTargetName;
-        ImplGetEnglishSearchFontName( aSearchName );
+        GetEnglishSearchFontName( aSearchName );
     }
 
     String      aSearchShortName;
@@ -3152,7 +2593,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD,
             continue;
 
         aSearchName = rFSD.maTargetName;
-        ImplGetEnglishSearchFontName( aSearchName );
+        GetEnglishSearchFontName( aSearchName );
 
         String      aTempShortName;
         String      aTempFamilyName;
@@ -6488,7 +5929,7 @@ SalLayout* OutputDevice::ImplLayout( const String& rOrigStr,
     // convert from logical units to physical units
     // recode string if needed
     if( mpFontEntry->mpConversion )
-        ImplRecodeString( mpFontEntry->mpConversion, aStr, 0, aStr.Len() );
+        mpFontEntry->mpConversion->RecodeString( aStr, 0, aStr.Len() );
 
     long nPixelWidth = nLogicalWidth;
     if( nLogicalWidth && mbMap )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index dd2f4a62c88d..4146f1764204 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2847,6 +2847,121 @@ static bool getPfbSegmentLengths( const unsigned char* pFontBytes, int nByteLen,
     return true;
 }
 
+std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontData* pFont, EmbedFont& rEmbed )
+{
+    std::map< sal_Int32, sal_Int32 > aRet;
+    if( isBuiltinFont( pFont ) )
+    {
+        aRet[ rEmbed.m_nNormalFontID ] = emitBuiltinFont( pFont );
+        return aRet;
+    }
+
+    sal_Int32 nFontObject = 0;
+    sal_Int32 nFontDescriptor = 0;
+    rtl::OString aSubType( "/Type1" );
+    FontSubsetInfo aInfo;
+    // fill in dummy values
+    aInfo.m_nAscent = 1000;
+    aInfo.m_nDescent = 200;
+    aInfo.m_nCapHeight = 1000;
+    aInfo.m_aFontBBox = Rectangle( Point( -200, -200 ), Size( 1700, 1700 ) );
+    aInfo.m_aPSName = pFont->maName;
+    sal_Int32 pWidths[256];
+    rtl_zeroMemory( pWidths, sizeof(pWidths) );
+    if( pFont->IsEmbeddable() )
+    {
+        const unsigned char* pFontData = NULL;
+        long nFontLen = 0;
+        sal_Ucs nEncodedCodes[256];
+        sal_Int32 pEncWidths[256];
+        if( (pFontData = (const unsigned char*)m_pReferenceDevice->mpGraphics->GetEmbedFontData( pFont, nEncodedCodes, pEncWidths, aInfo, &nFontLen )) != NULL )
+        {
+            m_pReferenceDevice->mpGraphics->FreeEmbedFontData( pFontData, nFontLen );
+            for( int i = 0; i < 256; i++ )
+            {
+                if( nEncodedCodes[i] >= 32 && nEncodedCodes[i] < 256 )
+                {
+                    pWidths[i] = pEncWidths[ i ];
+                }
+            }
+        }
+    }
+    else if( pFont->mbSubsettable )
+    {
+        aSubType = rtl::OString( "/TrueType" );
+        Int32Vector aGlyphWidths;
+        Ucs2UIntMap aUnicodeMap;
+        m_pReferenceDevice->mpGraphics->GetGlyphWidths( pFont, false, aGlyphWidths, aUnicodeMap );
+
+        OUString aTmpName;
+        osl_createTempFile( NULL, NULL, &aTmpName.pData );
+        sal_Int32 pGlyphIDs[ 256 ];
+        sal_uInt8 pEncoding[ 256 ];
+        sal_Ucs   pUnicodes[ 256 ];
+        sal_Int32 pDuWidths[ 256 ];
+
+        memset( pGlyphIDs, 0, sizeof( pGlyphIDs ) );
+        memset( pEncoding, 0, sizeof( pEncoding ) );
+        memset( pUnicodes, 0, sizeof( pUnicodes ) );
+        memset( pDuWidths, 0, sizeof( pDuWidths ) );
+
+        for( sal_Ucs c = 32; c < 256; c++ )
+        {
+            pUnicodes[c] = c;
+            pEncoding[c] = c;
+            pGlyphIDs[c] = 0;
+            if( aUnicodeMap.find( c ) != aUnicodeMap.end() )
+                pWidths[ c ] = aGlyphWidths[ aUnicodeMap[ c ] ];
+        }
+
+        m_pReferenceDevice->mpGraphics->CreateFontSubset( aTmpName, pFont, pGlyphIDs, pEncoding, pDuWidths, 256, aInfo );
+        osl_removeFile( aTmpName.pData );
+    }
+    else
+    {
+        DBG_ERROR( "system font neither embeddable nor subsettable" );
+    }
+
+    // write font descriptor
+    nFontDescriptor = emitFontDescriptor( pFont, aInfo, 0, 0 );
+    if( nFontDescriptor )
+    {
+        // write font object
+        sal_Int32 nObject = createObject();
+        if( updateObject( nObject ) )
+        {
+            OStringBuffer aLine( 1024 );
+            aLine.append( nObject );
+            aLine.append( " 0 obj\n"
+                          "<</Type/Font/Subtype" );
+            aLine.append( aSubType );
+            aLine.append( "/BaseFont/" );
+            appendName( aInfo.m_aPSName, aLine );
+            aLine.append( "\n" );
+            if( !pFont->mbSymbolFlag )
+                aLine.append( "/Encoding/WinAnsiEncoding\n" );
+            aLine.append( "/FirstChar 32 /LastChar 255\n"
+                          "/Widths[" );
+            for( int i = 32; i < 256; i++ )
+            {
+                aLine.append( pWidths[i] );
+                aLine.append( ((i&15) == 15) ? "\n" : " " );
+            }
+            aLine.append( "]\n"
+                          "/FontDescriptor " );
+            aLine.append( nFontDescriptor );
+            aLine.append( " 0 R>>\n"
+                          "endobj\n\n" );
+            writeBuffer( aLine.getStr(), aLine.getLength() );
+
+            nFontObject = nObject;
+            aRet[ rEmbed.m_nNormalFontID ] = nObject;
+        }
+    }
+
+    return aRet;
+}
+
 // TODO: always subset instead of embedding the full font => this method becomes obsolete then
 std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFontData* pFont, EmbedFont& rEmbed )
 {
@@ -3606,24 +3721,28 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const ImplFontData* pFont, FontSubs
     // According to PDF reference 1.4 StemV is required
     // seems a tad strange to me, but well ...
     aLine.append( "\n"
-                  "/StemV 80\n"
-                  "/FontFile" );
-    switch( rInfo.m_nFontType )
+                  "/StemV 80\n" );
+    if( nFontStream )
     {
-        case FontSubsetInfo::SFNT_TTF:
-            aLine.append( '2' );
-            break;
-        case FontSubsetInfo::TYPE1_PFA:
-        case FontSubsetInfo::TYPE1_PFB:
-        case FontSubsetInfo::ANY_TYPE1:
-            break;
-        default:
-            DBG_ERROR( "unknown fonttype in PDF font descriptor" );
-            return 0;
+        aLine.append( "/FontFile" );
+        switch( rInfo.m_nFontType )
+        {
+            case FontSubsetInfo::SFNT_TTF:
+                aLine.append( '2' );
+                break;
+            case FontSubsetInfo::TYPE1_PFA:
+            case FontSubsetInfo::TYPE1_PFB:
+            case FontSubsetInfo::ANY_TYPE1:
+                break;
+            default:
+                DBG_ERROR( "unknown fonttype in PDF font descriptor" );
+                return 0;
+        }
+        aLine.append( ' ' );
+        aLine.append( nFontStream );
+        aLine.append( " 0 R\n" );
     }
-    aLine.append( ' ' );
-    aLine.append( nFontStream );
-    aLine.append( " 0 R>>\n"
+    aLine.append( ">>\n"
                   "endobj\n\n" );
     CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
 
@@ -3880,6 +3999,17 @@ bool PDFWriterImpl::emitFonts()
         }
     }
 
+    // emit system fonts
+    for( FontEmbedData::iterator sit = m_aSystemFonts.begin(); sit != m_aSystemFonts.end(); ++sit )
+    {
+        std::map< sal_Int32, sal_Int32 > aObjects = emitSystemFont( sit->first, sit->second );
+        for( std::map< sal_Int32, sal_Int32 >::iterator fit = aObjects.begin(); fit != aObjects.end(); ++fit )
+        {
+            CHECK_RETURN( fit->second );
+            aFontIDToObject[ fit->first ] = fit->second;
+        }
+    }
+
     OStringBuffer aFontDict( 1024 );
     aFontDict.append( getFontDictObject() );
     aFontDict.append( " 0 obj\n"
@@ -4580,13 +4710,25 @@ void PDFWriterImpl::createDefaultEditAppearance( PDFWidget& rEdit, const PDFWrit
 
     // prepare font to use, draw field border
     Font aFont = drawFieldBorder( rEdit, rWidget, rSettings );
-    sal_Int32 nBest = getBestBuiltinFont( aFont );
+    sal_Int32 nBest = m_aContext.FieldsUseSystemFonts ? getSystemFont( aFont ): getBestBuiltinFont( aFont );
 
     // prepare DA string
     OStringBuffer aDA( 32 );
     appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetFieldTextColor() ), aDA );
     aDA.append( ' ' );
-    aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
+    if( m_aContext.FieldsUseSystemFonts )
+    {
+        aDA.append( "/F" );
+        aDA.append( nBest );
+
+        OStringBuffer aDR( 32 );
+        aDR.append( "/Font " );
+        aDR.append( getFontDictObject() );
+        aDR.append( " 0 R" );
+        rEdit.m_aDRDict = aDR.makeStringAndClear();
+    }
+    else
+        aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
     aDA.append( ' ' );
     m_aPages[ m_nCurrentPage ].appendMappedLength( sal_Int32( aFont.GetHeight() ), aDA );
     aDA.append( " Tf" );
@@ -4620,7 +4762,7 @@ void PDFWriterImpl::createDefaultListBoxAppearance( PDFWidget& rBox, const PDFWr
 
     // prepare font to use, draw field border
     Font aFont = drawFieldBorder( rBox, rWidget, rSettings );
-    sal_Int32 nBest = getBestBuiltinFont( aFont );
+    sal_Int32 nBest = m_aContext.FieldsUseSystemFonts ? getSystemFont( aFont ): getBestBuiltinFont( aFont );
 
     beginRedirect( pListBoxStream, rBox.m_aRect );
     OStringBuffer aAppearance( 64 );
@@ -4668,9 +4810,22 @@ void PDFWriterImpl::createDefaultListBoxAppearance( PDFWidget& rBox, const PDFWr
         aDA.append( " 2 Tr " );
     }
 #endif
+    // prepare DA string
     appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetFieldTextColor() ), aDA );
     aDA.append( ' ' );
-    aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
+    if( m_aContext.FieldsUseSystemFonts )
+    {
+        aDA.append( "/F" );
+        aDA.append( nBest );
+
+        OStringBuffer aDR( 32 );
+        aDR.append( "/Font " );
+        aDR.append( getFontDictObject() );
+        aDR.append( " 0 R" );
+        rBox.m_aDRDict = aDR.makeStringAndClear();
+    }
+    else
+        aDA.append( m_aBuiltinFonts[nBest].getNameObject() );
     aDA.append( ' ' );
     m_aPages[ m_nCurrentPage ].appendMappedLength( sal_Int32( aFont.GetHeight() ), aDA );
     aDA.append( " Tf" );
@@ -5247,9 +5402,18 @@ bool PDFWriterImpl::emitWidgetAnnotations()
         }
         if( rWidget.m_aDAString.getLength() )
         {
-            aLine.append( "/DR<</Font<<" );
-            appendBuiltinFontsToDict( aLine );
-            aLine.append( ">>>>\n" );
+            if( rWidget.m_aDRDict.getLength() )
+            {
+                aLine.append( "/DR<<" );
+                aLine.append( rWidget.m_aDRDict );
+                aLine.append( ">>\n" );
+            }
+            else
+            {
+                aLine.append( "/DR<</Font<<" );
+                appendBuiltinFontsToDict( aLine );
+                aLine.append( ">>>>\n" );
+            }
             aLine.append( "/DA" );
             appendLiteralStringEncrypt( rWidget.m_aDAString, rWidget.m_nObject, aLine );
             aLine.append( "\n" );
@@ -6390,6 +6554,29 @@ std::set< PDFWriter::ErrorCode > PDFWriterImpl::getErrors()
     return m_aErrors;
 }
 
+sal_Int32 PDFWriterImpl::getSystemFont( const Font& i_rFont )
+{
+    getReferenceDevice()->Push();
+    getReferenceDevice()->SetFont( i_rFont );
+    getReferenceDevice()->ImplNewFont();
+
+    const ImplFontData* pDevFont = m_pReferenceDevice->mpFontEntry->maFontSelData.mpFontData;
+    sal_Int32 nFontID = 0;
+    FontEmbedData::iterator it = m_aSystemFonts.find( pDevFont );
+    if( it != m_aSystemFonts.end() )
+        nFontID = it->second.m_nNormalFontID;
+    else
+    {
+        nFontID = m_nNextFID++;
+        m_aSystemFonts[ pDevFont ] = EmbedFont();
+        m_aSystemFonts[ pDevFont ].m_nNormalFontID = nFontID;
+    }
+
+    getReferenceDevice()->Pop();
+    getReferenceDevice()->ImplNewFont();
+
+    return nFontID;
+}
 
 void PDFWriterImpl::registerGlyphs( int nGlyphs,
                                     sal_GlyphId* pGlyphs,
@@ -10145,12 +10332,17 @@ void PDFWriterImpl::setFont( const Font& rFont )
 
 void PDFWriterImpl::push( sal_uInt16 nFlags )
 {
+    OSL_ENSURE( m_aGraphicsStack.size() > 0, "invalid graphics stack" );
     m_aGraphicsStack.push_front( m_aGraphicsStack.front() );
     m_aGraphicsStack.front().m_nFlags = nFlags;
 }
 
 void PDFWriterImpl::pop()
 {
+    OSL_ENSURE( m_aGraphicsStack.size() > 1, "pop without push" );
+    if( m_aGraphicsStack.size() < 2 )
+        return;
+
     GraphicsState aState = m_aGraphicsStack.front();
     m_aGraphicsStack.pop_front();
     GraphicsState& rOld = m_aGraphicsStack.front();
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 7d5ec2bf4f61..e058cfa487db 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -311,6 +311,8 @@ public:
     {
         sal_Int32                       m_nNormalFontID;
         std::list< EmbedEncoding >      m_aExtendedEncodings;
+
+        EmbedFont() : m_nNormalFontID( 0 ) {}
     };
     typedef std::map< const ImplFontData*, EmbedFont > FontEmbedData;
 
@@ -396,6 +398,7 @@ public:
         USHORT                      m_nTextStyle;
         rtl::OUString               m_aValue;
         rtl::OString                m_aDAString;
+        rtl::OString                m_aDRDict;
         rtl::OString                m_aMKDict;
         rtl::OString                m_aMKDictCAString;  // i12626, added to be able to encrypt the /CA text string
                                                         // since the object number is not known at the moment
@@ -612,6 +615,7 @@ private:
     FontSubsetData                      m_aSubsets;
     bool                                m_bEmbedStandardFonts;
     FontEmbedData                       m_aEmbeddedFonts;
+    FontEmbedData                       m_aSystemFonts;
     sal_Int32                           m_nNextFID;
     PDFFontCache                        m_aFontCache;
 
@@ -679,6 +683,7 @@ private:
                 m_aOverlineColor( COL_TRANSPARENT ),
                 m_nAntiAlias( 1 ),
                 m_nLayoutMode( 0 ),
+                m_aDigitLanguage( 0 ),
                 m_nTransparentPercent( 0 ),
                 m_nFlags( 0xffff ),
                 m_nUpdateFlags( 0xffff )
@@ -693,6 +698,7 @@ private:
                 m_aClipRegion( rState.m_aClipRegion ),
                 m_nAntiAlias( rState.m_nAntiAlias ),
                 m_nLayoutMode( rState.m_nLayoutMode ),
+                m_aDigitLanguage( rState.m_aDigitLanguage ),
                 m_nTransparentPercent( rState.m_nTransparentPercent ),
                 m_nFlags( rState.m_nFlags ),
                 m_nUpdateFlags( rState.m_nUpdateFlags )
@@ -710,6 +716,7 @@ private:
             m_aClipRegion           = rState.m_aClipRegion;
             m_nAntiAlias            = rState.m_nAntiAlias;
             m_nLayoutMode           = rState.m_nLayoutMode;
+            m_aDigitLanguage        = rState.m_aDigitLanguage;
             m_nTransparentPercent   = rState.m_nTransparentPercent;
             m_nFlags                = rState.m_nFlags;
             m_nUpdateFlags          = rState.m_nUpdateFlags;
@@ -897,6 +904,8 @@ i12626
     sal_Int32 emitBuiltinFont( const ImplFontData*, sal_Int32 nObject = -1 );
     /* writes a type1 embedded font object and returns its mapping from font ids to object ids (or 0 in case of failure ) */
     std::map< sal_Int32, sal_Int32 > emitEmbeddedFont( const ImplFontData*, EmbedFont& );
+    /* writes a type1 system font object and returns its mapping from font ids to object ids (or 0 in case of failure ) */
+    std::map< sal_Int32, sal_Int32 > emitSystemFont( const ImplFontData*, EmbedFont& );
     /* writes a font descriptor and returns its object id (or 0) */
     sal_Int32 emitFontDescriptor( const ImplFontData*, FontSubsetInfo&, sal_Int32 nSubsetID, sal_Int32 nStream );
     /* writes a ToUnicode cmap, returns the corresponding stream object */
@@ -983,6 +992,7 @@ i12626
     sal_Int32 findRadioGroupWidget( const PDFWriter::RadioButtonWidget& rRadio );
     Font replaceFont( const Font& rControlFont, const Font& rAppSetFont );
     sal_Int32 getBestBuiltinFont( const Font& rFont );
+    sal_Int32 getSystemFont( const Font& i_rFont );
 
     // used for edit and listbox
     Font drawFieldBorder( PDFWidget&, const PDFWriter::AnyWidget&, const StyleSettings& );
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 5314837143de..66865759db4b 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -2459,6 +2459,14 @@ SvStream& operator>>( SvStream& rIStrm, Region& rRegion )
                     }
                 }
 
+                if( rIStrm.IsEof() )
+                {
+                    DBG_ERROR( "premature end of region stream" );
+                    delete rRegion.mpImplRegion;
+                    rRegion.mpImplRegion = (ImplRegion*)&aImplEmptyRegion;
+                    return rIStrm;
+                }
+
                 // get next header
                 rIStrm >> nTmp16;
             }
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 71373bbabee5..36064fc8bc6b 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -83,6 +83,23 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
     if ( !mpAccelList )
         return;
 
+    //e.g. #i90599#. Someone starts typing a sequence in a dialog, but doesn't
+    //end it, and then closes the dialog, deleting the accelerators. So if
+    //we're removing an accelerator that a sub-accelerator which is in the
+    //sequence list, throw away the entire sequence
+    if ( mpSequenceList )
+    {
+        for (USHORT i = 0; i < pAccel->GetItemCount(); ++i)
+        {
+            Accelerator* pSubAccel = pAccel->GetAccel(pAccel->GetItemId(i));
+            if ( mpSequenceList->GetPos( pSubAccel ) != LIST_ENTRY_NOTFOUND )
+            {
+                EndSequence( true );
+                break;
+            }
+        }
+    }
+
     // Raus damit
     mpAccelList->Remove( pAccel );
 }
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1fc2b9be703a..997e63d8b22e 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -453,6 +453,14 @@ Dialog::~Dialog()
 
 // -----------------------------------------------------------------------
 
+IMPL_LINK( Dialog, ImplAsyncCloseHdl, void*, EMPTYARG )
+{
+    Close();
+    return 0;
+}
+
+// -----------------------------------------------------------------------
+
 long Dialog::Notify( NotifyEvent& rNEvt )
 {
     // Zuerst Basisklasse rufen wegen TabSteuerung
@@ -468,7 +476,11 @@ long Dialog::Notify( NotifyEvent& rNEvt )
             if ( (nKeyCode == KEY_ESCAPE) &&
                  ((GetStyle() & WB_CLOSEABLE) || ImplGetCancelButton( this ) || ImplGetOKButton( this )) )
             {
-                Close();
+                // #i89505# for the benefit of slightly mentally challenged implementations
+                // like e.g. SfxModelessDialog which destroy themselves inside Close()
+                // post this Close asynchronous so we can leave our key handler before
+                // we get destroyed
+                PostUserEvent( LINK( this, Dialog, ImplAsyncCloseHdl ), this );
                 return TRUE;
             }
         }
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index f3ce8b2d05ea..2d99fbb20b65 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -62,6 +62,7 @@ public:
 
     TaskPaneList*   mpTaskPaneList;
     Size            maMaxOutSize;
+    rtl::OUString   maRepresentedURL;
 };
 
 SystemWindow::ImplData::ImplData()
@@ -277,6 +278,29 @@ void SystemWindow::SetZLevel( BYTE nLevel )
 
 // -----------------------------------------------------------------------
 
+void SystemWindow::SetRepresentedURL( const rtl::OUString& i_rURL )
+{
+    bool bChanged = (i_rURL != mpImplData->maRepresentedURL);
+    mpImplData->maRepresentedURL = i_rURL;
+    if ( !mbSysChild && bChanged )
+    {
+        const Window* pWindow = this;
+        while ( pWindow->mpWindowImpl->mpBorderWindow )
+            pWindow = pWindow->mpWindowImpl->mpBorderWindow;
+
+        if ( pWindow->mpWindowImpl->mbFrame )
+            pWindow->mpWindowImpl->mpFrame->SetRepresentedURL( i_rURL );
+    }
+}
+// -----------------------------------------------------------------------
+
+const rtl::OUString& SystemWindow::GetRepresentedURL() const
+{
+    return mpImplData->maRepresentedURL;
+}
+
+// -----------------------------------------------------------------------
+
 void SystemWindow::SetIcon( USHORT nIcon )
 {
     if ( mnIcon == nIcon )
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 9ec86fab20de..ecc335420f18 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1002,6 +1002,9 @@ const Size& ToolBox::GetDefaultImageSize() const
             case STYLE_SYMBOLS_CRYSTAL:
                 aLargeButtonSize = Size( TB_LARGEIMAGESIZE_CRYSTAL, TB_LARGEIMAGESIZE_CRYSTAL );
                 break;
+            case STYLE_SYMBOLS_OXYGEN:
+                aLargeButtonSize = Size( TB_LARGEIMAGESIZE_OXYGEN, TB_LARGEIMAGESIZE_OXYGEN );
+                break;
             default:
                 aLargeButtonSize = Size( TB_LARGEIMAGESIZE, TB_LARGEIMAGESIZE );
         }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 371f962c45ac..bcf86c749673 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -68,7 +68,7 @@
 #include "vcl/wall.hxx"
 #include "vcl/gradient.hxx"
 #include "vcl/toolbox.h"
-#include "vcl/fontcfg.hxx"
+#include "unotools/fontcfg.hxx"
 #include "vcl/sysdata.hxx"
 #include "vcl/sallayout.hxx"
 #include "vcl/button.hxx" // Button::GetStandardText
@@ -310,7 +310,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
     if ( !bUseSystemFont )
     {
         ImplInitFontList();
-        String aConfigFont = vcl::DefaultFontConfiguration::get()->getUserInterfaceFont( rSettings.GetUILocale() );
+        String aConfigFont = utl::DefaultFontConfiguration::get()->getUserInterfaceFont( rSettings.GetUILocale() );
         xub_StrLen nIndex = 0;
         while( nIndex != STRING_NOTFOUND )
         {
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index 8d83ca008e4a..0a97e5ba1ca6 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -187,8 +187,16 @@ static accessibility::XAccessibleTextMarkup*
         if( !pWrap->mpTextMarkup && pWrap->mpContext )
         {
             uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleTextMarkup::static_type(NULL) );
-            pWrap->mpTextMarkup = reinterpret_cast< accessibility::XAccessibleTextMarkup * > (any.pReserved);
-            pWrap->mpTextMarkup->acquire();
+            /* Since this not a dedicated interface in Atk and thus has not
+             * been queried during wrapper initialization, we need to check
+             * the return value here.
+             */
+            if( typelib_TypeClass_INTERFACE == any.pType->eTypeClass )
+            {
+                pWrap->mpTextMarkup = reinterpret_cast< accessibility::XAccessibleTextMarkup * > (any.pReserved);
+                if( pWrap->mpTextMarkup )
+                    pWrap->mpTextMarkup->acquire();
+            }
         }
 
         return pWrap->mpTextMarkup;
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 99a331be2318..92ff2d3b8d8e 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2377,6 +2377,11 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
         }
     }
 
+    // free xrender resources
+    for( unsigned int i = 0; i < sizeof(m_aGraphics)/sizeof(m_aGraphics[0]); i++ )
+        if( m_aGraphics[i].bInUse )
+            m_aGraphics[i].pGraphics->SetDrawable( None, m_nScreen );
+
     // first deinit frame
     if( m_pIMHandler )
     {
diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx
index 831621e38cc1..04730b39fad2 100644
--- a/vcl/unx/inc/plugins/kde/kdedata.hxx
+++ b/vcl/unx/inc/plugins/kde/kdedata.hxx
@@ -75,7 +75,7 @@ public:
 
     virtual SalGraphics* GetGraphics();
     virtual void ReleaseGraphics( SalGraphics *pGraphics );
-    virtual void updateGraphics();
+    virtual void updateGraphics( bool bClear );
     virtual void UpdateSettings( AllSettings& rSettings );
     virtual void Show( BOOL bVisible, BOOL bNoActivate );
 };
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index 848f2250d31c..8dad0350a937 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -212,7 +212,9 @@ public:
     virtual SalGraphics*        GetGraphics();
     virtual void                ReleaseGraphics( SalGraphics* pGraphics );
 
-    virtual void                updateGraphics();
+    // call with true to clear graphics (setting None as drawable)
+    // call with false to setup graphics with window (GetWindow())
+    virtual void                updateGraphics( bool bClear );
 
     virtual BOOL                PostEvent( void* pData );
 
diff --git a/vcl/unx/inc/sm.hxx b/vcl/unx/inc/sm.hxx
index 17bb40e2106a..09d2f5557e1d 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/unx/inc/sm.hxx
@@ -69,7 +69,7 @@ public:
     static bool checkDocumentsSaved();
     static bool queryInteraction();
     static void saveDone();
-    static void interactionDone();
+    static void interactionDone( bool bCancelShutdown );
 
     static String getExecName();
     static VCL_DLLPUBLIC const ByteString&  getSessionID();
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 1b5a2f86dcee..9da57b6e790d 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_vcl.hxx"
 
 #define _SV_SALDATA_CXX
-#include "kde_headers.h"
+#include <shell/kde_headers.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 8046d22d75d3..cd461fc36c8f 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_vcl.hxx"
 
 #define _SV_SALNATIVEWIDGETS_KDE_CXX
-#include "kde_headers.h"
+#include <shell/kde_headers.h>
 
 #include <salunx.h>
 #include <saldata.hxx>
@@ -2073,12 +2073,13 @@ void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics )
     }
 }
 
-void KDESalFrame::updateGraphics()
+void KDESalFrame::updateGraphics( bool bClear )
 {
+    Drawable aDrawable = bClear ? None : GetWindow();
     for( int i = 0; i < nMaxGraphics; i++ )
     {
         if( m_aGraphics[i].bInUse )
-            m_aGraphics[i].pGraphics->SetDrawable( GetWindow(), GetScreenNumber() );
+            m_aGraphics[i].pGraphics->SetDrawable( aDrawable, GetScreenNumber() );
     }
 }
 
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 202d3dbcd517..6177c4b2896a 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -363,12 +363,13 @@ void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics )
     }
 }
 
-void KDESalFrame::updateGraphics()
+void KDESalFrame::updateGraphics( bool bClear )
 {
+    Drawable aDrawable = bClear ? None : GetWindow();
     for( int i = 0; i < nMaxGraphics; i++ )
     {
         if( m_aGraphics[i].bInUse )
-            m_aGraphics[i].pGraphics->SetDrawable( GetWindow(), GetScreenNumber() );
+            m_aGraphics[i].pGraphics->SetDrawable( aDrawable, GetScreenNumber() );
     }
 }
 
diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index 11a22bd93ba5..de3a5af189ee 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -52,7 +52,7 @@ class KDESalFrame : public X11SalFrame
 
         virtual SalGraphics* GetGraphics();
         virtual void ReleaseGraphics( SalGraphics *pGraphics );
-        virtual void updateGraphics();
+        virtual void updateGraphics( bool bClear );
         virtual void UpdateSettings( AllSettings& rSettings );
         virtual void Show( BOOL bVisible, BOOL bNoActivate );
 };
\ No newline at end of file
diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx
index 1dc2d1404009..6b7753960290 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/source/app/salinst.cxx
@@ -50,7 +50,7 @@
 #include "vcl/salwtype.hxx"
 #include "vcl/salatype.hxx"
 #include "vcl/helper.hxx"
-
+#include <tools/solarmutex.hxx>
 #include "vos/mutex.hxx"
 
 // -------------------------------------------------------------------------
@@ -63,6 +63,7 @@ SalYieldMutex::SalYieldMutex()
 {
     mnCount     = 0;
     mnThreadId  = 0;
+    ::tools::SolarMutex::SetSolarMutex( this );
 }
 
 void SalYieldMutex::acquire()
@@ -141,6 +142,7 @@ X11SalInstance::~X11SalInstance()
     delete pSalData;
     SetSalData( NULL );
 
+    ::tools::SolarMutex::SetSolarMutex( 0 );
       delete mpSalYieldMutex;
 }
 
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index ff981b04259b..c5605cec1dfb 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -114,7 +114,7 @@ void IceSalSession::queryInteraction()
 
 void IceSalSession::interactionDone()
 {
-    SessionManagerClient::interactionDone();
+    SessionManagerClient::interactionDone( false );
 }
 
 void IceSalSession::saveDone()
@@ -129,6 +129,7 @@ void IceSalSession::saveDone()
 
 bool IceSalSession::cancelShutdown()
 {
+    SessionManagerClient::interactionDone( true );
     return false;
 }
 
@@ -368,6 +369,12 @@ void SessionManagerClient::SaveYourselfProc(
 
 IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, ShutDownHdl, void*, EMPTYARG )
 {
+    if( pOneInstance )
+    {
+        SalSessionQuitEvent aEvent;
+        pOneInstance->CallCallback( &aEvent );
+    }
+
     const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
     SMprintf( rFrames.begin() != rFrames.end() ? "shutdown on first frame\n" : "shutdown event but no frame\n" );
     if( rFrames.begin() != rFrames.end() )
@@ -526,12 +533,12 @@ bool SessionManagerClient::queryInteraction()
     return bRet;
 }
 
-void SessionManagerClient::interactionDone()
+void SessionManagerClient::interactionDone( bool bCancelShutdown )
 {
     if( aSmcConnection )
     {
         ICEConnectionObserver::lock();
-        SmcInteractDone( aSmcConnection, False );
+        SmcInteractDone( aSmcConnection, bCancelShutdown ? True : False );
         ICEConnectionObserver::unlock();
     }
 }
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index c09803dcb269..cb554bccea21 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -1793,7 +1793,7 @@ void splitIntersectingSegments( LSVector& rLSVector)
 
     // prepare the result vector
     // try to avoid reallocations by guessing a reasonable result size
-    rLSVector.reserve( aYMinQueue.size() * 1.5);
+    rLSVector.reserve( aYMinQueue.size() * 3/2 );
 
     // find all intersections
     CutPointSet aCutPointSet;
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index 14de25b13e4d..f1c63b8abee7 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -149,34 +149,53 @@ static const rtl::OUString& get_desktop_environment()
     return aRet;
 }
 
-static const char* autodetect_plugin()
+static SalInstance* autodetect_plugin()
 {
+    static const char* pKDEFallbackList[] =
+    {
+        "kde4", "kde", "gtk", "gen", 0
+    };
+
+    static const char* pStandardFallbackList[] =
+    {
+        "gtk", "gen", 0
+    };
+
+    static const char* pHeadlessFallbackList[] =
+    {
+        "svp", 0
+    };
+
     const rtl::OUString& desktop( get_desktop_environment() );
-    const char * pRet = "gen";
+    const char ** pList = pStandardFallbackList;
+    int nListEntry = 0;
 
     // no server at all: dummy plugin
     if ( desktop.equalsAscii( desktop_strings[DESKTOP_NONE] ) )
-        pRet = "svp";
+        pList = pHeadlessFallbackList;
     else if ( desktop.equalsAscii( desktop_strings[DESKTOP_GNOME] ) )
-        pRet = "gtk";
+        pList = pStandardFallbackList;
     else if( desktop.equalsAscii( desktop_strings[DESKTOP_KDE] ) )
-        pRet = "kde";
-    else if( desktop.equalsAscii( desktop_strings[DESKTOP_KDE4] ) )
-        pRet = "kde4";
-    else
     {
-        // #i95296# use the much nicer looking gtk plugin
-        // on desktops that set gtk variables (e.g. XFCE)
-        static const char* pEnv = getenv( "GTK2_RC_FILES" );
-        if( pEnv && *pEnv ) // check for existance and non emptiness
-            pRet = "gtk";
+        pList = pKDEFallbackList;
+        nListEntry = 1;
     }
+    else if( desktop.equalsAscii( desktop_strings[DESKTOP_KDE4] ) )
+        pList = pKDEFallbackList;
 
-#if OSL_DEBUG_LEVEL > 1
-    std::fprintf( stderr, "plugin autodetection: %s\n", pRet );
-#endif
+    SalInstance* pInst = NULL;
+    while( pList[nListEntry] && pInst == NULL )
+    {
+        rtl::OUString aTry( rtl::OUString::createFromAscii( pList[nListEntry] ) );
+        pInst = tryInstance( aTry );
+        #if OSL_DEBUG_LEVEL > 1
+        if( pInst )
+            std::fprintf( stderr, "plugin autodetection: %s\n", pList[nListEntry] );
+        #endif
+        nListEntry++;
+    }
 
-    return pRet;
+    return pInst;
 }
 
 static SalInstance* check_headless_plugin()
@@ -202,10 +221,7 @@ SalInstance *CreateSalInstance()
         pInst = check_headless_plugin();
 
     if( ! pInst && !(pUsePlugin && *pUsePlugin) )
-        pUsePlugin = autodetect_plugin();
-
-    if( ! pInst && pUsePlugin && *pUsePlugin )
-        pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) );
+        pInst = autodetect_plugin();
 
     // fallback to gen
     if( ! pInst )
diff --git a/vcl/unx/source/printergfx/glyphset.cxx b/vcl/unx/source/printergfx/glyphset.cxx
index 156517d98220..5adff6683267 100644
--- a/vcl/unx/source/printergfx/glyphset.cxx
+++ b/vcl/unx/source/printergfx/glyphset.cxx
@@ -46,6 +46,7 @@
 
 #include <set>
 #include <map>
+#include <algorithm>
 
 using namespace vcl;
 using namespace psp;
@@ -785,6 +786,17 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
     return sal_True;
 }
 
+struct EncEntry
+{
+    sal_uChar  aEnc;
+    long       aGID;
+
+    EncEntry() : aEnc( 0 ), aGID( 0 ) {}
+
+    bool operator<( const EncEntry& rRight ) const
+    { return aEnc < rRight.aEnc; }
+};
+
 static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
     const char* pGlyphSetName, int nGlyphCount,
     /*const*/ sal_uInt16* pRequestedGlyphs, /*const*/ sal_uChar* pEncoding,
@@ -796,17 +808,29 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
     if( bAllowType42 )
         nTargetMask |= FontSubsetInfo::TYPE42_FONT;
 
+    std::vector< EncEntry > aSorted( nGlyphCount, EncEntry() );
+    for( int i = 0; i < nGlyphCount; i++ )
+    {
+        aSorted[i].aEnc = pEncoding[i];
+        aSorted[i].aGID = pRequestedGlyphs[i];
+    }
+
+    std::stable_sort( aSorted.begin(), aSorted.end() );
+
+    std::vector< sal_uChar > aEncoding( nGlyphCount );
+    std::vector< long > aRequestedGlyphs( nGlyphCount );
+
+    for( int i = 0; i < nGlyphCount; i++ )
+    {
+        aEncoding[i]        = aSorted[i].aEnc;
+        aRequestedGlyphs[i] = aSorted[i].aGID;
+    }
+
     FontSubsetInfo aInfo;
     aInfo.LoadFont( pSrcFont );
 
-#if 1 // TODO: remove 16bit->long conversion when input args has been changed
-        long aRequestedGlyphs[256];
-        for( int i = 0; i < nGlyphCount; ++i )
-            aRequestedGlyphs[i] = pRequestedGlyphs[i];
-#endif
-
     aInfo.CreateFontSubset( nTargetMask, pTmpFile, pGlyphSetName,
-        aRequestedGlyphs, pEncoding, nGlyphCount, NULL );
+        &aRequestedGlyphs[0], &aEncoding[0], nGlyphCount, NULL );
 }
 
 sal_Bool
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 6219b50d6ec3..68c99e05da77 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -930,12 +930,13 @@ void X11SalFrame::ReleaseGraphics( SalGraphics *pGraphics )
     pGraphics_      = NULL;
 }
 
-void X11SalFrame::updateGraphics()
+void X11SalFrame::updateGraphics( bool bClear )
 {
+    Drawable aDrawable = bClear ? None : GetWindow();
     if( pGraphics_ )
-        pGraphics_->SetDrawable( GetWindow(), m_nScreen );
+        pGraphics_->SetDrawable( aDrawable, m_nScreen );
     if( pFreeGraphics_ )
-        pFreeGraphics_->SetDrawable( GetWindow(), m_nScreen );
+        pFreeGraphics_->SetDrawable( aDrawable, m_nScreen );
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -2726,6 +2727,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
     }
 
     // first deinit frame
+    updateGraphics(true);
     if( mpInputContext )
     {
         mpInputContext->UnsetICFocus( this );
@@ -2748,7 +2750,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
         Init( nStyle_ & ~SAL_FRAME_STYLE_PLUG, nScreen, NULL, true );
 
     // update graphics if necessary
-    updateGraphics();
+    updateGraphics(false);
 
     if( m_aTitle.Len() )
         SetTitle( m_aTitle );
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index 32620d9e966a..ef4f13301ecd 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -73,7 +73,6 @@ HXXDEPNLST= $(INC)$/vcl$/accel.hxx       \
             $(INC)$/vcl$/fixed.hxx       \
             $(INC)$/vcl$/floatwin.hxx    \
             $(INC)$/vcl$/font.hxx        \
-            $(INC)$/vcl$/fontcvt.hxx     \
             $(INC)$/vcl$/floatwin.hxx    \
             $(INC)$/vcl$/graph.hxx       \
             $(INC)$/vcl$/group.hxx       \
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 2b5ac6d3162d..68177795c8db 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -55,6 +55,7 @@
 #include <vcl/salimestatus.hxx>
 #include <vcl/timer.hxx>
 #include <wincomp.hxx>  // CS_DROPSHADOW
+#include <tools/solarmutex.hxx>
 
 #ifndef min
 #define min(a,b)    (((a) < (b)) ? (a) : (b))
@@ -661,12 +662,14 @@ WinSalInstance::WinSalInstance()
     mpSalWaitMutex           = new vos::OMutex;
     mnYieldWaitCount         = 0;
     mpSalYieldMutex->acquire();
+    ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
 }
 
 // -----------------------------------------------------------------------
 
 WinSalInstance::~WinSalInstance()
 {
+    ::tools::SolarMutex::SetSolarMutex( 0 );
     mpSalYieldMutex->release();
     delete mpSalYieldMutex;
     delete mpSalWaitMutex;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 53f822a1e409..fc92757e0925 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <comphelper/processfactory.hxx>
+#include <unotools/misccfg.hxx>
 
 #include <string.h>
 #include <limits.h>
@@ -3095,7 +3096,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
                 if ( (nValue > 1000) && (nValue < 10000) )
                 {
                     MiscSettings aMiscSettings = rSettings.GetMiscSettings();
-                    aMiscSettings.SetTwoDigitYearStart( (USHORT)(nValue-99) );
+                    utl::MiscCfg().SetYear2000( (sal_Int32)(nValue-99) );
                     rSettings.SetMiscSettings( aMiscSettings );
                 }
             }
diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk
index 375476c9c4af..2cd9dcabf182 100644
--- a/wizards/com/sun/star/wizards/agenda/makefile.mk
+++ b/wizards/com/sun/star/wizards/agenda/makefile.mk
@@ -42,7 +42,6 @@ PACKAGE = com$/sun$/star$/wizards$/agenda
 JARFILES= unoil.jar \
     jurt.jar \
     ridl.jar \
-    sandbox.jar \
     juh.jar \
     java_uno.jar \
     java_uno_accessbridge \
@@ -73,4 +72,4 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
 # --- Targets ------------------------------------------------------
 
-.INCLUDE :  target.mk
\ No newline at end of file
+.INCLUDE :  target.mk
diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk
index 66e56132d6ab..0e1b9e17be63 100644
--- a/wizards/com/sun/star/wizards/fax/makefile.mk
+++ b/wizards/com/sun/star/wizards/fax/makefile.mk
@@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/fax
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
 
 CUSTOMMANIFESTFILE= MANIFEST.MF
 
diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk
index 1853e0844fe8..2237ac207759 100644
--- a/wizards/com/sun/star/wizards/form/makefile.mk
+++ b/wizards/com/sun/star/wizards/form/makefile.mk
@@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/form
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
 
 JARCLASSDIRS	= com$/sun$/star$/wizards$/form
diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk
index f7cfcfe5c160..d845f6456efb 100644
--- a/wizards/com/sun/star/wizards/table/makefile.mk
+++ b/wizards/com/sun/star/wizards/table/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/table
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
 
 JARCLASSDIRS	= com$/sun$/star$/wizards$/table
diff --git a/writerfilter/qa/cppunittests/doctok/makefile.mk b/writerfilter/qa/cppunittests/doctok/makefile.mk
index ca8d3e01a7c4..d9a704320185 100644
--- a/writerfilter/qa/cppunittests/doctok/makefile.mk
+++ b/writerfilter/qa/cppunittests/doctok/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:doctok by codegen.pl 
+# auto generated Target:doctok by codegen.pl
 SHL1OBJS=  \
        $(SLO)$/testdoctok.obj
 
@@ -53,6 +53,7 @@ SHL1STDLIBS=\
     $(UCBHELPERLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
+     $(TESTSHL2LIB)    \
    $(CPPUNITLIB)
 
 SHL1LIBS=\
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 70d25ab21a80..0ed8035fb1d3 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -1,6 +1,6 @@
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <osl/process.h>
 #include <ucbhelper/contentbroker.hxx>
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk
index b9e50e93919f..9833df5e009b 100644
--- a/writerfilter/qa/cppunittests/odiapi/makefile.mk
+++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     #CFLAGS+=/Ob1
@@ -52,14 +52,14 @@ SHL1OBJS=\
     $(SLO)$/testCore.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
-   
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(TESTSHL2LIB) $(CPPUNITLIB)
+
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=   $(LB)$/iodiapi.lib
 .ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"!="aqua"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"=="aqua"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.dylib
+SHL1STDLIBS+=$(LB)$/libodiapi.dylib
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/odiapi/testCore.cxx b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
index cbdc47e5d872..295f3895df5f 100644
--- a/writerfilter/qa/cppunittests/odiapi/testCore.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/core/Node.hxx>
 #include <odiapi/props/Properties.hxx>
 
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index b2a633f9b70f..c1ef49a4941c 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/props/Properties.hxx>
 #include "FileLoggerImpl.hxx"
 #include "ExternalViewLogger.hxx"
diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk
index d8a5916d107a..555c633b2cd6 100644
--- a/writerfilter/qa/cppunittests/qname/makefile.mk
+++ b/writerfilter/qa/cppunittests/qname/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,24 +42,24 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     CFLAGS+=/Ob1
 .ENDIF
 
 SHL1OBJS=\
-    $(SLO)$/testQName.obj 
+    $(SLO)$/testQName.obj
 
 SHL1TARGET=$(TARGET)
 
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=   $(LB)$/iodiapi.lib
 .ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/qname/testQName.cxx b/writerfilter/qa/cppunittests/qname/testQName.cxx
index b244015cf575..c66cc15de863 100644
--- a/writerfilter/qa/cppunittests/qname/testQName.cxx
+++ b/writerfilter/qa/cppunittests/qname/testQName.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/qname/QName.hxx>
 #include <stdio.h>
 #include <rtl/string.hxx>
diff --git a/writerfilter/qa/cppunittests/sl/makefile.mk b/writerfilter/qa/cppunittests/sl/makefile.mk
index d9d9abd0d50c..6efe7c63da97 100644
--- a/writerfilter/qa/cppunittests/sl/makefile.mk
+++ b/writerfilter/qa/cppunittests/sl/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,21 +42,21 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 SHL1OBJS=\
     $(SLO)$/testOD_SL.obj \
     $(SLO)$/FileLoggerImpl.obj\
-    $(SLO)$/ExternalViewLogger.obj	
+    $(SLO)$/ExternalViewLogger.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
-   
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=$(LB)$/iodiapi.lib
 .ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
index 13f95f94eae6..f0ba1898783e 100644
--- a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
+++ b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/xxml/XXmlReader.hxx>
 #include <odiapi/props/Properties.hxx>
 #include <odiapi/sl/od_sl.hxx>
@@ -90,4 +90,4 @@ public:
 // register test suites
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestXXML, "TestXXML");
 
-NOADDITIONAL;
\ No newline at end of file
+NOADDITIONAL;
diff --git a/writerfilter/qa/cppunittests/xxml/makefile.mk b/writerfilter/qa/cppunittests/xxml/makefile.mk
index 0cd8c1e57067..0af305b4313f 100644
--- a/writerfilter/qa/cppunittests/xxml/makefile.mk
+++ b/writerfilter/qa/cppunittests/xxml/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,23 +42,23 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     CFLAGS+=/Ob1
 .ENDIF
 
 SHL1OBJS=\
-    $(SLO)$/testXXML.obj 
+    $(SLO)$/testXXML.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
-   
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=$(LB)$/iodiapi.lib
 .ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/xxml/testXXML.cxx b/writerfilter/qa/cppunittests/xxml/testXXML.cxx
index 7a29c1b15882..2c132e38b585 100644
--- a/writerfilter/qa/cppunittests/xxml/testXXML.cxx
+++ b/writerfilter/qa/cppunittests/xxml/testXXML.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/xxml/XXmlReader.hxx>
 #include <osl/time.h>
 
@@ -157,4 +157,4 @@ public:
 // register test suites
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestXXML, "TestXXML");
 
-NOADDITIONAL;
\ No newline at end of file
+NOADDITIONAL;
diff --git a/xmerge/java/build.xml b/xmerge/java/build.xml
index 59ff9625324e..6f8d2f799c45 100644
--- a/xmerge/java/build.xml
+++ b/xmerge/java/build.xml
@@ -63,7 +63,6 @@
         <pathelement location="${solar.jar}/jurt.jar"/>
         <pathelement location="${solar.jar}/unoil.jar"/>
         <pathelement location="${solar.jar}/ridl.jar"/>
-        <pathelement location="${solar.jar}/sandbox.jar"/>
         <pathelement location="${solar.jar}/juh.jar"/>
         <pathelement location="${solar.jar}/jmc.jar"/>
     </path>
diff --git a/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk b/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk
index b2c709523a97..6b695eced864 100644
--- a/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk
+++ b/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk
@@ -37,7 +37,7 @@ TARGET  =DBFilter
 CLASSDIR!:=$(CLASSDIR)$/$(TARGET)  
 #USE_UDK_EXTENDED_MANIFESTFILE=TRUE
 #USE_EXTENDED_MANIFESTFILE=TRUE
-JARFILES 		= sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar 
+JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar 
 JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 CUSTOMMANIFESTFILE = Manifest  
 #JARMANIFEST = Manifest
diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile
index 96ce07d2d032..7f4d624235f8 100755
--- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile
+++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile
@@ -72,7 +72,6 @@ DK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
 		$(CLASSES_DIR)$(PS)jurt.jar\
 		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\
 		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\
 		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
 		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
         $(PATH_SEPARATOR)$(CLASSPATH) \
diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk
index 58563ba29302..bd0afda3bbcc 100755
--- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk
+++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk
@@ -36,7 +36,7 @@ TARGET  = examples_java_converterbridge
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
 
-JARFILES 		= sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar ridl.jar
+JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar ridl.jar
 JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 JARCOMPRESS 	= TRUE
 CUSTOMMANIFESTFILE = manifest
diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile
index e5055361d80a..63ec8b5b2d77 100644
--- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile
+++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile
@@ -34,7 +34,6 @@ $(COMPONENT_NAME)_CLASSFILES = *.class
 SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
 		$(PATH_SEPARATOR)$(OUT_COMP_CLASS))
 
diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk b/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk
index d59f398511de..288679bc667b 100644
--- a/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk
+++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk
@@ -38,7 +38,6 @@ $(COMPONENT_NAME)_CLASSFILES = *.class
 SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/xmerge.jar\
 		$(PATH_SEPARATOR)$(OUT_COMP_CLASS))
diff --git a/xml2cmp/source/xcd/xmlelem.cxx b/xml2cmp/source/xcd/xmlelem.cxx
index 4b642e1d30cc..aa80459ccead 100644
--- a/xml2cmp/source/xcd/xmlelem.cxx
+++ b/xml2cmp/source/xcd/xmlelem.cxx
@@ -36,15 +36,6 @@
 #include <parse.hxx>
 #include <cr_html.hxx>
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
-
-
-
 XmlElement::XmlElement( const char * i_sName )
     : sName(i_sName)
 {
@@ -160,7 +151,6 @@ ListElement::Write2Html( HtmlCreator & io_rHC ) const
 XmlElement *
 ListElement::Create_and_Add_NewElement()
 {
-    assert(fCreateNewElement != 0);
     XmlElement * pNew = (*fCreateNewElement)(Name());
     Children().push_back( pNew );
     return pNew;
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index 3f468f593a1a..6fd64bb01730 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,4 +1,4 @@
-xh	xmlhelp	:	ucbhelper transex3 LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene unotools javaunohelper NULL
+xh      xmlhelp :       comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper transex3 NULL
 xh	xmlhelp									usr1	-	all	xh_mkout NULL
 xh	xmlhelp\inc								nmake	-	all	xh_inc NULL
 xh	xmlhelp\source\treeview					nmake	-	all	xh_treeview xh_inc NULL
diff --git a/xmlhelp/source/com/sun/star/help/MANIFEST.MF b/xmlhelp/source/com/sun/star/help/MANIFEST.MF
index bf0e4ab46cb2..a4c5d50fde5c 100644
--- a/xmlhelp/source/com/sun/star/help/MANIFEST.MF
+++ b/xmlhelp/source/com/sun/star/help/MANIFEST.MF
@@ -1,2 +1 @@
 RegistrationClassName: com.sun.star.help.HelpComponent
-Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index db6e619b31e3..eab2a6a08a4d 100644
--- a/xmlhelp/source/com/sun/star/help/makefile.mk
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk
@@ -36,6 +36,7 @@ LIBBASENAME = helplinker
 PACKAGE = com$/sun$/star$/help
 TARGETTYPE=CUI
 
+.IF "$(SOLAR_JAVA)"!=""
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
@@ -76,14 +77,15 @@ ADDFILES = $(subst,$(SOLARBINDIR)$/help,$(CLASSDIR) $(TRANSEX3FILES))
 JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar 
 .IF "$(SYSTEM_LUCENE)" == "YES"
 XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-COMP=fix_system_lucene
+JARCLASSPATH = file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)
 .ELSE
 JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
+JARCLASSPATH = lucene-core-2.3.jar lucene-analyzers-2.3.jar
 .ENDIF
   
 JARTARGET	   	   = LuceneHelpWrapper.jar
 JARCOMPRESS        = TRUE 
-CUSTOMMANIFESTFILE = MANIFEST.MF 
+CUSTOMMANIFESTFILE = MANIFEST.MF
  
 # --- Targets ------------------------------------------------------
 
@@ -94,15 +96,17 @@ ALLTAR : $(ADDFILES)
 .IF "$(JARTARGETN)"!=""
 $(JAVATARGET) : $(ADDFILES)
 $(JARTARGETN) : $(ADDFILES)
-$(JARTARGETN) : $(COMP)
 .ENDIF
 
 $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class 
     $(MKDIRHIER) $(@:d)	
     $(COPY) $< $@
 
-
 fix_system_lucene:
     @echo "Fix Java Class-Path entry for Lucene libraries from system."
     @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
     -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
+.ELSE
+all:
+        @echo java disabled
+.ENDIF
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 1de0bc80ee73..467dd1539fed 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -40,7 +40,6 @@
 #include <rtl/memory.h>
 #include <com/sun/star/lang/Locale.hpp>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/miscopt.hxx>
 #include "inputstream.hxx"
 #include <algorithm>
 #include <string.h>
@@ -52,6 +51,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
@@ -149,7 +149,6 @@ struct ImplPackageSequenceHolder
 
 static ImplPackageSequenceHolder* GpPackageSequenceHolder = NULL;
 
-
 Databases::Databases( sal_Bool showBasic,
                       const rtl::OUString& instPath,
                       const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths,
@@ -200,7 +199,6 @@ Databases::Databases( sal_Bool showBasic,
     m_xSFA = Reference< ucb::XSimpleFileAccess >(
         m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
         m_xContext ), UNO_QUERY_THROW );
-
     GpPackageSequenceHolder = new ImplPackageSequenceHolder();
 }
 
@@ -281,42 +279,71 @@ static bool impl_getZipFile(
 
 rtl::OString Databases::getImagesZipFileURL()
 {
-    sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
-    if ( !m_aImagesZipFileURL.getLength() || ( m_nSymbolsStyle != nSymbolsStyle ) )
+    //sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
+    sal_Int16 nSymbolsStyle = 0;
+    try
     {
-        m_nSymbolsStyle = nSymbolsStyle;
-
-        rtl::OUString aImageZip;
-        rtl::OUString aSymbolsStyleName = SvtMiscOptions().GetCurrentSymbolsStyleName();
-        bool bFound = false;
+        uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
+            m_xSMgr ->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"), m_xContext), uno::UNO_QUERY_THROW);
+
+        // set root path
+        uno::Sequence < uno::Any > lParams(1);
+        beans::PropertyValue                       aParam ;
+        aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
+        aParam.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Office.Common");
+        lParams[0] = uno::makeAny(aParam);
+
+        // open it
+        uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
+                    ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                    lParams) );
+
+        bool bChanged = false;
+        uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW);
+        uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString::createFromAscii("Misc/SymbolSet"));
+        if ( (aResult >>= nSymbolsStyle) && m_nSymbolsStyle != nSymbolsStyle )
+        {
+            m_nSymbolsStyle = nSymbolsStyle;
+            bChanged = true;
+        }
 
-        if ( aSymbolsStyleName.getLength() != 0 )
+        if ( !m_aImagesZipFileURL.getLength() || bChanged )
         {
-            rtl::OUString aZipName = rtl::OUString::createFromAscii( "images_" );
-            aZipName += aSymbolsStyleName;
-            aZipName += rtl::OUString::createFromAscii( ".zip" );
+            rtl::OUString aImageZip, aSymbolsStyleName;
+            aResult = xAccess->getByHierarchicalName(::rtl::OUString::createFromAscii("Misc/SymbolStyle"));
+            aResult >>= aSymbolsStyleName;
 
-            bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
-        }
+            bool bFound = false;
+            if ( aSymbolsStyleName.getLength() != 0 )
+            {
+                rtl::OUString aZipName = rtl::OUString::createFromAscii( "images_" );
+                aZipName += aSymbolsStyleName;
+                aZipName += rtl::OUString::createFromAscii( ".zip" );
 
-        if ( ! bFound )
-            bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString::createFromAscii( "images.zip" ), aImageZip );
+                bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
+            }
 
-        if ( ! bFound )
-            aImageZip = rtl::OUString();
+            if ( ! bFound )
+                bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString::createFromAscii( "images.zip" ), aImageZip );
 
-        m_aImagesZipFileURL = rtl::OUStringToOString(
-                    rtl::Uri::encode(
-                        aImageZip,
-                        rtl_UriCharClassPchar,
-                        rtl_UriEncodeIgnoreEscapes,
-                        RTL_TEXTENCODING_UTF8 ), RTL_TEXTENCODING_UTF8 );
+            if ( ! bFound )
+                aImageZip = rtl::OUString();
+
+            m_aImagesZipFileURL = rtl::OUStringToOString(
+                        rtl::Uri::encode(
+                            aImageZip,
+                            rtl_UriCharClassPchar,
+                            rtl_UriEncodeIgnoreEscapes,
+                            RTL_TEXTENCODING_UTF8 ), RTL_TEXTENCODING_UTF8 );
+        }
+    }
+    catch ( NoSuchElementException const & )
+    {
     }
 
     return m_aImagesZipFileURL;
 }
 
-
 void Databases::replaceName( rtl::OUString& oustring ) const
 {
     sal_Int32 idx = -1,idx1 = -1,idx2 = -1,k = 0,off;
@@ -818,10 +845,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
 
     for( sal_uInt32 i = 0; i < id.size(); ++i )
     {
-        // the following object must live longer than the
-        // pointer returned by aDBData.getData()
-        DBData aDBData;
-
         listId[i] = id[i];
         listAnchor[i] = anchor[i];
 
@@ -833,6 +856,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
             DBHelp* pDBHelp = pDb->getDBHelp();
             if( pDBHelp != NULL )
             {
+                DBData aDBData;
                 bool bSuccess = pDBHelp->getValueForKey( idi, aDBData );
                 if( bSuccess )
                 {
@@ -1629,14 +1653,14 @@ rtl::OUString ExtensionIteratorBase::implGetFileFromPackage(
             ::std::vector< ::rtl::OUString > av;
             implGetLanguageVectorFromPackage( av, xPackage );
             ::std::vector< ::rtl::OUString >::const_iterator pFound = av.end();
-            try

-            {

-                pFound = ::comphelper::Locale::getFallback( av, m_aLanguage );

-            }

+            try
+            {
+                pFound = ::comphelper::Locale::getFallback( av, m_aLanguage );
+            }
             catch( ::comphelper::Locale::MalFormedLocaleException& )
             {}
-            if( pFound != av.end() )

-                aLanguage = *pFound;

+            if( pFound != av.end() )
+                aLanguage = *pFound;
         }
     }
     return aFile;
@@ -1653,7 +1677,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
 {
     rv.clear();
     rtl::OUString aExtensionPath = xPackage->getURL();
-    Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );

+    Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
 
     const rtl::OUString* pSeq = aEntrySeq.getConstArray();
     sal_Int32 nCount = aEntrySeq.getLength();
@@ -1677,7 +1701,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
                     rv.push_back( aPureEntry );
             }
         }
-    }

+    }
 }
 
 
@@ -1748,15 +1772,15 @@ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xP
         ::std::vector< ::rtl::OUString > av;
         implGetLanguageVectorFromPackage( av, xPackage );
         ::std::vector< ::rtl::OUString >::const_iterator pFound = av.end();
-        try

-        {

-            pFound = ::comphelper::Locale::getFallback( av, m_aLanguage );

-        }

+        try
+        {
+            pFound = ::comphelper::Locale::getFallback( av, m_aLanguage );
+        }
         catch( ::comphelper::Locale::MalFormedLocaleException& )
         {}
-        if( pFound != av.end() )

+        if( pFound != av.end() )
         {
-            aUsedLanguage = *pFound;

+            aUsedLanguage = *pFound;
             pRetDb = m_rDatabases.getBerkeley( aHelpFilesBaseName, aUsedLanguage, m_bHelpText, &aExtensionPath );
         }
     }
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index da5c4db374c1..9718d17c3844 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -55,7 +55,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <rtl/bootstrap.hxx>
-#include <unotools/configmgr.hxx>
 
 #include "databases.hxx"
 #include "provider.hxx"
@@ -324,11 +323,32 @@ void ContentProvider::init()
     rtl::OUString setupversion(
         getKey( xHierAccess,"Product/ooSetupVersion" ) );
     rtl::OUString setupextension;
-    utl::ConfigManager * mgr = utl::ConfigManager::GetConfigManager();
-    if (mgr != NULL) {
-        mgr->GetDirectConfigProperty(utl::ConfigManager::PRODUCTEXTENSION) >>=
-            setupextension;
+
+    try
+    {
+        uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
+              m_xSMgr ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
+
+        uno::Sequence < uno::Any > lParams(1);
+        beans::PropertyValue                       aParam ;
+        aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
+        aParam.Value <<= ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Product");
+        lParams[0] = uno::makeAny(aParam);
+
+        // open it
+        uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
+                    ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                    lParams) );
+
+        uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
+        uno::Any aRet = xDirectAccess->getByName(::rtl::OUString::createFromAscii("ooSetupExtension"));
+
+        aRet >>= setupextension;
     }
+    catch ( uno::Exception& )
+    {
+    }
+
     rtl::OUString productversion(
         setupversion +
         rtl::OUString::createFromAscii( " " ) +
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index c8685645c6fd..b9521c85dc89 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -1015,7 +1015,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
         ::rtl::OUString aExtensionPath;
         rtl::OUString aJar = urlParam->get_jar();
 
-        bool bAddExtensionPath = false;

+        bool bAddExtensionPath = false;
         sal_Int32 nQuestionMark1 = aJar.indexOf( sal_Unicode('?') );
         sal_Int32 nQuestionMark2 = aJar.lastIndexOf( sal_Unicode('?') );
         if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 )
diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
index 8334f233a0ef..4541a1745b53 100644
--- a/xmlhelp/source/treeview/makefile.mk
+++ b/xmlhelp/source/treeview/makefile.mk
@@ -61,8 +61,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(COMPHELPERLIB)         \
     $(EXPATASCII3RDLIB)      \
-    $(SALLIB)  \
-    $(UNOTOOLSLIB)
+    $(SALLIB)  
 SHL1VERSIONMAP=	$(TARGET).map
 
 DEF1NAME=$(SHL1TARGET)
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 62ec993e485d..a35b494c5742 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -38,13 +38,8 @@
 #include <vos/diagnose.hxx>
 #endif
 #include "tvread.hxx"
-#ifdef SYSTEM_EXPAT
 #include <expat.h>
-#else
-#include <expat/xmlparse.h>
-#endif
 #include <osl/file.hxx>
-#include <unotools/configmgr.hxx>
 #include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
@@ -708,11 +703,32 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     rtl::OUString productName( getKey(  xHierAccess,"Product/ooName" ) );
     setupversion = getKey(  xHierAccess,"Product/ooSetupVersion" );
     setupextension = rtl::OUString();
-    utl::ConfigManager * mgr = utl::ConfigManager::GetConfigManager();
-    if (mgr != NULL) {
-        mgr->GetDirectConfigProperty(utl::ConfigManager::PRODUCTEXTENSION) >>=
-            setupextension;
+
+    try
+    {
+        uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
+              xSMgr ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
+
+        uno::Sequence < uno::Any > lParams(1);
+        beans::PropertyValue                       aParam ;
+        aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
+        aParam.Value <<= ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Product");
+        lParams[0] = uno::makeAny(aParam);
+
+        // open it
+        uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
+                    ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                    lParams) );
+
+        uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
+        uno::Any aRet = xDirectAccess->getByName(::rtl::OUString::createFromAscii("ooSetupExtension"));
+
+        aRet >>= setupextension;
     }
+    catch ( uno::Exception& )
+    {
+    }
+
     rtl::OUString productVersion( setupversion +
                                   rtl::OUString::createFromAscii( " " ) +
                                   setupextension );
@@ -1129,7 +1145,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
 {
     rv.clear();
     rtl::OUString aExtensionPath = xPackage->getURL();
-    Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );

+    Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
 
     const rtl::OUString* pSeq = aEntrySeq.getConstArray();
     sal_Int32 nCount = aEntrySeq.getLength();
@@ -1153,7 +1169,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
                     rv.push_back( aPureEntry );
             }
         }
-    }

+    }
 }
 
 
@@ -1269,14 +1285,14 @@ rtl::OUString TreeFileIterator::implGetTreeFileFromPackage
             ::std::vector< ::rtl::OUString > av;
             implGetLanguageVectorFromPackage( av, xPackage );
             ::std::vector< ::rtl::OUString >::const_iterator pFound = av.end();
-            try

-            {

-                pFound = ::comphelper::Locale::getFallback( av, m_aLanguage );

-            }

+            try
+            {
+                pFound = ::comphelper::Locale::getFallback( av, m_aLanguage );
+            }
             catch( ::comphelper::Locale::MalFormedLocaleException& )
             {}
-            if( pFound != av.end() )

-                aLanguage = *pFound;

+            if( pFound != av.end() )
+                aLanguage = *pFound;
         }
     }
 
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index 8b2a95171345..a16e7958d796 100644
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/util/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -64,10 +64,8 @@ SHL1STDLIBS=                     \
     $(SALLIB)                \
     $(EXPATASCII3RDLIB)      \
     $(UCBHELPERLIB)          \
-    $(SVTOOLLIB)             	 \
-    $(BERKELEYLIB)		 	 \
-    $(XSLTLIB) \
-    $(UNOTOOLSLIB)
+        $(BERKELEYLIB)           \
+        $(XSLTLIB)
 
 SHL1LIBS =                       \
     $(SLB)$/jaqe.lib         \
diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/VisAreaContext.hxx
index ddfff6716772..7a99c4240395 100644
--- a/xmloff/inc/VisAreaContext.hxx
+++ b/xmloff/inc/VisAreaContext.hxx
@@ -32,7 +32,7 @@
 #define _XMLOFF_VISAREACONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 
 class Rectangle;
 
diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/VisAreaExport.hxx
index e49b09801257..e2ce09472607 100644
--- a/xmloff/inc/VisAreaExport.hxx
+++ b/xmloff/inc/VisAreaExport.hxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_VISAREAEXPORT_HXX
 #define _XMLOFF_VISAREAEXPORT_HXX
 
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <sal/types.h>
 
 class SvXMLExport;
diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index f8f890e9050f..06c27d0a7103 100644
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
@@ -436,15 +436,15 @@
 
 #include "sot/clsids.hxx"
 
-#include "svtools/cntnrsrt.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/nfsymbol.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svstdarr.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/cntnrsrt.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/nfsymbol.hxx"
+#include "svl/numuno.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "svl/urihelper.hxx"
 
 
 #include "tools/bigint.hxx"
@@ -469,9 +469,9 @@
 #include "unotools/processfactory.hxx"
 #include "unotools/streamwrap.hxx"
 
-#include "vcl/fldunit.hxx"
-#include "vcl/fontcvt.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/fldunit.hxx"
+#include "unotools/fontcvt.hxx"
+#include "tools/mapunit.hxx"
 
 #include "vos/mutex.hxx"
 #include "vos/ref.hxx"
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b361081a7ce2..96e7e7fee238 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -745,6 +745,11 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext
 {
     rtl::OUString aName;
     const ::rtl::OUString sPropertyName;
+    const ::rtl::OUString sPropertyNumberFormat;
+    const ::rtl::OUString sPropertyIsFixedLanguage;
+    sal_Int32   nFormat;
+    sal_Bool    bFormatOK;
+    sal_Bool    bIsDefaultLanguage;
 
 public:
 
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 10b89e6291b3..39529a04c88d 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/drawing/FlagSequenceSequence.hpp>
 #include <com/sun/star/drawing/FlagSequence.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vector>
 
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx
index 93777391b9bc..0da5b64369a9 100644
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmlcnitm.hxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_XMLCNITM_HXX
 #define _XMLOFF_XMLCNITM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvXMLNamespaceMap;
 namespace rtl { class OUString; }
diff --git a/xmloff/inc/xmlehelp.hxx b/xmloff/inc/xmlehelp.hxx
index d5ffaafed3dc..bdf0fad3be3e 100644
--- a/xmloff/inc/xmlehelp.hxx
+++ b/xmloff/inc/xmlehelp.hxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_XMLEHELP_HXX
 #define _XMLOFF_XMLEHELP_HXX
 
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 
 namespace rtl { class OUStringBuffer; }
 
diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx
index 7908b575ec36..383f35059ee9 100644
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx
@@ -52,7 +52,7 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper
             // #96469#; if the value goes over the Range the progressbar starts again
             sal_Bool                                                                        bRepeat;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             sal_Bool                                                                        bFailure;
 #endif
 public:
diff --git a/xmloff/inc/xmloff/maptype.hxx b/xmloff/inc/xmloff/maptype.hxx
index ba85669d8be2..69d94145d6fc 100644
--- a/xmloff/inc/xmloff/maptype.hxx
+++ b/xmloff/inc/xmloff/maptype.hxx
@@ -34,7 +34,7 @@
 #include <tools/solar.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 ///////////////////////////////////////////////////////////////////////////
 //
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx
index e18547c62688..a11b24857b46 100644
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/xmloff/inc/xmloff/styleexp.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/Reference.h>
 
 #ifndef _VCL_MAPUNIT_HXX
-//#include <vcl/mapunit.hxx>
+//#include <tools/mapunit.hxx>
 #endif
 #include <xmloff/uniref.hxx>
 
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index d964e73a3fed..d0b6ab4d7a63 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -35,11 +35,11 @@
 #include "xmloff/dllapi.h"
 #include "sal/types.h"
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <xmloff/nmspmap.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 namespace rtl { class OUString; }
 
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index b4d388957f0f..2133a108da78 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <rtl/ustring.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <xmloff/txtparae.hxx>
 #include <xmloff/formlayerexport.hxx>
 #include <xmloff/xmlnumfe.hxx>
@@ -68,7 +68,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <xmloff/XMLPageExport.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
@@ -87,7 +87,7 @@ class XMLImageMapExport;
 class XMLErrors;
 
 // --> OD 2006-03-14 #i51726#
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 // <--
 
 namespace rtl { class OUString; }
@@ -380,7 +380,7 @@ public:
         = ::rtl::OUString::createFromAscii("gen") );
 
     // Check if common attribute list is empty.
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     void CheckAttrList() {}
 #else
     void CheckAttrList();
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index 498ad92813fe..7543cddb0bce 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.hxx
@@ -32,7 +32,7 @@
 #define _XMLOFF_XMLNUME_HXX
 
 #include <rtl/ustring.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <xmloff/XMLStringVector.hxx>
 #include <xmloff/attrlist.hxx>
 
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index f71741f8a51b..607a0771e291 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -38,7 +38,7 @@
 #include <limits.h>
 #include <tools/solar.h>
 #include <tools/color.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/util/Date.hpp>
diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst
index 9396ccdb8f54..8817d4590715 100644
--- a/xmloff/prj/build.lst
+++ b/xmloff/prj/build.lst
@@ -1,4 +1,4 @@
-xo	xmloff	:	offapi goodies comphelper NULL
+xo	xmloff	:	offapi svl vos NULL
 xo	xmloff									usr1	-	all	xo_mkout NULL
 xo	xmloff\prj								get		-	all	xo_prj NULL
 xo	xmloff\inc								nmake	-	all	xo_inc NULL
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
index 273e9db4e364..cc67c4ac75fa 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "XMLErrorBarStylePropertyHdl.hxx"
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index dc35627a8ea2..68df76642196 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -56,7 +56,7 @@ ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::
 , fOldPercent(0.0)
 , bStrict(bTempStrict)
 , bRepeat(sal_True)
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 , bFailure(sal_False)
 #endif
 {
@@ -130,7 +130,7 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
 //              fOldPercent = fPercent;
 //          }
         }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         else if (!bFailure)
         {
             DBG_ERROR("tried to set a wrong value on the progressbar");
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 130fc7be832f..75c189ce68b3 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -37,13 +37,6 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
-
 #include <xmloff/attrlist.hxx>
 
 using ::rtl::OUString;
@@ -183,7 +176,7 @@ void SvXMLAttributeList::Clear()
 {
     m_pImpl->vecAttribute.clear();
 
-    assert( ! getLength() );
+    OSL_ASSERT( ! getLength() );
 }
 
 void SvXMLAttributeList::RemoveAttribute( const OUString sName )
@@ -207,7 +200,7 @@ void SvXMLAttributeList::SetAttributeList( const uno::Reference< ::com::sun::sta
 
 void SvXMLAttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList >  &r )
 {
-    assert( r.is() );
+    OSL_ASSERT( r.is() );
 
     sal_Int16 nMax = r->getLength();
     SvXMLAttributeList_Impl::size_type nTotalSize =
@@ -220,7 +213,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< ::com::sun::
             r->getValueByIndex( i )));
     }
 
-    assert( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength());
+    OSL_ASSERT( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength());
 }
 
 void SvXMLAttributeList::SetValueByIndex( sal_Int16 i,
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index e5ef3c394aea..0f8f49d83ece 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_xmloff.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "i18nmap.hxx"
 
 using namespace rtl;
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx
index 9aed5000913d..12397a621bc0 100644
--- a/xmloff/source/core/xmlehelp.cxx
+++ b/xmloff/source/core/xmlehelp.cxx
@@ -34,7 +34,6 @@
 #include <tools/debug.hxx>
 #include <tools/bigint.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <vcl/outdev.hxx>
 #include "xmlehelp.hxx"
 
 #ifndef _XMLOFF_XMTOKEN_HXX
@@ -228,82 +227,6 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
 
     if( eUnit != XML_TOKEN_INVALID )
         rOut.append( GetXMLToken(eUnit) );
-#if 0
-    enum XMLTokenEnum eUnit;
-    sal_Int32 nFac = 1;
-    switch( eOutUnit )
-    {
-    case MAP_100TH_MM:
-        nFac *= 10L;
-    case MAP_10TH_MM:
-        nFac *= 10L;
-        eOutUnit = MAP_MM;
-    case MAP_MM:
-        // 0.01mm
-        nFac *= 100L;
-        eUnit = XML_UNIT_MM;
-        break;
-
-    case MAP_CM:
-#ifdef EXACT_VALUES
-        // 0.001cm
-        nFac *= 1000L;
-#else
-        // 0.01cm
-        nFac *= 100L;
-#endif
-        eUnit = XML_UNIT_CM;
-        break;
-
-    case MAP_TWIP:
-    case MAP_POINT:
-#ifdef EXACT_VALUES
-        // 0.01pt
-        nFac *= 100L;
-#else
-        // 0.1pt
-        nFac *= 10L;
-#endif
-        eUnit = XML_UNIT_PT;
-        break;
-
-    case MAP_1000TH_INCH:
-        nFac *= 10L;
-    case MAP_100TH_INCH:
-        nFac *= 10L;
-    case MAP_10TH_INCH:
-        nFac *= 10L;
-    case MAP_INCH:
-    default:
-        eOutUnit = MAP_INCH;
-#ifdef EXACT_VALUES
-        // 0.0001in
-        nFac *= 10000L;
-#else
-        // 0.01in
-        nFac *= 100L;
-#endif
-        eUnit = XML_UNIT_INCH;
-        break;
-    }
-
-    if( eValueUnit != eOutUnit )
-        nValue = OutputDevice::LogicToLogic( nValue, eValueUnit, eOutUnit );
-
-    rOut.append( nValue / nFac );
-    if( nFac > 1 && (nValue % nFac) != 0 )
-    {
-        rOut.append( sal_Unicode('.') );
-        while( nFac > 1 && (nValue % nFac) != 0 )
-        {
-            nFac /= 10L;
-            rOut.append( (nValue / nFac) % 10L );
-        }
-    }
-
-    rOut.append( GetXMLToken(eUnit) );
-#endif
-
 }
 
 void SvXMLExportHelper::AddPercentage( sal_Int32 nValue, OUStringBuffer& rOut )
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 5e3173c16597..9331ff228ed1 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -126,7 +126,7 @@ void XMLErrors::AddRecord(
     aErrors.push_back( ErrorRecord( nId, rParams, rExceptionMessage,
                                     nRow, nColumn, rPublicId, rSystemId ) );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
     // give detailed assertion on this message
 
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 55af99802f9d..2028ad26db25 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -86,7 +86,7 @@
 #include <comphelper/extract.hxx>
 #include "PropertySetMerger.hxx"
 
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include "xformsexport.hxx"
 
 #include <unotools/docinfohelper.hxx>
@@ -1055,7 +1055,7 @@ void SvXMLExport::ClearAttrList()
     mpAttrList->Clear();
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 void SvXMLExport::CheckAttrList()
 {
     DBG_ASSERT( !mpAttrList->getLength(),
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0dece7c6965c..66ae95da5393 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -36,7 +36,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -69,7 +69,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 
 #include <com/sun/star/rdf/XMetadatable.hpp>
 #include <com/sun/star/rdf/XRepositorySupplier.hpp>
@@ -764,7 +764,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
 }
 
 void SAL_CALL SvXMLImport::endElement( const OUString&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 rName
 #endif
 )
@@ -778,7 +778,7 @@ rName
         SvXMLImportContext *pContext = (*mpContexts)[nCount-1];
         mpContexts->Remove( nCount-1, 1 );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         // Non product only: check if endElement call matches startELement call.
         OUString aLocalName;
         USHORT nPrefix =
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 30a791865f7b..297249e4b8c5 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 9d1218b876a9..21e03cdaf0e8 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -50,7 +50,7 @@
 #endif
 
 #include <tools/time.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 // #110680#
 //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index bcac474e97eb..3a0e01631f28 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -559,7 +559,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     const ImplXMLShapeExportInfo& aShapeInfo = aShapeInfoVector[nZIndex];
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // ---------------------------------------
     // check if this is the correct ShapesInfo
     // ---------------------------------------
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index b2e81d333fba..e09ad66dfeb9 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -55,7 +55,7 @@
 #include <xmloff/xmluconv.hxx>
 #include "XMLImageMapExport.hxx"
 #include "xexptran.hxx"
-#include <vcl/salbtype.hxx>     // FRound
+#include <tools/gen.hxx>        // FRound
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index d71162da5fd2..543910303d1c 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
+#include <tools/gen.hxx>
 
 #ifndef _XMLOFF_SHAPEEXPORT_HXX
 #include <xmloff/shapeexport.hxx>
@@ -59,12 +60,6 @@ using ::rtl::OUStringBuffer;
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-//////////////////////////////////////////////////////////////////////////////
-
-inline sal_Int32 FRound( double fVal )
-{
-    return( fVal > 0.0 ? (sal_Int32) ( fVal + 0.5 ) : -(sal_Int32) ( -fVal + 0.5 ) );
-}
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 12053fb2fbb2..d48f2430d264 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <vcl/salbtype.hxx>
+#include <tools/gen.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 35c1bafbec94..67ee2d044851 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -52,7 +52,7 @@
 #include <xmloff/xmlprcon.hxx>
 #include <xmloff/families.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include "PropertySetMerger.hxx"
 #include "sdpropls.hxx"
 #include "layerimp.hxx"
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index d3dc170e58d5..a17138654730 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -58,14 +58,13 @@
 #include <com/sun/star/awt/ImagePosition.hpp>
 /** === end UNO includes === **/
 
-#include <vcl/wintypes.hxx>     // for check states
+#include <tools/wintypes.hxx>       // for check states
 #include <xmloff/txtprmap.hxx>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
 #include <tools/urlobj.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <vcl/wintypes.hxx>     // for check states
 #include <xmloff/XMLEventExport.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index d34fe30485a5..c9e2d7321a36 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
-#include <vcl/wintypes.hxx>     // for check states
+#include <tools/wintypes.hxx>       // for check states
 #include <xmloff/xmltoken.hxx>
 
 //.........................................................................
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 1cff242fca69..9172686511bf 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -55,7 +55,7 @@
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/form/ListSourceType.hpp>
-#include <vcl/wintypes.hxx>     // for check states
+#include <tools/wintypes.hxx>       // for check states
 #include <com/sun/star/lang/Locale.hpp>
 #include <xmloff/controlpropertyhdl.hxx>
 #include "controlpropertymap.hxx"
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index d3c601cb37c2..9854f99d39e1 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -36,20 +36,6 @@
 #include <comphelper/extract.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-
-/*
-#include <vcl/vclenum.hxx>
-#include <tools/solar.h>
-
-#ifndef _INC_LIMITS
-#include <limits.h>
-#endif
-
-
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
-#endif
-*/
 #include <com/sun/star/uno/Any.hxx>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index b114d988a729..a5c662ef33a7 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include <svtools/cntnrsrt.hxx>
-#include <vcl/vclenum.hxx>
+#include <svl/cntnrsrt.hxx>
+#include <tools/fontenum.hxx>
 #include "xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 010544766e77..acfc846883e7 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 #ifndef _XMLOFF_XMLEMENT_HXX
 #include <xmloff/xmlelement.hxx>
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index d63384a71068..39507689fcc1 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -33,7 +33,7 @@
 
 #include <sal/types.h>
 #include <tools/list.hxx>
-#include <svtools/cntnrsrt.hxx>
+#include <svl/cntnrsrt.hxx>
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 55ec5ad9abc8..c75207d9e094 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <rtl/ustring.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index 6c5365b72f73..9f22f6d914ac 100644
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
@@ -36,7 +36,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 #ifndef _XMLOFF_XMLEMENT_HXX
 #include <xmloff/xmlelement.hxx>
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index f822239d3106..f03c0ac9a78b 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -33,7 +33,7 @@
 #include <tools/debug.hxx>
 #ifndef _SVSTDARR_STRINGSSORTDTOR_DECL
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
 #include "xmlnmspe.hxx"
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 61c6b2a8e183..3bddf6dd5556 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -33,7 +33,7 @@
 #include <weighhdl.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <tools/solar.h>
 
 #ifndef _INC_LIMITS
@@ -42,10 +42,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
-#endif
 #include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/awt/FontWeight.hpp>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -55,24 +53,24 @@ using namespace ::xmloff::token;
 
 struct FontWeightMapper
 {
-    FontWeight eWeight;
+    float fWeight;
     USHORT nValue;
 };
 
 FontWeightMapper const aFontWeightMap[] =
 {
-    { WEIGHT_DONTKNOW,              0 },
-    { WEIGHT_THIN,                  100 },
-    { WEIGHT_ULTRALIGHT,            150 },
-    { WEIGHT_LIGHT,                 250 },
-    { WEIGHT_SEMILIGHT,             350 },
-    { WEIGHT_NORMAL,                400 },
-    { WEIGHT_MEDIUM,                450 },
-    { WEIGHT_SEMIBOLD,              600 },
-    { WEIGHT_BOLD,                  700 },
-    { WEIGHT_ULTRABOLD,             800 },
-    { WEIGHT_BLACK,                 900 },
-    { (FontWeight)USHRT_MAX,       1000 }
+    { ::com::sun::star::awt::FontWeight::DONTKNOW,              0 },
+    { ::com::sun::star::awt::FontWeight::THIN,                  100 },
+    { ::com::sun::star::awt::FontWeight::ULTRALIGHT,            150 },
+    { ::com::sun::star::awt::FontWeight::LIGHT,                 250 },
+    { ::com::sun::star::awt::FontWeight::SEMILIGHT,             350 },
+    { ::com::sun::star::awt::FontWeight::NORMAL,                400 },
+    { ::com::sun::star::awt::FontWeight::NORMAL,                450 },
+    { ::com::sun::star::awt::FontWeight::SEMIBOLD,              600 },
+    { ::com::sun::star::awt::FontWeight::BOLD,                  700 },
+    { ::com::sun::star::awt::FontWeight::ULTRABOLD,             800 },
+    { ::com::sun::star::awt::FontWeight::BLACK,                 900 },
+    { ::com::sun::star::awt::FontWeight::DONTKNOW,             1000 }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -111,8 +109,8 @@ sal_Bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rVa
     if( bRet )
     {
         bRet = sal_False;
-
-        for( int i = 0; aFontWeightMap[i].eWeight != USHRT_MAX; i++ )
+        static int nCount = sizeof(aFontWeightMap)/sizeof(FontWeightMapper);
+        for( int i=0; i<nCount; i++ )
         {
             if( (nWeight >= aFontWeightMap[i].nValue) && (nWeight <= aFontWeightMap[i+1].nValue) )
             {
@@ -120,9 +118,9 @@ sal_Bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rVa
                 sal_uInt16 nDiff2 = aFontWeightMap[i+1].nValue - nWeight;
 
                 if( nDiff1 < nDiff2 )
-                    rValue <<= (float)( VCLUnoHelper::ConvertFontWeight( aFontWeightMap[i].eWeight ) );
+                    rValue <<= aFontWeightMap[i].fWeight;
                 else
-                    rValue <<= (float)( VCLUnoHelper::ConvertFontWeight( aFontWeightMap[i+1].eWeight ) );
+                    rValue <<= aFontWeightMap[i+1].fWeight;
 
                 bRet = sal_True;
                 break;
@@ -136,7 +134,6 @@ sal_Bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rVa
 sal_Bool XMLFontWeightPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const
 {
     sal_Bool bRet = sal_False;
-    FontWeight eWeight;
 
     float fValue = float();
     if( !( rValue >>= fValue ) )
@@ -151,15 +148,13 @@ sal_Bool XMLFontWeightPropHdl::exportXML( OUString& rStrExpValue, const Any& rVa
     else
         bRet = sal_True;
 
-    eWeight = VCLUnoHelper::ConvertFontWeight( fValue );
-
     if( bRet )
     {
         sal_uInt16 nWeight = 0;
-
-        for( int i = 0; aFontWeightMap[i].eWeight != -1; i++ )
+        static int nCount = sizeof(aFontWeightMap)/sizeof(FontWeightMapper);
+        for( int i=0; i<nCount; i++ )
         {
-            if( aFontWeightMap[i].eWeight == eWeight )
+            if( fValue <= aFontWeightMap[i].fWeight )
             {
                  nWeight = aFontWeightMap[i].nValue;
                  break;
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index cece11f6fc31..05d85e74d1a7 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -54,7 +54,7 @@
 
 #ifndef _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 using ::rtl::OUString;
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 2fd2565ef91a..7233c0f7da8f 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -58,7 +58,7 @@
 #include "XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/xmlexp.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 3b1330211024..aa5aa2315c3e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -34,10 +34,10 @@
 #define _SVSTDARR_ULONGS
 #define _ZFORLIST_DECLARE_TABLE
 
-#include <svtools/svstdarr.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svl/numuno.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
@@ -60,8 +60,8 @@
 #include <xmloff/xmlnumfi.hxx>      // SvXMLNumFmtDefaults
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svtools/nfsymbol.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/nfsymbol.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 875676bef356..89b300bd0bc0 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
-#include <svtools/zformat.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/zformat.hxx>
+#include <svl/numuno.hxx>
 #include <rtl/math.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 74e1c3dd704c..66f10e7274c6 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -33,7 +33,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -73,7 +73,7 @@
 #include <xmloff/xmlnumi.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 5e7477bedbff..17a7c0206988 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -46,8 +46,8 @@
 #endif
 #include <tools/debug.hxx>
 #include <tools/list.hxx>
-#include <svtools/cntnrsrt.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/cntnrsrt.hxx>
+#include <svl/itemset.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
@@ -283,7 +283,7 @@ class SvXMLStylesContext_Impl
     SvXMLStyleIndices_Impl  *pIndices;
     sal_Bool bAutomaticStyle;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_uInt32 nIndexCreated;
 #endif
 
@@ -317,7 +317,7 @@ SvXMLStylesContext_Impl::SvXMLStylesContext_Impl( sal_Bool bAuto ) :
     aStyles( 20, 5 ),
     pIndices( 0 ),
     bAutomaticStyle( bAuto )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 ,   nIndexCreated( 0 )
 #endif
 {}
@@ -363,7 +363,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
 
     if( !pIndices && bCreateIndex && aStyles.Count() > 0 )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         DBG_ASSERT( 0==nIndexCreated,
                     "Performance warning: sdbcx::Index created multiple times" );
 #endif
@@ -379,7 +379,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
                 delete pStyleIndex;
             }
         }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ((SvXMLStylesContext_Impl *)this)->nIndexCreated++;
 #endif
     }
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index a32c606532be..4f7672289523 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -44,7 +44,7 @@
 #include "xmltabi.hxx"
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 92f015344948..9c206ad95430 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -220,7 +220,7 @@ void XMLIndexTOCContext::StartElement(
                 //    index
 
                 // preliminaries
-#ifdef PRODUCT
+#ifndef DBG_UTIL
                 OUString sMarker(RTL_CONSTASCII_USTRINGPARAM(" "));
 #else
                 OUString sMarker(RTL_CONSTASCII_USTRINGPARAM("Y"));
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 7148bc92fc3a..443aa15dc77c 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -226,7 +226,7 @@ void XMLSectionImportContext::StartElement(
                 // last paragraph (and marker) when closing a section.
                 Reference<XTextRange> xStart =
                     rHelper->GetCursor()->getStart();
-#ifdef PRODUCT
+#ifndef DBG_UTIL
                 static const sal_Char sMarker[] = " ";
 #else
                 static const sal_Char sMarker[] = "X";
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index aa85549cc812..eeea34ce1cae 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -43,7 +43,7 @@
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextColumnsContext.hxx"
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 3710c16dddb3..509459b96880 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include <svtools/cntnrsrt.hxx>
+#include <svl/cntnrsrt.hxx>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 708133efaf45..05d3694462be 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -707,6 +707,7 @@ sal_Bool XMLTextFieldExport::IsStringField(
     case FIELD_ID_PAGENUMBER:
     case FIELD_ID_REFPAGE_SET:
     case FIELD_ID_REFPAGE_GET:
+    case FIELD_ID_DOCINFO_CUSTOM:
         // always number
         return sal_False;
 
@@ -727,7 +728,6 @@ sal_Bool XMLTextFieldExport::IsStringField(
     case FIELD_ID_HIDDEN_PARAGRAPH:
     case FIELD_ID_DOCINFO_CREATION_AUTHOR:
     case FIELD_ID_DOCINFO_DESCRIPTION:
-    case FIELD_ID_DOCINFO_CUSTOM:
     case FIELD_ID_DOCINFO_PRINT_AUTHOR:
     case FIELD_ID_DOCINFO_TITLE:
     case FIELD_ID_DOCINFO_SUBJECT:
@@ -880,6 +880,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
     case FIELD_ID_USER_GET:
     case FIELD_ID_EXPRESSION:
     case FIELD_ID_TABLE_FORMULA:
+    case FIELD_ID_DOCINFO_CUSTOM:
         // register number format, if this is a numeric field
         if (! IsStringField(nToken, xPropSet)) {
 
@@ -943,7 +944,6 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
     case FIELD_ID_HIDDEN_PARAGRAPH:
     case FIELD_ID_DOCINFO_CREATION_AUTHOR:
     case FIELD_ID_DOCINFO_DESCRIPTION:
-    case FIELD_ID_DOCINFO_CUSTOM:
     case FIELD_ID_DOCINFO_PRINT_AUTHOR:
     case FIELD_ID_DOCINFO_TITLE:
     case FIELD_ID_DOCINFO_SUBJECT:
@@ -1503,6 +1503,13 @@ void XMLTextFieldExport::ExportFieldHelper(
 
     case FIELD_ID_DOCINFO_CUSTOM:
     {
+        ProcessValueAndType(sal_False,  // doesn't happen for text
+                                GetIntProperty(sPropertyNumberFormat,rPropSet),
+                                sEmpty, sEmpty, 0.0, // not used
+                                sal_False, sal_False, sal_True,
+                                ! GetOptionalBoolProperty(
+                                    sPropertyIsFixedLanguage,
+                                    rPropSet, xPropSetInfo, sal_False ));
         uno::Any aAny = rPropSet->getPropertyValue( sPropertyName );
         ::rtl::OUString sName;
         aAny >>= sName;
@@ -2866,7 +2873,7 @@ sal_Bool XMLTextFieldExport::ExplodeFieldMasterName(
     sal_Int32 nSeparator = sMasterName.indexOf('.', nLength);
     sal_Bool bReturn = sal_True;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // check for service name
     bReturn &= (0 == sFieldMasterPrefix.compareTo(sMasterName, nLength));
 #endif
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 632fba8ddddd..f6f768312a94 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2048,6 +2048,11 @@ XMLUserDocInfoImportContext::XMLUserDocInfoImportContext(
                                       sLocalName, nToken,
                                       sal_False, sal_False)
     , sPropertyName(RTL_CONSTASCII_USTRINGPARAM(sAPI_name))
+    , sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format))
+    , sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed_language))
+    , nFormat(0)
+    , bFormatOK(sal_False)
+    , bIsDefaultLanguage( sal_True )
 {
     bValid = sal_False;
 }
@@ -2058,6 +2063,17 @@ void XMLUserDocInfoImportContext::ProcessAttribute(
 {
     switch (nAttrToken)
     {
+        case XML_TOK_TEXTFIELD_DATA_STYLE_NAME:
+        {
+            sal_Int32 nKey = GetImportHelper().GetDataStyleKey(
+                                               sAttrValue, &bIsDefaultLanguage);
+            if (-1 != nKey)
+            {
+                nFormat = nKey;
+                bFormatOK = sal_True;
+            }
+            break;
+        }
         case XML_TOK_TEXTFIELD_NAME:
         {
             if (!bValid)
@@ -2080,12 +2096,27 @@ void XMLUserDocInfoImportContext::PrepareField(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet> & xPropertySet)
 {
+    uno::Any aAny;
     if ( aName.getLength() )
     {
-        uno::Any aAny;
         aAny <<= aName;
         xPropertySet->setPropertyValue(sPropertyName, aAny);
     }
+    Reference<XPropertySetInfo> xPropertySetInfo(
+        xPropertySet->getPropertySetInfo());
+    if (bFormatOK &&
+        xPropertySetInfo->hasPropertyByName(sPropertyNumberFormat))
+    {
+        aAny <<= nFormat;
+        xPropertySet->setPropertyValue(sPropertyNumberFormat, aAny);
+
+        if( xPropertySetInfo->hasPropertyByName( sPropertyIsFixedLanguage ) )
+        {
+            sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
+            aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+            xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
+        }
+    }
 
     // call superclass to handle "fixed"
     XMLSimpleDocInfoImportContext::PrepareField(xPropertySet);
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index cad922d48fdd..7817fa7c4c19 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #ifndef _SVSTDARR_STRINGSDTOR_DECL
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -1661,8 +1661,14 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
         pProps->Name = sHeadingStyleName;
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            pProps->Value <<= sChosenStyles[i];
-            xChapterNumbering->replaceByIndex( i, makeAny( aProps ) );
+            // --> OD 2009-12-11 #i107610#
+            if ( bSetEmptyLevels ||
+                 sChosenStyles[i].getLength() > 0 )
+            // <--
+            {
+                pProps->Value <<= sChosenStyles[i];
+                xChapterNumbering->replaceByIndex( i, makeAny( aProps ) );
+            }
         }
         // <--
     }
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 9feacd0ad3d9..4dca73940dba 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -218,7 +218,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
         if( !pFontStyleName )
         {
             aAny <<= sEmpty;
-    #ifndef PRODUCT
+    #ifdef DBG_UTIL
                 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                                 pFontFamilyName->mnIndex + 1 );
                 DBG_ASSERT( nTmp == CTF_FONTSTYLENAME || nTmp == CTF_FONTSTYLENAME_CJK || nTmp == CTF_FONTSTYLENAME_CTL,
@@ -232,7 +232,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
         {
             aAny <<= (sal_Int16)com::sun::star::awt::FontFamily::DONTKNOW;
 
-    #ifndef PRODUCT
+    #ifdef DBG_UTIL
                 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                                 pFontFamilyName->mnIndex + 2 );
                 DBG_ASSERT( nTmp == CTF_FONTFAMILY || nTmp == CTF_FONTFAMILY_CJK || nTmp == CTF_FONTFAMILY_CTL,
@@ -245,7 +245,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
         if( !pFontPitch )
         {
             aAny <<= (sal_Int16)com::sun::star::awt::FontPitch::DONTKNOW;
-    #ifndef PRODUCT
+    #ifdef DBG_UTIL
                 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                                 pFontFamilyName->mnIndex + 3 );
                 DBG_ASSERT( nTmp == CTF_FONTPITCH || nTmp == CTF_FONTPITCH_CJK || nTmp == CTF_FONTPITCH_CTL,
@@ -258,7 +258,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
         if( !pFontCharSet )
         {
             aAny <<= (sal_Int16)gsl_getSystemTextEncoding();
-    #ifndef PRODUCT
+    #ifdef DBG_UTIL
                 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                                 pFontFamilyName->mnIndex + 4 );
                 DBG_ASSERT( nTmp == CTF_FONTCHARSET || nTmp == CTF_FONTCHARSET_CJK || nTmp == CTF_FONTCHARSET_CTL,
@@ -408,7 +408,7 @@ void XMLTextImportPropertyMapper::finished(
     {
         if( pAllBorderDistance && !pBorderDistances[i] )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                         pAllBorderDistance->mnIndex + i + 1 );
             DBG_ASSERT( nTmp >= CTF_LEFTBORDERDISTANCE &&
@@ -422,7 +422,7 @@ void XMLTextImportPropertyMapper::finished(
         }
         if( pAllBorder && !pBorders[i] )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                             pAllBorder->mnIndex + i + 1 );
             DBG_ASSERT( nTmp >= CTF_LEFTBORDER && nTmp <= CTF_BOTTOMBORDER,
@@ -461,7 +461,7 @@ void XMLTextImportPropertyMapper::finished(
         {
             if( !pBorderDistances[i] )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                         pBorders[i]->mnIndex + 5 );
                 DBG_ASSERT( nTmp >= CTF_LEFTBORDERDISTANCE &&
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index d46d3a446395..f07d8a89c5ef 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -34,9 +34,9 @@
 #include <tools/debug.hxx>
 #ifndef _SVSTDARR_LONGS_DECL
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/types.h>
 
@@ -265,7 +265,7 @@ SV_IMPL_PTRARR( OUStrings_Impl, OUStringPtr )
 SV_DECL_PTRARR_SORT_DEL( OUStringsSort_Impl, OUStringPtr, 20, 10 )
 SV_IMPL_OP_PTRARR_SORT( OUStringsSort_Impl, OUStringPtr )
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 static int txtparae_bContainsIllegalCharacters = sal_False;
 #endif
 
@@ -1303,7 +1303,7 @@ XMLTextParagraphExport::~XMLTextParagraphExport()
 //    delete pExportedLists;
     // <--
     delete pListAutoPool;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     txtparae_bContainsIllegalCharacters = sal_False;
 #endif
     // --> OD 2008-04-25 #refactorlists#
@@ -3395,7 +3395,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
         default:
             if( cChar < 0x0020 )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 OSL_ENSURE( txtparae_bContainsIllegalCharacters ||
                             cChar >= 0x0020,
                             "illegal character in text content" );
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index dda2c3d49030..aaac42d14597 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -36,7 +36,7 @@
 #include <tools/debug.hxx>
 
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index f3c8da0bcf03..62582e634c29 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -33,7 +33,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <xmloff/xmlimp.hxx>
 #include "XMLTextFrameContext.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 61d61714cfb9..b382f71db2f1 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/style/DropCapFormat.hpp>
 #include <com/sun/star/text/FontRelief.hpp>
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index c4d645277e91..d1941c18585b 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -352,7 +352,7 @@ XMLTypedPropertiesOOoTContext_Impl
         ++i;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( !( XML_NAMESPACE_NONE == nPrefix ||
                 (XML_NAMESPACE_UNKNOWN_FLAG & nPrefix) ||
                 XML_PROP_TYPE_END==m_aPropTypes[1] ||
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 12b36274609e..973b49274031 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -337,7 +337,7 @@ void SAL_CALL XMLTransformerBase::startElement( const OUString& rName,
 }
 
 void SAL_CALL XMLTransformerBase::endElement( const OUString&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 rName
 #endif
 )
@@ -348,7 +348,7 @@ rName
         // Get topmost context
         ::rtl::Reference< XMLTransformerContext > xContext = m_pContexts->back();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         OSL_ENSURE( xContext->GetQName() == rName,
                 "XMLTransformerBase::endElement: popped context has wrong lname" );
 #endif
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index 31852e15175a..bc93c1d4297c 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -71,15 +71,12 @@ SHL1IMPLIB= _ixo
 SHL1USE_EXPORTS=name
 
 SHL1STDLIBS= \
-        $(SVTOOLLIB)	\
         $(TOOLSLIB)		\
         $(I18NISOLANGLIB) \
         $(VOSLIB)		\
         $(CPPULIB)		\
         $(CPPUHELPERLIB)\
         $(COMPHELPERLIB)\
-        $(VCLLIB)		\
-        $(TKLIB)		\
         $(SVLLIB)		\
         $(SALLIB)		\
         $(UNOTOOLSLIB)	\
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 8fb05fdaa895..88dd1b9a592d 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -39,7 +39,7 @@
 #include <vcl/tabpage.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svx/simptabl.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 
 namespace com {
 namespace sun {
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index dde41a4ac636..5882bdbafd4a 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/ucb/Command.hpp>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/security/SerialNumberAdapter.hpp>
 #include <ucbhelper/contentbroker.hxx>
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index e8a484f38944..31005a64f091 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -88,6 +88,8 @@ namespace
     {
         sal_Int16 m_nODF;
     public:
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
         SaveODFItem();
         //See group ODF in Common.xcs
         bool isLessODF1_2()
@@ -96,6 +98,9 @@ namespace
         }
     };
 
+void SaveODFItem::Commit() {}
+void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
     SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
         "Office.Common/Save"))), m_nODF(0)
     {
diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc
index 8d7e082cea6b..c0f9f4cd3dcb 100644
--- a/xmlsecurity/source/dialogs/helpids.hrc
+++ b/xmlsecurity/source/dialogs/helpids.hrc
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index f7fa2c08eca5..83e2ea82a303 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/security/SerialNumberAdapter.hpp>
 #include <comphelper/sequence.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/pickerhelper.hxx>
+#include <svl/pickerhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 693d003b0d77..f1b47c3f0f0d 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -36,8 +36,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/solar.hrc>
-#include <svtools/syslocale.hxx>
+#include <svl/solar.hrc>
+#include <unotools/syslocale.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustrbuf.h>
 #include <vector>
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index c0f2db15eff7..bc5747ed3c88 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -41,14 +41,14 @@
 #endif
 #include <vcl/image.hxx>
 //#ifndef _SFXITEMPOOL_HXX
-//#include <svtools/itempool.hxx>
+//#include <svl/itempool.hxx>
 //#endif
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 
 #include <xmlsecurity/stbcontrl.hxx>
diff --git a/xmlsecurity/tools/demo/makefile.mk b/xmlsecurity/tools/demo/makefile.mk
index 9789bd93ee97..41f80da9c8ad 100644
--- a/xmlsecurity/tools/demo/makefile.mk
+++ b/xmlsecurity/tools/demo/makefile.mk
@@ -125,7 +125,7 @@ APP5OBJS= $(OBJ)$/util.obj	$(OBJ)$/performance.obj
 # ---------- jflatfilter ----------
 #
 PACKAGE=	    com$/sun$/star$/xml$/security$/eval
-JARFILES=       sandbox.jar ridl.jar jurt.jar unoil.jar juh.jar
+JARFILES=       ridl.jar jurt.jar unoil.jar juh.jar
 JAVAFILES:=     $(shell @ls *.java)
 JAVACLASSFILES= $(CLASSDIR)$/$(PACKAGE)$/JavaFlatFilter.class
 JARCLASSDIRS=   $(PACKAGE)
diff --git a/xmlsecurity/tools/examples/uno_win.bat b/xmlsecurity/tools/examples/uno_win.bat
index 606ced6f5caf..6d1f74ada1f6 100644
--- a/xmlsecurity/tools/examples/uno_win.bat
+++ b/xmlsecurity/tools/examples/uno_win.bat
@@ -18,6 +18,6 @@ echo =============================================
 @echo on
 
 cp %WS_PATH%/xmlsecurity/tools/uno/current.gif ./.
-java -classpath %WS_PATH%/xmlsecurity/%OUTPUTDIR%/class;%SO_CLASSPATHPATH%/rt.jar;%SO_CLASSPATHPATH%/java_uno.jar;%SO_CLASSPATHPATH%/sandbox.jar;%SO_CLASSPATHPATH%/jurt.jar;%SO_CLASSPATHPATH%/unoil.jar;%SO_CLASSPATHPATH%/ridl.jar;%SO_CLASSPATHPATH%/juh.jar com.sun.star.xml.security.uno.TestTool %WS_PATH%/xmlsecurity/tools/cryptoken/jks/testToken.jks ""
+java -classpath %WS_PATH%/xmlsecurity/%OUTPUTDIR%/class;%SO_CLASSPATHPATH%/rt.jar;%SO_CLASSPATHPATH%/java_uno.jar;%SO_CLASSPATHPATH%/jurt.jar;%SO_CLASSPATHPATH%/unoil.jar;%SO_CLASSPATHPATH%/ridl.jar;%SO_CLASSPATHPATH%/juh.jar com.sun.star.xml.security.uno.TestTool %WS_PATH%/xmlsecurity/tools/cryptoken/jks/testToken.jks ""
 rm ./current.gif
 
diff --git a/xmlsecurity/tools/standalone/csfit/util/makefile.mk b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
index e25f42e7ce49..3ac85f910f8d 100644
--- a/xmlsecurity/tools/standalone/csfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
@@ -107,7 +107,7 @@ REGISTERJARS=\
 #	xsec_jxsec.jar
 
 # jar-files, which regcomp needs so that it can use java
-REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar
+REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
 
 # CLASSPATH, which regcomp needs to be run
 # $(SOLARLIBDIR) needs to be included in case Java components are registered,
diff --git a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
index 399522e90bdf..3c1d17b7ecd1 100644
--- a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
@@ -107,7 +107,7 @@ REGISTERJARS=\
 #	xsec_jxsec.jar
 
 # jar-files, which regcomp needs so that it can use java
-REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar
+REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
 
 # CLASSPATH, which regcomp needs to be run
 # $(SOLARLIBDIR) needs to be included in case Java components are registered,
diff --git a/xmlsecurity/tools/uno/makefile.mk b/xmlsecurity/tools/uno/makefile.mk
index 34c47ad2c166..3f3da61e57d6 100644
--- a/xmlsecurity/tools/uno/makefile.mk
+++ b/xmlsecurity/tools/uno/makefile.mk
@@ -41,7 +41,7 @@ USE_JAVAVER:=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE :	$(PRJ)$/util$/target.pmk
 
-JARFILES = java_uno.jar sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar
+JARFILES = java_uno.jar jurt.jar unoil.jar ridl.jar juh.jar
 JAVAFILES := $(shell @ls *.java)
 JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/xpdf/prj/build.lst b/xpdf/prj/build.lst
index 9d4b9563a40f..527985ff0cf2 100644
--- a/xpdf/prj/build.lst
+++ b/xpdf/prj/build.lst
@@ -1,2 +1,2 @@
-xp      xpdf : solenv sal soltools NULL
+xp      xpdf : solenv soltools NULL
 xp      xpdf						nmake   -       all     xp_xpdf NULL