CWS gnumake4: convert unotools to new build system

18 files changed, 328 insertions, 2489 deletions

diff --git a/unotools/inc/makefile.mk b/unotools/JunitTest_unotools_complex.mk
index e28adc7305e5..b34ea5fd294d 100644
--- a/unotools/inc/makefile.mk
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,25 +24,32 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=unotools
-TARGET=inc
+$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
+	$$(DEFS) \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_JunitTest_add_jars,unotools_complex,\
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+	$(OUTDIR)/bin/test-tools.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+))
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+$(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\
+	unotools/qa/complex/tempfile/TempFileTest \
+	unotools/qa/complex/tempfile/TempFileUnitTest \
+	unotools/qa/complex/tempfile/Test01 \
+	unotools/qa/complex/tempfile/Test02 \
+	unotools/qa/complex/tempfile/TestHelper \
+))
 
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+$(eval $(call gb_JunitTest_add_classes,unotools_complex,\
+	complex.tempfile.TempFileUnitTest \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
new file mode 100644
index 000000000000..dbd32accf47e
--- /dev/null
+++ b/unotools/Library_utl.mk
@@ -0,0 +1,157 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# 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.
+#
+#*************************************************************************
+
+# unotools is the name of the module the makefile is located in
+
+# declare a library
+# utl is the name of the library as it is found in Repository.mk
+$(eval $(call gb_Library_Library,utl))
+
+# declare packages that will be delivered before compilation of utl
+# learn more about TYPE in the Package.mk template
+$(eval $(call gb_Library_add_package_headers,utl,unotools_inc))
+
+# for platforms supporting PCH: declare the location of the pch file
+# this is the name of the cxx file (without extension)
+$(eval $(call gb_Library_add_precompiled_header,utl,$(SRCDIR)/unotools/inc/pch/precompiled_unotools))
+
+# in case UNO services are exported: declare location of component file
+$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
+
+# add any additional include paths for this library here
+$(eval $(call gb_Library_set_include,utl,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/unotools/inc \
+	-I$(SRCDIR)/unotools/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+# add any additional definitions to be set for compilation here
+# (e.g. -DLIB_DLLIMPLEMENTATION)
+$(eval $(call gb_Library_set_defs,utl,\
+	$$(DEFS) \
+	-DUNOTOOLS_DLLIMPLEMENTATION \
+))
+
+# add libraries to be linked to utl; again these names need to be given as
+# specified in Repository.mk
+$(eval $(call gb_Library_add_linked_libs,utl,\
+	sal \
+	salhelper \
+	stl \
+	comphelper \
+	ucbhelper \
+	cppu \
+	cppuhelper \
+	i18nisolang1 \
+	tl \
+	vos3 \
+    $(gb_STDLIBS) \
+))
+
+# add all source files that shall be compiled with exceptions enabled
+# the name is relative to $(SRCROOT) and must not contain an extension
+$(eval $(call gb_Library_add_exception_objects,utl,\
+	unotools/source/streaming/streamhelper \
+	unotools/source/streaming/streamwrap \
+	unotools/source/accessibility/accessiblestatesethelper \
+	unotools/source/accessibility/accessiblerelationsethelper \
+	unotools/source/property/propertysethelper \
+	unotools/source/property/propertysetinfo \
+	unotools/source/misc/sharedunocomponent \
+	unotools/source/misc/componentresmodule \
+	unotools/source/misc/eventlisteneradapter \
+	unotools/source/misc/fontcvt \
+	unotools/source/misc/syslocale \
+	unotools/source/misc/fontdefs \
+	unotools/source/misc/datetime \
+	unotools/source/misc/atom \
+	unotools/source/misc/desktopterminationobserver \
+	unotools/source/processfactory/processfactory \
+	unotools/source/ucbhelper/localfilehelper \
+	unotools/source/ucbhelper/ucbstreamhelper \
+	unotools/source/ucbhelper/xtempfile \
+	unotools/source/ucbhelper/ucblockbytes \
+	unotools/source/ucbhelper/tempfile \
+	unotools/source/ucbhelper/ucbhelper \
+	unotools/source/ucbhelper/progresshandlerwrap \
+	unotools/source/config/historyoptions \
+	unotools/source/config/optionsdlg \
+	unotools/source/config/regoptions \
+	unotools/source/config/bootstrap \
+	unotools/source/config/configpathes \
+	unotools/source/config/javaoptions \
+	unotools/source/config/lingucfg \
+	unotools/source/config/fontoptions \
+	unotools/source/config/useroptions \
+	unotools/source/config/internaloptions \
+	unotools/source/config/viewoptions \
+	unotools/source/config/workingsetoptions \
+	unotools/source/config/fltrcfg \
+	unotools/source/config/localisationoptions \
+	unotools/source/config/itemholder1 \
+	unotools/source/config/cmdoptions \
+	unotools/source/config/cacheoptions \
+	unotools/source/config/docinfohelper \
+	unotools/source/config/inetoptions \
+	unotools/source/config/misccfg \
+	unotools/source/config/options \
+	unotools/source/config/xmlaccelcfg \
+	unotools/source/config/fontcfg \
+	unotools/source/config/startoptions \
+	unotools/source/config/extendedsecurityoptions \
+	unotools/source/config/printwarningoptions \
+	unotools/source/config/configmgr \
+	unotools/source/config/eventcfg \
+	unotools/source/config/configitem \
+	unotools/source/config/defaultoptions \
+	unotools/source/config/searchopt \
+	unotools/source/config/confignode \
+	unotools/source/config/sourceviewconfig \
+	unotools/source/config/compatibility \
+	unotools/source/config/pathoptions \
+	unotools/source/config/dynamicmenuoptions \
+	unotools/source/config/moduleoptions \
+	unotools/source/config/undoopt \
+	unotools/source/config/configvaluecontainer \
+	unotools/source/config/syslocaleoptions \
+	unotools/source/config/accelcfg \
+	unotools/source/config/saveopt \
+	unotools/source/config/securityoptions \
+	unotools/source/i18n/charclass \
+	unotools/source/i18n/textsearch \
+	unotools/source/i18n/readwritemutexguard \
+	unotools/source/i18n/intlwrapper \
+	unotools/source/i18n/transliterationwrapper \
+	unotools/source/i18n/calendarwrapper \
+	unotools/source/i18n/localedatawrapper \
+	unotools/source/i18n/collatorwrapper \
+	unotools/source/i18n/numberformatcodewrapper \
+	unotools/source/i18n/nativenumberwrapper \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotools/source/streaming/makefile.mk b/unotools/Makefile
index b70d7fea4091..90947b2e5f48 100644
--- a/unotools/source/streaming/makefile.mk
+++ b/unotools/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,24 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=streaming
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-ENABLE_EXCEPTIONS=TRUE
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES= $(SLO)$/streamhelper.obj        \
-        $(SLO)$/streamwrap.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+# vim: set noet sw=4 ts=4:
diff --git a/unotools/source/property/makefile.mk b/unotools/Module_unotools.mk
index c53f5a8d2cf5..3f474fc12692 100644
--- a/unotools/source/property/makefile.mk
+++ b/unotools/Module_unotools.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,24 +25,15 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=property
+$(eval $(call gb_Module_Module,unotools))
 
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Module_add_targets,unotools,\
+	Library_utl \
+	Package_inc \
+))
 
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/propertysetinfo.obj \
-            $(SLO)$/propertysethelper.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+$(eval $(call gb_Module_add_subsequentcheck_targets,unotools,\
+	JunitTest_unotools_complex  \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
new file mode 100644
index 000000000000..146891db1bca
--- /dev/null
+++ b/unotools/Package_inc.mk
@@ -0,0 +1,115 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,unotools_inc,$(SRCDIR)/unotools/inc))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/calendarwrapper.hxx,unotools/calendarwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/syslocale.hxx,unotools/syslocale.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localedatawrapper.hxx,unotools/localedatawrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/searchopt.hxx,unotools/searchopt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/digitgroupingiterator.hxx,unotools/digitgroupingiterator.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamsection.hxx,unotools/streamsection.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamhelper.hxx,unotools/streamhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontcfg.hxx,unotools/fontcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configvaluecontainer.hxx,unotools/configvaluecontainer.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/docinfohelper.hxx,unotools/docinfohelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/historyoptions_const.hxx,unotools/historyoptions_const.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/querydeep.hxx,unotools/querydeep.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/internaloptions.hxx,unotools/internaloptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/componentresmodule.hxx,unotools/componentresmodule.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/cmdoptions.hxx,unotools/cmdoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/workingsetoptions.hxx,unotools/workingsetoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/extendedsecurityoptions.hxx,unotools/extendedsecurityoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/defaultoptions.hxx,unotools/defaultoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/charclass.hxx,unotools/charclass.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/itemholderbase.hxx,unotools/itemholderbase.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accelcfg.hxx,unotools/accelcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/readwritemutexguard.hxx,unotools/readwritemutexguard.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/syslocaleoptions.hxx,unotools/syslocaleoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fltrcfg.hxx,unotools/fltrcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions_const.hxx,unotools/useroptions_const.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/propertysetinfo.hxx,unotools/propertysetinfo.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucblockbytes.hxx,unotools/ucblockbytes.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/viewoptions.hxx,unotools/viewoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucbstreamhelper.hxx,unotools/ucbstreamhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/idhelper.hxx,unotools/idhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/numberformatcodewrapper.hxx,unotools/numberformatcodewrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/misccfg.hxx,unotools/misccfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configpathes.hxx,unotools/configpathes.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/regpathhelper.hxx,unotools/regpathhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontoptions.hxx,unotools/fontoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/pathoptions.hxx,unotools/pathoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/confignode.hxx,unotools/confignode.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/datetime.hxx,unotools/datetime.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/javaoptions.hxx,unotools/javaoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucbhelper.hxx,unotools/ucbhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/textsearch.hxx,unotools/textsearch.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configitem.hxx,unotools/configitem.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/eventcfg.hxx,unotools/eventcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/saveopt.hxx,unotools/saveopt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/nativenumberwrapper.hxx,unotools/nativenumberwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/processfactory.hxx,unotools/processfactory.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/sourceviewconfig.hxx,unotools/sourceviewconfig.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/dynamicmenuoptions.hxx,unotools/dynamicmenuoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/loghelper.hxx,unotools/loghelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/progresshandlerwrap.hxx,unotools/progresshandlerwrap.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/startoptions.hxx,unotools/startoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/collatorwrapper.hxx,unotools/collatorwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/cacheoptions.hxx,unotools/cacheoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/lingucfg.hxx,unotools/lingucfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotunnelhelper.hxx,unotools/unotunnelhelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontcvt.hxx,unotools/fontcvt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/atom.hxx,unotools/atom.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/linguprops.hxx,unotools/linguprops.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/printwarningoptions.hxx,unotools/printwarningoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/compatibility.hxx,unotools/compatibility.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configmgr.hxx,unotools/configmgr.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/bootstrap.hxx,unotools/bootstrap.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/intlwrapper.hxx,unotools/intlwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/securityoptions.hxx,unotools/securityoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/eventlisteneradapter.hxx,unotools/eventlisteneradapter.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/tempfile.hxx,unotools/tempfile.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/optionsdlg.hxx,unotools/optionsdlg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/transliterationwrapper.hxx,unotools/transliterationwrapper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/xmlaccelcfg.hxx,unotools/xmlaccelcfg.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/undoopt.hxx,unotools/undoopt.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblerelationsethelper.hxx,unotools/accessiblerelationsethelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions.hxx,unotools/useroptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/regoptions.hxx,unotools/regoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/desktopterminationobserver.hxx,unotools/desktopterminationobserver.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/options.hxx,unotools/options.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamwrap.hxx,unotools/streamwrap.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/propertysethelper.hxx,unotools/propertysethelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/historyoptions.hxx,unotools/historyoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontdefs.hxx,unotools/fontdefs.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/sharedunocomponent.hxx,unotools/sharedunocomponent.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblestatesethelper.hxx,unotools/accessiblestatesethelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/moduleoptions.hxx,unotools/moduleoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotoolsdllapi.h,unotools/unotoolsdllapi.h))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localfilehelper.hxx,unotools/localfilehelper.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/inetoptions.hxx,unotools/inetoptions.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localisationoptions.hxx,unotools/localisationoptions.hxx))
+# vim: set noet sw=4 ts=4:
diff --git a/unotools/prj/build.lst b/unotools/prj/build.lst
index d6f10335c254..fd0b4a7e925c 100644
--- a/unotools/prj/build.lst
+++ b/unotools/prj/build.lst
@@ -1,14 +1,3 @@
 ut	unotools	: LIBXSLT:libxslt comphelper cppuhelper offuh tools ucbhelper NULL
