#i103496#: split svtools in two libs, depending on whether the code needs vcl or not

333 files changed, 1538 insertions, 1668 deletions

diff --git a/svtools/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx
index 15a002ab8d..15a002ab8d 100644
--- a/svtools/inc/PasswordHelper.hxx
+++ b/svl/inc/PasswordHelper.hxx
diff --git a/svtools/inc/adrparse.hxx b/svl/inc/adrparse.hxx
index 9c87782873..9c87782873 100644
--- a/svtools/inc/adrparse.hxx
+++ b/svl/inc/adrparse.hxx
diff --git a/svtools/inc/broadcast.hxx b/svl/inc/broadcast.hxx
index 6ffbb131dd..6ffbb131dd 100644
--- a/svtools/inc/broadcast.hxx
+++ b/svl/inc/broadcast.hxx
diff --git a/svtools/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx
index 190673cd13..190673cd13 100644
--- a/svtools/inc/cntnrsrt.hxx
+++ b/svl/inc/cntnrsrt.hxx
diff --git a/svtools/inc/cntwids.hrc b/svl/inc/cntwids.hrc
index c331f680a4..c331f680a4 100644
--- a/svtools/inc/cntwids.hrc
+++ b/svl/inc/cntwids.hrc
diff --git a/svtools/inc/filenotation.hxx b/svl/inc/filenotation.hxx
index 6f2448ca5b..6f2448ca5b 100644
--- a/svtools/inc/filenotation.hxx
+++ b/svl/inc/filenotation.hxx
diff --git a/svtools/inc/flbytes.hxx b/svl/inc/flbytes.hxx
index 0003816fc4..0003816fc4 100644
--- a/svtools/inc/flbytes.hxx
+++ b/svl/inc/flbytes.hxx
diff --git a/svtools/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx
index ee167d594d..ee167d594d 100644
--- a/svtools/inc/folderrestriction.hxx
+++ b/svl/inc/folderrestriction.hxx
diff --git a/svtools/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx
index 207db3388d..207db3388d 100644
--- a/svtools/inc/fstathelper.hxx
+++ b/svl/inc/fstathelper.hxx
diff --git a/svtools/inc/inetdef.hxx b/svl/inc/inetdef.hxx
index edd1118e9b..edd1118e9b 100644
--- a/svtools/inc/inetdef.hxx
+++ b/svl/inc/inetdef.hxx
diff --git a/svtools/inc/inetmsg.hxx b/svl/inc/inetmsg.hxx
index f296b9feaf..f296b9feaf 100644
--- a/svtools/inc/inetmsg.hxx
+++ b/svl/inc/inetmsg.hxx
diff --git a/svtools/inc/inetstrm.hxx b/svl/inc/inetstrm.hxx
index c5c3ef3c9c..c5c3ef3c9c 100644
--- a/svtools/inc/inetstrm.hxx
+++ b/svl/inc/inetstrm.hxx
diff --git a/svtools/inc/instrm.hxx b/svl/inc/instrm.hxx
index 96f986d39d..96f986d39d 100644
--- a/svtools/inc/instrm.hxx
+++ b/svl/inc/instrm.hxx
diff --git a/svtools/inc/listener.hxx b/svl/inc/listener.hxx
index 6aad2b592c..6aad2b592c 100644
--- a/svtools/inc/listener.hxx
+++ b/svl/inc/listener.hxx
diff --git a/svtools/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx
index cfe5206bf2..cfe5206bf2 100644
--- a/svtools/inc/listeneriter.hxx
+++ b/svl/inc/listeneriter.hxx
diff --git a/svtools/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx
index 42ce322040..42ce322040 100644
--- a/svtools/inc/lngmisc.hxx
+++ b/svl/inc/lngmisc.hxx
diff --git a/svtools/source/misc1/makefile.mk b/svl/inc/makefile.mk
index dd143ea4e9..a9974d7506 100644
--- a/svtools/source/misc1/makefile.mk
+++ b/svl/inc/makefile.mk
@@ -1,14 +1,14 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.6 $
+# $Revision: 1.4 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -28,42 +28,25 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+PRJ=..
 
-PRJ=..$/..
 PRJNAME=svtools
-TARGET=misc1
+TARGET=inc
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
+.INCLUDE :  $(PRJ)$/util$/svt.pmk
 
 # --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-    $(SLO)$/fstathelper.obj \
-    $(SLO)$/folderrestriction.obj \
-    $(SLO)$/strmadpt.obj \
-    $(SLO)$/svtdata.obj
-
-SLOFILES=\
-    $(EXCEPTIONSFILES) \
-    $(SLO)$/adrparse.obj \
-    $(SLO)$/filenotation.obj \
-    $(SLO)$/inethist.obj \
-    $(SLO)$/inettype.obj \
-    $(SLO)$/iniadrtk.obj \
-    $(SLO)$/lngmisc.obj \
-    $(SLO)$/PasswordHelper.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    mediatyp.src
-
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-
-
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+    $(SLO)$/precompiled.pch \
+    $(SLO)$/precompiled_ex.pch
+    
+.ENDIF			# "$(ENABLE_PCH)"!=""
 
diff --git a/svtools/inc/memberid.hrc b/svl/inc/memberid.hrc
index cd94e64731..cd94e64731 100644
--- a/svtools/inc/memberid.hrc
+++ b/svl/inc/memberid.hrc
diff --git a/svtools/inc/misccfg.hxx b/svl/inc/misccfg.hxx
index 5fb224ac77..5fb224ac77 100644
--- a/svtools/inc/misccfg.hxx
+++ b/svl/inc/misccfg.hxx
diff --git a/svtools/inc/nfsymbol.hxx b/svl/inc/nfsymbol.hxx
index d4a3eacc11..d4a3eacc11 100644
--- a/svtools/inc/nfsymbol.hxx
+++ b/svl/inc/nfsymbol.hxx
diff --git a/svtools/inc/numuno.hxx b/svl/inc/numuno.hxx
index a369423f3d..a369423f3d 100644
--- a/svtools/inc/numuno.hxx
+++ b/svl/inc/numuno.hxx
diff --git a/svtools/inc/outstrm.hxx b/svl/inc/outstrm.hxx
index a6786bba52..a6786bba52 100644
--- a/svtools/inc/outstrm.hxx
+++ b/svl/inc/outstrm.hxx
diff --git a/svtools/inc/svtool.h b/svl/inc/pch/precompiled_svtools.cxx
index a76a0c10b7..3efac2b2e7 100644
--- a/svtools/inc/svtool.h
+++ b/svl/inc/pch/precompiled_svtools.cxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svtool.h,v $
+ * $RCSfile: precompiled_svtools.cxx,v $
  * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
@@ -28,13 +28,5 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOL_H
-#define _SVTOOL_H
+#include "precompiled_svtools.hxx"
 
