CWS-TOOLING: integrate CWS oj18

2009-08-21 15:08:49 +0200 oj  r275263 : wrong check
2009-08-21 08:56:01 +0200 oj  r275215 : missing not
2009-08-20 07:27:13 +0200 oj  r275164 : use new method from global
2009-08-19 10:22:35 +0200 oj  r275138 : call GetLocale instead of pLocale
2009-08-18 10:39:32 +0200 oj  r275082 : missing header include
2009-08-18 10:09:44 +0200 oj  r275081 : new methods at global
2009-08-18 10:09:00 +0200 oj  r275080 : unused var
2009-08-18 08:59:04 +0200 oj  r275078 : move files from classes to xml
2009-08-17 14:58:16 +0200 oj  r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55)
2009-08-17 13:29:44 +0200 oj  r275047 : compile error
2009-08-17 13:27:47 +0200 oj  r275045 : compile error
2009-08-17 11:44:54 +0200 oj  r275040 : add dep
2009-07-22 14:26:05 +0200 oj  r274240 : move unused services into fwl
2009-07-22 14:25:35 +0200 oj  r274239 : move unused services into fwl
2009-07-22 13:47:45 +0200 oj  r274233 : remove some unused code
2009-07-22 09:06:20 +0200 oj  r274219 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 08:48:58 +0200 oj  r274218 : create NumberFormatter on demand
2009-07-22 08:39:23 +0200 oj  r274217 : change char to sal_Char
2009-07-22 07:33:34 +0200 oj  r274214 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 07:30:04 +0200 oj  r274213 : late init of numberformatter and breakiterator
2009-07-22 07:28:55 +0200 oj  r274212 : export dbtoolsclient dbcharsethelper for sc
2009-07-21 13:43:28 +0200 oj  r274196 : check if quick start is enbaled
2009-07-21 13:40:09 +0200 oj  r274195 : check config entry for UiEventsLogger
2009-07-21 13:37:40 +0200 oj  r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:35:38 +0200 oj  r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:33:41 +0200 oj  r274192 : doc meta data will now be created on demand
2009-07-21 13:13:40 +0200 oj  r274187 : load ldap functions on demand
2009-07-21 13:03:17 +0200 oj  r274183 : late init of TransliterationImpl
2009-07-21 12:36:10 +0200 oj  r274180 : late init of charClass

24 files changed, 109 insertions, 66 deletions

diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx
index 8295ec2189..7821b2ce13 100644
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/svx/inc/svx/SmartTagMgr.hxx
@@ -102,7 +102,7 @@ private:
     std::vector< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > maActionList;
     std::set< rtl::OUString > maDisabledSmartTagTypes;
     std::multimap < rtl::OUString, ActionReference > maSmartTagMap;
-    com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIter;
+    mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIter;
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxContext;
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxConfigurationSettings;
@@ -129,6 +129,8 @@ private:
     */
     void AssociateActionsWithRecognizers();
 
+    void CreateBreakIterator() const;
+
 public:
 
     SmartTagMgr( const rtl::OUString& rApplicationName );
diff --git a/svx/source/inc/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx
index c88ecc71f2..342f54c1e4 100644..100755
--- a/svx/source/inc/dbcharsethelper.hxx
+++ b/svx/inc/svx/dbcharsethelper.hxx
@@ -30,8 +30,8 @@
 
 #ifndef SVX_DBCHARSETHELPER_HXX
 #define SVX_DBCHARSETHELPER_HXX
-
-#include "dbtoolsclient.hxx"
+#include "svx/svxdllapi.h"
+#include "svx/dbtoolsclient.hxx"
 
 //........................................................................
 namespace svxform
@@ -41,7 +41,7 @@ namespace svxform
     //====================================================================
     //= ODataAccessCharsetHelper
     //====================================================================
