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

1 files changed, 14 insertions, 5 deletions

diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 7855b8a68728..3b89f3540d7c 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -50,6 +50,9 @@ class String;
 class SW_DLLPUBLIC SwBreakIt
 {
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMSF;
+    mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xBreak;
+    com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > xCTLDetect;
+
 
     com::sun::star::lang::Locale * m_pLocale;
     com::sun::star::i18n::ForbiddenCharacters * m_pForbidden;
@@ -60,6 +63,9 @@ class SW_DLLPUBLIC SwBreakIt
     void _GetLocale( const LanguageType aLang );
     void _GetForbidden( const LanguageType  aLang );
 
+    void createBreakIterator() const;
+    void createScriptTypeDetector();
+
     // forbidden and not implemented.
     SwBreakIt();
     SwBreakIt( const SwBreakIt &);
@@ -79,15 +85,18 @@ public:
 public:
     static SwBreakIt * Get();
 
-    // @@@ backward compatibility @@@
-    com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xBreak;
-    com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > xCTLDetect;
-
-    const com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > & GetBreakIter()
+    com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > GetBreakIter()
     {
+        createBreakIterator();
         return xBreak;
     }
 
+    com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > GetScriptTypeDetector()
+    {
+        createScriptTypeDetector();
+        return xCTLDetect;
+    }
+
     const com::sun::star::lang::Locale& GetLocale( const LanguageType aLang )
     {
         if( !m_pLocale || aLast != aLang )