fix sfx2 with Library_merged

Change-Id: I53d64b9023be816d0179eed21920beed3660909c

fix sfx2 with Library_merged
Change-Id: I53d64b9023be816d0179eed21920beed3660909c
0b78f2b9 · Peter Foley · 04f02fae · 0b78f2b9
Kaydet (Commit) 0b78f2b9 authored Mar 31, 2013 tarafından Peter Foley
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

appinit.cxx sfx2/source/appl/appinit.cxx +5 -1

No files found.
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -186,7 +186,11 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
        bDetermineFunction = true;
 #ifndef DISABLE_DYNLOADING
-        static ::rtl::OUString aLibName( SVLIBRARY( "cui"  ) );
+    #ifdef LIBO_MERGEDLIBS
+        static OUString aLibName( SVLIBRARY( "merged" ) );
+    #else
+        static OUString aLibName( SVLIBRARY( "cui" ) );
+    #endif
        oslModule handleMod = osl_loadModuleRelative(
            &thisModule, aLibName.pData, 0 );