Avoid expensive dlopen thrash for break iterators.

Change-Id: I770c1b3e5164cb486b5a5c2b1259f713914a1bae

1 files changed, 19 insertions, 7 deletions

diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 13078e88d5c0..2b1ece0d2447 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -40,17 +40,29 @@ struct WordBreakCache {
     bool equals(const sal_Unicode *str, Boundary& boundary);    // checking cached string
 };
 
-class xdictionary
+struct xdictionarydata
 {
-private:
     const sal_uInt8  * existMark;
     const sal_Int16  * index1;
-    const sal_Int32 * index2;
-    const sal_Int32 * lenArray;
+    const sal_Int32  * index2;
+    const sal_Int32  * lenArray;
     const sal_Unicode* dataArea;
-#ifndef DISABLE_DYNLOADING
-    oslModule hModule;
-#endif
+    xdictionarydata() :
+        existMark( NULL ),
+        index1( NULL ),
+        index2( NULL ),
+        lenArray( NULL ),
+        dataArea( NULL )
+    {
+    }
+};
+
+class xdictionary
+{
+private:
+    xdictionarydata data;
+    void initDictionaryData(const sal_Char *lang);
+
     Boundary boundary;
     bool japaneseWordBreak;