#i103496#: make svl buildable

36 files changed, 226 insertions, 227 deletions

diff --git a/svl/inc/converter.hxx b/svl/inc/converter.hxx
new file mode 100644
index 000000000000..f6a5d67ca966
--- /dev/null
+++ b/svl/inc/converter.hxx
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: converter.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 _SV_CONVERTER_HXX_
+#define _SV_CONVERTER_HXX_
+
+#include "svtools/svldllapi.h"
+#include <tools/solar.h>
+
+class SvDbaseConverter
+{
+public:
+    SVL_DLLPUBLIC static INT32 ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale);
+    SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale);
+};
+
+#endif //_CONVERTER_HXX_
+
+
+
diff --git a/svl/inc/makefile.mk b/svl/inc/makefile.mk
index a9974d75065c..9368bce7cde1 100644
--- a/svl/inc/makefile.mk
+++ b/svl/inc/makefile.mk
@@ -30,13 +30,13 @@
 #*************************************************************************
 PRJ=..
 
-PRJNAME=svtools
+PRJNAME=svl
 TARGET=inc
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
 
 # --- Files --------------------------------------------------------
 # --- Targets -------------------------------------------------------
diff --git a/svl/inc/misccfg.hxx b/svl/inc/misccfg.hxx
index 3f897e1cecc3..9689b04cef89 100644
--- a/svl/inc/misccfg.hxx
+++ b/svl/inc/misccfg.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFX_MISCCFG_HXX
 #define _SFX_MISCCFG_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include "tools/solar.h"
 #include "unotools/configitem.hxx"
 
@@ -38,7 +38,7 @@
      Beschreibung:
  --------------------------------------------------------------------*/
 