-    class ODataAccessCharsetHelper : public ODbtoolsClient
+    class SVX_DLLPUBLIC ODataAccessCharsetHelper : public ODbtoolsClient
     {
     protected:
         mutable ::rtl::Reference< ::connectivity::simple::IDataAccessCharSet >	m_xCharsetHelper;
diff --git a/svx/source/inc/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 262b791e80..ae5721a87f 100644..100755
--- a/svx/source/inc/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -36,7 +36,7 @@
 #include <osl/module.h>
 #include <tools/solar.h>
 #include <unotools/sharedunocomponent.hxx>
-#include <svx/svxdllapi.h>
+#include "svx/svxdllapi.h"
 
 //........................................................................
 namespace svxform
@@ -94,7 +94,7 @@ namespace svxform
     public:
         OStaticDataAccessTools();
 
-        SVX_DLLPRIVATE const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; }
+        const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; }
 
         // ------------------------------------------------
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
@@ -103,13 +103,13 @@ namespace svxform
         ) const;
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE sal_Int32 getDefaultNumberFormat(
+        sal_Int32 getDefaultNumberFormat(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes,									 
             const ::com::sun::star::lang::Locale& _rLocale );
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
             const ::rtl::OUString& _rDataSourceName,
             const ::rtl::OUString& _rUser,
             const ::rtl::OUString& _rPwd,
@@ -131,26 +131,26 @@ namespace svxform
                 const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE void TransferFormComponentProperties(
+        void TransferFormComponentProperties(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew,
             const ::com::sun::star::lang::Locale& _rLocale
         ) const;
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE ::rtl::OUString quoteName(
+        ::rtl::OUString quoteName(
             const ::rtl::OUString& _rQuote,
             const ::rtl::OUString& _rName
         ) const;
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE ::rtl::OUString composeTableNameForSelect(
+        ::rtl::OUString composeTableNameForSelect(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable
         ) const;
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::sdb::SQLContext prependContextInfo(
+        ::com::sun::star::sdb::SQLContext prependContextInfo(
             ::com::sun::star::sdbc::SQLException& _rException,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
             const ::rtl::OUString& _rContextDescription,
@@ -158,7 +158,7 @@ namespace svxform
         ) const;
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
                 const ::rtl::OUString& _rsRegisteredName,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
             ) const;
@@ -167,22 +167,22 @@ namespace svxform
         /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
             @param		_rxCursorSet	the property set
         */
-        SVX_DLLPRIVATE sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+        sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
 
         // ------------------------------------------------
         /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
             @param		_rxCursorSet	the property set
         */
-        SVX_DLLPRIVATE sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+        sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
 
         // ------------------------------------------------
         /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
             @param		_rxCursorSet	the property set
         */
-        SVX_DLLPRIVATE sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+        sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
             getFieldsByCommandDescriptor(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                 const sal_Int32 _nCommandType,
@@ -201,13 +201,13 @@ namespace svxform
             )	SAL_THROW( ( ) );
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE bool isEmbeddedInDatabase(
+        bool isEmbeddedInDatabase(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection
         );
 
         // ------------------------------------------------
-        SVX_DLLPRIVATE bool isEmbeddedInDatabase(
+        bool isEmbeddedInDatabase(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent
         );
     };
@@ -215,7 +215,7 @@ namespace svxform
     //====================================================================
     //= DBToolsObjectFactory
     //====================================================================
-    class DBToolsObjectFactory : public ODbtoolsClient
+    class SVX_DLLPUBLIC DBToolsObjectFactory : public ODbtoolsClient
     {
     public:
         DBToolsObjectFactory();
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 5fe0d1245b..8a93741bc3 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -309,6 +309,9 @@ public:
 
 class SVX_DLLPUBLIC SdrGlobalData
 {
+    const SvtSysLocale*         pSysLocale;     // follows always locale settings
+    const CharClass*            pCharClass;     // follows always SysLocale
+    const LocaleDataWrapper*    pLocaleData;    // follows always SysLocale
 public:
     SdrLinkList     	aUserMakeObjHdl;
     SdrLinkList     	aUserMakeObjUserDataHdl;
@@ -317,10 +320,11 @@ public:
     ResMgr*            	pResMgr;
     ULONG              	nExchangeFormat;
     OLEObjCache			aOLEObjCache;
-    const SvtSysLocale*         pSysLocale;     // follows always locale settings
-    const CharClass*            pCharClass;     // follows always SysLocale
-    const LocaleDataWrapper*    pLocaleData;    // follows always SysLocale
+    
 
+    const SvtSysLocale*         GetSysLocale();     // follows always locale settings
+    const CharClass*            GetCharClass();     // follows always SysLocale
+    const LocaleDataWrapper*    GetLocaleData();    // follows always SysLocale
 public:
     SdrGlobalData();
     ~SdrGlobalData();
diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx
index d61d03f03c..1e4dc79301 100644
--- a/svx/inc/svx/tstpitem.hxx
+++ b/svx/inc/svx/tstpitem.hxx
@@ -53,11 +53,13 @@ private:
     long            nTabPos;
 
     SvxTabAdjust    eAdjustment;
-    sal_Unicode		cDecimal;
+    mutable sal_Unicode		m_cDecimal;
     sal_Unicode		cFill;
 
     SVX_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
 
+    void fillDecimal() const;
+
 public:
     SvxTabStop();
 #if (_MSC_VER < 1300)
@@ -78,8 +80,8 @@ public:
     SvxTabAdjust&   GetAdjustment() { return eAdjustment; }
     SvxTabAdjust    GetAdjustment() const { return eAdjustment; }
 
-    sal_Unicode&  GetDecimal() { return cDecimal; }
-    sal_Unicode   GetDecimal() const { return cDecimal; }
+    sal_Unicode&  GetDecimal() { fillDecimal(); return m_cDecimal; }
+    sal_Unicode   GetDecimal() const { fillDecimal(); return m_cDecimal; }
 
     sal_Unicode&  GetFill() { return cFill; }
     sal_Unicode   GetFill() const { return cFill; }
@@ -91,7 +93,7 @@ public:
                         {
                             return ( nTabPos     == rTS.nTabPos     &&
                                      eAdjustment == rTS.eAdjustment &&
-                                     cDecimal    == rTS.cDecimal    &&
+                                     m_cDecimal    == rTS.m_cDecimal    &&
                                      cFill       == rTS.cFill );
                         }
 
@@ -105,7 +107,7 @@ public:
                         {
                             nTabPos = rTS.nTabPos;
                             eAdjustment = rTS.eAdjustment;
-                            cDecimal = rTS.cDecimal;
+                            m_cDecimal = rTS.m_cDecimal;
                             cFill = rTS.cFill;
                             return *this;
                         }
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index 227dac4db6..7edc2fbc9c 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -554,6 +554,8 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx
 ..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx
 ..\inc\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
+..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx
+..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 527be2b9b0..7d89f8fa6f 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -34,7 +34,7 @@
 #include "txencbox.hxx"
 #include "txenctab.hxx"
 #include <svx/dialogs.hrc>
-#include "dbcharsethelper.hxx"
+#include "svx/dbcharsethelper.hxx"
 #include <vcl/svapp.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/locale.h>
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 54e5b12455..08a03a6ba3 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <svx/gridctrl.hxx>
 #include "gridcell.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "fmtools.hxx"
 #include <svtools/stringtransfer.hxx>
 
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index d430f1063d..9f6b1b7401 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "dbcharsethelper.hxx"
+#include "svx/dbcharsethelper.hxx"
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index d467a53b6a..c430a2e14a 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include <osl/diagnose.h>
 #include <connectivity/formattedcolumnvalue.hxx>
 
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index 58c3db830f..fb5790c35c 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -34,7 +34,7 @@
 #ifndef SVX_SOURCE_FORM_FMDOCUMENTCLASSIFICATION_HXX
 #include "fmdocumentclassification.hxx"
 #endif
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/container/XChild.hpp>
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index edd9b20718..107cf5464e 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -40,7 +40,7 @@
 #include "fmobj.hxx"
 #include "svditer.hxx"
 #include "fmresids.hrc"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "treevisitor.hxx"
 
 #include <com/sun/star/sdb/CommandType.hpp>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 9be98fd4b1..6f3c9f5a75 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include "fmtools.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "fmservs.hxx"
 #include <svx/fmglob.hxx>
 #include <vcl/stdtext.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index bc8b334d55..2fc7022f73 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -55,7 +55,7 @@
 #include <rtl/logfile.hxx>
 #include <svx/dialmgr.hxx>
 #include "fmpgeimp.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include <svtools/macitem.hxx>
 #include <tools/shl.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index b4151a9531..33f8b47bd6 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -30,7 +30,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "formcontrolfactory.hxx"
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 7aa57d9a81..0ad9062461 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -52,7 +52,7 @@
 #endif
 #include <svx/fmshell.hxx>
 #include "fmshimp.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include <svx/fmpage.hxx>
 
 #ifndef _SVX_FMPGEIMP_HXX
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 350bf26a5f..0e13eedb31 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -79,7 +79,7 @@
 #include <cppuhelper/compbase4.hxx>
 #include <cppuhelper/compbase6.hxx>
 #include <unotools/configitem.hxx>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "formcontrolling.hxx"
 #include "fmdocumentclassification.hxx"
 
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index 61e0e951bd..a17198bea1 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -31,7 +31,7 @@
 #ifndef SVX_SQLPARSERCLIENT_HXX
 #define SVX_SQLPARSERCLIENT_HXX
 
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "ParseContext.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 6f1aaf5d2a..f4a4ecb0b0 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -42,7 +42,7 @@
 //#endif
 #include <comphelper/propmultiplex.hxx>
 #include <svtools/transfer.hxx>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 
 //==================================================================
 class FmFieldWin;
diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx
index d7c3870a96..605e76f208 100644
--- a/svx/source/inc/typeconversionclient.hxx
+++ b/svx/source/inc/typeconversionclient.hxx
@@ -31,7 +31,7 @@
 #ifndef SVX_TYPECONVERSION_CLIENT_HXX
 #define SVX_TYPECONVERSION_CLIENT_HXX
 
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx
index d4693fde03..32a493b5bd 100644
--- a/svx/source/items/numitem.cxx
+++ b/svx/source/items/numitem.cxx
@@ -71,28 +71,31 @@ using namespace ::com::sun::star::style;
 
 sal_Int32 SvxNumberType::nRefCount = 0;
 com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> SvxNumberType::xFormatter = 0;
-/* -----------------------------22.02.01 14:24--------------------------------
-
- ---------------------------------------------------------------------------*/
-SvxNumberType::SvxNumberType(sal_Int16 nType) :
-    nNumType(nType),
-    bShowSymbol(sal_True)
+void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& _xFormatter)
 {
-    if(!xFormatter.is())
+    if(!_xFormatter.is())
        {
         try
-        {
+        { 
             Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
             Reference < XInterface > xI = xMSF->createInstance(
                 ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) );
             Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
             DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"");
-            xFormatter = Reference<XNumberingFormatter> (xRet, UNO_QUERY);
+            _xFormatter = Reference<XNumberingFormatter> (xRet, UNO_QUERY);
         }
         catch(Exception& )
         {
         }
     }
+}
+/* -----------------------------22.02.01 14:24--------------------------------
+
+ ---------------------------------------------------------------------------*/
+SvxNumberType::SvxNumberType(sal_Int16 nType) :
+    nNumType(nType),
+    bShowSymbol(sal_True)
+{
     nRefCount++;
 }
 /* -----------------------------22.02.01 14:31--------------------------------
@@ -126,6 +129,7 @@ String SvxNumberType::GetNumStr( ULONG nNo ) const
  * --------------------------------------------------*/
 String 	SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
 {
+    lcl_getFormatter(xFormatter);
     String aTmpStr;
     if(!xFormatter.is())
         return aTmpStr;
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index 4bb7b62ac7..56436448d7 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -889,7 +889,7 @@ SvxTabStop::SvxTabStop()
 {
     nTabPos = 0;
     eAdjustment = SVX_TAB_ADJUST_LEFT;
-    cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0);
+    m_cDecimal = cDfltDecimalChar;
     cFill = cDfltFillChar;
 }
 
@@ -900,10 +900,15 @@ SvxTabStop::SvxTabStop( const long nPos, const SvxTabAdjust eAdjst,
 {
     nTabPos = nPos;
     eAdjustment = eAdjst;
-    cDecimal = ( cDfltDecimalChar == cDec ) ? SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0) : cDec;
+    m_cDecimal = cDec;
     cFill = cFil;
 }
-
+// -----------------------------------------------------------------------------
+void SvxTabStop::fillDecimal() const
+{
+    if ( cDfltDecimalChar == m_cDecimal )
+        m_cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0);
+}
 // -----------------------------------------------------------------------
 
 XubString SvxTabStop::GetValueString() const
@@ -918,7 +923,7 @@ XubString SvxTabStop::GetValueString() const
     aStr += cpDelim;
     aStr += sal_Unicode('[');
     aStr += XubString( ResId( RID_SVXITEMS_TAB_DECIMAL_CHAR, DIALOG_MGR() ) );
-    aStr += cDecimal;
+    aStr += GetDecimal();
     aStr += sal_Unicode(']');
     aStr += cpDelim;
     aStr += cpDelim;
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index f1bb85a626..43b3dd207e 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -70,10 +70,7 @@ SmartTagMgr::SmartTagMgr( const rtl::OUString& rApplicationName )
       maActionList(),
       maDisabledSmartTagTypes(),
       maSmartTagMap(),
-      mxBreakIter(),
       mxMSF( ::comphelper::getProcessServiceFactory() ),
-      mxContext(),
-      mxConfigurationSettings(),
       mbLabelTextWithSmartTags(true)
 {
 }
@@ -93,10 +90,6 @@ void SmartTagMgr::Init( const rtl::OUString& rConfigurationGroupName )
 
         if ( mxContext.is() )
         {
-            // get the break iterator
-            mxBreakIter = Reference< i18n::XBreakIterator >(
-                mxMSF->createInstance( C2U( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY);
-
             PrepareConfiguration( rConfigurationGroupName );
             ReadConfiguration( true, true );
             RegisterListener();
@@ -104,6 +97,14 @@ void SmartTagMgr::Init( const rtl::OUString& rConfigurationGroupName )
         }
     }
 }
+void SmartTagMgr::CreateBreakIterator() const
+{
+    if ( !mxBreakIter.is() && mxMSF.is() && mxContext.is() )
+    {
+        // get the break iterator
+        mxBreakIter.set(mxMSF->createInstance( C2U( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY);
+    }
+}
 
 /** Dispatches the recognize call to all installed smart tag recognizers
 */
@@ -129,10 +130,13 @@ void SmartTagMgr::Recognize( const rtl::OUString& rText,
         }
 
         if ( bCallRecognizer )
+        {
+            CreateBreakIterator();
             maRecognizerList[i]->recognize( rText, nStart, nLen,
                                             smarttags::SmartTagRecognizerMode_PARAGRAPH,
                                             rLocale, xMarkup, maApplicationName, xController,
                                             mxBreakIter );
+        }
     }
 }
 
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 0487aafb3c..b01caa73f8 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -82,14 +82,17 @@ using namespace ::com::sun::star;
 ******************************************************************************/
 
 SdrGlobalData::SdrGlobalData() :
+    pSysLocale(NULL),
+    pCharClass(NULL),
+    pLocaleData(NULL),
     pOutliner(NULL),
     pDefaults(NULL),
     pResMgr(NULL),
     nExchangeFormat(0)
 {
-    pSysLocale = new SvtSysLocale;
-    pCharClass = pSysLocale->GetCharClassPtr();
-    pLocaleData = pSysLocale->GetLocaleDataPtr();
+    //pSysLocale = new SvtSysLocale;
+    //pCharClass = pSysLocale->GetCharClassPtr();
+    //pLocaleData = pSysLocale->GetLocaleDataPtr();
 
     svx::ExtrusionBar::RegisterInterface();
     svx::FontworkBar::RegisterInterface();
@@ -103,7 +106,24 @@ SdrGlobalData::~SdrGlobalData()
     //! do NOT delete pCharClass and pLocaleData
     delete pSysLocale;
 }
-
+const SvtSysLocale*         SdrGlobalData::GetSysLocale()
+{
+    if ( !pSysLocale )
+        pSysLocale = new SvtSysLocale;
+    return pSysLocale;
+}
+const CharClass*            SdrGlobalData::GetCharClass()
+{
+    if ( !pCharClass )
+        pCharClass = GetSysLocale()->GetCharClassPtr();
+    return pCharClass;
+}
+const LocaleDataWrapper*    SdrGlobalData::GetLocaleData()
+{
+    if ( !pLocaleData )
+        pLocaleData = GetSysLocale()->GetLocaleDataPtr();
+    return pLocaleData;
+}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 OLEObjCache::OLEObjCache()