-#if defined( W30 ) && defined( _MSC_VER )
-#define SVEXPORT    _export
-#else
-#define SVEXPORT
-#endif
-
-#endif // _SVTOOL_H
diff --git a/svl/inc/pch/precompiled_svtools.hxx b/svl/inc/pch/precompiled_svtools.hxx
new file mode 100644
index 0000000000..3622cb33ff
--- /dev/null
+++ b/svl/inc/pch/precompiled_svtools.hxx
@@ -0,0 +1,440 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: precompiled_svtools.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:05.076676
+
+#ifdef PRECOMPILED_HEADERS
+
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
+#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/io/XAsyncOutputMonitor.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/ucb/Command.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/IllegalIdentifierException.hpp"
+#include "com/sun/star/ucb/UnsupportedCommandException.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XCommandProcessor.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentIdentifier.hpp"
+#include "com/sun/star/ucb/XContentIdentifierFactory.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XContentProviderManager.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uri/XUriReference.hpp"
+#include "com/sun/star/uri/XUriReferenceFactory.hpp"
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/LineEndFormat.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <com/sun/star/awt/XImageConsumer.hpp>
+#include <com/sun/star/awt/XItemEventBroadcaster.hpp>
+#include <com/sun/star/awt/XTextArea.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyChangeEvent.hpp>
+#include <com/sun/star/beans/PropertyState.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/beans/XFastPropertySet.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/datatransfer/XMimeContentType.hpp>
+#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
+#include <com/sun/star/document/XEventsSupplier.hpp>
+#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/document/XTypeDetection.hpp>
+#include <com/sun/star/document/XViewDataSupplier.hpp>
+#include <com/sun/star/embed/Actions.hpp>
+#include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/EmbedMisc.hpp>
+#include <com/sun/star/embed/EmbedStates.hpp>
+#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
+#include <com/sun/star/embed/XActionsApproval.hpp>
+#include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/embed/XEmbedPersist.hpp>
+#include <com/sun/star/embed/XExtendedStorageStream.hpp>
+#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
+#include <com/sun/star/embed/XStateChangeListener.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/frame/DoubleInitializationException.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/frame/XConfigManager.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XDocumentTemplates.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
+#include <com/sun/star/frame/status/ItemState.hpp>
+#include <com/sun/star/frame/status/ItemStatus.hpp>
+#include <com/sun/star/frame/status/Visibility.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/i18n/AmPmValue.hpp>
+#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
+#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
+#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/CollatorOptions.hpp>
+#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
+#include <com/sun/star/i18n/KNumberFormatType.hpp>
+#include <com/sun/star/i18n/KNumberFormatUsage.hpp>
+#include <com/sun/star/i18n/NumberFormatCode.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <com/sun/star/i18n/Weekdays.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/i18n/XExtendedCalendar.hpp>
+#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <com/sun/star/io/XActiveDataControl.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XPersist.hpp>
+#include <com/sun/star/io/XPersistObject.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/io/XTruncate.hpp>
+#include <com/sun/star/java/InvalidJavaSettingsException.hpp>
+#include <com/sun/star/java/JavaDisabledException.hpp>
+#include <com/sun/star/java/JavaNotFoundException.hpp>
+#include <com/sun/star/java/JavaVMCreationFailureException.hpp>
+#include <com/sun/star/java/RestartRequiredException.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/registry/XSimpleRegistry.hpp>
+#include <com/sun/star/script/XTypeConverter.hpp>
+#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/sdb/XCompletedConnection.hpp>
+#include <com/sun/star/sdbc/SQLWarning.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/svg/XSVGWriter.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/system/XProxySettings.hpp>
+#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/task/DocumentPasswordRequest.hpp>
+#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
+#include <com/sun/star/task/MasterPasswordRequest.hpp>
+#include <com/sun/star/task/NoMasterException.hpp>
+#include <com/sun/star/task/PasswordRequestMode.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionContinuation.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/XInteractionPassword.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/task/XJobExecutor.hpp>
+#include <com/sun/star/task/XPasswordContainer.hpp>
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/ContentCreationException.hpp>
+#include <com/sun/star/ucb/FileSystemNotation.hpp>
+#include <com/sun/star/ucb/IOErrorCode.hpp>
+#include <com/sun/star/ucb/InteractiveIOException.hpp>
+#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
+#include <com/sun/star/ucb/TransferResult.hpp>
+#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
+#include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/XContentProviderManager.hpp>
+#include <com/sun/star/ucb/XDynamicResultSet.hpp>
+#include <com/sun/star/ucb/XProgressHandler.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
+#include <com/sun/star/ui/XImageManager.hpp>
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/XAggregation.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/XCurrentContext.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/XWeak.hpp>
+#include <com/sun/star/util/AliasProgrammaticPair.hpp>
+#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/DateTimeRange.hpp>
+#include <com/sun/star/util/SearchAlgorithms.hpp>
+#include <com/sun/star/util/SearchFlags.hpp>
+#include <com/sun/star/util/SearchOptions.hpp>
+#include <com/sun/star/util/SearchResult.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/util/XCloseBroadcaster.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
+#include <com/sun/star/util/XStringSubstitution.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/util/XUpdatable.hpp>
+#include <com/sun/star/view/XPrintable.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <com/sun/star/xml/sax/XParser.hpp>
+
+#include <algorithm>
+#include <deque>
+#include <hash_map>
+#include <limits>
+
+#include <list>
+#include <map>
+#include <memory>
+#include <queue>
+#include <set>
+#include <stack>
+#include <utility>
+#include <vector>
+
+
+#include <i18npool/lang.h>
+#include <i18npool/mslangid.hxx>
+
+#include "comphelper/processfactory.hxx"
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/configurationhelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/regpathhelper.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/servicehelper.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/storagehelper.hxx>
+#include <comphelper/types.hxx>
+#include <comphelper/uno3.hxx>
+
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/weakref.hxx"
+#include <cppuhelper/bootstrap.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/interfacecontainer.h>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/propshlp.hxx>
+#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/servicefactory.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakagg.hxx>
+#include <cppuhelper/weakref.hxx>
+
+#include <osl/conditn.hxx>
+#include <osl/conditn.hxx> 
+#include <osl/diagnose.h>
+#include <osl/endian.h>
+#include <osl/file.h>
+#include <osl/file.hxx>
+#include <osl/module.h>
+#include <osl/module.hxx>
+#include <osl/mutex.h>
+#include <osl/mutex.hxx>
+#include <osl/process.h>
+#include <osl/thread.h>
+#include <osl/thread.hxx>
+
+#include <rsc/rscsfx.hxx>
+
+#include "rtl/crc.h"
+#include "rtl/memory.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include <rtl/alloc.h>
+#include <rtl/byteseq.hxx>
+#include <rtl/cipher.h>
+#include <rtl/crc.h>
+#include <rtl/digest.h>
+#include <rtl/logfile.hxx>
+#include <rtl/math.hxx>
+#include <rtl/memory.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/tencinfo.h>
+#include <rtl/textcvt.h>
+#include <rtl/textenc.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <rtl/uuid.h>
+
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+
+#include <sot/clsids.hxx>
+
+#include <tools/inetdef.hxx>
+
+#include <ucbhelper/commandenvironment.hxx>
+#include <ucbhelper/content.hxx>
+#include <ucbhelper/contentbroker.hxx>
+#include <ucbhelper/fileidentifierconverter.hxx>
+
+#include <uno/mapping.hxx>
+
+#include <unotools/bootstrap.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <unotools/configitem.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/confignode.hxx>
+#include <unotools/configpathes.hxx>
+#include <unotools/nativenumberwrapper.hxx>
+#include <unotools/numberformatcodewrapper.hxx>
+#include <unotools/processfactory.hxx>
+
+#include <vcl/dndhelp.hxx>
+#include <vcl/fldunit.hxx>
+#include <vcl/mapunit.hxx>
+#include <vcl/unohelp.hxx>
+
+#include <vos/mutex.hxx>
+#include <vos/process.hxx>
+#include <vos/ref.hxx>
+#include <vos/refernce.hxx>
+#include <vos/security.hxx>
+#include <vos/thread.hxx>
+#include <vos/timer.hxx>
+
+//---MARKER---
+
+#endif
+
diff --git a/svtools/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx
index 97f5a72ec2..97f5a72ec2 100644
--- a/svtools/inc/pickerhelper.hxx
+++ b/svl/inc/pickerhelper.hxx
diff --git a/svtools/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx
index a120288411..a120288411 100644
--- a/svtools/inc/pickerhistory.hxx
+++ b/svl/inc/pickerhistory.hxx
diff --git a/svtools/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx
index 59c502afda..59c502afda 100644
--- a/svtools/inc/pickerhistoryaccess.hxx
+++ b/svl/inc/pickerhistoryaccess.hxx
diff --git a/svtools/inc/poolcach.hxx b/svl/inc/poolcach.hxx
index acfdbf8288..acfdbf8288 100644
--- a/svtools/inc/poolcach.hxx
+++ b/svl/inc/poolcach.hxx
diff --git a/svtools/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx
index 5e99cc7d51..5e99cc7d51 100644
--- a/svtools/inc/strmadpt.hxx
+++ b/svl/inc/strmadpt.hxx
diff --git a/svtools/inc/stylepool.hxx b/svl/inc/stylepool.hxx
index f0035571b9..f0035571b9 100644
--- a/svtools/inc/stylepool.hxx
+++ b/svl/inc/stylepool.hxx
diff --git a/svtools/inc/svtools/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index ef48a3c5d2..ef48a3c5d2 100644
--- a/svtools/inc/svtools/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
diff --git a/svtools/inc/svtools/bintitem.hxx b/svl/inc/svl/bintitem.hxx
index 1ca75b54bf..1ca75b54bf 100644
--- a/svtools/inc/svtools/bintitem.hxx
+++ b/svl/inc/svl/bintitem.hxx
diff --git a/svtools/inc/svtools/brdcst.hxx b/svl/inc/svl/brdcst.hxx
index 6608566571..6608566571 100644
--- a/svtools/inc/svtools/brdcst.hxx
+++ b/svl/inc/svl/brdcst.hxx
diff --git a/svtools/inc/svtools/cancel.hxx b/svl/inc/svl/cancel.hxx
index 1fd34ffaeb..1fd34ffaeb 100644
--- a/svtools/inc/svtools/cancel.hxx
+++ b/svl/inc/svl/cancel.hxx
diff --git a/svtools/inc/svtools/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 6263b207b4..6263b207b4 100644
--- a/svtools/inc/svtools/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
diff --git a/svtools/inc/svtools/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index e3e7a9053b..e3e7a9053b 100644
--- a/svtools/inc/svtools/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
diff --git a/svtools/inc/svtools/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx
index 1573a029f2..1573a029f2 100644
--- a/svtools/inc/svtools/cjkoptions.hxx
+++ b/svl/inc/svl/cjkoptions.hxx
diff --git a/svtools/inc/svtools/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx
index 13216aec92..13216aec92 100644
--- a/svtools/inc/svtools/cnclhint.hxx
+++ b/svl/inc/svl/cnclhint.hxx
diff --git a/svtools/inc/svtools/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index 3a32e10e24..3a32e10e24 100644
--- a/svtools/inc/svtools/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
diff --git a/svtools/inc/svtools/cstitem.hxx b/svl/inc/svl/cstitem.hxx
index afd27aad46..afd27aad46 100644
--- a/svtools/inc/svtools/cstitem.hxx
+++ b/svl/inc/svl/cstitem.hxx
diff --git a/svtools/inc/svtools/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 5c18052df3..5c18052df3 100644
--- a/svtools/inc/svtools/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
diff --git a/svtools/inc/svtools/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index c56390fe69..c56390fe69 100644
--- a/svtools/inc/svtools/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
diff --git a/svtools/inc/svtools/custritm.hxx b/svl/inc/svl/custritm.hxx
index 9629613294..9629613294 100644
--- a/svtools/inc/svtools/custritm.hxx
+++ b/svl/inc/svl/custritm.hxx
diff --git a/svtools/inc/svtools/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index 1087b34e84..1087b34e84 100644
--- a/svtools/inc/svtools/dateitem.hxx
+++ b/svl/inc/svl/dateitem.hxx
diff --git a/svtools/inc/svtools/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx
index 7421cd4330..7421cd4330 100644
--- a/svtools/inc/svtools/documentlockfile.hxx
+++ b/svl/inc/svl/documentlockfile.hxx
diff --git a/svtools/inc/svtools/dtritem.hxx b/svl/inc/svl/dtritem.hxx
index db38ce07ec..db38ce07ec 100644
--- a/svtools/inc/svtools/dtritem.hxx
+++ b/svl/inc/svl/dtritem.hxx
diff --git a/svtools/inc/svtools/eitem.hxx b/svl/inc/svl/eitem.hxx
index 9618ef9f1f..9618ef9f1f 100644
--- a/svtools/inc/svtools/eitem.hxx
+++ b/svl/inc/svl/eitem.hxx
diff --git a/svtools/inc/svtools/filerec.hxx b/svl/inc/svl/filerec.hxx
index 63ed0cee6c..63ed0cee6c 100644
--- a/svtools/inc/svtools/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
diff --git a/svtools/inc/svtools/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index 3ea9b5645b..3ea9b5645b 100644
--- a/svtools/inc/svtools/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
diff --git a/svtools/inc/svtools/frqitem.hxx b/svl/inc/svl/frqitem.hxx
index 8688f57dbb..8688f57dbb 100644
--- a/svtools/inc/svtools/frqitem.hxx
+++ b/svl/inc/svl/frqitem.hxx
diff --git a/svtools/inc/svtools/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
index d5c54537a6..d5c54537a6 100644
--- a/svtools/inc/svtools/globalnameitem.hxx
+++ b/svl/inc/svl/globalnameitem.hxx
diff --git a/svtools/inc/svtools/hint.hxx b/svl/inc/svl/hint.hxx
index 25bf1baca3..25bf1baca3 100644
--- a/svtools/inc/svtools/hint.hxx
+++ b/svl/inc/svl/hint.hxx
diff --git a/svtools/inc/svtools/httpcook.hxx b/svl/inc/svl/httpcook.hxx
index de317e7c58..de317e7c58 100644
--- a/svtools/inc/svtools/httpcook.hxx
+++ b/svl/inc/svl/httpcook.hxx
diff --git a/svtools/inc/svtools/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx
index a1463b3969..a1463b3969 100644
--- a/svtools/inc/svtools/ilstitem.hxx
+++ b/svl/inc/svl/ilstitem.hxx
diff --git a/svtools/inc/svtools/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index a744f5c527..a744f5c527 100644
--- a/svtools/inc/svtools/imageitm.hxx
+++ b/svl/inc/svl/imageitm.hxx
diff --git a/svtools/inc/svtools/inethist.hxx b/svl/inc/svl/inethist.hxx
index 1f5fe5a83c..1f5fe5a83c 100644
--- a/svtools/inc/svtools/inethist.hxx
+++ b/svl/inc/svl/inethist.hxx
diff --git a/svtools/inc/svtools/inettype.hxx b/svl/inc/svl/inettype.hxx
index 526e9ffb30..526e9ffb30 100644
--- a/svtools/inc/svtools/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
diff --git a/svtools/inc/svtools/intitem.hxx b/svl/inc/svl/intitem.hxx
index a70bdc63b9..a70bdc63b9 100644
--- a/svtools/inc/svtools/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
diff --git a/svtools/inc/svtools/isethint.hxx b/svl/inc/svl/isethint.hxx
index bc3b210fac..bc3b210fac 100644
--- a/svtools/inc/svtools/isethint.hxx
+++ b/svl/inc/svl/isethint.hxx
diff --git a/svtools/inc/svtools/itemiter.hxx b/svl/inc/svl/itemiter.hxx
index d3962cc889..d3962cc889 100644
--- a/svtools/inc/svtools/itemiter.hxx
+++ b/svl/inc/svl/itemiter.hxx
diff --git a/svtools/inc/svtools/itempool.hxx b/svl/inc/svl/itempool.hxx
index f285469767..f285469767 100644
--- a/svtools/inc/svtools/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
diff --git a/svtools/inc/svtools/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index 821589f116..821589f116 100644
--- a/svtools/inc/svtools/itemprop.hxx
+++ b/svl/inc/svl/itemprop.hxx
diff --git a/svtools/inc/svtools/itemset.hxx b/svl/inc/svl/itemset.hxx
index 26595e1d23..26595e1d23 100644
--- a/svtools/inc/svtools/itemset.hxx
+++ b/svl/inc/svl/itemset.hxx
diff --git a/svtools/inc/svtools/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index dd94e38124..dd94e38124 100644
--- a/svtools/inc/svtools/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
diff --git a/svtools/inc/svtools/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx
index fa1a216a83..fa1a216a83 100644
--- a/svtools/inc/svtools/lckbitem.hxx
+++ b/svl/inc/svl/lckbitem.hxx
diff --git a/svtools/inc/svtools/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx
index 3d114f7939..3d114f7939 100644
--- a/svtools/inc/svtools/lockfilecommon.hxx
+++ b/svl/inc/svl/lockfilecommon.hxx
diff --git a/svtools/inc/svtools/lstner.hxx b/svl/inc/svl/lstner.hxx
index 512efee64c..512efee64c 100644
--- a/svtools/inc/svtools/lstner.hxx
+++ b/svl/inc/svl/lstner.hxx
diff --git a/svtools/inc/svtools/macitem.hxx b/svl/inc/svl/macitem.hxx
index a2b7e15498..a2b7e15498 100644
--- a/svtools/inc/svtools/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
diff --git a/svtools/inc/svtools/metitem.hxx b/svl/inc/svl/metitem.hxx
index 2faab3517e..2faab3517e 100644
--- a/svtools/inc/svtools/metitem.hxx
+++ b/svl/inc/svl/metitem.hxx
diff --git a/svtools/inc/svtools/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx
index 5f83854fe7..5f83854fe7 100644
--- a/svtools/inc/svtools/nfkeytab.hxx
+++ b/svl/inc/svl/nfkeytab.hxx
diff --git a/svtools/inc/svtools/nfversi.hxx b/svl/inc/svl/nfversi.hxx
index 84deedf49e..84deedf49e 100644
--- a/svtools/inc/svtools/nfversi.hxx
+++ b/svl/inc/svl/nfversi.hxx
diff --git a/svtools/inc/svtools/nranges.hxx b/svl/inc/svl/nranges.hxx
index 594a6651bb..594a6651bb 100644
--- a/svtools/inc/svtools/nranges.hxx
+++ b/svl/inc/svl/nranges.hxx
diff --git a/svtools/inc/svtools/ondemand.hxx b/svl/inc/svl/ondemand.hxx
index e5c70641b7..e5c70641b7 100644
--- a/svtools/inc/svtools/ondemand.hxx
+++ b/svl/inc/svl/ondemand.hxx
diff --git a/svtools/inc/svtools/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index e5f930e735..e5f930e735 100644
--- a/svtools/inc/svtools/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
diff --git a/svtools/inc/svtools/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index e59353e9ed..e59353e9ed 100644
--- a/svtools/inc/svtools/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
diff --git a/svtools/inc/svtools/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 280eaea4fd..280eaea4fd 100644
--- a/svtools/inc/svtools/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
diff --git a/svtools/inc/svtools/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index 3f9e56cb9b..3f9e56cb9b 100644
--- a/svtools/inc/svtools/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
diff --git a/svtools/inc/svtools/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx
index 1af954fd20..1af954fd20 100644
--- a/svtools/inc/svtools/restrictedpaths.hxx
+++ b/svl/inc/svl/restrictedpaths.hxx
diff --git a/svtools/inc/svtools/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index ec779e523a..ec779e523a 100644
--- a/svtools/inc/svtools/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
diff --git a/svtools/inc/svtools/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index c665cb284f..c665cb284f 100644
--- a/svtools/inc/svtools/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.hxx
diff --git a/svtools/inc/svtools/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx
index 6ef893c4d9..6ef893c4d9 100644
--- a/svtools/inc/svtools/sharecontrolfile.hxx
+++ b/svl/inc/svl/sharecontrolfile.hxx
diff --git a/svtools/inc/svtools/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index eee4c03dc8..eee4c03dc8 100644
--- a/svtools/inc/svtools/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
diff --git a/svtools/inc/svtools/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index 4d65093b59..4d65093b59 100644
--- a/svtools/inc/svtools/smplhint.hxx
+++ b/svl/inc/svl/smplhint.hxx
diff --git a/svtools/inc/svtools/solar.hrc b/svl/inc/svl/solar.hrc
index a0fd4ea5f4..a0fd4ea5f4 100644
--- a/svtools/inc/svtools/solar.hrc
+++ b/svl/inc/svl/solar.hrc
diff --git a/svtools/inc/svtools/stritem.hxx b/svl/inc/svl/stritem.hxx
index 56b749cbbe..56b749cbbe 100644
--- a/svtools/inc/svtools/stritem.hxx
+++ b/svl/inc/svl/stritem.hxx
diff --git a/svtools/inc/svtools/style.hrc b/svl/inc/svl/style.hrc
index 6ca79af4da..6ca79af4da 100644
--- a/svtools/inc/svtools/style.hrc
+++ b/svl/inc/svl/style.hrc
diff --git a/svtools/inc/svtools/style.hxx b/svl/inc/svl/style.hxx
index b0d4a238d5..b0d4a238d5 100644
--- a/svtools/inc/svtools/style.hxx
+++ b/svl/inc/svl/style.hxx
diff --git a/svtools/inc/svtools/svarray.hxx b/svl/inc/svl/svarray.hxx
index ea2146b10a..ea2146b10a 100644
--- a/svtools/inc/svtools/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
diff --git a/svtools/inc/svtools/svdde.hxx b/svl/inc/svl/svdde.hxx
index e755e3a7dd..e755e3a7dd 100644
--- a/svtools/inc/svtools/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
new file mode 100644
index 0000000000..d1e35b2066
--- /dev/null
+++ b/svl/inc/svl/svldata.hxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svtdata.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SVTOOLS_SVTDATA_HXX
+#define _SVTOOLS_SVTDATA_HXX
+
+#include <tools/resid.hxx>
+#include <tools/simplerm.hxx>
+
+class ResMgr;
+class SfxItemDesruptorList_Impl;
+class SfxItemPool;
+class Twain;
+
+//============================================================================
+class ImpSvtData
+{
+public:
+    Twain * pTwain;
+    const SfxItemPool * pStoringPool;
+    SfxItemDesruptorList_Impl * pItemDesruptList;
+
+    ResMgr *		pResMgr;
+    ResMgr *		pPatchResMgr;
+    
+    void*			m_pThreadsafeRMs;
+        // one SimpleResMgr for each language for which a resource was requested
+        // (When using the 'non-simple' resmgr, the first request for any language wins, any
+        // further request for any other language supply the resmgr of the first call.
+        // For the simple resmgr we have a mgr for each language ever requested).
+
+private:
+    ImpSvtData():
+        pTwain(0), pStoringPool(0), pItemDesruptList(0), pResMgr(0),
+        pPatchResMgr(NULL), m_pThreadsafeRMs(NULL)
+    {}
+
+    ~ImpSvtData();
+
+public:
+    ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale);
+    ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL!
+
+    ResMgr * GetPatchResMgr();
+    ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale);
+
+    
+    SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale);
+
+    static ImpSvtData & GetSvtData();
+};
+
+//============================================================================
+
+class SvpResId: public ResId
+{
+public:
+    SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ):
+        ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {}
+
+     // VCL dependant, only available in SVT, not in SVL!
+    SvpResId( USHORT nId );
+};
+
+
+class SvtResId: public ResId
+{
+public:
+    SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale):
+        ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {}
+
+    SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {}
+     // VCL dependant, only available in SVT, not in SVL!
+};
+
+//============================================================================
+class SvtSimpleResId
+{
+    String	m_sValue;
+
+public:
+    SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvtData::GetSvtData().GetSimpleRM(aLocale)->ReadString(nId)) { };
+
+    operator String () const { return m_sValue; }
+};
+
+
+
+#endif //  _SVTOOLS_SVTDATA_HXX
+
diff --git a/svtools/inc/svtools/svldllapi.h b/svl/inc/svl/svldllapi.h
index 19f6752c32..19f6752c32 100644
--- a/svtools/inc/svtools/svldllapi.h
+++ b/svl/inc/svl/svldllapi.h
diff --git a/svtools/inc/svtools/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index a1b022c740..a1b022c740 100644
--- a/svtools/inc/svtools/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
diff --git a/svtools/inc/svtools/svtools.hrc b/svl/inc/svl/svtools.hrc
index ed4eb845d2..ed4eb845d2 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svl/inc/svl/svtools.hrc
diff --git a/svtools/inc/svtools/syslocale.hxx b/svl/inc/svl/syslocale.hxx
index 6e0713a404..6e0713a404 100644
--- a/svtools/inc/svtools/syslocale.hxx
+++ b/svl/inc/svl/syslocale.hxx
diff --git a/svtools/inc/svtools/syslocaleoptions.hxx b/svl/inc/svl/syslocaleoptions.hxx
index 8b03785d54..8b03785d54 100644
--- a/svtools/inc/svtools/syslocaleoptions.hxx
+++ b/svl/inc/svl/syslocaleoptions.hxx
diff --git a/svtools/inc/svtools/szitem.hxx b/svl/inc/svl/szitem.hxx
index 67db3c864c..67db3c864c 100644
--- a/svtools/inc/svtools/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
diff --git a/svtools/inc/svtools/tfrmitem.hxx b/svl/inc/svl/tfrmitem.hxx
index b993887c5c..b993887c5c 100644
--- a/svtools/inc/svtools/tfrmitem.hxx
+++ b/svl/inc/svl/tfrmitem.hxx
diff --git a/svtools/inc/svtools/tresitem.hxx b/svl/inc/svl/tresitem.hxx
index e1bdf23503..e1bdf23503 100644
--- a/svtools/inc/svtools/tresitem.hxx
+++ b/svl/inc/svl/tresitem.hxx
diff --git a/svtools/inc/svtools/undo.hxx b/svl/inc/svl/undo.hxx
index 7796965e03..7796965e03 100644
--- a/svtools/inc/svtools/undo.hxx
+++ b/svl/inc/svl/undo.hxx
diff --git a/svtools/inc/svtools/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx
index a740e0a677..a740e0a677 100644
--- a/svtools/inc/svtools/urlfilter.hxx
+++ b/svl/inc/svl/urlfilter.hxx
diff --git a/svtools/inc/svtools/visitem.hxx b/svl/inc/svl/visitem.hxx
index 2e1154deed..2e1154deed 100644
--- a/svtools/inc/svtools/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
diff --git a/svtools/inc/svtools/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 2f3a09bff9..2f3a09bff9 100644
--- a/svtools/inc/svtools/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
diff --git a/svtools/inc/svtools/zformat.hxx b/svl/inc/svl/zformat.hxx
index 4c52b1043e..4c52b1043e 100644
--- a/svtools/inc/svtools/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
diff --git a/svtools/inc/urihelper.hxx b/svl/inc/urihelper.hxx
index 06341f8f4d..06341f8f4d 100644
--- a/svtools/inc/urihelper.hxx
+++ b/svl/inc/urihelper.hxx
diff --git a/svtools/inc/urlbmk.hxx b/svl/inc/urlbmk.hxx
index e20da45e42..e20da45e42 100644
--- a/svtools/inc/urlbmk.hxx
+++ b/svl/inc/urlbmk.hxx
diff --git a/svtools/inc/whiter.hxx b/svl/inc/whiter.hxx
index 385e82c17e..385e82c17e 100644
--- a/svtools/inc/whiter.hxx
+++ b/svl/inc/whiter.hxx
diff --git a/svtools/inc/xmlement.hxx b/svl/inc/xmlement.hxx
index 7dc131c3b8..7dc131c3b8 100644
--- a/svtools/inc/xmlement.hxx
+++ b/svl/inc/xmlement.hxx
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
new file mode 100644
index 0000000000..a601997405
--- /dev/null
+++ b/svl/prj/build.lst
@@ -0,0 +1,55 @@
+st	svtools	:	l10n offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL
+st	svtools						usr1	-	all	st_mkout NULL
+st	svtools\inc					nmake	-	all	st_inc NULL
+st	svtools\inc\sane				get	-	all	st_incsa NULL
+st	svtools\prj					get	-	all	st_prj NULL
+st	svtools\res					get	-	all	st_res NULL
+st	svtools\win\inc					get	-	all	st_winc NULL
+st	svtools\win\res					get	-	all	st_wres NULL
+st	svtools\os2\inc					get	-	all	st_oinc NULL
+st	svtools\mac\inc					get	-	all	st_minc NULL
+st	svtools\unx\inc					get	-	all	st_uinc NULL
+st	svtools\bmpmaker				nmake	-	all	st_bmp st_inc NULL
+st	svtools\source\memtools				nmake	-	all	st_mem st_inc NULL
+st	svtools\source\numbers				nmake	-	all	st_num st_inc NULL
+st	svtools\source\notify				nmake	-	all	st_not st_inc NULL
+st	svtools\source\config				nmake	-	all	st_conf st_inc NULL
+st	svtools\unx\source\svdde			nmake	-	u	st_usdde st_inc NULL
+st	svtools\unx\source\svdde			nmake	-	p	st_psdde st_inc NULL
+st	svtools\mac\source\svdde			nmake	-	m	st_msdde st_inc NULL
+st	svtools\mac\source\misc				nmake	-	m	st_msc st_inc NULL
+st	svtools\source\control				nmake	-	all	st_ctl st_inc NULL
+st	svtools\source\filerec				nmake	-	all	st_file st_inc NULL
+st	svtools\source\filter.vcl\filter		nmake	-	all	st_vfilt st_inc NULL
+st	svtools\source\filter.vcl\wmf			nmake	-	all	st_vwmf st_inc NULL
+st	svtools\source\filter.vcl\igif			nmake	-	all	st_vigif st_inc NULL
+st	svtools\source\filter.vcl\jpeg			nmake	-	all	st_vjpeg st_inc NULL
+st	svtools\source\filter.vcl\ixbm			nmake	-	all	st_vixbm st_inc NULL
+st	svtools\source\filter.vcl\ixpm			nmake	-	all	st_vixpm st_inc NULL
+st	svtools\source\brwbox				nmake	-	all	st__brw st_bmp st_inc NULL
+st	svtools\source\urlobj				nmake	-	all	st__url st_inc NULL
+st	svtools\source\misc				nmake	-	all	st__misc st_bmp st_inc NULL
+st	svtools\source\misc1			nmake	-	all	st__misc1 st_inc NULL
+st	svtools\source\contnr				nmake	-	all	st__ctr st_inc NULL
+st	svtools\source\svdde				nmake	-	all	st__dde st_inc NULL
+st	svtools\source\items				nmake	-	all	st__item st_inc NULL
+st	svtools\source\items1				nmake	-	all	st__item1 st_inc NULL
+st	svtools\source\undo				nmake	-	all	st_undo st_inc NULL
+st	svtools\source\plugapp				nmake	-	all	st_papp st_inc NULL
+st	svtools\source\dialogs				nmake	-	all	st_dial st_inc NULL
+st	svtools\source\edit				nmake	-	all	st_edit st_inc NULL
+st	svtools\source\table               nmake	-	all	st_table st_inc NULL
+st	svtools\source\uno				nmake	-	all	st_uno st_inc NULL
+st	svtools\source\svrtf				nmake	-	all	st_rtf st_inc NULL
+st	svtools\source\svsql				nmake	-	all	st_sql st_inc NULL
+st	svtools\source\svhtml				nmake	-	all	st_html st_inc NULL
+st  svtools\source\syslocale                nmake   -   all st_sysloc st_inc NULL
+st	svtools\source\filepicker               nmake	-	all	st_filepick st_inc NULL
+st  svtools\util                            nmake   -   all st_util st__brw st__ctr st__dde st__item st__item1 st__misc st__misc1 st__url  st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_psdde.p st_msdde.m st_msc.m st_undo st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_sysloc st_filepick st_not st_conf st_mem st_num st_svtjava NULL
+st	svtools\source\fsstor				nmake	-	all	st_fsstor st_inc NULL
+st	svtools\source\hatchwindow			nmake	-	all	st_hatchwin st_inc NULL
+st	svtools\source\passwordcontainer	nmake	-	all	st_passcont st_inc NULL
+st	svtools\source\productregistration	nmake	-	all	st_prodreg st_util st_inc NULL
+st	svtools\uno							nmake	-	all	st_svtuno st_util st_inc NULL
+st	svtools\source\java				nmake	-	all	st_svtjava  st_inc NULL
+st  svtools\workben\unodialog           nmake   -   all st_workben_udlg st_util NULL
diff --git a/svl/prj/d.lst b/svl/prj/d.lst
new file mode 100644
index 0000000000..a3a7679f8a
--- /dev/null
+++ b/svl/prj/d.lst
@@ -0,0 +1,133 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+mkdir: %_DEST%\inc%_EXT%\svtools
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs
+..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid
+..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib
+..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib
+..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib
+..\%__SRC%\bin\dllver.exe %_DEST%\bin%_EXT%\dllver.exe
+..\%__SRC%\bin\dllver %_DEST%\bin%_EXT%\dllver
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.*
+..\%__SRC%\bin\bmpsum.* %_DEST%\bin%_EXT%\bmpsum.*
+..\%__SRC%\bin\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.*
+..\%__SRC%\bin\g2g.* %_DEST%\bin%_EXT%\g2g.*
+..\%__SRC%\bin\bmp %_DEST%\bin%_EXT%\bmp
+..\%__SRC%\bin\bmpsum %_DEST%\bin%_EXT%\bmpsum
+..\%__SRC%\bin\bmpgui %_DEST%\bin%_EXT%\bmpgui
+..\%__SRC%\bin\g2g %_DEST%\bin%_EXT%\g2g
+..\%__SRC%\res\bmp.* %_DEST%\bin%_EXT%\bmp.*
+..\%__SRC%\res\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.*
+..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
+
+..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
+..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h
+..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
+
+..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\svtools\imagemgr.hxx
+..\inc\imagemgr.hrc %_DEST%\inc%_EXT%\svtools\imagemgr.hrc
+..\inc\testtool.hxx %_DEST%\inc%_EXT%\svtools\testtool.hxx
+..\inc\flbytes.hxx %_DEST%\inc%_EXT%\svtools\flbytes.hxx
+..\inc\adrparse.hxx %_DEST%\inc%_EXT%\svtools\adrparse.hxx
+..\inc\broadcast.hxx %_DEST%\inc%_EXT%\svtools\broadcast.hxx
+..\inc\calendar.hxx %_DEST%\inc%_EXT%\svtools\calendar.hxx
+..\inc\cntnrsrt.hxx %_DEST%\inc%_EXT%\svtools\cntnrsrt.hxx
+..\inc\ctrlbox.hxx %_DEST%\inc%_EXT%\svtools\ctrlbox.hxx
+..\inc\ctrltool.hxx %_DEST%\inc%_EXT%\svtools\ctrltool.hxx
+..\inc\collatorres.hxx %_DEST%\inc%_EXT%\svtools\collatorres.hxx
+..\inc\indexentryres.hxx %_DEST%\inc%_EXT%\svtools\indexentryres.hxx
+..\inc\cntwids.hrc %_DEST%\inc%_EXT%\svtools\cntwids.hrc
+..\inc\itemdel.hxx %_DEST%\inc%_EXT%\svtools\itemdel.hxx
+..\inc\wallitem.hxx %_DEST%\inc%_EXT%\svtools\wallitem.hxx
+..\inc\stylepool.hxx %_DEST%\inc%_EXT%\svtools\stylepool.hxx
+..\inc\dialogcontrolling.hxx %_DEST%\inc%_EXT%\svtools\dialogcontrolling.hxx
+..\inc\filedlg.hxx %_DEST%\inc%_EXT%\svtools\filedlg.hxx
+..\inc\fltdefs.hxx %_DEST%\inc%_EXT%\svtools\fltdefs.hxx
+..\inc\imgdef.hxx %_DEST%\inc%_EXT%\svtools\imgdef.hxx
+..\inc\inetdef.hxx %_DEST%\inc%_EXT%\svtools\inetdef.hxx
+..\inc\inetmsg.hxx %_DEST%\inc%_EXT%\svtools\inetmsg.hxx
+..\inc\inetstrm.hxx %_DEST%\inc%_EXT%\svtools\inetstrm.hxx
+..\inc\listener.hxx %_DEST%\inc%_EXT%\svtools\listener.hxx
+..\inc\listeneriter.hxx %_DEST%\inc%_EXT%\svtools\listeneriter.hxx
+..\inc\memberid.hrc %_DEST%\inc%_EXT%\svtools\memberid.hrc
+..\inc\prgsbar.hxx %_DEST%\inc%_EXT%\svtools\prgsbar.hxx
+..\inc\poolcach.hxx %_DEST%\inc%_EXT%\svtools\poolcach.hxx
+..\inc\ruler.hxx %_DEST%\inc%_EXT%\svtools\ruler.hxx
+..\inc\scrwin.hxx %_DEST%\inc%_EXT%\svtools\scrwin.hxx
+..\inc\scriptedtext.hxx %_DEST%\inc%_EXT%\svtools\scriptedtext.hxx
+..\inc\tabbar.hxx %_DEST%\inc%_EXT%\svtools\tabbar.hxx
+..\inc\taskbar.hxx %_DEST%\inc%_EXT%\svtools\taskbar.hxx
+..\inc\whiter.hxx %_DEST%\inc%_EXT%\svtools\whiter.hxx
+..\inc\stdmenu.hxx %_DEST%\inc%_EXT%\svtools\stdmenu.hxx
+..\inc\tooltiplbox.hxx %_DEST%\inc%_EXT%\svtools\tooltiplbox.hxx
+..\inc\txtattr.hxx %_DEST%\inc%_EXT%\svtools\txtattr.hxx
+..\inc\sychconv.hxx %_DEST%\inc%_EXT%\svtools\sychconv.hxx
+..\inc\cliplistener.hxx %_DEST%\inc%_EXT%\svtools\cliplistener.hxx
+..\inc\txtcmp.hxx %_DEST%\inc%_EXT%\svtools\txtcmp.hxx
+..\inc\urlbmk.hxx %_DEST%\inc%_EXT%\svtools\urlbmk.hxx
+..\inc\inetimg.hxx %_DEST%\inc%_EXT%\svtools\inetimg.hxx
+..\inc\nfsymbol.hxx %_DEST%\inc%_EXT%\svtools\nfsymbol.hxx
+..\inc\numuno.hxx %_DEST%\inc%_EXT%\svtools\numuno.hxx
+..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx
+..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx
+..\inc\templatefoldercache.hxx %_DEST%\inc%_EXT%\svtools\templatefoldercache.hxx
+..\inc\folderrestriction.hxx %_DEST%\inc%_EXT%\svtools\folderrestriction.hxx
+..\inc\filenotation.hxx %_DEST%\inc%_EXT%\svtools\filenotation.hxx
+..\inc\framestatuslistener.hxx %_DEST%\inc%_EXT%\svtools\framestatuslistener.hxx
+..\inc\statusbarcontroller.hxx %_DEST%\inc%_EXT%\svtools\statusbarcontroller.hxx
+..\inc\htmltokn.h %_DEST%\inc%_EXT%\svtools\htmltokn.h
+..\inc\htmlkywd.hxx %_DEST%\inc%_EXT%\svtools\htmlkywd.hxx
+..\source\svrtf\rtfout.hxx %_DEST%\inc%_EXT%\svtools\rtfout.hxx
+..\source\svrtf\rtftoken.h %_DEST%\inc%_EXT%\svtools\rtftoken.h
+..\source\svrtf\rtfkeywd.hxx %_DEST%\inc%_EXT%\svtools\rtfkeywd.hxx
+..\inc\strmadpt.hxx %_DEST%\inc%_EXT%\svtools\strmadpt.hxx
+..\inc\instrm.hxx %_DEST%\inc%_EXT%\svtools\instrm.hxx
+..\inc\outstrm.hxx %_DEST%\inc%_EXT%\svtools\outstrm.hxx
+..\inc\sectctr.hxx %_DEST%\inc%_EXT%\svtools\sectctr.hxx
+..\inc\privsplt.hxx %_DEST%\inc%_EXT%\svtools\privsplt.hxx
+..\inc\expander.hxx %_DEST%\inc%_EXT%\svtools\expander.hxx
+..\source\svsql\converter.hxx %_DEST%\inc%_EXT%\svtools\converter.hxx
+..\inc\filectrl.hxx %_DEST%\inc%_EXT%\svtools\filectrl.hxx
+..\inc\sfxecode.hxx %_DEST%\inc%_EXT%\svtools\sfxecode.hxx
+..\source\dialogs\filedlg2.hrc %_DEST%\inc%_EXT%\svtools\filedlg2.hrc
+..\inc\xmlement.hxx %_DEST%\inc%_EXT%\svtools\xmlement.hxx
+..\inc\urihelper.hxx %_DEST%\inc%_EXT%\svtools\urihelper.hxx
+..\inc\reginfo.hxx %_DEST%\inc%_EXT%\svtools\reginfo.hxx
+..\inc\fstathelper.hxx %_DEST%\inc%_EXT%\svtools\fstathelper.hxx
+..\inc\localresaccess.hxx %_DEST%\inc%_EXT%\svtools\localresaccess.hxx
+..\inc\roadmap.hxx %_DEST%\inc%_EXT%\svtools\roadmap.hxx
+..\inc\helpagentwindow.hxx %_DEST%\inc%_EXT%\svtools\helpagentwindow.hxx
+..\inc\pickerhistory.hxx %_DEST%\inc%_EXT%\svtools\pickerhistory.hxx
+..\inc\pickerhistoryaccess.hxx %_DEST%\inc%_EXT%\svtools\pickerhistoryaccess.hxx
+..\inc\pickerhelper.hxx %_DEST%\inc%_EXT%\svtools\pickerhelper.hxx
+..\inc\lngmisc.hxx %_DEST%\inc%_EXT%\svtools\lngmisc.hxx
+..\inc\PasswordHelper.hxx %_DEST%\inc%_EXT%\svtools\PasswordHelper.hxx
+..\inc\unoimap.hxx %_DEST%\inc%_EXT%\svtools\unoimap.hxx
+..\inc\unoevent.hxx %_DEST%\inc%_EXT%\svtools\unoevent.hxx
+..\inc\ivctrl.hxx %_DEST%\inc%_EXT%\svtools\ivctrl.hxx
+..\inc\fileview.hxx %_DEST%\inc%_EXT%\svtools\fileview.hxx
+..\inc\templdlg.hxx %_DEST%\inc%_EXT%\svtools\templdlg.hxx
+..\inc\asynclink.hxx %_DEST%\inc%_EXT%\svtools\asynclink.hxx
+..\inc\controldims.hrc %_DEST%\inc%_EXT%\svtools\controldims.hrc
+..\inc\soerr.hxx %_DEST%\inc%_EXT%\svtools\soerr.hxx
+..\inc\sores.hxx %_DEST%\inc%_EXT%\svtools\sores.hxx
+..\inc\textwindowaccessibility.hxx %_DEST%\inc%_EXT%\svtools\textwindowaccessibility.hxx
+..\inc\fontsubstconfig.hxx %_DEST%\inc%_EXT%\svtools\fontsubstconfig.hxx
+..\inc\apearcfg.hxx %_DEST%\inc%_EXT%\svtools\apearcfg.hxx
+..\inc\misccfg.hxx %_DEST%\inc%_EXT%\svtools\misccfg.hxx
+..\inc\acceleratorexecute.hxx %_DEST%\inc%_EXT%\svtools\acceleratorexecute.hxx
+..\inc\QueryFolderName.hxx %_DEST%\inc%_EXT%\svtools\QueryFolderName.hxx
+..\inc\DocumentInfoPreview.hxx %_DEST%\inc%_EXT%\svtools\DocumentInfoPreview.hxx
+..\inc\dialogclosedlistener.hxx %_DEST%\inc%_EXT%\svtools\dialogclosedlistener.hxx
+..\inc\contextmenuhelper.hxx %_DEST%\inc%_EXT%\svtools\contextmenuhelper.hxx
+..\inc\extcolorcfg.hxx %_DEST%\inc%_EXT%\svtools\extcolorcfg.hxx
+
+dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
+
+*.xml %_DEST%\xml%_EXT%\*.xml
+
diff --git a/svtools/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java
index c0e9a8a828..c0e9a8a828 100644
--- a/svtools/qa/complex/ConfigItems/CheckConfigItems.java
+++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java
diff --git a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
index 0763321003..0763321003 100644
--- a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
index bac779e30e..bac779e30e 100644
--- a/svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
diff --git a/svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index 6cedc183fd..6cedc183fd 100644
--- a/svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index 7fe6952e37..7fe6952e37 100644
--- a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
index 8415d9f989..8415d9f989 100644
--- a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
diff --git a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
index 4fa2c2d88e..4fa2c2d88e 100644
--- a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
index 5609614a0c..5609614a0c 100644
--- a/svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
index ff5e75ccd3..ff5e75ccd3 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
index 72ff71cafe..72ff71cafe 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
diff --git a/svtools/qa/complex/ConfigItems/helper/exports.map b/svl/qa/complex/ConfigItems/helper/exports.map
index 85610ad808..85610ad808 100644
--- a/svtools/qa/complex/ConfigItems/helper/exports.map
+++ b/svl/qa/complex/ConfigItems/helper/exports.map
diff --git a/svtools/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index 6070d25b7b..6070d25b7b 100644
--- a/svtools/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/makefile.mk
diff --git a/svtools/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk
index f85c5b0a8e..f85c5b0a8e 100644
--- a/svtools/qa/complex/ConfigItems/makefile.mk
+++ b/svl/qa/complex/ConfigItems/makefile.mk
diff --git a/svtools/qa/complex/passwordcontainer/MasterPasswdHandler.java b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java
index af48cb5c0d..af48cb5c0d 100644
--- a/svtools/qa/complex/passwordcontainer/MasterPasswdHandler.java
+++ b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java
diff --git a/svtools/qa/complex/passwordcontainer/PasswordContainerTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
index 5264c406ed..5264c406ed 100644
--- a/svtools/qa/complex/passwordcontainer/PasswordContainerTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
diff --git a/svtools/qa/complex/passwordcontainer/PasswordContainerUnitTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
index 0d8fafdf7a..0d8fafdf7a 100644
--- a/svtools/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
diff --git a/svtools/qa/complex/passwordcontainer/Test01.java b/svl/qa/complex/passwordcontainer/Test01.java
index 02e1ec087f..02e1ec087f 100644
--- a/svtools/qa/complex/passwordcontainer/Test01.java
+++ b/svl/qa/complex/passwordcontainer/Test01.java
diff --git a/svtools/qa/complex/passwordcontainer/Test02.java b/svl/qa/complex/passwordcontainer/Test02.java
index 08bfd1e629..08bfd1e629 100644
--- a/svtools/qa/complex/passwordcontainer/Test02.java
+++ b/svl/qa/complex/passwordcontainer/Test02.java
diff --git a/svtools/qa/complex/passwordcontainer/Test03.java b/svl/qa/complex/passwordcontainer/Test03.java
index 17876dc649..17876dc649 100644
--- a/svtools/qa/complex/passwordcontainer/Test03.java
+++ b/svl/qa/complex/passwordcontainer/Test03.java
diff --git a/svtools/qa/complex/passwordcontainer/TestHelper.java b/svl/qa/complex/passwordcontainer/TestHelper.java
index 262181c48f..262181c48f 100644
--- a/svtools/qa/complex/passwordcontainer/TestHelper.java
+++ b/svl/qa/complex/passwordcontainer/TestHelper.java
diff --git a/svtools/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk
index 4ce811bd36..4ce811bd36 100644
--- a/svtools/qa/complex/passwordcontainer/makefile.mk
+++ b/svl/qa/complex/passwordcontainer/makefile.mk
diff --git a/svtools/qa/export.map b/svl/qa/export.map
index 994a475372..994a475372 100755
--- a/svtools/qa/export.map
+++ b/svl/qa/export.map
diff --git a/svtools/qa/makefile.mk b/svl/qa/makefile.mk
index c56dc2804a..c56dc2804a 100644
--- a/svtools/qa/makefile.mk
+++ b/svl/qa/makefile.mk
diff --git a/svtools/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx
index a90fbe039b..a90fbe039b 100644
--- a/svtools/qa/test_URIHelper.cxx
+++ b/svl/qa/test_URIHelper.cxx
diff --git a/svtools/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 0419e5ec7c..0419e5ec7c 100644
--- a/svtools/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
diff --git a/svtools/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 7814e2e7cf..7814e2e7cf 100644
--- a/svtools/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
new file mode 100644
index 0000000000..d0e5b30007
--- /dev/null
+++ b/svl/source/config/itemholder2.cxx
@@ -0,0 +1,242 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: itemholder2.cxx,v $
+ * $Revision: 1.13 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
+
+#ifdef  SVL_DLLIMPLEMENTATION
+#undef  SVL_DLLIMPLEMENTATION
+#endif
+#define SVT_DLLIMPLEMENTATION
+
+#include "itemholder2.hxx"
+
+//-----------------------------------------------
+// includes
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XComponent.hpp>
+
+#include <svtools/accessibilityoptions.hxx>
+#include <apearcfg.hxx>
+#include <svtools/cjkoptions.hxx>
+#include <svtools/menuoptions.hxx>
+#include <svtools/colorcfg.hxx>
+#include <svtools/ctloptions.hxx>
+#include <fontsubstconfig.hxx>
+#include <svtools/helpopt.hxx>
+#include <svtools/languageoptions.hxx>
+#include <misccfg.hxx>
+#include <svtools/printoptions.hxx>
+#include <svtools/syslocaleoptions.hxx>
+#include <unotools/options.hxx>
+#include <svtools/miscopt.hxx>
+
+
+#include <tools/debug.hxx>
+
+//-----------------------------------------------
+// namespaces
+
+namespace css = ::com::sun::star;
+
+//-----------------------------------------------
+// declarations
+
+//-----------------------------------------------
+ItemHolder2::ItemHolder2()
+    : ItemHolderMutexBase()
+{
+    try
+    {
+        css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
+        css::uno::Reference< css::lang::XComponent > xCfg(
+            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            css::uno::UNO_QUERY);
+        if (xCfg.is())
+            xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
+    }
+// #i37892  got errorhandling from   ConfigManager::GetConfigurationProvider()
+    catch(css::uno::RuntimeException& rREx)
+    {
+        throw rREx;
+    }
+#ifdef DBG_UTIL
+    catch(css::uno::Exception& rEx)
+    {
+        static sal_Bool bMessage = sal_True;
+        if(bMessage)
+        {
+            bMessage = sal_False;
+            ::rtl::OString sMsg("CreateInstance with arguments exception: ");
+            sMsg += ::rtl::OString(rEx.Message.getStr(),
+                        rEx.Message.getLength(),
+                        RTL_TEXTENCODING_ASCII_US);
+            DBG_ERROR(sMsg.getStr());
+        }
+    }
+#else
+    catch(css::uno::Exception&){}
+#endif
+}
+
+//-----------------------------------------------
+ItemHolder2::~ItemHolder2()
+{
+    impl_releaseAllItems();
+}
+
+//-----------------------------------------------
+void ItemHolder2::holdConfigItem(EItem eItem)
+{
+    static ItemHolder2* pHolder = new ItemHolder2();
+    pHolder->impl_addItem(eItem);
+}
+
+//-----------------------------------------------
+void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&)
+    throw(css::uno::RuntimeException)
+{
+    impl_releaseAllItems();
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_addItem(EItem eItem)
+{
+    ::osl::ResettableMutexGuard aLock(m_aLock);
+
+    TItems::const_iterator pIt;
+    for (  pIt  = m_lItems.begin();
+           pIt != m_lItems.end()  ;
+         ++pIt                    )
+    {
+        const TItemInfo& rInfo = *pIt;
+        if (rInfo.eItem == eItem)
+            return;
+    }
+
+    TItemInfo aNewItem;
+    aNewItem.eItem = eItem;
+    impl_newItem(aNewItem);
+    if (aNewItem.pItem)
+        m_lItems.push_back(aNewItem);
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_releaseAllItems()
+{
+    ::osl::ResettableMutexGuard aLock(m_aLock);
+
+    TItems::iterator pIt;
+    for (  pIt  = m_lItems.begin();
+           pIt != m_lItems.end()  ;
+         ++pIt                    )
+    {
+        TItemInfo& rInfo = *pIt;
+        impl_deleteItem(rInfo);
+    }
+    m_lItems.clear();
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_newItem(TItemInfo& rItem)
+{
+    switch(rItem.eItem)
+    {
+        case E_ACCESSIBILITYOPTIONS :
+            rItem.pItem = new SvtAccessibilityOptions();
+            break;
+
+        case E_APEARCFG :
+// no ref count            rItem.pItem = new SvtTabAppearanceCfg();
+            break;
+
+        case E_CJKOPTIONS :
+            rItem.pItem = new SvtCJKOptions();
+            break;
+
+        case E_COLORCFG :
+            rItem.pItem = new ::svtools::ColorConfig();
+            break;
+
+        case E_CTLOPTIONS :
+            rItem.pItem = new SvtCTLOptions();
+            break;
+
+        case E_FONTSUBSTCONFIG :
+// no ref count            rItem.pItem = new SvtFontSubstConfig();
+            break;
+
+        case E_HELPOPTIONS :
+            rItem.pItem = new SvtHelpOptions();
+            break;
+
+        case E_LANGUAGEOPTIONS :
+// capsulate CTL and CJL options !            rItem.pItem = new SvtLanguageOptions();
+            break;
+
+        case E_MISCCFG :
+// no ref count            rItem.pItem = new SfxMiscCfg();
+            break;
+
+        case E_MENUOPTIONS :
+            rItem.pItem = new SvtMenuOptions();
+            break;
+
+        case E_PRINTOPTIONS :
+            rItem.pItem = new SvtPrinterOptions();
+            break;
+
+        case E_PRINTFILEOPTIONS :
+            rItem.pItem = new SvtPrintFileOptions();
+            break;
+
+        case E_SYSLOCALEOPTIONS :
+            rItem.pItem = new SvtSysLocaleOptions();
+            break;
+
+        case E_MISCOPTIONS :
+            rItem.pItem = new SvtMiscOptions();
+            break;
+
+        default:
+            OSL_ASSERT(false);
+            break;
+    }
+}
+
+//-----------------------------------------------
+void ItemHolder2::impl_deleteItem(TItemInfo& rItem)
+{
+    if (rItem.pItem)
+    {
+        delete rItem.pItem;
+        rItem.pItem = 0;
+    }
+}
diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
new file mode 100644
index 0000000000..192df8f746
--- /dev/null
+++ b/svl/source/config/itemholder2.hxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: itemholder2.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
+#define INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
+
+//-----------------------------------------------
+// includes
+
+#include <unotools/itemholderbase.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/lang/XEventListener.hpp>
+
+//-----------------------------------------------
+// namespaces
+
+#ifdef css
+#error "Cant use css as namespace alias."
+#else
+#define css ::com::sun::star
+#endif
+
+//-----------------------------------------------
+// definitions
+
+class ItemHolder2 : private ItemHolderMutexBase
+                  , public  ::cppu::WeakImplHelper1< css::lang::XEventListener >
+{
+    //...........................................
+    // member
+    private:
+
+        TItems m_lItems;
+
+    //...........................................
+    // c++ interface
+    public:
+
+        ItemHolder2();
+        virtual ~ItemHolder2();
+        static void holdConfigItem(EItem eItem);
+
+    //...........................................
+    // uno interface
+    public:
+
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
+            throw(css::uno::RuntimeException);
+
+    //...........................................
+    // helper
+    private:
+
+        void impl_addItem(EItem eItem);
+        void impl_releaseAllItems();
+        void impl_newItem(TItemInfo& rItem);
+        void impl_deleteItem(TItemInfo& rItem);
+};
+
+//-----------------------------------------------
+// namespaces
+
+#undef css
+
+#endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
diff --git a/svtools/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 204c06621c..204c06621c 100644
--- a/svtools/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
diff --git a/svtools/source/items1/makefile.mk b/svl/source/config/makefile.mk
index 9a7d13ff7d..d3f2615776 100644
--- a/svtools/source/items1/makefile.mk
+++ b/svl/source/config/makefile.mk
@@ -1,14 +1,14 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.61 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -28,11 +28,12 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-
 PRJ=..$/..
+
 PRJNAME=svtools
-TARGET=items1
-ENABLE_EXCEPTIONS=TRUE
+TARGET=config
+
+ENABLE_EXCEPTIONS := TRUE
 
 # --- Settings -----------------------------------------------------
 
@@ -41,39 +42,25 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=\
-    $(SLO)$/bintitem.obj	\
-    $(SLO)$/cenumitm.obj	\
-    $(SLO)$/cintitem.obj	\
-    $(SLO)$/cntwall.obj	\
-    $(SLO)$/cstitem.obj	\
-    $(SLO)$/ctypeitm.obj	\
-    $(SLO)$/custritm.obj	\
-    $(SLO)$/dateitem.obj	\
-    $(SLO)$/dtritem.obj	\
-    $(SLO)$/frqitem.obj	\
-    $(SLO)$/ilstitem.obj    \
-    $(SLO)$/itemiter.obj	\
-    $(SLO)$/itempool.obj	\
-    $(SLO)$/itemprop.obj	\
-    $(SLO)$/itemset.obj	\
-    $(SLO)$/lckbitem.obj	\
-    $(SLO)$/poolio.obj	\
-    $(SLO)$/stylepool.obj	\
-    $(SLO)$/poolitem.obj	\
-    $(SLO)$/sfontitm.obj	\
-    $(SLO)$/sitem.obj	    \
-    $(SLO)$/slstitm.obj	\
-    $(SLO)$/tfrmitem.obj	\
-    $(SLO)$/tresitem.obj	\
-    $(SLO)$/whiter.obj \
-    $(SLO)$/visitem.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    cstitem.src
+SLOFILES=  \
+    $(SLO)$/accessibilityoptions.obj	\
+    $(SLO)$/apearcfg.obj				\
+        $(SLO)$/cjkoptions.obj          \
+        $(SLO)$/colorcfg.obj            \
+        $(SLO)$/ctloptions.obj          \
+        $(SLO)$/extcolorcfg.obj            \
+    $(SLO)$/fontsubstconfig.obj				\
+        $(SLO)$/helpopt.obj                 \
+    $(SLO)$/itemholder2.obj \
+        $(SLO)$/languageoptions.obj     \
+    $(SLO)$/menuoptions.obj				\
+    $(SLO)$/misccfg.obj				\
+        $(SLO)$/miscopt.obj             \
+    $(SLO)$/optionsdrawinglayer.obj		\
+    $(SLO)$/printoptions.obj			\
+        $(SLO)$/syslocaleoptions.obj
 
-# --- Targets -------------------------------------------------------
+# --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
diff --git a/svtools/source/config/misccfg.cxx b/svl/source/config/misccfg.cxx
index 7101a13781..7101a13781 100644
--- a/svtools/source/config/misccfg.cxx
+++ b/svl/source/config/misccfg.cxx
diff --git a/svtools/source/config/syslocaleoptions.cxx b/svl/source/config/syslocaleoptions.cxx
index 94b96bd91b..94b96bd91b 100644
--- a/svtools/source/config/syslocaleoptions.cxx
+++ b/svl/source/config/syslocaleoptions.cxx
diff --git a/svtools/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk
index d00ac5170e..d00ac5170e 100644
--- a/svtools/source/filepicker/makefile.mk
+++ b/svl/source/filepicker/makefile.mk
diff --git a/svtools/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx
index 64f0204ba8..64f0204ba8 100644
--- a/svtools/source/filepicker/pickerhelper.cxx
+++ b/svl/source/filepicker/pickerhelper.cxx
diff --git a/svtools/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx
index 5d3d4ec585..5d3d4ec585 100644
--- a/svtools/source/filepicker/pickerhistory.cxx
+++ b/svl/source/filepicker/pickerhistory.cxx
diff --git a/svtools/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index 40de424c83..40de424c83 100644
--- a/svtools/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
diff --git a/svtools/source/filerec/makefile.mk b/svl/source/filerec/makefile.mk
index 33e4b49231..33e4b49231 100644
--- a/svtools/source/filerec/makefile.mk
+++ b/svl/source/filerec/makefile.mk
diff --git a/svtools/source/fsstor/exports.map b/svl/source/fsstor/exports.map
index f4ed78b9e9..f4ed78b9e9 100644
--- a/svtools/source/fsstor/exports.map
+++ b/svl/source/fsstor/exports.map
diff --git a/svtools/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 6b7eb59dcd..6b7eb59dcd 100644
--- a/svtools/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
diff --git a/svtools/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index dfcd5c9c17..dfcd5c9c17 100644
--- a/svtools/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
diff --git a/svtools/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 98e2ed46fe..98e2ed46fe 100644
--- a/svtools/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
diff --git a/svtools/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
index f55f6747f9..f55f6747f9 100644
--- a/svtools/source/fsstor/makefile.mk
+++ b/svl/source/fsstor/makefile.mk
diff --git a/svtools/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index 868ba57585..868ba57585 100644
--- a/svtools/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
diff --git a/svtools/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index 9cca217a30..9cca217a30 100644
--- a/svtools/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
diff --git a/svtools/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index 516f2f55e0..516f2f55e0 100644
--- a/svtools/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
diff --git a/svtools/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index 0f5bf8882f..0f5bf8882f 100644
--- a/svtools/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
diff --git a/svtools/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index dc82913865..dc82913865 100644
--- a/svtools/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
diff --git a/svtools/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index d341765272..d341765272 100644
--- a/svtools/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
diff --git a/svtools/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 425ca6cfff..425ca6cfff 100644
--- a/svtools/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
diff --git a/svtools/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 36e06d1d77..36e06d1d77 100644
--- a/svtools/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
diff --git a/svtools/source/items1/bintitem.cxx b/svl/source/items/bintitem.cxx
index 594d0460a4..594d0460a4 100644
--- a/svtools/source/items1/bintitem.cxx
+++ b/svl/source/items/bintitem.cxx
diff --git a/svtools/source/items1/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index b692e730b0..b692e730b0 100644
--- a/svtools/source/items1/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
diff --git a/svtools/source/items1/cintitem.cxx b/svl/source/items/cintitem.cxx
index 5c6bc3a1f3..5c6bc3a1f3 100644
--- a/svtools/source/items1/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
diff --git a/svtools/source/items1/cntwall.cxx b/svl/source/items/cntwall.cxx
index 5a0a841285..5a0a841285 100644
--- a/svtools/source/items1/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
diff --git a/svtools/source/items1/cstitem.cxx b/svl/source/items/cstitem.cxx
index 97d4492fbf..97d4492fbf 100644
--- a/svtools/source/items1/cstitem.cxx
+++ b/svl/source/items/cstitem.cxx
diff --git a/svtools/source/items1/cstitem.src b/svl/source/items/cstitem.src
index 7b2bd177df..7b2bd177df 100644
--- a/svtools/source/items1/cstitem.src
+++ b/svl/source/items/cstitem.src
diff --git a/svtools/source/items1/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 49d90f14eb..49d90f14eb 100644
--- a/svtools/source/items1/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
diff --git a/svtools/source/items1/custritm.cxx b/svl/source/items/custritm.cxx
index fd889b15aa..fd889b15aa 100644
--- a/svtools/source/items1/custritm.cxx
+++ b/svl/source/items/custritm.cxx
diff --git a/svtools/source/items1/dateitem.cxx b/svl/source/items/dateitem.cxx
index f518669239..f518669239 100644
--- a/svtools/source/items1/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
diff --git a/svtools/source/items1/dtritem.cxx b/svl/source/items/dtritem.cxx
index 02fadb4754..02fadb4754 100644
--- a/svtools/source/items1/dtritem.cxx
+++ b/svl/source/items/dtritem.cxx
diff --git a/svtools/source/items/eitem.cxx b/svl/source/items/eitem.cxx
index fdd44f8bd3..fdd44f8bd3 100644
--- a/svtools/source/items/eitem.cxx
+++ b/svl/source/items/eitem.cxx
diff --git a/svtools/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 65ae8bdd59..65ae8bdd59 100644
--- a/svtools/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
diff --git a/svtools/source/items1/frqitem.cxx b/svl/source/items/frqitem.cxx
index d360592c86..d360592c86 100644
--- a/svtools/source/items1/frqitem.cxx
+++ b/svl/source/items/frqitem.cxx
diff --git a/svtools/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index f3aff6f1ef..f3aff6f1ef 100644
--- a/svtools/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
diff --git a/svtools/source/items1/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 955cfa7b85..955cfa7b85 100644
--- a/svtools/source/items1/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
diff --git a/svtools/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index d2977e21ca..d2977e21ca 100644
--- a/svtools/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
diff --git a/svtools/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 31196d325e..31196d325e 100644
--- a/svtools/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
diff --git a/svtools/source/items1/itemiter.cxx b/svl/source/items/itemiter.cxx
index 96dc19c3ac..96dc19c3ac 100644
--- a/svtools/source/items1/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
diff --git a/svtools/source/items1/itempool.cxx b/svl/source/items/itempool.cxx
index 78bea447df..78bea447df 100644
--- a/svtools/source/items1/itempool.cxx
+++ b/svl/source/items/itempool.cxx
diff --git a/svtools/source/items1/itemprop.cxx b/svl/source/items/itemprop.cxx
index b9d0e82ceb..b9d0e82ceb 100644
--- a/svtools/source/items1/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
diff --git a/svtools/source/items1/itemset.cxx b/svl/source/items/itemset.cxx
index 06997ea03b..06997ea03b 100644
--- a/svtools/source/items1/itemset.cxx
+++ b/svl/source/items/itemset.cxx
diff --git a/svtools/source/items1/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 2a6b3bf9ef..2a6b3bf9ef 100644
--- a/svtools/source/items1/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
diff --git a/svtools/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 255989c73a..255989c73a 100644
--- a/svtools/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
diff --git a/svtools/source/items/makefile.mk b/svl/source/items/makefile.mk
index 651e54bb7e..651e54bb7e 100644
--- a/svtools/source/items/makefile.mk
+++ b/svl/source/items/makefile.mk
diff --git a/svtools/source/items1/nranges.cxx b/svl/source/items/nranges.cxx
index c9ffd5ca8f..c9ffd5ca8f 100644
--- a/svtools/source/items1/nranges.cxx
+++ b/svl/source/items/nranges.cxx
diff --git a/svtools/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index e8978b70f2..e8978b70f2 100644
--- a/svtools/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
diff --git a/svtools/source/items1/poolio.cxx b/svl/source/items/poolio.cxx
index 636319a81e..636319a81e 100644
--- a/svtools/source/items1/poolio.cxx
+++ b/svl/source/items/poolio.cxx
diff --git a/svtools/source/items1/poolitem.cxx b/svl/source/items/poolitem.cxx
index dc0b167cee..dc0b167cee 100644
--- a/svtools/source/items1/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
diff --git a/svtools/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 7c6c9b9a07..7c6c9b9a07 100644
--- a/svtools/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
diff --git a/svtools/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 582c4f9861..582c4f9861 100644
--- a/svtools/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
diff --git a/svtools/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 7769760bf9..7769760bf9 100644
--- a/svtools/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
diff --git a/svtools/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index 43d6eec0e5..43d6eec0e5 100755
--- a/svtools/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.cxx
diff --git a/svtools/source/items1/sfontitm.cxx b/svl/source/items/sfontitm.cxx
index 3c126e4858..3c126e4858 100644
--- a/svtools/source/items1/sfontitm.cxx
+++ b/svl/source/items/sfontitm.cxx
diff --git a/svtools/source/items1/sitem.cxx b/svl/source/items/sitem.cxx
index ec50581170..ec50581170 100644
--- a/svtools/source/items1/sitem.cxx
+++ b/svl/source/items/sitem.cxx
diff --git a/svtools/source/items1/slstitm.cxx b/svl/source/items/slstitm.cxx
index 4a7b6a0664..4a7b6a0664 100644
--- a/svtools/source/items1/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
diff --git a/svtools/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index d306169ebb..d306169ebb 100644
--- a/svtools/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
diff --git a/svtools/source/items/style.cxx b/svl/source/items/style.cxx
index 31bcfcc120..31bcfcc120 100644
--- a/svtools/source/items/style.cxx
+++ b/svl/source/items/style.cxx
diff --git a/svtools/source/items1/stylepool.cxx b/svl/source/items/stylepool.cxx
index 5f31500be7..5f31500be7 100644
--- a/svtools/source/items1/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
diff --git a/svtools/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index ddfc87032f..ddfc87032f 100644
--- a/svtools/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
diff --git a/svtools/source/items1/tfrmitem.cxx b/svl/source/items/tfrmitem.cxx
index fe9130dd44..fe9130dd44 100644
--- a/svtools/source/items1/tfrmitem.cxx
+++ b/svl/source/items/tfrmitem.cxx
diff --git a/svtools/source/items1/tresitem.cxx b/svl/source/items/tresitem.cxx
index 2054172500..2054172500 100644
--- a/svtools/source/items1/tresitem.cxx
+++ b/svl/source/items/tresitem.cxx
diff --git a/svtools/source/items1/visitem.cxx b/svl/source/items/visitem.cxx
index 81ccea901b..81ccea901b 100644
--- a/svtools/source/items1/visitem.cxx
+++ b/svl/source/items/visitem.cxx
diff --git a/svtools/source/items1/whassert.hxx b/svl/source/items/whassert.hxx
index 11cbbdc345..11cbbdc345 100644
--- a/svtools/source/items1/whassert.hxx
+++ b/svl/source/items/whassert.hxx
diff --git a/svtools/source/items1/whiter.cxx b/svl/source/items/whiter.cxx
index a74a9e4253..a74a9e4253 100644
--- a/svtools/source/items1/whiter.cxx
+++ b/svl/source/items/whiter.cxx
diff --git a/svtools/source/memtools/makefile.mk b/svl/source/memtools/makefile.mk
index 4592bceff8..4592bceff8 100644
--- a/svtools/source/memtools/makefile.mk
+++ b/svl/source/memtools/makefile.mk
diff --git a/svtools/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index b786a186ac..b786a186ac 100644
--- a/svtools/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
diff --git a/svtools/source/misc1/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx
index b06bcdd49b..b06bcdd49b 100644
--- a/svtools/source/misc1/PasswordHelper.cxx
+++ b/svl/source/misc/PasswordHelper.cxx
diff --git a/svtools/source/misc1/adrparse.cxx b/svl/source/misc/adrparse.cxx
index 31bdf7b7a2..31bdf7b7a2 100644
--- a/svtools/source/misc1/adrparse.cxx
+++ b/svl/source/misc/adrparse.cxx
diff --git a/svtools/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 1f54a6771f..1f54a6771f 100644
--- a/svtools/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
diff --git a/svtools/source/misc1/filenotation.cxx b/svl/source/misc/filenotation.cxx
index 0c3959b0fe..0c3959b0fe 100644
--- a/svtools/source/misc1/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
diff --git a/svtools/source/misc/flbytes.cxx b/svl/source/misc/flbytes.cxx
index bb8c783b0a..bb8c783b0a 100644
--- a/svtools/source/misc/flbytes.cxx
+++ b/svl/source/misc/flbytes.cxx
diff --git a/svtools/source/misc1/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index 8eb05721f3..8eb05721f3 100644
--- a/svtools/source/misc1/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.cxx
diff --git a/svtools/source/misc1/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 38149af6a9..38149af6a9 100644
--- a/svtools/source/misc1/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
diff --git a/svtools/source/misc1/inethist.cxx b/svl/source/misc/inethist.cxx
index 56ba81149c..56ba81149c 100644
--- a/svtools/source/misc1/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
diff --git a/svtools/source/misc1/inettype.cxx b/svl/source/misc/inettype.cxx
index 32082d7e4f..32082d7e4f 100644
--- a/svtools/source/misc1/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
diff --git a/svtools/source/misc1/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index f365e0df1d..f365e0df1d 100644
--- a/svtools/source/misc1/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
diff --git a/svtools/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index ba4440c462..ba4440c462 100644
--- a/svtools/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
diff --git a/svtools/source/misc1/mediatyp.src b/svl/source/misc/mediatyp.src
index fc538d1fcd..fc538d1fcd 100644
--- a/svtools/source/misc1/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
diff --git a/svtools/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 0ad114a352..0ad114a352 100644
--- a/svtools/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
diff --git a/svtools/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index 80581bb43f..80581bb43f 100644
--- a/svtools/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
diff --git a/svtools/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index 32d7b1873f..32d7b1873f 100644
--- a/svtools/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
diff --git a/svtools/source/misc1/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 00fcfb9f64..00fcfb9f64 100644
--- a/svtools/source/misc1/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
diff --git a/svtools/source/misc1/svtdata.cxx b/svl/source/misc/svldata.cxx
index b8d572e2d1..b8d572e2d1 100644
--- a/svtools/source/misc1/svtdata.cxx
+++ b/svl/source/misc/svldata.cxx
diff --git a/svtools/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 5771ed9dff..5771ed9dff 100644
--- a/svtools/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
diff --git a/svtools/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index 83bdb1cee9..83bdb1cee9 100644
--- a/svtools/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.cxx
diff --git a/svtools/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index 63efdd0cf4..63efdd0cf4 100644
--- a/svtools/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
diff --git a/svtools/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx
index 013e30a96c..013e30a96c 100644
--- a/svtools/source/notify/cancel.cxx
+++ b/svl/source/notify/cancel.cxx
diff --git a/svtools/source/notify/hint.cxx b/svl/source/notify/hint.cxx
index 51f346bcf7..51f346bcf7 100644
--- a/svtools/source/notify/hint.cxx
+++ b/svl/source/notify/hint.cxx
diff --git a/svtools/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx
index d482519f0f..d482519f0f 100644
--- a/svtools/source/notify/isethint.cxx
+++ b/svl/source/notify/isethint.cxx
diff --git a/svtools/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index e57cd1d1c8..e57cd1d1c8 100644
--- a/svtools/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
diff --git a/svtools/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx
index e6828042b1..e6828042b1 100644
--- a/svtools/source/notify/listenerbase.cxx
+++ b/svl/source/notify/listenerbase.cxx
diff --git a/svtools/source/notify/listenerbase.hxx b/svl/source/notify/listenerbase.hxx
index 49e3d4595f..49e3d4595f 100644
--- a/svtools/source/notify/listenerbase.hxx
+++ b/svl/source/notify/listenerbase.hxx
diff --git a/svtools/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx
index 96bc46ec79..96bc46ec79 100644
--- a/svtools/source/notify/listeneriter.cxx
+++ b/svl/source/notify/listeneriter.cxx
diff --git a/svtools/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 37a38b3d97..37a38b3d97 100644
--- a/svtools/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
diff --git a/svtools/source/notify/makefile.mk b/svl/source/notify/makefile.mk
index 8e4c4b2112..8e4c4b2112 100644
--- a/svtools/source/notify/makefile.mk
+++ b/svl/source/notify/makefile.mk
diff --git a/svtools/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx
index e420a1a761..e420a1a761 100644
--- a/svtools/source/notify/smplhint.cxx
+++ b/svl/source/notify/smplhint.cxx
diff --git a/svtools/source/numbers/makefile.mk b/svl/source/numbers/makefile.mk
index 46cd3985df..46cd3985df 100644
--- a/svtools/source/numbers/makefile.mk
+++ b/svl/source/numbers/makefile.mk
diff --git a/svtools/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx
index 21743dfbc4..21743dfbc4 100644
--- a/svtools/source/numbers/nbdll.cxx
+++ b/svl/source/numbers/nbdll.cxx
diff --git a/svtools/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index cf2b0125d7..cf2b0125d7 100644
--- a/svtools/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
diff --git a/svtools/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 94d36f71c5..94d36f71c5 100644
--- a/svtools/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
diff --git a/svtools/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index 6bd6ac4610..6bd6ac4610 100644
--- a/svtools/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.cxx
diff --git a/svtools/source/numbers/numhead.hxx b/svl/source/numbers/numhead.hxx
index 706fd68f89..706fd68f89 100644
--- a/svtools/source/numbers/numhead.hxx
+++ b/svl/source/numbers/numhead.hxx
diff --git a/svtools/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 417dbe78f2..417dbe78f2 100644
--- a/svtools/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
diff --git a/svtools/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 76fa7e8713..76fa7e8713 100644
--- a/svtools/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
diff --git a/svtools/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index 6efa2de4c6..6efa2de4c6 100644
--- a/svtools/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.hxx
diff --git a/svtools/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index aa13feaf4e..aa13feaf4e 100644
--- a/svtools/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
diff --git a/svtools/inc/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 37c93cc1c8..37c93cc1c8 100644
--- a/svtools/inc/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
diff --git a/svtools/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 0e6a1f634c..0e6a1f634c 100644
--- a/svtools/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
diff --git a/svtools/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 368fb160b0..368fb160b0 100644
--- a/svtools/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
diff --git a/svtools/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ab780cd050..ab780cd050 100644
--- a/svtools/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
diff --git a/svtools/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index df243f10ba..df243f10ba 100644
--- a/svtools/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
diff --git a/svtools/source/passwordcontainer/exports.map b/svl/source/passwordcontainer/exports.map
index f4ed78b9e9..f4ed78b9e9 100644
--- a/svtools/source/passwordcontainer/exports.map
+++ b/svl/source/passwordcontainer/exports.map
diff --git a/svtools/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
index 31e1336ad9..31e1336ad9 100644
--- a/svtools/source/passwordcontainer/makefile.mk
+++ b/svl/source/passwordcontainer/makefile.mk
diff --git a/svtools/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 5f9ce207ff..5f9ce207ff 100644
--- a/svtools/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
diff --git a/svtools/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index d4d875a205..d4d875a205 100644
--- a/svtools/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
diff --git a/svtools/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx
index 2df406cbda..2df406cbda 100644
--- a/svtools/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.hxx
diff --git a/svtools/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index f76253a78d..f76253a78d 100644
--- a/svtools/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
diff --git a/svtools/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index 675635d1b9..675635d1b9 100644
--- a/svtools/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
diff --git a/svtools/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx
index b06acd3951..b06acd3951 100644
--- a/svtools/source/svdde/ddedll.cxx
+++ b/svl/source/svdde/ddedll.cxx
diff --git a/svtools/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 6353c24574..6353c24574 100644
--- a/svtools/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
diff --git a/svtools/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index fcdf4e4340..fcdf4e4340 100644
--- a/svtools/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.cxx
diff --git a/svtools/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx
index f2c627759a..f2c627759a 100644
--- a/svtools/source/svdde/ddeml1.cxx
+++ b/svl/source/svdde/ddeml1.cxx
diff --git a/svtools/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx
index 5398d680d8..5398d680d8 100644
--- a/svtools/source/svdde/ddeml2.cxx
+++ b/svl/source/svdde/ddeml2.cxx
diff --git a/svtools/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx
index 3329b42a30..3329b42a30 100644
--- a/svtools/source/svdde/ddemldeb.cxx
+++ b/svl/source/svdde/ddemldeb.cxx
diff --git a/svtools/source/svdde/ddemldeb.hxx b/svl/source/svdde/ddemldeb.hxx
index 4a15c3349c..4a15c3349c 100644
--- a/svtools/source/svdde/ddemldeb.hxx
+++ b/svl/source/svdde/ddemldeb.hxx
diff --git a/svtools/source/svdde/ddemlimp.hxx b/svl/source/svdde/ddemlimp.hxx
index 3739c44b4b..3739c44b4b 100644
--- a/svtools/source/svdde/ddemlimp.hxx
+++ b/svl/source/svdde/ddemlimp.hxx
diff --git a/svtools/source/svdde/ddemlos2.h b/svl/source/svdde/ddemlos2.h
index 1916a0d55d..1916a0d55d 100644
--- a/svtools/source/svdde/ddemlos2.h
+++ b/svl/source/svdde/ddemlos2.h
diff --git a/svtools/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 4f357216cd..4f357216cd 100644
--- a/svtools/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.cxx
diff --git a/svtools/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 81cf7101a0..81cf7101a0 100644
--- a/svtools/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
diff --git a/svtools/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx
index d6ba8d963b..d6ba8d963b 100644
--- a/svtools/source/svdde/ddewrap.cxx
+++ b/svl/source/svdde/ddewrap.cxx
diff --git a/svtools/source/svdde/ddewrap.hxx b/svl/source/svdde/ddewrap.hxx
index 793d5c972e..793d5c972e 100644
--- a/svtools/source/svdde/ddewrap.hxx
+++ b/svl/source/svdde/ddewrap.hxx
diff --git a/svtools/source/svdde/makefile.mk b/svl/source/svdde/makefile.mk
index f4c72aff20..f4c72aff20 100644
--- a/svtools/source/svdde/makefile.mk
+++ b/svl/source/svdde/makefile.mk
diff --git a/svtools/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx
index 6af6cbe476..6af6cbe476 100644
--- a/svtools/source/svsql/converter.cxx
+++ b/svl/source/svsql/converter.cxx
diff --git a/svtools/source/svsql/converter.hxx b/svl/source/svsql/converter.hxx
index fd47f0413e..fd47f0413e 100644
--- a/svtools/source/svsql/converter.hxx
+++ b/svl/source/svsql/converter.hxx
diff --git a/svtools/source/svsql/makefile.mk b/svl/source/svsql/makefile.mk
index 55c400b83e..55c400b83e 100644
--- a/svtools/source/svsql/makefile.mk
+++ b/svl/source/svsql/makefile.mk
diff --git a/svtools/source/syslocale/makefile.mk b/svl/source/syslocale/makefile.mk
index a393c17485..a393c17485 100644
--- a/svtools/source/syslocale/makefile.mk
+++ b/svl/source/syslocale/makefile.mk
diff --git a/svtools/source/syslocale/syslocale.cxx b/svl/source/syslocale/syslocale.cxx
index 77dcd2e9af..77dcd2e9af 100644
--- a/svtools/source/syslocale/syslocale.cxx
+++ b/svl/source/syslocale/syslocale.cxx
diff --git a/svtools/source/undo/makefile.mk b/svl/source/undo/makefile.mk
index b277fa3c90..b277fa3c90 100644
--- a/svtools/source/undo/makefile.mk
+++ b/svl/source/undo/makefile.mk
diff --git a/svtools/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 68a770b48b..68a770b48b 100644
--- a/svtools/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
diff --git a/svtools/win/res/makefile.mk b/svl/source/uno/makefile.mk
index 3c33d006ed..51e55a1f91 100644
--- a/svtools/win/res/makefile.mk
+++ b/svl/source/uno/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.3 $
+# $Revision: 1.21 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -28,3 +28,37 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=svtools
+TARGET=unoiface
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/svt.pmk
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=	uno
+SRC1FILES=  unoifac2.src
+
+SLOFILES= \
+            $(SLO)$/unoiface.obj \
+            $(SLO)$/unoevent.obj \
+            $(SLO)$/unoimap.obj \
+            $(SLO)$/toolboxcontroller.obj \
+            $(SLO)$/framestatuslistener.obj \
+            $(SLO)$/statusbarcontroller.obj \
+            $(SLO)$/genericunodialog.obj \
+            $(SLO)$/generictoolboxcontroller.obj \
+            $(SLO)$/treecontrolpeer.obj \
+            $(SLO)$/unocontroltablemodel.obj \
+            $(SLO)$/registerservices.obj\
+            $(SLO)$/contextmenuhelper.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svtools/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx
index 7edb9e1f9e..7edb9e1f9e 100644
--- a/svtools/source/uno/registerservices.cxx
+++ b/svl/source/uno/registerservices.cxx
diff --git a/svtools/uno/addrtempuno.cxx b/svl/uno/addrtempuno.cxx
index a8bbe21537..a8bbe21537 100644
--- a/svtools/uno/addrtempuno.cxx
+++ b/svl/uno/addrtempuno.cxx
diff --git a/svtools/uno/exports.map b/svl/uno/exports.map
index f4ed78b9e9..f4ed78b9e9 100644
--- a/svtools/uno/exports.map
+++ b/svl/uno/exports.map
diff --git a/svtools/uno/makefile.mk b/svl/uno/makefile.mk
index 8f61c71005..8f61c71005 100644
--- a/svtools/uno/makefile.mk
+++ b/svl/uno/makefile.mk
diff --git a/svtools/uno/miscservices.cxx b/svl/uno/miscservices.cxx
index e9e857734a..e9e857734a 100644
--- a/svtools/uno/miscservices.cxx
+++ b/svl/uno/miscservices.cxx
diff --git a/svtools/uno/pathservice.cxx b/svl/uno/pathservice.cxx
index 152ff5f316..152ff5f316 100644
--- a/svtools/uno/pathservice.cxx
+++ b/svl/uno/pathservice.cxx
diff --git a/svtools/unx/inc/convert.hxx b/svl/unx/inc/convert.hxx
index 890067bd89..890067bd89 100644
--- a/svtools/unx/inc/convert.hxx
+++ b/svl/unx/inc/convert.hxx
diff --git a/svtools/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index e5c3f964ba..e5c3f964ba 100644
--- a/svtools/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
diff --git a/svtools/unx/source/svdde/makefile.mk b/svl/unx/source/svdde/makefile.mk
index d0203fd637..d0203fd637 100644
--- a/svtools/unx/source/svdde/makefile.mk
+++ b/svl/unx/source/svdde/makefile.mk
diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk
new file mode 100644
index 0000000000..fac8f654bf
--- /dev/null
+++ b/svl/util/makefile.mk
@@ -0,0 +1,274 @@
+#*************************************************************************
+#*
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.67 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=svtools
+TARGET=svtool
+RESTARGET=svt
+RESTARGETPATCH=svp
+RESTARGETSIMPLE=svs
+GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+USE_LDUMP2=TRUE
+
+# --- general section ----------------------------------------------------
+
+.IF "$(GUI)"!="UNX"
+LIB3TARGET= $(LB)$/svtool.lib
+LIB3FILES=	$(LB)$/_svt.lib
+.ENDIF
+
+.IF "$(GUI)"!="UNX"
+LIB4TARGET= $(LB)$/isvl.lib
+LIB4FILES=	$(LB)$/_isvl.lib
+.ENDIF
+
+LIB7TARGET= $(SLB)$/svt.lib
+LIB7FILES=	\
+        $(SLB)$/misc.lib		\
+        $(SLB)$/items.lib		\
+        $(SLB)$/browse.lib		\
+        $(SLB)$/ctrl.lib		\
+        $(SLB)$/dialogs.lib 	\
+        $(SLB)$/edit.lib		\
+        $(SLB)$/unoiface.lib	\
+        $(SLB)$/filter.lib		\
+        $(SLB)$/igif.lib		\
+        $(SLB)$/jpeg.lib		\
+        $(SLB)$/ixpm.lib		\
+        $(SLB)$/ixbm.lib		\
+        $(SLB)$/numbers.lib 	\
+        $(SLB)$/numbers.uno.lib 	\
+        $(SLB)$/wmf.lib 		\
+        $(SLB)$/undo.lib		\
+        $(SLB)$/urlobj.lib		\
+        $(SLB)$/plugapp.lib 	\
+        $(SLB)$/svcontnr.lib	\
+        $(SLB)$/syslocale.lib   \
+        $(SLB)$/svdde.lib \
+        $(SLB)$/svhtml.lib     \
+        $(SLB)$/svrtf.lib	\
+        $(SLB)$/config.lib	\
+        $(SLB)$/table.lib 	\
+        $(SLB)$/java.lib
+
+LIB8TARGET= $(SLB)$/svl.lib
+LIB8FILES=	\
+        $(SLB)$/filerec.lib \
+        $(SLB)$/filepicker.lib \
+        $(SLB)$/items1.lib	\
+        $(SLB)$/misc1.lib	\
+        $(SLB)$/notify.lib	\
+        $(SLB)$/svarray.lib \
+        $(SLB)$/svsql.lib
+
+# generation of resourcen-lib ----------------------------------------
+
+RESLIB1NAME=	$(RESTARGET)
+RESLIB1IMAGES=$(PRJ)$/res
+RESLIB1SRSFILES= \
+        $(SRS)$/filter.srs  \
+        $(SRS)$/misc.srs        \
+        $(SRS)$/ctrl.srs        \
+        $(SRS)$/dialogs.srs     \
+        $(SRS)$/plugapp.srs     \
+        $(SRS)$/svcontnr.srs    \
+        $(SRS)$/uno.srs         \
+        $(SRS)$/browse.srs		\
+        $(SRS)$/javaerror.srs
+
+RESLIB2NAME=	$(RESTARGETSIMPLE)
+RESLIB2SRSFILES=\
+        $(SRS)$/items1.srs \
+        $(SRS)$/misc1.srs
+
+
+RESLIB3NAME= $(RESTARGETPATCH)
+RESLIB3SRSFILES= \
+        $(SRS)$/patchjavaerror.srs
+
+# build the shared library  --------------------------------------------------
+
+SHL1TARGET= svt$(DLLPOSTFIX)
+SHL1IMPLIB= _svt
+SHL1USE_EXPORTS=name
+
+.IF "$(OS)"!="MACOSX"
+# static libraries
+SHL1STDLIBS+= $(JPEG3RDLIB)
+.ENDIF
+
+# dynamic libraries
+SHL1STDLIBS+= \
+        $(TKLIB)			\
+        $(VCLLIB)			\
+        $(SVLLIB)			\
+        $(SOTLIB)			\
+        $(UNOTOOLSLIB)		\
+        $(TOOLSLIB)			\
+        $(I18NISOLANGLIB)   \
+        $(I18NUTILLIB)		\
+        $(UCBHELPERLIB)		\
+        $(COMPHELPERLIB)	\
+        $(CPPUHELPERLIB)	\
+        $(CPPULIB)			\
+        $(VOSLIB)			\
+        $(SALLIB)			\
+        $(ICUUCLIB)		\
+        $(JVMFWKLIB)
+
+.IF "$(OS)"=="MACOSX"
+# static libraries go at end
+SHL1STDLIBS+= $(JPEG3RDLIB)
+.ENDIF
+
+.IF "$(GUI)"=="WNT"
+SHL1STDLIBS+= \
+        $(UWINAPILIB) \
+        $(ADVAPI32LIB)	\
+        $(GDI32LIB) \
+        $(OLE32LIB) 	\
+        $(UUIDLIB) 	\
+        $(ADVAPI32LIB)	\
+        $(OLEAUT32LIB)
+.ENDIF # WNT
+
+SHL1OBJS= \
+    $(SLO)$/svtdata.obj
+
+SHL1LIBS= \
+    $(SLB)$/svt.lib
+
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+SHL1DEPN=$(SHL2TARGETN)
+
+DEF1NAME=	$(SHL1TARGET)
+DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt
+DEFLIB1NAME =svt
+DEF1DES 	=SvTools
+
+
+# --- svtools lite --------------------------------------------------
+
+SHL2TARGET= svl$(DLLPOSTFIX)
+SHL2IMPLIB= _isvl
+SHL2USE_EXPORTS=name
+#Do not link with VCL or any other library that links with VCL
+SHL2STDLIBS= \
+        $(UNOTOOLSLIB)		\
+        $(TOOLSLIB) 		\
+        $(I18NISOLANGLIB)   \
+        $(UCBHELPERLIB)		\
+        $(COMPHELPERLIB)	\
+        $(CPPUHELPERLIB)	\
+        $(CPPULIB)			\
+        $(VOSLIB)			\
+        $(VCLLIB)			\
+        $(SALLIB)
+
+.IF "$(GUI)"=="WNT"
+SHL2STDLIBS+= \
+        $(UWINAPILIB) \
+        $(ADVAPI32LIB)	\
+        $(GDI32LIB)
+.ENDIF # WNT
+
+SHL2LIBS=	$(SLB)$/svl.lib
+
+SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
+
+DEF2NAME=	$(SHL2TARGET)
+DEF2DEPN=	$(MISC)$/$(SHL2TARGET).flt $(SLB)$/svl.lib
+DEFLIB2NAME=svl
+DEF2DES =SvTools lite
+
+# --- g2g application --------------------------------------------------
+
+APP2TARGET	=	g2g
+APP2BASE	=	0x10000000
+APP2DEPN	=   $(SHL1TARGETN) $(SHL2TARGETN)
+
+APP2OBJS	=   $(OBJ)$/g2g.obj
+
+.IF "$(GUI)"!="UNX"
+APP2STDLIBS+= $(SVTOOLLIB)
+.ELSE
+APP2STDLIBS+= -lsvt$(DLLPOSTFIX)
+APP2STDLIBS+= -lsvl$(DLLPOSTFIX)
+.ENDIF
+
+APP2STDLIBS+=	$(VCLLIB)		\
+                $(TOOLSLIB)		\
+                $(VOSLIB) 		\
+                $(SALLIB)
+
+# --- Targets ------------------------------------------------------
+
+.IF "$(GUI)"=="UNX"
+SVTTARGETS= $(LB)$/lib$(SHL2TARGET)$(DLLPOST) $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
+.ELSE
+SVTTARGETS= $(LB)$/isvl.lib \
+            $(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST)
+.ENDIF
+
+# just a quick fix - has to be cleaned up some day...
+.IF "$(L10N-framework)"==""
+ALL: $(SLB)$/svl.lib \
+    $(SLB)$/svt.lib \
+    $(MISC)$/$(SHL2TARGET).flt \
+    $(MISC)$/$(SHL1TARGET).flt \
+    $(MISC)$/$(SHL2TARGET).def \
+    $(MISC)$/$(SHL1TARGET).def \
+    $(SVTTARGETS) \
+    ALLTAR
+.ENDIF          # "$(L10N-framework)"==""
+
+.INCLUDE :	target.mk
+
+# --- Svtools-Control-Filter-Datei ---
+
+$(MISC)$/$(SHL1TARGET).flt: svt.flt
+    @echo ------------------------------
+    @echo Making: $@
+    $(TYPE) svt.flt >$@
+
+$(MISC)$/$(SHL2TARGET).flt: svl.flt
+    @echo ------------------------------
+    @echo Making: $@
+    $(TYPE) svl.flt >$@
+
diff --git a/svtools/util/svl.pmk b/svl/util/svl.pmk
index aec76257e7..aec76257e7 100644
--- a/svtools/util/svl.pmk
+++ b/svl/util/svl.pmk
diff --git a/svtools/source/dialogs/filedlg2.hrc b/svtools/inc/filedlg2.hrc
index dc7bd8aa5e..dc7bd8aa5e 100644
--- a/svtools/source/dialogs/filedlg2.hrc
+++ b/svtools/inc/filedlg2.hrc
diff --git a/svtools/inc/iniadrtk.hxx b/svtools/inc/iniadrtk.hxx
deleted file mode 100644
index 3f26b061d8..0000000000
--- a/svtools/inc/iniadrtk.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: iniadrtk.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVTOOLS_INIADRTK_HXX
-#define SVTOOLS_INIADRTK_HXX
-
-class String;
-
-//============================================================================
-enum AddressToken
-{
-    ADDRESS_COMPANY,
-    ADDRESS_STREET,
-    ADDRESS_COUNTRY,
-    ADDRESS_PLZ,
-    ADDRESS_CITY,
-    ADDRESS_TITLE,
-    ADDRESS_POSITION,
-    ADDRESS_TEL_PRIVATE,
-    ADDRESS_TEL_COMPANY,
-    ADDRESS_FAX,
-    ADDRESS_EMAIL,
-    ADDRESS_STATE,
-    ADDRESS_FATHERSNAME,
-    ADDRESS_APARTMENT
-};
-
-//============================================================================
-class SfxIniManagerAddressEntry
-{
-public:
-    static String get(const String & rAddress, AddressToken eToken);
-};
-
-#endif // SVTOOLS_INIADRTK_HXX
-
diff --git a/svtools/inc/inidef.hxx b/svtools/inc/inidef.hxx
deleted file mode 100644
index d47d98edc7..0000000000
--- a/svtools/inc/inidef.hxx
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: inidef.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SFXINIDEF_HXX
-#define _SFXINIDEF_HXX
-
-#ifndef _INIMGR_HXX
-#include <iniman.hxx>
-#endif
-
-class SfxIniEntry;
-class SfxIniDefaulterList;
-class SfxIniDefaultManager;
-
-#if _SOLAR__PRIVATE
-#include <svtools/svarray.hxx>
-
-class SfxIniDefaulter;
-SV_DECL_PTRARR( SfxIniDefaulterList, SfxIniDefaulter*, 0, 2 );
-#endif
-
-//========================================================================
-
-class SfxIniDefaulter
-
-/*	[Beschreibung]
-
-    Instanzen dieser Klasse k"onnen (f"ur die Laufzeit eines Moduls, z.B.
-    einer DLL-Nutzung oder einer Applikation) angelegt werden, um Defaults
-    f"ur eine Anzahl von ini-Eintr"agen zu liefern. Diese Defaults werden
-    erfragt, wenn ein <SfxIniManager> einen Eintrag nicht in den ini-Files
-    finden kann.
-
-    Defaults verschiedener <SfxIniDefaulter>-Instanzen d"urfen sich nicht
-    unterscheiden, da die Reihenfolge der Abarbeitung nicht definiert ist.
-
-    Die Instanzen brauchen nicht zerst"ort zu werden, au\ser wenn der
-    dazugeh"orige Code entladen wird (load-on-demand DLLs). Sonst geschieht
-    dies automatisch beim Zerst"oren des <SfxIniDefaultManager>.
-*/
-
-{
-    SfxIniDefaultManager*	_pManager;
-
-public:
-                            SfxIniDefaulter( SfxIniDefaultManager *pManager );
-                            ~SfxIniDefaulter();
-
-    virtual BOOL			QueryDefault( String &aValue,
-                                          const SfxIniEntry &rEntry ) = 0;
-};
-
-//========================================================================
-
-class SfxIniDefaultManager
-
-/*	[Beschreibung]
-
-    Genau eine Instanz dieser Klasse mu\s in jeder Application-Subklasse,
-    die diesen Mechanismus nutzen m"ochte, in deren Ctor angelegt werden
-    und sollte in deren Dtor zerst"ort werden.
-*/
-
-{
-    SfxIniDefaulterList*	_pList;
-
-public:
-                            SfxIniDefaultManager();
-                            ~SfxIniDefaultManager();
-
-#if _SOLAR__PRIVATE
-    void					Insert( SfxIniDefaulter *pDefaulter )
-                            { _pList->C40_INSERT( SfxIniDefaulter, pDefaulter, _pList->Count() ); }
-    void					Remove( SfxIniDefaulter *pDefaulter )
-                            { _pList->Remove( _pList->C40_GETPOS( SfxIniDefaulter, pDefaulter ) ); }
-    BOOL					QueryDefault( String &aValue,
-                                          const SfxIniEntry &rEntry );
-#endif
-};
-
-//========================================================================
-
-class SfxIniEntry
-
-/*	[Beschreibung]
-
-    Instanzen dieser Klasse beschreiben einen Eintrag eines Ini-Files,
-    um mit der Klasse <SfxIniDefaulter> erfragt werden zu k"onnen, falls
-    der <SfxIniManager> einen Eintrag nicht in den Ini-Files auffindet.
-*/
-
-{
-friend class SfxIniManager;
-
-    const String&   		_aGroup;
-    const String&			_aKey;
-    SfxIniGroup 			_eGroup;
-    SfxIniKey				_eKey;
-    USHORT					_nIndex;
-
-private:
-                            SfxIniEntry( const String&  aGroup,
-                                         const String&	aKey,
-                                         SfxIniGroup	eGroup,
-                                         SfxIniKey		eKey,
-                                         USHORT		 	nIndex );
-                            SfxIniEntry( const SfxIniEntry & ); // n.i.
-    SfxIniEntry&			operator=( const SfxIniEntry & ); // n.i.
-
-public:
-    const String&			GetGroupName() const { return _aGroup; }
-    SfxIniGroup 			GetGroup() const { return _eGroup; }
-    const String&			GetKeyName() const { return _aKey; }
-    SfxIniKey				GetKey() const { return _eKey; }
-    USHORT 					GetIndex() const { return _nIndex; }
-};
-
-#endif
-
diff --git a/svtools/inc/iniprop.hxx b/svtools/inc/iniprop.hxx
deleted file mode 100644
index 6dbe56eb47..0000000000
--- a/svtools/inc/iniprop.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: iniprop.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SFXINIPROP_HXX
-#define _SFXINIPROP_HXX
-
-#include <limits.h>
-#include <tools/rtti.hxx>
-#ifndef _APP_HXX
-#include <vcl/svapp.hxx>
-#endif
-
-class SfxIniManager;
-
-//------------------------------------------------------------------------
-
-class SfxAppIniManagerProperty: public ApplicationProperty
-
-//	fuer Application::Property(), um von ueberall an den AppIniManger zu kommen
-
-{
-    SfxIniManager*		_pIniManager;
-
-public:
-                        TYPEINFO();
-                        SfxAppIniManagerProperty()
-                        :	_pIniManager(0)
-                        {}
-                        ~SfxAppIniManagerProperty();
-
-    SfxIniManager*		GetIniManager() const { return _pIniManager; }
-    void				SetIniManager( SfxIniManager *pIniManager )
-                        { _pIniManager = pIniManager; }
-};
-
-
-#endif
-
diff --git a/svtools/inc/reginfo.hxx b/svtools/inc/reginfo.hxx
deleted file mode 100644
index 83b64d0d38..0000000000
--- a/svtools/inc/reginfo.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: reginfo.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _REGINFO_HXX
-#define _REGINFO_HXX
-
-struct RegInfo_Impl;
-
-#include <tools/string.hxx>
-
-class RegInfo
-{
-
-  public:
-
-                    RegInfo();
-                    ~RegInfo();
-
-    const String&   GetGroup() const { return aCurrentGroup; }
-    void			SetAppGroup( const String& rGroup );
-    void			DeleteAppGroup( const String& rGroup );
-
-    String			ReadKey( const String& rKey ) const;
-    String			ReadKey( const String& rKey, const String& rDefault ) const;
-    void			WriteKey( const String& rKey, const String& rValue );
-    void			DeleteKey( const String& rKey );
-    String			GetKeyName( USHORT nKey ) const;
-    String			ReadKey( USHORT nKey ) const;
-    USHORT			GetKeyCount() const;
-
-  private:
-
-    String          aCurrentGroup;
-    RegInfo_Impl*   pImp;
-
-};
-
-
-#endif
diff --git a/svtools/inc/reqitem.hxx b/svtools/inc/reqitem.hxx
deleted file mode 100644
index 8a4cd443bc..0000000000
--- a/svtools/inc/reqitem.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: reqitem.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _REQITEM_HXX
-#define _REQITEM_HXX
-
-#include <solar.h>
-#include <rtti.hxx>
-
-#if _SOLAR__PRIVATE
-#include <svtools/poolitem.hxx>
-#else
-#include <sfxipool.hxx>
-#endif
-
-// -----------------------------------------------------------------------
-
-class SfxRequestItem: public SfxSetItem
-
-/**	[Description]
-
-    Represents a function call with optional arguments.
-*/
-
-{
-public:
-                                TYPEINFO();
-                                SfxRequestItem();
-                                SfxRequestItem( USHORT nWhich, SvStream & );
-                                SfxRequestItem( const SfxRequestItem& );
-                                ~SfxRequestItem();
-
-    virtual int 			 	operator==( const SfxPoolItem& ) const;
-    virtual
-    virtual SfxPoolItem*     	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 	Create(SvStream &, USHORT nItemVersion) const;
-    virtual SvStream&		 	Store(SvStream &, USHORT nItemVersion ) const;
-};
-
-
-#endif
-
diff --git a/svtools/source/svrtf/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx
index 87258b5a24..87258b5a24 100644
--- a/svtools/source/svrtf/rtfkeywd.hxx
+++ b/svtools/inc/rtfkeywd.hxx
diff --git a/svtools/source/svrtf/rtfout.hxx b/svtools/inc/rtfout.hxx
index 49405bcde6..49405bcde6 100644
--- a/svtools/source/svrtf/rtfout.hxx
+++ b/svtools/inc/rtfout.hxx
diff --git a/svtools/source/svrtf/rtftoken.h b/svtools/inc/rtftoken.h
index ec48c73b9e..ec48c73b9e 100644
--- a/svtools/source/svrtf/rtftoken.h
+++ b/svtools/inc/rtftoken.h
diff --git a/svtools/inc/svipcdef.h b/svtools/inc/svipcdef.h
deleted file mode 100644
index 8663366aeb..0000000000
--- a/svtools/inc/svipcdef.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: svipcdef.h,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVIPCDEF_H
-#define _SVIPCDEF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (WNT) || defined (WIN)
-#define CDECL __cdecl
-#elif defined CSET
-#define CDECL _System
-#else
-#define CDECL
-#endif
-
-#if defined WIN
-#define _EXTLIBCALL_ _pascal
-#else
-#define _EXTLIBCALL_ CDECL
-#endif
-
-typedef void (CDECL *IPCCallbackFunc)(void*);
-
-extern void _EXTLIBCALL_ IPCFreeMemory(void*);
-extern short _EXTLIBCALL_ IPCGetStatus(void*);
-extern short _EXTLIBCALL_ IPCInit(void);
-extern void  _EXTLIBCALL_ IPCDeInit(void);
-extern void*  _EXTLIBCALL_ IPCConnectServer(const char*, IPCCallbackFunc);
-extern void  _EXTLIBCALL_ IPCDisconnectServer(void *);
-#ifdef WIN
-extern long CDECL IPCCALLFUNCTION(void *,unsigned long,void *,
-                                               short,const char *, char, ...);
-#else
-extern long CDECL IPCCallFunction(void *,unsigned long,void *,
-                                               short,const char *, char, ...);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/svtools/inc/svtuno.hxx b/svtools/inc/svtuno.hxx
deleted file mode 100644
index 04688babd6..0000000000
--- a/svtools/inc/svtuno.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: svtuno.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_SVTUNO_HXX
-#define _SVTOOLS_SVTUNO_HXX
-
-// Macro to define const unicode a'la "..."
-// It's better then "OUString::createFromAscii(...)" !!!
-#define	DEFINE_CONST_UNICODE(CONSTASCII)		UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-#define	DEFINE_CONST_OUSTRING(CONSTASCII)		OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-
-// defines ---------------------------------------------------------------
-#define	UNOANY							::com::sun::star::uno::Any
-#define	UNOEXCEPTION					::com::sun::star::uno::Exception
-#define	UNOMUTEX						::osl::Mutex
-#define	UNOMUTEXGUARD					::osl::MutexGuard
-#define	UNOOIMPLEMENTATIONID			::cppu::OImplementationId
-#define	UNOOTYPECOLLECTION				::cppu::OTypeCollection
-#define	UNOOUSTRING						::rtl::OUString
-#define	UNOPROPERTYVALUE				::com::sun::star::beans::PropertyValue
-#define	UNOSTRINGPAIR					::com::sun::star::beans::StringPair
-#define	UNOREFERENCE					::com::sun::star::uno::Reference
-#define	UNORUNTIMEEXCEPTION				::com::sun::star::uno::RuntimeException
-#define	UNOINVALIDREGISTRYEXCEPTION		::com::sun::star::registry::InvalidRegistryException
-#define	UNOSEQUENCE						::com::sun::star::uno::Sequence
-#define	UNOTYPE							::com::sun::star::uno::Type
-#define	UNOURL							::com::sun::star::util::URL
-#define	UNOXINTERFACE					::com::sun::star::uno::XInterface
-#define	UNOXMULTISERVICEFACTORY			::com::sun::star::lang::XMultiServiceFactory
-#define	UNOXSINGLESERVICEFACTORY		::com::sun::star::lang::XSingleServiceFactory
-#define	UNOXTYPEPROVIDER				::com::sun::star::lang::XTypeProvider
-#define UNOILLEGALARGUMENTEXCEPTION	    ::com::sun::star::lang::IllegalArgumentException
-
-// -----------------------------------------------------------------------
-
-#endif
diff --git a/svtools/inc/twain.hxx b/svtools/inc/twain.hxx
deleted file mode 100644
index 7314e6c046..0000000000
--- a/svtools/inc/twain.hxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: twain.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TWAIN_HXX
-#define _TWAIN_HXX
-
-// please add new platforms if TWAIN is available
-#if defined WIN || defined WNT || defined UNX
-#define	TWAIN_AVAILABLE	1
-#else
-#undef	TWAIN_AVAILABLE
-#endif
-
-// include following only, if define is not set
-#ifndef _TWAIN_HXX_CHECK
-
-#include <vcl/bitmap.hxx>
-
-// -----------
-// - Defines -
-// -----------
-
-#define TWAIN_ERR_NO_ERROR					0
-#define TWAIN_ERR_MODULE_NOT_LOADED			2
-#define	TWAIN_ERR_DSMENTRY_NOT_FOUND		4
-#define	TWAIN_ERR_SOURCE_MANAGER_NOT_OPENED	6
-#define	TWAIN_ERR_SOURCE_SELECTION_DIALOG	8
-
-// ---------
-// - Twain -
-// ---------
-
-struct TwainImp;
-namespace com { namespace sun { namespace star { namespace lang { struct EventObject; } } } }
-
-class Twain
-{
-friend class TwainEventListener;
-
-private:
-    
-    TwainImp*			mpImp;
-
-    Bitmap				maBitmap;
-    Link				maUpdateLink;
-    USHORT				mnErrorCode;
-    BOOL				mbScanning;
-
-                        Twain();
-                        Twain( const Twain& rTwain );
-    const Twain&		operator=( const Twain& rTwain ) { return *this; }
-
-protected:
-
-    void				Disposing( const com::sun::star::lang::EventObject& rEventObject );
-
-public:					
-                        
-                        Twain( const Link& rUpdateLink );
-                        ~Twain();
-                
-    BOOL				SelectSource();
-    BOOL				PerformTransfer();
-
-    Bitmap				GetBitmap();
-                        
-    BOOL				IsScanning() const { return mbScanning; }
-    USHORT				GetErrorCode() const { return mnErrorCode; }
-};
-
-#endif // _TWAIN_HXX_CHECK
-#endif // _TWAIN_HXX
diff --git a/svtools/inc/whmap.hxx b/svtools/inc/whmap.hxx
deleted file mode 100644
index 57ec7b340e..0000000000
--- a/svtools/inc/whmap.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: whmap.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SFX_WHMAP_HXX
-#define _SFX_WHMAP_HXX
-
-#include <solar.h>
-
-struct SfxWhichMapEntry
-{
-    USHORT nWhichId;
-    USHORT nSlotId;
-};
-
-class SfxWhichMap
-{
-    const SfxWhichMapEntry *pMap;
-
-public:
-    inline				SfxWhichMap( const SfxWhichMapEntry *pMappings = 0 );
-    virtual             ~SfxWhichMap();
-
-    int 				IsNull() const
-                        { return 0 == pMap; }
-    virtual USHORT		GetWhich(USHORT nSlot) const;
-    virtual USHORT		GetSlot(USHORT nWhich) const;
-    virtual SfxWhichMap*Clone() const;
-};
-
-inline SfxWhichMap::SfxWhichMap( const SfxWhichMapEntry *pMappings ):
-    pMap( pMappings )
-{
-}
-
-#endif
diff --git a/svtools/inc/xmlcnimp.hxx b/svtools/inc/xmlcnimp.hxx
deleted file mode 100644
index bc7a1ed4a9..0000000000
--- a/svtools/inc/xmlcnimp.hxx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: xmlcnimp.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_XMLCNIMP_HXX
-#define _SVTOOLS_XMLCNIMP_HXX
-
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/svarray.hxx>
-
-#ifndef _SVTOOLS_NMSPMAP_HXX
-#include <xmloff/nmspmap.hxx>
-#endif
-
-namespace rtl { class OUString; }
-
-typedef ::rtl::OUString *OUStringPtr;
-SV_DECL_PTRARR_DEL( OUStringsDtor2_Impl, OUStringPtr, 5, 5 )
-
-class SvXMLAttrContainerItem_Impl
-{
-    SvXMLNamespaceMap	aNamespaceMap;
-    SvUShorts			aPrefixPoss;
-    OUStringsDtor2_Impl	aLNames;
-    OUStringsDtor2_Impl	aValues;
-
-    inline sal_uInt16 GetPrefixPos( sal_uInt16 i ) const;
-public:
-
-    SvXMLAttrContainerItem_Impl( const SvXMLAttrContainerItem_Impl& rImpl );
-    SvXMLAttrContainerItem_Impl();
-
-    int  operator ==( const SvXMLAttrContainerItem_Impl& rCmp ) const;
-
-    BOOL AddAttr( const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix, const ::rtl::OUString& rNamespace,
-                    const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix,
-                  const ::rtl::OUString& rLName,
-                  const ::rtl::OUString& rValue );
-
-    sal_uInt16 GetAttrCount() const { return aLNames.Count(); }
-    inline ::rtl::OUString GetAttrNamespace( sal_uInt16 i ) const;
-    inline ::rtl::OUString GetAttrPrefix( sal_uInt16 i ) const;
-    inline const ::rtl::OUString& GetAttrLName( sal_uInt16 i ) const;
-    inline const ::rtl::OUString& GetAttrValue( sal_uInt16 i ) const;
-
-    sal_uInt16 GetFirstNamespaceIndex() const { return aNamespaceMap.GetFirstIndex(); }
-    sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const { return aNamespaceMap.GetNextIndex( nIdx ); }
-    inline const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const;
-    inline const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const;
-
-    BOOL SetAt( sal_uInt16 i,
-                const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
-                const ::rtl::OUString& rPrefix, const ::rtl::OUString& rNamespace,
-                const ::rtl::OUString& rLName, const ::rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
-                const ::rtl::OUString& rPrefix,
-                const ::rtl::OUString& rLName,
-                const ::rtl::OUString& rValue );
-
-    void Remove( sal_uInt16 i );
-};
-
-inline sal_uInt16 SvXMLAttrContainerItem_Impl::GetPrefixPos( sal_uInt16 i ) const
-{
-//	DBG_ASSERT( i >= 0 && i < aPrefixPoss.Count(),
-//				"SvXMLAttrContainerItem_Impl::GetPrefixPos: illegal index" );
-    return aPrefixPoss[i];
-}
-
-inline ::rtl::OUString SvXMLAttrContainerItem_Impl::GetAttrNamespace( sal_uInt16 i ) const
-{
-    ::rtl::OUString sRet;
-    sal_uInt16 nPos = GetPrefixPos( i );
-    if( USHRT_MAX != nPos )
-        sRet = aNamespaceMap.GetNameByIndex( nPos );
-    return sRet;
-}
-
-inline ::rtl::OUString SvXMLAttrContainerItem_Impl::GetAttrPrefix( sal_uInt16 i ) const
-{
-    ::rtl::OUString sRet;
-    sal_uInt16 nPos = GetPrefixPos( i );
-    if( USHRT_MAX != nPos )
-        sRet = aNamespaceMap.GetPrefixByIndex( nPos );
-    return sRet;
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetAttrLName(sal_uInt16 i) const
-{
-    DBG_ASSERT( i >= 0 && i < aLNames.Count(),
-                "SvXMLAttrContainerItem_Impl::GetLName: illegal index" );
-    return *aLNames[i];
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetAttrValue(sal_uInt16 i) const
-{
-    DBG_ASSERT( i >= 0 && i < aValues.Count(),
-                "SvXMLAttrContainerItem_Impl::GetValue: illegal index" );
-    return *aValues[i];
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetNamespace(
-                                                            sal_uInt16 i ) const
-{
-    return aNamespaceMap.GetNameByIndex( i );
-}
-
-inline const ::rtl::OUString& SvXMLAttrContainerItem_Impl::GetPrefix( sal_uInt16 i ) const
-{
-    return aNamespaceMap.GetPrefixByIndex( i );
-}
-
-#endif
-
diff --git a/svtools/inc/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
index 371f4a792d..371f4a792d 100644
--- a/svtools/inc/propctrl.hxx
+++ b/svtools/source/dialogs/propctrl.hxx
diff --git a/svtools/source/inc/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx
index 9567250862..9567250862 100644
--- a/svtools/source/inc/hatchwindowfactory.hxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx
diff --git a/svtools/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc
index e875e577cb..e875e577cb 100644
--- a/svtools/inc/filectrl.hrc
+++ b/svtools/source/inc/filectrl.hrc
diff --git a/svtools/inc/gifread.hxx b/svtools/source/inc/gifread.hxx
index 41a8aef7a2..41a8aef7a2 100644
--- a/svtools/inc/gifread.hxx
+++ b/svtools/source/inc/gifread.hxx
diff --git a/svtools/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx
index 651574759b..651574759b 100644
--- a/svtools/inc/gradwrap.hxx
+++ b/svtools/source/inc/gradwrap.hxx
diff --git a/svtools/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
index e6a6dec96d..e6a6dec96d 100644
--- a/svtools/inc/iodlg.hrc
+++ b/svtools/source/inc/iodlg.hrc
diff --git a/svtools/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx
index 9a7b8c3922..9a7b8c3922 100644
--- a/svtools/inc/jpeg.hxx
+++ b/svtools/source/inc/jpeg.hxx
diff --git a/svtools/inc/msgrd.hxx b/svtools/source/inc/msgrd.hxx
index 63ed3dbe24..63ed3dbe24 100644
--- a/svtools/inc/msgrd.hxx
+++ b/svtools/source/inc/msgrd.hxx
diff --git a/svtools/inc/msgwr.hxx b/svtools/source/inc/msgwr.hxx
index 46c9c80be1..46c9c80be1 100644
--- a/svtools/inc/msgwr.hxx
+++ b/svtools/source/inc/msgwr.hxx
diff --git a/svtools/inc/property.hxx b/svtools/source/inc/property.hxx
index 31c75012d4..31c75012d4 100644
--- a/svtools/inc/property.hxx
+++ b/svtools/source/inc/property.hxx
diff --git a/svtools/inc/sgfbram.hxx b/svtools/source/inc/sgfbram.hxx
index 1fde9f9884..1fde9f9884 100644
--- a/svtools/inc/sgfbram.hxx
+++ b/svtools/source/inc/sgfbram.hxx
diff --git a/svtools/inc/sgffilt.hxx b/svtools/source/inc/sgffilt.hxx
index 79fe7ef80f..79fe7ef80f 100644
--- a/svtools/inc/sgffilt.hxx
+++ b/svtools/source/inc/sgffilt.hxx
diff --git a/svtools/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx
index c7c2dfd9a5..c7c2dfd9a5 100644
--- a/svtools/inc/sgvmain.hxx
+++ b/svtools/source/inc/sgvmain.hxx
diff --git a/svtools/inc/sgvspln.hxx b/svtools/source/inc/sgvspln.hxx
index 661614080c..661614080c 100644
--- a/svtools/inc/sgvspln.hxx
+++ b/svtools/source/inc/sgvspln.hxx
diff --git a/svtools/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 9bef741b35..9bef741b35 100644
--- a/svtools/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
diff --git a/svtools/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 3ee8e96350..3ee8e96350 100644
--- a/svtools/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
diff --git a/svtools/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx
index 6161b6a5b6..6161b6a5b6 100644
--- a/svtools/inc/xbmread.hxx
+++ b/svtools/source/inc/xbmread.hxx
diff --git a/svtools/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx
index 3d54b41fb3..3d54b41fb3 100644
--- a/svtools/inc/xpmread.hxx
+++ b/svtools/source/inc/xpmread.hxx
diff --git a/svtools/source/misc/config.src b/svtools/source/misc/config.src
deleted file mode 100644
index ca00bdc395..0000000000
--- a/svtools/source/misc/config.src
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: config.src,v $
- * $Revision: 1.29 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <svtools/svtools.hrc>
-
-String STR_WARNING_ITEM
-{
-    Text [ en-US ] = "Incorrect Version!" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/misc/inidef.cxx b/svtools/source/misc/inidef.cxx
deleted file mode 100644
index 88cdb3ccde..0000000000
--- a/svtools/source/misc/inidef.cxx
+++ /dev/null
@@ -1,269 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: inidef.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-
-#include <tools/string.hxx>
-#include "inetdef.hxx"
-#include "inidef.hxx"
-
-//========================================================================
-
-class SfxStdIniDef_Impl: public SfxIniDefaulter
-{
-public:
-                    SfxStdIniDef_Impl( SfxIniDefaultManager *pDefMgr )
-                    :	SfxIniDefaulter( pDefMgr )
-                    {}
-    virtual BOOL 	QueryDefault( String &rValue, const SfxIniEntry &rEntry );
-};
-
-//-------------------------------------------------------------------------
-
-BOOL SfxStdIniDef_Impl::QueryDefault( String &rValue, const SfxIniEntry &rEntry )
-{
-    switch ( rEntry.GetKey() )
-    {
-        case SFX_KEY_BROWSERRESTORE:
-        {
-            rValue = "1";
-            return TRUE;
-        }
-
-        case SFX_KEY_INET_HOME:
-        {
-            if ( System::GetLanguage() == LANGUAGE_GERMAN )
-                rValue = "http://www.stardivision.de";
-            else
-                rValue = "http://www.stardivision.com";
-            return TRUE;
-        }
-
-        case SFX_KEY_INET_MEMCACHE:
-            rValue = "4";
-            return TRUE;
-
-        case SFX_KEY_INET_DISKCACHE:
-            rValue = "2048";
-            return TRUE;
-
-        case SFX_KEY_INET_CACHEEXPIRATION:
-            rValue = "3";
-            return TRUE;
-
-        case SFX_KEY_INET_MAXHTTPCONS:
-            rValue = "4";
-            return TRUE;
-
-        case SFX_KEY_INET_MAXFTPCONS:
-            rValue = "2";
-            return TRUE;
-
-//  		case SFX_KEY_INET_JAVAMINHEAP:
-//  			rValue = "256";
-//  			return TRUE;
-
-//  		case SFX_KEY_INET_JAVAMAXHEAP:
-//  			rValue = "";
-//  			return TRUE;
-
-        case SFX_KEY_INET_USERAGENT:
-            rValue = INET_DEF_CALLERNAME;
-            return TRUE;
-
-        case SFX_KEY_INET_EXE_JAVASCRIPT:
-#ifdef SOLAR_JAVA
-            rValue = "0"; // noch "0", solange es noch soviel Bugs gibt
-#else
-            rValue = "0"; // immer "0"
-#endif
-            return TRUE;
-
-        case SFX_KEY_INET_EXE_PLUGIN:
-            rValue = "1";
-            return TRUE;
-
-/*		case SFX_KEY_INET_JAVA_ENABLE:
-#ifdef SOLAR_JAVA
-            rValue = "1";
-#else
-            rValue = "0";
-#endif
-            return TRUE; */
-
-//  		case SFX_KEY_INET_NETACCESS:
-//  			rValue = "2";
-//  			return TRUE;
-
-        case SFX_KEY_INET_CHANNELS:
-            rValue = "1";
-            return TRUE;
-
-        case SFX_KEY_BASIC_ENABLE:
-            rValue = "1";
-            return TRUE;
-
-        case SFX_KEY_INET_COOKIES:
-            rValue = "1";
-            return TRUE;
-
-        case SFX_KEY_ICONGRID:
-            rValue = "100;70;0";
-            return TRUE;
-
-        case SFX_KEY_METAFILEPRINT:
-            rValue = "1";
-            return TRUE;
-    }
-
-    return SfxIniDefaulter::QueryDefault( rValue, rEntry );
-}
-
-//=========================================================================
-
-SfxIniDefaultManager::SfxIniDefaultManager()
-:	_pList( new SfxIniDefaulterList )
-{
-    new SfxStdIniDef_Impl( this );
-}
-
-//-------------------------------------------------------------------------
-
-SfxIniDefaultManager::~SfxIniDefaultManager()
-{
-    if ( _pList )
-    {
-        for ( USHORT n = _pList->Count(); n--; )
-            delete _pList->GetObject(n);
-        delete _pList;
-    }
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxIniDefaultManager::QueryDefault
-(
-    String&				rValue, 	/* out:	Default-Wert f"ur 'rEntry'
-                                       (Default ist Leerstring) */
-    const SfxIniEntry&	rEntry		// in:	Beschreibung des Eintrags
-)
-
-/*	[Beschreibung]
-
-    "Uber diese interne Methode besorgt sich der <SfxIniManager> den
-    Default f"ur einen in 'rEntry' beschriebenen Eintrag.
-*/
-
-{
-    for ( USHORT n = _pList->Count(); n--; )
-        if ( _pList->GetObject(n)->QueryDefault( rValue, rEntry ) )
-            return TRUE;
-    return FALSE;
-}
-
-//=========================================================================
-
-SfxIniDefaulter::SfxIniDefaulter( SfxIniDefaultManager *pManager )
-
-/*	[Beschreibung]
-
-    Der Ctor dieser Klasse meldet die neue Instanz automatisch am
-    <SfxiniDefaultManager> 'pManager' an.
-*/
-
-:	_pManager( pManager )
-
-{
-    pManager->Insert( this );
-}
-
-//-------------------------------------------------------------------------
-
-SfxIniDefaulter::~SfxIniDefaulter()
-
-/*	[Beschreibung]
-
-    Der Dtor dieser Klasse meldet die neue Instanz automatisch am
-    <SfxiniDefaultManager> ab, der im Ctor angegeben wurde.
-*/
-
-{
-    _pManager->Remove( this );
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxIniDefaulter::QueryDefault
-(
-    String&				rValue, 	/* out:	Default-Wert f"ur 'rEntry'
-                                       (Default ist Leerstring) */
-    const SfxIniEntry&	rEntry		// in:	Beschreibung des Eintrags
-)
-
-/*	[Beschreibung]
-
-    Diese virtuelle Methode mu\s "uberladen werden. Sie soll dann in
-    'rValue' einen Default-Wert f"ur den in 'rEntry' beschriebenen
-    ini-Eintrag setzen, falls ihr dieser bekannt ist.
-
-
-    [Returnwert]
-
-    TRUE			In 'rValue' befindet sich der Default-Wert.
-
-    FALSE			F"ur diesen Eintrag ist kein Default-Wert bekannt.
-
-*/
-
-{
-    return FALSE;
-};
-
-//========================================================================
-
-SfxIniEntry::SfxIniEntry
-(
-    const String&  	aGroup,
-    const String&	aKey,
-    SfxIniGroup		eGroup,
-    SfxIniKey		eKey,
-    USHORT		 	nIndex
-)
-:	_aGroup( aGroup ),
-    _aKey( aKey ),
-    _eGroup( eGroup ),
-    _eKey( eKey ),
-    _nIndex( nIndex )
-{
-}
-
-
diff --git a/svtools/source/misc/iniman.src b/svtools/source/misc/iniman.src
deleted file mode 100644
index 974d2d41df..0000000000
--- a/svtools/source/misc/iniman.src
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: iniman.src,v $
- * $Revision: 1.27 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <svtools/svtools.hrc>
-
-ErrorBox ERRBOX_CHECK_PLZ
-{
-    BUTTONS = WB_OK ;
-    Message [ en-US ] = "The ZIP code specified is invalid.\nA ZIP code should begin with a number (or in some cases a letter) and\ncan only contain numbers, letters, spaces and dashes.";
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/misc/iniprop.cxx b/svtools/source/misc/iniprop.cxx
deleted file mode 100644
index 473da913a4..0000000000
--- a/svtools/source/misc/iniprop.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: iniprop.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-
-#include "iniprop.hxx"
-
-//-------------------------------------------------------------------------
-
-TYPEINIT1(SfxAppIniManagerProperty, ApplicationProperty);
-
-//-------------------------------------------------------------------------
-
-SfxAppIniManagerProperty::~SfxAppIniManagerProperty()
-{
-}
-
-
diff --git a/svtools/source/items/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index c5283cb0ac..c5283cb0ac 100644
--- a/svtools/source/items/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
new file mode 100644
index 0000000000..b8d572e2d1
--- /dev/null
+++ b/svtools/source/misc/svtdata.cxx
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svtdata.cxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
+
+#include <map>
+#include <tools/resmgr.hxx>
+#include <tools/shl.hxx>
+#include <vos/process.hxx>
+#include <svtools/svtdata.hxx>
+
+namespace unnamed_svtools_svtdata {}
+using namespace unnamed_svtools_svtdata;
+    // unnamed namespaces don't work well yet
+
+//============================================================================
+namespace unnamed_svtools_svtdata {
+
+typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap;
+
+}
+
+//============================================================================
+//
+//  ImpSvtData
+//
+//============================================================================
+
+ImpSvtData::~ImpSvtData()
+{
+    delete pResMgr;
+    for (SimpleResMgrMap::iterator t
+             = static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->begin();
+         t != static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->end(); ++t)
+        delete t->second;
+    delete static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs);
+}
+
+//============================================================================
+ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale)
+{
+    if (!pResMgr)
+    {
+        pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svt), aLocale );
+    }
+    return pResMgr;
+}
+
+//============================================================================
+SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale)
+{
+    if (!m_pThreadsafeRMs)
+        m_pThreadsafeRMs = new SimpleResMgrMap;
+    rtl::OUString aISOcode = rLocale.Language;
+    aISOcode += rtl::OStringToOUString("-", RTL_TEXTENCODING_UTF8);
+    aISOcode += rLocale.Country;
+
+    SimpleResMgr *& rResMgr
+        = (*static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs))[aISOcode];
+    if (!rResMgr)
+    {
+        rResMgr = new SimpleResMgr(CREATEVERSIONRESMGR_NAME(svs), rLocale );
+    }
+    return rResMgr;
+}
+
+ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
+{
+    if (!pPatchResMgr)
+    {
+        pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
+    }
+    return pPatchResMgr;
+}
+
+//============================================================================
+// static
+ImpSvtData & ImpSvtData::GetSvtData()
+{
+    void ** pAppData = GetAppData(SHL_SVT);
+    if (!*pAppData)
+        *pAppData= new ImpSvtData;
+    return *static_cast<ImpSvtData *>(*pAppData);
+}
+
diff --git a/svtools/source/misc/vcldata.cxx b/svtools/source/misc/vcldata.cxx
deleted file mode 100644
index 45687f58a0..0000000000
--- a/svtools/source/misc/vcldata.cxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: vcldata.cxx,v $
- * $Revision: 1.10 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <svtools/svtdata.hxx>
-
-//============================================================================
-//
-//  class ImpSvtData
-//
-//============================================================================
-
-ResMgr * ImpSvtData::GetResMgr()
-{
-    return GetResMgr(Application::GetSettings().GetUILocale());
-}
-
-ResMgr * ImpSvtData::GetPatchResMgr()
-{
-    return GetPatchResMgr(Application::GetSettings().GetUILocale());
-}
-
-SvpResId::SvpResId( USHORT nId ) :
-    ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() )
-{
-}
-
diff --git a/svtools/source/items/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index e3f1459d30..e3f1459d30 100644
--- a/svtools/source/items/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
diff --git a/svtools/source/misc1/iniadrtk.cxx b/svtools/source/misc1/iniadrtk.cxx
deleted file mode 100644
index 0245a986d4..0000000000
--- a/svtools/source/misc1/iniadrtk.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: iniadrtk.cxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <tools/string.hxx>
-#include <iniadrtk.hxx>
-
-//============================================================================
-//
-//  class SfxIniManagerAddressEntry
-//
-//============================================================================
-
-// static
-String SfxIniManagerAddressEntry::get(const String & rAddress,
-                                      AddressToken eToken)
-{
-    String aToken;
-    USHORT i = 0, nTxt = 0;
-
-    while ( i < rAddress.Len() )
-    {
-        while ( i < rAddress.Len() && rAddress.GetChar(i) != '#' )
-        {
-            if ( rAddress.GetChar(i) == '\\' )
-                i++;
-            aToken += rAddress.GetChar(i++);
-        }
-
-        // rAddress[i] == '#' oder am Ende, also eine Position weiter gehen
-        i++;
-
-        if ( eToken == (AddressToken)nTxt )
-            break;
-        else if ( i >= rAddress.Len() )
-        {
-            aToken.Erase();
-            break;
-        }
-        else
-        {
-            aToken.Erase();
-            nTxt++;
-        }
-    }
-    return aToken;
-}
-
diff --git a/svtools/util/svl.flt b/svtools/util/svl.flt
deleted file mode 100644
index be7de3bce8..0000000000
--- a/svtools/util/svl.flt
+++ /dev/null
@@ -1,85 +0,0 @@
-AUTO_CODE
-BrowserDataWin
-BrowserColumn
-ButtonFrame
-CreateLoader
-DdeString
-DlgSource
-DlgExport
-EditWindow
-FileEntry
-GIFLZWDecompressor
-GIFReader
-PNGReader
-ImpDetect
-ImpDraw
-ImpGet
-ImpPut
-ImpSvNum
-JPEGReader
-WMFReader
-EnhWMFReader
-WMFWriter
-LinkStub
-MultiTextLineInfo
-Regexpr
-RemoteControlServer
-RemoteControlService
-RetStream
-SCmdStream
-SbxArrayRef
-SbxBasicFormater
-SbxRes
-SbxVariableRef
-SfxListUndoAction
-SfxPointerEntry
-SfxUINT32s
-SfxULongRangeItem
-SfxULongRanges
-SfxULongRangesItem
-SgfFontLst
-SgfFontOne
-StatementCommand
-StatementControl
-StatementFlow
-StatementList
-StatementSlot
-SVDDE_MISC_CODE
-SvInterfaceClient
-SvImp
-SvStringLockBytes
-svtools
-SVTOOLS_FILTER
-SVTOOLS_CODE
-SVTOOLS_FILTER4
-SVTOOLS_FILTER_CODE
-ValueSetItem
-WMFRecord
-WriteRecord
-XPMReader
-XBMReader
-_grow
-_ImplINetHistoryLoadTimer
-_ImplINetHistoryStoreTimer
-sRTF_
-sHTML_
-SdbSqlScanner
-Sdbyy_scan
-SqlInternalNode
-unnamed
-WEP
-LIBMAIN
-LibMain
-??_7
-??_8
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-0Imp
-Impl@@
-Imp@@
-__CT
-_STL
diff --git a/svtools/util/svt.flt b/svtools/util/svt.flt
deleted file mode 100644
index f021d41b1d..0000000000
--- a/svtools/util/svt.flt
+++ /dev/null
@@ -1,81 +0,0 @@
-AUTO_CODE
-BrowserDataWin
-BrowserColumn
-ButtonFrame
-CreateLoader
-DdeString
-DlgSource
-DlgExport
-EditWindow
-FileEntry
-GIFLZWDecompressor
-GIFReader
-PNGReader
-ImpDetect
-ImpDraw
-ImpGet
-ImpPut
-ImpSv
-JPEGReader
-WMFReader
-EnhWMFReader
-WMFWriter
-LinkStub
-MultiTextLineInfo
-Regexpr
-RemoteControlServer
-RemoteControlService
-RetStream
-SCmdStream
-SbxArrayRef
-SbxBasicFormater
-SbxRes
-SbxVariableRef
-SfxListUndoAction
-SfxPointerEntry
-SfxUINT32s
-SfxULongRangeItem
-SfxULongRanges
-SfxULongRangesItem
-SgfFontLst
-SgfFontOne
-StatementCommand
-StatementControl
-StatementFlow
-StatementList
-StatementSlot
-SVDDE_MISC_CODE
-SvInterfaceClient
-SvImp
-SvStringLockBytes
-SVTOOLS_FILTER
-SVTOOLS_CODE
-SVTOOLS_FILTER4
-SVTOOLS_FILTER_CODE
-ValueSetItem
-WMFRecord
-WriteRecord
-XPMReader
-XBMReader
-_grow
-_ImplINetHistoryLoadTimer
-_ImplINetHistoryStoreTimer
-sRTF_
-sHTML_
-unnamed
-svtools\
-WEP
-LIBMAIN
-LibMain
-??_7
-??_8
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-0Imp
-Impl@@
-Imp@@
-__CT