-ut	unotools								usr1	-	all	ut_mkout NULL
-ut	unotools\inc							nmake	-	all	ut_inc NULL
-ut	unotools\source\misc					nmake	-	all	ut_misc ut_config ut_inc NULL
-ut	unotools\source\streaming				nmake	-	all	ut_streaming ut_inc NULL
-ut	unotools\source\config					nmake	-	all	ut_config ut_i18n ut_inc NULL
-ut	unotools\source\ucbhelper				nmake	-	all	ut_ucbhelper ut_inc NULL
-ut	unotools\source\processfactory				nmake	-	all	ut_procfact ut_inc NULL
-ut	unotools\source\i18n					nmake	-	all	ut_i18n ut_inc NULL
-ut	unotools\source\property				nmake	-	all	ut_property ut_inc NULL
-ut	unotools\source\accessibility				nmake	-	all	ut_accessibility ut_inc NULL
-ut	unotools\util						nmake	-	all	ut_util ut_config ut_i18n ut_misc ut_procfact ut_streaming ut_ucbhelper ut_property ut_accessibility NULL
+ut	unotools\prj							nmake	-	all	ut_prj NULL
 
-ut	unotools\qa\complex\tempfile				nmake	-	all	ut_qa_complex ut_util NULL
diff --git a/unotools/prj/d.lst b/unotools/prj/d.lst
index 38cafd0cc1f8..e69de29bb2d1 100644
--- a/unotools/prj/d.lst
+++ b/unotools/prj/d.lst
@@ -1,12 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\inc\*.bin %_DEST%\bin%_EXT%\*.bin
-
-mkdir: %_DEST%\inc%_EXT%\unotools
-..\inc\unotools\*.hxx %_DEST%\inc%_EXT%\unotools\*.hxx
-..\inc\unotools\unotoolsdllapi.h %_DEST%\inc%_EXT%\unotools\unotoolsdllapi.h
-..\%__SRC%\misc\utl.component %_DEST%\xml%_EXT%\utl.component
diff --git a/unotools/util/makefile.pmk b/unotools/prj/makefile.mk
index 0c0e54319f0e..88cd9dfe08b8 100644
--- a/unotools/util/makefile.pmk
+++ b/unotools/prj/makefile.mk
@@ -25,7 +25,16 @@
 #
 #*************************************************************************
 
