merge commit

1 files changed, 9 insertions, 2 deletions

diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index d7b42601b01f..91d856b19e62 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -190,9 +190,9 @@ static sal_Unicode lowerLetter[] = {
     0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
 };
 
-DefaultNumberingProvider::DefaultNumberingProvider( const Reference < XMultiServiceFactory >& xMSF ) : xSMgr(xMSF)
+DefaultNumberingProvider::DefaultNumberingProvider( const Reference < XMultiServiceFactory >& xMSF ) : xSMgr(xMSF),translit(NULL)
 {
-        translit = new TransliterationImpl(xMSF);
+
 }
 
 DefaultNumberingProvider::~DefaultNumberingProvider()
@@ -200,6 +200,12 @@ DefaultNumberingProvider::~DefaultNumberingProvider()
         delete translit;
 }
 
+void DefaultNumberingProvider::impl_loadTranslit()
+{
+    if ( !translit )
+        translit = new TransliterationImpl(xSMgr);
+}
+
 Sequence< Reference<container::XIndexAccess> >
 DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException)
 {
@@ -463,6 +469,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                     const OUString &tmp = OUString::valueOf( number );
                     OUString transliteration;
                     getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;
+                    impl_loadTranslit();
                     translit->loadModuleByImplName(transliteration, aLocale);
                     result += translit->transliterateString2String(tmp, 0, tmp.getLength());
                } catch (Exception& ) {