-class SVT_DLLPUBLIC SfxMiscCfg : public utl::ConfigItem
+class SVL_DLLPUBLIC SfxMiscCfg : public utl::ConfigItem
 {
     BOOL            bPaperSize;     // printer warnings
     BOOL            bPaperOrientation;
diff --git a/svl/inc/numuno.hxx b/svl/inc/numuno.hxx
index c31829dec020..d6f5621246fd 100644
--- a/svl/inc/numuno.hxx
+++ b/svl/inc/numuno.hxx
@@ -30,7 +30,7 @@
 #ifndef _NUMUNO_HXX
 #define _NUMUNO_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -57,7 +57,7 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
 //  SvNumberFormatsSupplierObj: aggregate to document,
 //  construct with SvNumberFormatter
 
-class SVT_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
+class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
                                     com::sun::star::util::XNumberFormatsSupplier,
                                     com::sun::star::lang::XUnoTunnel>
 {
diff --git a/svl/inc/pch/precompiled_svtools.cxx b/svl/inc/pch/precompiled_svl.cxx
index 2346d52b68af..da41b68a5eae 100644
--- a/svl/inc/pch/precompiled_svtools.cxx
+++ b/svl/inc/pch/precompiled_svl.cxx
@@ -28,5 +28,5 @@
  *
  ************************************************************************/
 
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
diff --git a/svl/inc/pch/precompiled_svtools.hxx b/svl/inc/pch/precompiled_svl.hxx
index cab81cac04ec..b41e2ca89fc6 100644
--- a/svl/inc/pch/precompiled_svtools.hxx
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -421,11 +421,6 @@
 #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>
diff --git a/svl/inc/poolcach.hxx b/svl/inc/poolcach.hxx
index 20d9e4d19c43..8e7cf3ddbfa7 100644
--- a/svl/inc/poolcach.hxx
+++ b/svl/inc/poolcach.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFXPOOLCACH_HXX
 #define _SFXPOOLCACH_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/solar.h>
 
 class SfxItemModifyArr_Impl;
@@ -39,7 +39,7 @@ class SfxItemSet;
 class SfxPoolItem;
 class SfxSetItem;
 
-class SVT_DLLPUBLIC SfxItemPoolCache
+class SVL_DLLPUBLIC SfxItemPoolCache
 {
     SfxItemPool             *pPool;
     SfxItemModifyArr_Impl   *pCache;
diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 5cfd3d0fc15e..e10b3f7a8e70 100644
--- a/svl/inc/svl/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
@@ -30,14 +30,14 @@
 #ifndef _AEITEM_HXX
 #define _AEITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/poolitem.hxx>
 #include <svtools/eitem.hxx>
 
 class SfxAllEnumValueArr;
 class SvUShorts;
 
-class SVT_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
+class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
 {
     SfxAllEnumValueArr*     pValues;
     SvUShorts*              pDisabledValues;
diff --git a/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx
index 1573a029f29f..03a4e0216e82 100644
--- a/svl/inc/svl/cjkoptions.hxx
+++ b/svl/inc/svl/cjkoptions.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVTOOLS_CJKOPTIONS_HXX
 #define _SVTOOLS_CJKOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <sal/types.h>
 #include <unotools/options.hxx>
 
@@ -38,7 +38,7 @@ class SvtCJKOptions_Impl;
 
 // class SvtCJKOptions --------------------------------------------------
 
-class SVT_DLLPUBLIC SvtCJKOptions: public utl::detail::Options
+class SVL_DLLPUBLIC SvtCJKOptions: public utl::detail::Options
 {
 private:
     SvtCJKOptions_Impl*    pImp;
diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 4157d129cce1..fae5e13dfbb8 100644
--- a/svl/inc/svl/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVTOOLS_CTLOPTIONS_HXX
 #define _SVTOOLS_CTLOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <sal/types.h>
 #include <svtools/brdcst.hxx>
 #include <svtools/lstner.hxx>
@@ -40,7 +40,7 @@ class SvtCTLOptions_Impl;
 
 // class SvtCTLOptions --------------------------------------------------------
 
-class SVT_DLLPUBLIC SvtCTLOptions:
+class SVL_DLLPUBLIC SvtCTLOptions:
     public utl::detail::Options, public SfxBroadcaster, public SfxListener
 {
 private:
diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx
index f2625f7955bb..91074908cf8a 100644
--- a/svl/inc/svl/documentlockfile.hxx
+++ b/svl/inc/svl/documentlockfile.hxx
@@ -32,7 +32,7 @@
 #ifndef _SVT_DOCUMENTLOCKFILE_HXX
 #define _SVT_DOCUMENTLOCKFILE_HXX
 
-#include <svtools/svtdllapi.h>
+#include <svtools/svldllapi.h>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -45,7 +45,7 @@
 
 namespace svt {
 
-class SVT_DLLPUBLIC DocumentLockFile : public LockFileCommon
+class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
 {
     // the workaround for automated testing!
     static sal_Bool m_bAllowInteraction;
diff --git a/svl/inc/svl/eitem.hxx b/svl/inc/svl/eitem.hxx
index f9e1927a881d..1a9aa8fd63a0 100644
--- a/svl/inc/svl/eitem.hxx
+++ b/svl/inc/svl/eitem.hxx
@@ -31,11 +31,11 @@
 #ifndef _SFXENUMITEM_HXX
 #define _SFXENUMITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/cenumitm.hxx>
 
 //============================================================================
-class SVT_DLLPUBLIC SfxEnumItem: public CntEnumItem
+class SVL_DLLPUBLIC SfxEnumItem: public CntEnumItem
 {
 protected:
     SfxEnumItem(USHORT which = 0, USHORT nValue = 0):
@@ -50,7 +50,7 @@ public:
 };
 
 //============================================================================
-class SVT_DLLPUBLIC SfxBoolItem: public CntBoolItem
+class SVL_DLLPUBLIC SfxBoolItem: public CntBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index 5298bbd1678b..1ea04db955c5 100644
--- a/svl/inc/svl/flagitem.hxx
+++ b/svl/inc/svl/flagitem.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFXFLAGITEM_HXX
 #define _SFXFLAGITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/solar.h>
 #include <tools/rtti.hxx>
 #include <svtools/poolitem.hxx>
@@ -41,9 +41,9 @@ extern USHORT nSfxFlagVal[16];
 
 // -----------------------------------------------------------------------
 
-DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC)
 
-class SVT_DLLPUBLIC SfxFlagItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
 {
     USHORT                   nVal;
 
diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
index f19ea1dd8457..7e01d3487d95 100644
--- a/svl/inc/svl/globalnameitem.hxx
+++ b/svl/inc/svl/globalnameitem.hxx
@@ -30,7 +30,7 @@
 #ifndef _GLOBALNAMEITEM_HXX
 #define _GLOBALNAMEITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/solar.h>
 #include <tools/rtti.hxx>
 #include <tools/globname.hxx>
@@ -38,7 +38,7 @@
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
 {
     SvGlobalName            m_aName;
 
diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index e0151729c2e0..ec5552e3d217 100644
--- a/svl/inc/svl/imageitm.hxx
+++ b/svl/inc/svl/imageitm.hxx
@@ -31,13 +31,13 @@
 #ifndef _SVT_IMAGEITM_HXX
 #define _SVT_IMAGEITM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/intitem.hxx>
 
 class String;
 
 struct SfxImageItem_Impl;
-class SVT_DLLPUBLIC SfxImageItem : public SfxInt16Item
+class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item
 {
     SfxImageItem_Impl*      pImp;
 public:
diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
index fe2a3543e630..d54267eb4de1 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -31,11 +31,11 @@
 #ifndef _SFXINTITEM_HXX
 #define _SFXINTITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/cintitem.hxx>
 
 //============================================================================
-class SVT_DLLPUBLIC SfxByteItem: public CntByteItem
+class SVL_DLLPUBLIC SfxByteItem: public CntByteItem
 {
 public:
     TYPEINFO();
@@ -53,9 +53,9 @@ public:
 };
 
 //============================================================================
-DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVL_DLLPUBLIC)
 
-class SVT_DLLPUBLIC SfxInt16Item: public SfxPoolItem
+class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem
 {
     INT16 m_nValue;
 
@@ -115,7 +115,7 @@ inline void SfxInt16Item::SetValue(INT16 nTheValue)
 }
 
 //============================================================================
-class SVT_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
+class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
 {
 public:
     TYPEINFO();
@@ -134,7 +134,7 @@ public:
 };
 
 //============================================================================
-class SVT_DLLPUBLIC SfxInt32Item: public CntInt32Item
+class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item
 {
 public:
     TYPEINFO();
@@ -154,7 +154,7 @@ public:
 };
 
 //============================================================================
-class SVT_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
+class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
 {
 public:
     TYPEINFO();
diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index ed247ac01fa3..52ec53089b8a 100644
--- a/svl/inc/svl/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX
 #define _SVTOOLS_LANGUAGEOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <sal/types.h>
 #include <svtools/brdcst.hxx>
 #include <svtools/lstner.hxx>
@@ -47,7 +47,7 @@
 class SvtCJKOptions;
 class SvtCTLOptions;
 
-class SVT_DLLPUBLIC SvtLanguageOptions : public SfxBroadcaster, public SfxListener
+class SVL_DLLPUBLIC SvtLanguageOptions : public SfxBroadcaster, public SfxListener
 {
 private:
     SvtCJKOptions*  m_pCJKOptions;
@@ -113,7 +113,7 @@ public:
 };
 /** #i42730# Gives access to the Windows 16bit system locale
  */
-class SVT_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem
+class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem
 {
 private:
     ::rtl::OUString m_sWin16SystemLocale;
diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx
index c8bd6251f9cb..7d97d6c952cd 100644
--- a/svl/inc/svl/lockfilecommon.hxx
+++ b/svl/inc/svl/lockfilecommon.hxx
@@ -32,7 +32,7 @@
 #ifndef _SVT_LOCKFILECOMMON_HXX
 #define _SVT_LOCKFILECOMMON_HXX
 
-#include <svtools/svtdllapi.h>
+#include <svtools/svldllapi.h>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -54,7 +54,7 @@
 namespace svt {
 
 // This is a general implementation that is used in document lock file implementation and in sharing control file implementation
-class SVT_DLLPUBLIC LockFileCommon
+class SVL_DLLPUBLIC LockFileCommon
 {
 protected:
     ::osl::Mutex m_aMutex;
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 2e43120f653d..f1790bf5f294 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -32,7 +32,7 @@
 
 // class SvxMacroItem ----------------------------------------------------
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/poolitem.hxx>
 #include <tools/rtti.hxx>
 #include <tools/debug.hxx>
@@ -72,7 +72,7 @@ public:
 
 class SjJSbxObject;
 
-class SVT_DLLPUBLIC SvxMacro
+class SVL_DLLPUBLIC SvxMacro
 {
     String aMacName;
     String aLibName;
@@ -125,7 +125,7 @@ DECLARE_TABLE( _SvxMacroTableDtor, SvxMacro* )
 
 #define SVX_MACROTBL_AKTVERSION SVX_MACROTBL_VERSION40
 
-class SVT_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor
+class SVL_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor
 {
 public:
     inline SvxMacroTableDtor( const USHORT nInitSz = 0, const USHORT nReSz = 1 );
@@ -152,7 +152,7 @@ inline SvxMacroTableDtor::SvxMacroTableDtor( const USHORT nInitSz,
 Dieses Item beschreibt eine Makro-Tabelle.
 */
 
-class SVT_DLLPUBLIC SvxMacroItem: public SfxPoolItem
+class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem
 {
 public:
     TYPEINFO();
diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx
index a37d119d57c1..0289d5cb8e00 100644
--- a/svl/inc/svl/metitem.hxx
+++ b/svl/inc/svl/metitem.hxx
@@ -30,14 +30,14 @@
 #ifndef _SFXMETRICITEM_HXX
 #define _SFXMETRICITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/intitem.hxx>
 
-DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC)
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxMetricItem: public SfxInt32Item
+class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
 {
 public:
                              TYPEINFO();
diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 472f50e6ef60..397e4f532521 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -31,7 +31,7 @@
 #ifndef _OWNLIST_HXX
 #define _OWNLIST_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/stream.hxx>
 #include <tools/ownlist.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -79,7 +79,7 @@ public:
 };
 
 //=========================================================================
-class SVT_DLLPUBLIC SvCommandList
+class SVL_DLLPUBLIC SvCommandList
 /*  [Beschreibung]
 
     Die Liste enth"alt Objekte vom Typ SvCommand. Wird ein Objekt
@@ -95,8 +95,8 @@ class SVT_DLLPUBLIC SvCommandList
     BOOL FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
     void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
 
-    SVT_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & );
-    SVT_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & );
+    SVL_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & );
+    SVL_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & );
 };
 
 #endif // _OWNLIST_HXX
diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 923ab73da1d5..5ce99c09b98f 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -30,17 +30,17 @@
 #ifndef _SFXPTITEM_HXX
 #define _SFXPTITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/poolitem.hxx>
 #include <tools/gen.hxx>
 
 class SvStream;
 
-DBG_NAMEEX_VISIBILITY(SfxPointItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC)
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxPointItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem
 {
     Point                    aVal;
 
diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index 39c85d9ab228..b71705fc2047 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -30,18 +30,18 @@
 #ifndef _SFXRECTITEM_HXX
 #define _SFXRECTITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <svtools/poolitem.hxx>
 
 class SvStream;
 
-DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVT_DLLPUBLIC)
+DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC)
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
+class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
 {
     Rectangle                aVal;
 
diff --git a/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx
index 218e34cd4556..057c83cac7d1 100644
--- a/svl/inc/svl/restrictedpaths.hxx
+++ b/svl/inc/svl/restrictedpaths.hxx
@@ -32,14 +32,14 @@
 #define SVTOOLS_RESTRICTEDPATHS_HXX
 
 #include <svtools/urlfilter.hxx>
-#include <svtools/svtdllapi.h>
+#include <svtools/svldllapi.h>
 #include <tools/string.hxx>
 
 #include <vector>
 
 namespace svt
 {
-    class SVT_DLLPUBLIC RestrictedPaths : public IUrlFilter
+    class SVL_DLLPUBLIC RestrictedPaths : public IUrlFilter
     {
     private:
         ::std::vector< String >     m_aUnrestrictedURLs;
diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 52831f93f71f..92ab50b751e6 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -53,14 +53,14 @@
 #define _SFXRNGITEM_HXX
 
 #else
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/poolitem.hxx>
 
 class SvStream;
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxXRangeItem : public SfxPoolItem
 {
 private:
     NUMTYPE                     nFrom;
@@ -89,7 +89,7 @@ public:
 
 // -----------------------------------------------------------------------
 
-class SVT_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
+class SVL_DLLPUBLIC SfxXRangesItem : public SfxPoolItem
 {
 private:
     NUMTYPE*                    _pRanges;
diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx
index 8735f8c5ccf7..a926e6124e8c 100644
--- a/svl/inc/svl/sharecontrolfile.hxx
+++ b/svl/inc/svl/sharecontrolfile.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVT_SHARECONTROLFILE_HXX
 #define _SVT_SHARECONTROLFILE_HXX
 
-#include <svtools/svtdllapi.h>
+#include <svtools/svldllapi.h>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -51,7 +51,7 @@
 
 namespace svt {
 
-class SVT_DLLPUBLIC ShareControlFile : public LockFileCommon
+class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
diff --git a/svl/inc/svl/stritem.hxx b/svl/inc/svl/stritem.hxx
index a2430b142c1d..84a0be6b9fd1 100644
--- a/svl/inc/svl/stritem.hxx
+++ b/svl/inc/svl/stritem.hxx
@@ -31,11 +31,11 @@
 #ifndef _SFXSTRITEM_HXX
 #define _SFXSTRITEM_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <svtools/custritm.hxx>
 
 //============================================================================
-class SVT_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
+class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
 {
 public:
     TYPEINFO();
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 17e4bf7b9c06..f560c10e8901 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -38,7 +38,7 @@
 #include <vector>
 #include <comphelper/weak.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <rsc/rscsfx.hxx>
 #include <tools/string.hxx>
 #include <svtools/hint.hxx>
@@ -91,7 +91,7 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from:
 
 #define VIRTUAL510 virtual
 
-class SVT_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
+class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
 {
     friend class SfxStyleSheetBasePool;
 
@@ -165,7 +165,7 @@ typedef std::vector< rtl::Reference< SfxStyleSheetBase > > SfxStyles;
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetIterator
+class SVL_DLLPUBLIC SfxStyleSheetIterator
 
 /*  [Beschreibung]
 
@@ -195,8 +195,8 @@ protected:
 
 private:
     USHORT                  GetPos(){return nAktPosition;}
-    SVT_DLLPRIVATE BOOL                     IsTrivialSearch();
-    SVT_DLLPRIVATE BOOL                     DoesStyleMatch(SfxStyleSheetBase *pStyle);
+    SVL_DLLPRIVATE BOOL                     IsTrivialSearch();
+    SVL_DLLPRIVATE BOOL                     DoesStyleMatch(SfxStyleSheetBase *pStyle);
 
     void*                   pImp;
     SfxStyleSheetBase*      pAktStyle;
@@ -210,7 +210,7 @@ friend class SfxStyleSheetBasePool;
 
 class SfxStyleSheetBasePool_Impl;
 
-class SVT_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject
+class SVL_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject
 {
 friend class SfxStyleSheetIterator;
 friend class SfxStyleSheetBase;
@@ -218,8 +218,8 @@ friend class SfxStyleSheetBase;
     SfxStyleSheetBasePool_Impl *pImp;
 
 private:
-    SVT_DLLPRIVATE BOOL                         Load1_Impl( SvStream& );
-    SVT_DLLPRIVATE SfxStyleSheetIterator&      GetIterator_Impl();
+    SVL_DLLPRIVATE BOOL                         Load1_Impl( SvStream& );
+    SVL_DLLPRIVATE SfxStyleSheetIterator&      GetIterator_Impl();
 protected:
     String                      aAppName;
     SfxItemPool&                rPool;
@@ -287,7 +287,7 @@ public:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
+class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
                      public SfxListener, public SfxBroadcaster
 {
 public:
@@ -306,7 +306,7 @@ protected:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
+class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
 {
 protected:
     using SfxStyleSheetBasePool::Create;
@@ -334,7 +334,7 @@ public:
 
 //========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
+class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
 {
     USHORT nHint;
 
@@ -348,7 +348,7 @@ public:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxStyleSheetHint: public SfxHint
+class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint
 {
     SfxStyleSheetBase*  pStyleSh;
     USHORT              nHint;
@@ -364,7 +364,7 @@ public:
                         { return nHint; }
 };
 
-class SVT_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
+class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
 {
     String              aName;
 
@@ -379,7 +379,7 @@ public:
     const String&       GetOldName() { return aName; }
 };
 
-class SVT_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
+class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
 {
 public:
     SfxUnoStyleSheet( const UniString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, USHORT _nMaske );
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 82681ed9d240..4e0063e2477b 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVDDE_HXX
 #define _SVDDE_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <sot/exchange.hxx>
 #include <tools/string.hxx>
 #include <tools/list.hxx>
@@ -84,7 +84,7 @@ DECLARE_LIST( StringList, String * )
 // - DdeData -
 // -----------
 
-class SVT_DLLPUBLIC DdeData
+class SVL_DLLPUBLIC DdeData
 {
     friend class    DdeInternal;
     friend class    DdeService;
@@ -93,7 +93,7 @@ class SVT_DLLPUBLIC DdeData
     DdeDataImp*     pImp;
 
 //#if 0 // _SOLAR__PRIVATE
-    SVT_DLLPRIVATE void            Lock();
+    SVL_DLLPRIVATE void            Lock();
 //#endif
     void            SetFormat( ULONG nFmt );
 
@@ -155,7 +155,7 @@ public:
 // - DdeTransaction -
 // ------------------
 
-class SVT_DLLPUBLIC DdeTransaction
+class SVL_DLLPUBLIC DdeTransaction
 {
 public:
     virtual void    Data( const DdeData* );
@@ -205,7 +205,7 @@ private:
 // - DdeLink -
 // -----------
 
-class SVT_DLLPUBLIC DdeLink : public DdeTransaction
+class SVL_DLLPUBLIC DdeLink : public DdeTransaction
 {
     Link            aNotify;
 
@@ -222,7 +222,7 @@ public:
 // - DdeWarmLink -
 // ---------------
 
-class SVT_DLLPUBLIC DdeWarmLink : public DdeLink
+class SVL_DLLPUBLIC DdeWarmLink : public DdeLink
 {
 public:
             DdeWarmLink( DdeConnection&, const String&, long = 0 );
@@ -232,7 +232,7 @@ public:
 // - DdeHotLink -
 // --------------
 
-class SVT_DLLPUBLIC DdeHotLink : public DdeLink
+class SVL_DLLPUBLIC DdeHotLink : public DdeLink
 {
 public:
             DdeHotLink( DdeConnection&, const String&, long = 0 );
@@ -242,7 +242,7 @@ public:
 // - DdeRequest -
 // --------------
 
-class SVT_DLLPUBLIC DdeRequest : public DdeTransaction
+class SVL_DLLPUBLIC DdeRequest : public DdeTransaction
 {
 public:
             DdeRequest( DdeConnection&, const String&, long = 0 );
@@ -252,7 +252,7 @@ public:
 // - DdePoke -
 // -----------
 
-class SVT_DLLPUBLIC DdePoke : public DdeTransaction
+class SVL_DLLPUBLIC DdePoke : public DdeTransaction
 {
 public:
             DdePoke( DdeConnection&, const String&, const char*, long,
@@ -265,7 +265,7 @@ public:
 // - DdeExecute -
 // --------------
 
-class SVT_DLLPUBLIC DdeExecute : public DdeTransaction
+class SVL_DLLPUBLIC DdeExecute : public DdeTransaction
 {
 public:
             DdeExecute( DdeConnection&, const String&, long = 0 );
@@ -275,7 +275,7 @@ public:
 // - DdeConnection -
 // -----------------
 
-class SVT_DLLPUBLIC DdeConnection
+class SVL_DLLPUBLIC DdeConnection
 {
     friend class    DdeInternal;
     friend class    DdeTransaction;
@@ -307,7 +307,7 @@ private:
 // - DdeItem -
 // -----------
 
-class SVT_DLLPUBLIC DdeItem
+class SVL_DLLPUBLIC DdeItem
 {
     friend class    DdeInternal;
     friend class    DdeTopic;
@@ -336,7 +336,7 @@ public:
 // - DdeItem -
 // -----------
 
-class SVT_DLLPUBLIC DdeGetPutItem : public DdeItem
+class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem
 {
 public:
                     DdeGetPutItem( const sal_Unicode* p );
@@ -352,9 +352,9 @@ public:
 // - DdeTopic -
 // ------------
 
-class SVT_DLLPUBLIC DdeTopic
+class SVL_DLLPUBLIC DdeTopic
 {
-    SVT_DLLPRIVATE void _Disconnect( long );
+    SVL_DLLPRIVATE void _Disconnect( long );
 
 public:
     virtual void    Connect( long );
@@ -421,7 +421,7 @@ private:
 // - DdeService -
 // --------------
 
-class SVT_DLLPUBLIC DdeService
+class SVL_DLLPUBLIC DdeService
 {
     friend class    DdeInternal;
 
@@ -448,7 +448,7 @@ private:
     ConvList*       pConv;
     short           nStatus;
 
-    SVT_DLLPRIVATE BOOL            HasCbFormat( USHORT );
+    SVL_DLLPRIVATE BOOL            HasCbFormat( USHORT );
 
 public:
                     DdeService( const String& );
diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
index c929faad3d13..468e6025cb5a 100644
--- a/svl/inc/svl/svldata.hxx
+++ b/svl/inc/svl/svldata.hxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svtdata.hxx,v $
+ * $RCSfile: svldata.hxx,v $
  * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
@@ -28,28 +28,18 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_SVTDATA_HXX
-#define _SVTOOLS_SVTDATA_HXX
+#ifndef _SVL_SVLDATA_HXX
+#define _SVL_SVLDATA_HXX
 
-#include <tools/resid.hxx>
 #include <tools/simplerm.hxx>
 
-class ResMgr;
-class SfxItemDesruptorList_Impl;
 class SfxItemPool;
-class Twain;
 
 //============================================================================
-class ImpSvtData
+class ImpSvlData
 {
 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
@@ -57,47 +47,15 @@ public:
         // 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)
+    ImpSvlData():
+        pStoringPool(0), m_pThreadsafeRMs(NULL)
     {}
 
-    ~ImpSvtData();
+    ~ImpSvlData();
 
 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!
+    static ImpSvlData & GetSvlData();
 };
 
 //============================================================================
@@ -106,12 +64,12 @@ class SvtSimpleResId
     String  m_sValue;
 
 public:
-    SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvtData::GetSvtData().GetSimpleRM(aLocale)->ReadString(nId)) { };
+    SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvlData::GetSvlData().GetSimpleRM(aLocale)->ReadString(nId)) { };
 
     operator String () const { return m_sValue; }
 };
 
 
 
-#endif //  _SVTOOLS_SVTDATA_HXX
+#endif //  _SVL_SVLDATA_HXX
 
diff --git a/svl/inc/svl/syslocale.hxx b/svl/inc/svl/syslocale.hxx
index bd853d0d4eeb..de5962fa0d1a 100644
--- a/svl/inc/svl/syslocale.hxx
+++ b/svl/inc/svl/syslocale.hxx
@@ -31,7 +31,7 @@
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
 #define INCLUDED_SVTOOLS_SYSLOCALE_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <sal/types.h>
@@ -50,14 +50,14 @@ class LocaleDataWrapper;
     SvtSysLocale is not expensive as long as there is at least one instance
     left.
  */
-class SVT_DLLPUBLIC SvtSysLocale
+class SVL_DLLPUBLIC SvtSysLocale
 {
     friend class SvtSysLocale_Impl;     // access to mutex
 
     static  SvtSysLocale_Impl*  pImpl;
     static  sal_Int32           nRefCount;
 
-    SVT_DLLPRIVATE static  ::osl::Mutex&               GetMutex();
+    SVL_DLLPRIVATE static  ::osl::Mutex&               GetMutex();
 
 public:
                                         SvtSysLocale();
diff --git a/svl/inc/svl/syslocaleoptions.hxx b/svl/inc/svl/syslocaleoptions.hxx
index 8b03785d541e..a5884c7bbcaa 100644
--- a/svl/inc/svl/syslocaleoptions.hxx
+++ b/svl/inc/svl/syslocaleoptions.hxx
@@ -31,7 +31,7 @@
 #ifndef INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
 #define INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
@@ -48,12 +48,12 @@ class SvtSysLocaleOptions_Impl;
 class SvtListener;
 namespace osl { class Mutex; }
 
-class SVT_DLLPUBLIC SvtSysLocaleOptions: public utl::detail::Options
+class SVL_DLLPUBLIC SvtSysLocaleOptions: public utl::detail::Options
 {
     static  SvtSysLocaleOptions_Impl*   pOptions;
     static  sal_Int32                   nRefCount;
 
-    SVT_DLLPRIVATE static  ::osl::Mutex&       GetMutex();
+    SVL_DLLPRIVATE static  ::osl::Mutex&       GetMutex();
 
 public:
 
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 38cbfb227f1b..5bd48342f530 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -30,14 +30,14 @@
 #ifndef _UNDO_HXX
 #define _UNDO_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/rtti.hxx>
 #include <tools/string.hxx>
 #include <svtools/svarray.hxx>
 
 //====================================================================
 
-class SVT_DLLPUBLIC SfxRepeatTarget
+class SVL_DLLPUBLIC SfxRepeatTarget
 {
 public:
                         TYPEINFO();
@@ -46,7 +46,7 @@ public:
 
 //====================================================================
 
-class SVT_DLLPUBLIC SfxUndoAction
+class SVL_DLLPUBLIC SfxUndoAction
 {
     BOOL bLinked;
 public:
@@ -79,7 +79,7 @@ SV_DECL_PTRARR( SfxUndoActions, SfxUndoAction*, 20, 8 )
 
 /** do not make use of this implementation details, unless you
     really really have to! */
-struct SVT_DLLPUBLIC SfxUndoArray
+struct SVL_DLLPUBLIC SfxUndoArray
 {
     SfxUndoActions          aUndoActions;
     USHORT                  nMaxUndoActions;
@@ -95,7 +95,7 @@ struct SVT_DLLPUBLIC SfxUndoArray
 
 /** do not make use of this implementation details, unless you
     really really have to! */
-class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray
+class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray
 
 /*  [Beschreibung]
 
@@ -135,7 +135,7 @@ class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxUndoManager
+class SVL_DLLPUBLIC SfxUndoManager
 {
     friend class SfxLinkUndoAction;
 
@@ -197,7 +197,7 @@ public:
 
 //=========================================================================
 
-class SVT_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
+class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
 
 /*  [Beschreibung]
 
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 22a258d32f88..5862a1312039 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -30,7 +30,7 @@
 #ifndef _ZFORLIST_HXX
 #define _ZFORLIST_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/string.hxx>
 #ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
@@ -231,7 +231,7 @@ typedef ::std::map< sal_uInt32, sal_uInt32 > SvNumberFormatterMergeMap;
 
 /** Language/country dependent currency entries
  */
-class SVT_DLLPUBLIC NfCurrencyEntry
+class SVL_DLLPUBLIC NfCurrencyEntry
 {
     String          aSymbol;            /// currency symbol
     String          aBankSymbol;        /// currency abbreviation
@@ -251,7 +251,7 @@ private:
 //#if 0 // _SOLAR__PRIVATE
                         // nDecimalFormat := 0, 1, 2
                         // #,##0 or #,##0.00 or #,##0.-- are assigned
-    SVT_DLLPRIVATE void             Impl_BuildFormatStringNumChars( String&,
+    SVL_DLLPRIVATE void             Impl_BuildFormatStringNumChars( String&,
                             const LocaleDataWrapper&, USHORT nDecimalFormat ) const;
 //#endif    // __PRIVATE
 
@@ -328,12 +328,12 @@ public:
 typedef NfCurrencyEntry* NfCurrencyEntryPtr;
 SV_DECL_PTRARR_DEL( NfCurrencyTable, NfCurrencyEntryPtr, 128, 1 )
 typedef String* WSStringPtr;
-SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVT_DLLPUBLIC )
+SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVL_DLLPUBLIC )
 
 
 class SvNumberFormatterRegistry_Impl;
 
-class SVT_DLLPUBLIC SvNumberFormatter
+class SVL_DLLPUBLIC SvNumberFormatter
 {
 public:
 
@@ -813,37 +813,37 @@ private:
 
 #ifdef _ZFORLIST_CXX                // ----- private Methoden -----
 
-    SVT_DLLPRIVATE static BOOL          bCurrencyTableInitialized;
-    SVT_DLLPRIVATE static USHORT            nSystemCurrencyPosition;
-    SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
+    SVL_DLLPRIVATE static BOOL          bCurrencyTableInitialized;
+    SVL_DLLPRIVATE static USHORT            nSystemCurrencyPosition;
+    SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
 
     // get the registry, create one if none exists
-    SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry();
+    SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry();
 
     // called by ctors
-    SVT_DLLPRIVATE void ImpConstruct( LanguageType eLang );
+    SVL_DLLPRIVATE void ImpConstruct( LanguageType eLang );
 
     // Changes initialized language/country, clears the entries and generates
     // new ones, may ONLY be called by the binary file format load
-    SVT_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 );
+    SVL_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 );
 
     // Generate builtin formats provided by i18n behind CLOffset,
     // if bLoadingSO5==FALSE also generate additional i18n formats.
-    SVT_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 );
+    SVL_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 );
 
     // Generate additional formats provided by i18n
-    SVT_DLLPRIVATE void ImpGenerateAdditionalFormats(
+    SVL_DLLPRIVATE void ImpGenerateAdditionalFormats(
                 sal_uInt32 CLOffset,
                 NumberFormatCodeWrapper& rNumberFormatCode,
                 BOOL bAfterLoadingSO5 );
 
-    SVT_DLLPRIVATE SvNumberformat* ImpInsertFormat(
+    SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat(
                 const ::com::sun::star::i18n::NumberFormatCode& rCode,
                 sal_uInt32 nPos,
                 BOOL bAfterLoadingSO5 = FALSE,
                 sal_Int16 nOrgIndex = 0 );
     // ImpInsertNewStandardFormat for new (since version ...) builtin formats
-    SVT_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat(
+    SVL_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat(
                 const ::com::sun::star::i18n::NumberFormatCode& rCode,
                 sal_uInt32 nPos,
                 USHORT nVersion,
@@ -851,41 +851,41 @@ private:
                 sal_Int16 nOrgIndex = 0 );
 
     // Return CLOffset or (MaxCLOffset + SV_COUNTRY_LANGUAGE_OFFSET) if new language/country
-    SVT_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const;
+    SVL_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const;
 
     // Test whether format code already exists, then return index key,
     // otherwise NUMBERFORMAT_ENTRY_NOT_FOUND
-    SVT_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString,
+    SVL_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString,
                         sal_uInt32 CLOffset,
                         LanguageType eLnge );
 
     // Create builtin formats for language/country if necessary, return CLOffset
-    SVT_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE );
+    SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE );
 
     // Build negative currency format, old compatibility style
-    SVT_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol );
+    SVL_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol );
     // Build positive currency format, old compatibility style
-    SVT_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol );
+    SVL_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol );
 
     // Create <type>theCurrencyTable</type> with all <type>NfCurrencyEntry</type>
-    SVT_DLLPRIVATE static void ImpInitCurrencyTable();
+    SVL_DLLPRIVATE static void ImpInitCurrencyTable();
 
     // Return the format index of the currency format of the system locale.
     // Format is created if not already present.
-    SVT_DLLPRIVATE sal_uInt32   ImpGetDefaultSystemCurrencyFormat();
+    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultSystemCurrencyFormat();
 
     // Return the format index of the currency format of the current locale.
     // Format is created if not already present.
-    SVT_DLLPRIVATE sal_uInt32   ImpGetDefaultCurrencyFormat();
+    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultCurrencyFormat();
 
     // Return the default format for a given type and current locale.
     // May ONLY be called from within GetStandardFormat().
-    SVT_DLLPRIVATE sal_uInt32   ImpGetDefaultFormat( short nType );
+    SVL_DLLPRIVATE sal_uInt32   ImpGetDefaultFormat( short nType );
 
     // Return the index in a sequence of format codes matching an enum of
     // NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't
     // contain any format code elements a default element is created and inserted.
-    SVT_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex(
+    SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex(
         ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq,
         const NfIndexTableOffset nTabOff );
 
@@ -895,7 +895,7 @@ private:
     // Return the default index in the sequence.
     // Non-PRODUCT version may check locale data for matching defaults in one
     // FormatElement group.
-    SVT_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault(
+    SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault(
         ::com::sun::star::i18n::NumberFormatCode * pFormatArr,
         sal_Int32 nCount, BOOL bCheckCorrectness = TRUE
         );
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index ae7d961c0bc6..208c876bfbfc 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -30,7 +30,7 @@
 #ifndef _ZFORMAT_HXX
 #define _ZFORMAT_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include <tools/string.hxx>
 #include <i18npool/mslangid.hxx>
 #include <svtools/zforlist.hxx>
@@ -175,7 +175,7 @@ private:
 
 };
 
-class SVT_DLLPUBLIC SvNumberformat
+class SVL_DLLPUBLIC SvNumberformat
 {
 public:
     // Ctor for Load
@@ -461,11 +461,11 @@ private:
     BOOL bStandard;                 // If this is a default standard format
     BOOL bIsUsed;                   // Flag as used for storing
 
-    SVT_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const;
+    SVL_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const;
 
-    SVT_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
+    SVL_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
 
-    SVT_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
+    SVL_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
             double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const;
 
 #ifdef _ZFORMAT_CXX     // ----- private implementation methods -----
@@ -476,36 +476,36 @@ private:
     const SvNumberFormatter& GetFormatter() const   { return *rScan.GetNumberformatter(); }
 
     // divide in substrings and color conditions
-    SVT_DLLPRIVATE short ImpNextSymbol( String& rString,
+    SVL_DLLPRIVATE short ImpNextSymbol( String& rString,
                      xub_StrLen& nPos,
                      String& sSymbol );
 
     // read string until ']' and strip blanks (after condition)
-    SVT_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString,
+    SVL_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString,
                    xub_StrLen& nPos,
                    String& sSymbol );
 
     // get xxx of "[$-xxx]" as LanguageType, starting at and advancing position nPos
-    SVT_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos );
+    SVL_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos );
 
     // standard number output
-    SVT_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString );
+    SVL_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString );
     // numbers in input line
-    SVT_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString );
+    SVL_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString );
 
     // check subcondition
     // OP undefined => -1
     // else 0 or 1
-    SVT_DLLPRIVATE short ImpCheckCondition(double& fNumber,
+    SVL_DLLPRIVATE short ImpCheckCondition(double& fNumber,
                          double& fLimit,
                          SvNumberformatLimitOps eOp);
 
-    SVT_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y);
-    SVT_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y);
+    SVL_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y);
+    SVL_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y);
 
     // Helper function for number strings
     // append string symbols, insert leading 0 or ' ', or ...
-    SVT_DLLPRIVATE BOOL ImpNumberFill( String& sStr,
+    SVL_DLLPRIVATE BOOL ImpNumberFill( String& sStr,
                     double& rNumber,
                     xub_StrLen& k,
                     USHORT& j,
@@ -513,7 +513,7 @@ private:
                     short eSymbolType );
 
     // Helper function to fill in the integer part and the group (AKA thousand) separators
-    SVT_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr,
+    SVL_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr,
                                  double& rNumber,
                                  xub_StrLen k,
                                  USHORT j,
@@ -524,20 +524,20 @@ private:
 
     // Helper function to fill in the group (AKA thousand) separators
     // or to skip additional digits
-    SVT_DLLPRIVATE void ImpDigitFill( String& sStr,
+    SVL_DLLPRIVATE void ImpDigitFill( String& sStr,
                     xub_StrLen nStart,
                     xub_StrLen& k,
                     USHORT nIx,
                     xub_StrLen & nDigitCount,
                     utl::DigitGroupingIterator & );
 
-    SVT_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber,
                        USHORT nIx,
                        String& OutString );
-    SVT_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber,
                        USHORT nIx,
                        String& OutString );
-    SVT_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber,
                            USHORT nIx,
                            String& OutString );
 
@@ -546,23 +546,23 @@ private:
     // know a "before" era (like zh_TW ROC or ja_JP Gengou). If switched and
     // rOrgCalendar was "gregorian" the string is emptied. If rOrgCalendar was
     // empty the previous calendar name and date/time are returned.
-    SVT_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
+    SVL_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
 
     // Append a "G" short era string of the given calendar. In the case of a
     // Gengou calendar this is a one character abbreviation, for other
     // calendars the XExtendedCalendar::getDisplayString() method is called.
-    SVT_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal,
+    SVL_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal,
             sal_Int16 nNatNum );
 
-    SVT_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber,
+    SVL_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber,
                          USHORT nIx,
                          String& OutString );
 
-    SVT_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
+    SVL_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
 
     // normal digits or other digits, depending on ImpSvNumFor.aNatNum,
     // [NatNum1], [NatNum2], ...
-    SVT_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal,
+    SVL_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal,
             USHORT nMinDigits = 0  ) const;
 
     String ImpIntToString( USHORT nIx, sal_Int32 nVal, USHORT nMinDigits = 0 ) const
@@ -574,7 +574,7 @@ private:
         }
 
     // transliterate according to NativeNumber
-    SVT_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
+    SVL_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
 
     void ImpTransliterate( String& rStr, const SvNumberNatNum& rNum ) const
         {
diff --git a/svl/inc/urihelper.hxx b/svl/inc/urihelper.hxx
index 209f3f04e28a..e68e8f0ee54f 100644
--- a/svl/inc/urihelper.hxx
+++ b/svl/inc/urihelper.hxx
@@ -31,7 +31,7 @@
 #ifndef SVTOOLS_URIHELPER_HXX
 #define SVTOOLS_URIHELPER_HXX
 
-#include "svtools/svtdllapi.h"
+#include "svtools/svldllapi.h"
 #include "com/sun/star/uno/Reference.hxx"
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <rtl/textenc.h>
@@ -64,7 +64,7 @@ namespace URIHelper {
    existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
    if you want to generate file URLs without checking for their existence.
 */
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
              ByteString const & rTheRelURIRef,
              Link const & rMaybeFileHdl = Link(),
@@ -91,7 +91,7 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
    existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
    if you want to generate file URLs without checking for their existence.
 */
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
              UniString const & rTheRelURIRef,
              Link const & rMaybeFileHdl = Link(),
@@ -106,10 +106,10 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
              INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
 
 //============================================================================
-SVT_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
+SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
 
 //============================================================================
-SVT_DLLPUBLIC Link GetMaybeFileHdl();
+SVL_DLLPUBLIC Link GetMaybeFileHdl();
 
 /**
    Converts a URI reference to a relative one, ignoring certain differences (for
@@ -131,7 +131,7 @@ SVT_DLLPUBLIC Link GetMaybeFileHdl();
 
    @exception com::sun::star::uno::RuntimeException if any error occurs
  */
-SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
+SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
 normalizedMakeRelative(
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
     const & context,
@@ -159,11 +159,11 @@ normalizedMakeRelative(
    @deprecated
    No code should rely on the default component context.
 */
-SVT_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative(
+SVL_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative(
     rtl::OUString const & baseUriReference, rtl::OUString const & uriReference);
 
 //============================================================================
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 FindFirstURLInText(UniString const & rText,
                    xub_StrLen & rBegin,
                    xub_StrLen & rEnd,
@@ -200,7 +200,7 @@ FindFirstURLInText(UniString const & rText,
 
     @return  The input URI with any password component removed.
  */
-SVT_DLLPUBLIC UniString
+SVL_DLLPUBLIC UniString
 removePassword(UniString const & rURI,
                INetURLObject::EncodeMechanism eEncodeMechanism
                    = INetURLObject::WAS_ENCODED,
@@ -229,7 +229,7 @@ removePassword(UniString const & rURI,
     @return  The style bit corresponding to the queried content provider's
     conventions, or FSysStyle(0) if these cannot be determined.
  */
-SVT_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl,
+SVL_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl,
                                         bool bAddConvenienceStyles = true)
     throw (com::sun::star::uno::RuntimeException);