-# define UNOTOOLS_DLLIMPLEMENTATION (see @ unotoolsdllapi.h)
-CDEFS += -DUNOTOOLS_DLLIMPLEMENTATION
+PRJ=..
+TARGET=prj
 
-VISIBILITY_HIDDEN=TRUE
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/unotools/qa/complex/tempfile/makefile.mk b/unotools/qa/complex/tempfile/makefile.mk
deleted file mode 100644
index 30a5eb7261ec..000000000000
--- a/unotools/qa/complex/tempfile/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = unotools
-TARGET = qa_complex_tempfile
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/tempfile
-JAVATESTFILES = \
-    TempFileUnitTest.java
-
-JAVAFILES = $(JAVATESTFILES) \
-    TempFileTest.java \
-    Test01.java \
-    Test02.java \
-    TestHelper.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/unotools/source/accessibility/makefile.mk b/unotools/source/accessibility/makefile.mk
deleted file mode 100644
index 59536b12e517..000000000000
--- a/unotools/source/accessibility/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=accessibility
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/accessiblestatesethelper.obj		\
-        $(SLO)$/accessiblerelationsethelper.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk
deleted file mode 100644
index 27e8f67f8888..000000000000
--- a/unotools/source/config/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=config
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-
-# --- 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)$/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 ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/unotools/source/config/optionsdrawinglayer.cxx b/unotools/source/config/optionsdrawinglayer.cxx
deleted file mode 100644
index c15f5a97e435..000000000000
--- a/unotools/source/config/optionsdrawinglayer.cxx
+++ /dev/null
@@ -1,1705 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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.
- *
- ************************************************************************/
-#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/unotools/source/i18n/makefile.mk b/unotools/source/i18n/makefile.mk
deleted file mode 100644
index bb21d65625cb..000000000000
--- a/unotools/source/i18n/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=i18n
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/charclass.obj	\
-    $(SLO)$/calendarwrapper.obj	\
-    $(SLO)$/collatorwrapper.obj	\
-    $(SLO)$/intlwrapper.obj \
-    $(SLO)$/localedatawrapper.obj	\
-    $(SLO)$/nativenumberwrapper.obj	\
-    $(SLO)$/numberformatcodewrapper.obj \
-    $(SLO)$/readwritemutexguard.obj \
-    $(SLO)$/transliterationwrapper.obj \
-    $(SLO)$/textsearch.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/unotools/source/misc/makefile.mk b/unotools/source/misc/makefile.mk
deleted file mode 100644
index 46e173b9a055..000000000000
--- a/unotools/source/misc/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=misc
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-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
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/unotools/source/processfactory/componentfactory.cxx b/unotools/source/processfactory/componentfactory.cxx
deleted file mode 100644
index 67055ee215ca..000000000000
--- a/unotools/source/processfactory/componentfactory.cxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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/componentfactory.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HDL_
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#endif
-
-#include <cppuhelper/factory.hxx>
-
-#include <uno/environment.h>
-#include <uno/mapping.hxx>
-
-#include <rtl/ustring.hxx>
-#include <osl/module.h>
-
-
-
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-using namespace ::rtl;
-
-
-namespace utl
-{
-
-Reference< XInterface > getComponentInstance(
-            const OUString & rLibraryName,
-            const OUString & rImplementationName
-            )
-{
-    Reference< XInterface > xI;
-    Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-    if ( xMSF.is() )
-        xI = xMSF->createInstance( rImplementationName );
-    if( !xI.is() )
-    {
-        Reference< XSingleServiceFactory > xSSF =
-            loadLibComponentFactory( rLibraryName, rImplementationName,
-            Reference< XMultiServiceFactory >(), Reference< XRegistryKey >() );
-        xI = xSSF->createInstance();
-    }
-    return xI;
-}
-
-
-Reference< XSingleServiceFactory > loadLibComponentFactory(
-            const OUString & rLibName,
-            const OUString & rImplName,
-            const Reference< XMultiServiceFactory > & xSF,
-            const Reference< XRegistryKey > & xKey
-            )
-{
-    Reference< XSingleServiceFactory > xRet;
-
-    oslModule lib = osl_loadModule( rLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
-    if (lib)
-    {
-        void * pSym;
-
-        // ========================= LATEST VERSION =========================
-        OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) );
-        if (pSym = osl_getSymbol( lib, aGetEnvName.pData ))
-        {
-            uno_Environment * pCurrentEnv = 0;
-            uno_Environment * pEnv = 0;
-            const sal_Char * pEnvTypeName = 0;
-            (*((component_getImplementationEnvironmentFunc)pSym))( &pEnvTypeName, &pEnv );
-
-            sal_Bool bNeedsMapping =
-                (pEnv || 0 != rtl_str_compare( pEnvTypeName, CPPU_CURRENT_LANGUAGE_BINDING_NAME ));
-
-            OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
-
-            if (bNeedsMapping)
-            {
-                if (! pEnv)
-                    uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
-                if (pEnv)
-                {
-                    OUString aCppEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
-                    uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-                    if (pCurrentEnv)
-                        bNeedsMapping = (pEnv != pCurrentEnv);
-                }
-            }
-
-            OUString aGetFactoryName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY) );
-            if (pSym = osl_getSymbol( lib, aGetFactoryName.pData ))
-            {
-                OString aImplName( OUStringToOString( rImplName, RTL_TEXTENCODING_ASCII_US ) );
-
-                if (bNeedsMapping)
-                {
-                    if (pEnv && pCurrentEnv)
-                    {
-                        Mapping aCurrent2Env( pCurrentEnv, pEnv );
-                        Mapping aEnv2Current( pEnv, pCurrentEnv );
-
-                        if (aCurrent2Env.is() && aEnv2Current.is())
-                        {
-                            void * pSMgr = aCurrent2Env.mapInterface(
-                                xSF.get(), ::getCppuType( (const Reference< XMultiServiceFactory > *)0 ) );
-                            void * pKey = aCurrent2Env.mapInterface(
-                                xKey.get(), ::getCppuType( (const Reference< XRegistryKey > *)0 ) );
-
-                            void * pSSF = (*((component_getFactoryFunc)pSym))(
-                                aImplName.getStr(), pSMgr, pKey );
-
-                            if (pKey)
-                                (*pEnv->pExtEnv->releaseInterface)( pEnv->pExtEnv, pKey );
-                            if (pSMgr)
-                                (*pEnv->pExtEnv->releaseInterface)( pEnv->pExtEnv, pSMgr );
-
-                            if (pSSF)
-                            {
-                                aEnv2Current.mapInterface(
-                                    reinterpret_cast< void ** >( &xRet ),
-                                    pSSF, ::getCppuType( (const Reference< XSingleServiceFactory > *)0 ) );
-                                (*pEnv->pExtEnv->releaseInterface)( pEnv->pExtEnv, pSSF );
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    XSingleServiceFactory * pRet = (XSingleServiceFactory *)
-                        (*((component_getFactoryFunc)pSym))(
-                            aImplName.getStr(), xSF.get(), xKey.get() );
-                    if (pRet)
-                    {
-                        xRet = pRet;
-                        pRet->release();
-                    }
-                }
-            }
-
-            if (pEnv)
-                (*pEnv->release)( pEnv );
-            if (pCurrentEnv)
-                (*pCurrentEnv->release)( pCurrentEnv );
-        }
-
-
-        if (! xRet.is())
-            osl_unloadModule( lib );
-    }
-
-    return xRet;
-}
-
-}   // namespace utl
diff --git a/unotools/source/processfactory/makefile.mk b/unotools/source/processfactory/makefile.mk
deleted file mode 100644
index 0e1e4aeacca8..000000000000
--- a/unotools/source/processfactory/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=procfact
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings common for the whole project -----
-
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/processfactory.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/unotools/source/ucbhelper/makefile.mk b/unotools/source/ucbhelper/makefile.mk
deleted file mode 100644
index 57088c69ca5c..000000000000
--- a/unotools/source/ucbhelper/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=unotools
-TARGET=ucbhelp
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-                        $(SLO)$/ucblockbytes.obj \
-                        $(SLO)$/localfilehelper.obj \
-                        $(SLO)$/ucbhelper.obj 		\
-                        $(SLO)$/ucbstreamhelper.obj \
-                        $(SLO)$/tempfile.obj		\
-                        $(SLO)$/xtempfile.obj		\
-                        $(SLO)$/progresshandlerwrap.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/unotools/util/makefile.mk b/unotools/util/makefile.mk
deleted file mode 100644
index 343e56f04169..000000000000
--- a/unotools/util/makefile.mk
+++ /dev/null
@@ -1,104 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=unotools
-TARGET=utl
-TARGETTYPE=CUI
-USE_LDUMP2=TRUE
-
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Library -----------------------------------
-
-LIB1TARGET=$(SLB)$/untools.lib
-LIB1FILES=\
-        $(SLB)$/i18n.lib \
-        $(SLB)$/misc.lib \
-        $(SLB)$/streaming.lib \
-        $(SLB)$/config.lib \
-        $(SLB)$/ucbhelp.lib \
-        $(SLB)$/procfact.lib \
-        $(SLB)$/property.lib \
-        $(SLB)$/accessibility.lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1IMPLIB=iutl
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS= \
-        $(SALHELPERLIB) \
-        $(COMPHELPERLIB) \
-        $(UCBHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(I18NISOLANGLIB) \
-        $(TOOLSLIB) \
-        $(VOSLIB) \
-        $(SALLIB)
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1DEPN=$(LIB1TARGET)
-
-DEF1NAME	=$(SHL1TARGET)
-DEF1DEPN        =$(MISC)$/$(SHL1TARGET).flt
-DEFLIB1NAME     =untools
-DEF1DES         =unotools
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-# --- Filter-Datei ---
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo CLEAR_THE_FILE		> $@
-    @echo _TI					>> $@
-    @echo _real					>> $@
-    @echo NodeValueAccessor			>> $@
-    @echo SubNodeAccess				>> $@
-    @echo UpdateFromConfig			>> $@
-    @echo UpdateToConfig				>> $@
-        @echo _Impl >> $@
-
-
-ALLTAR : $(MISC)/utl.component
-
-$(MISC)/utl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        utl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt utl.component