1 files changed, 4 insertions, 7 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 57d87b800d45..fe682c3e30e4 100644..100755
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -69,18 +69,18 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/evntconf.hxx>
 #include "intro.hxx"
-#include <sfx2/macrconf.hxx>
 #include <sfx2/mnumgr.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
-#include "sfxhelp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/viewsh.hxx>
 #include "nochaos.hxx"
 #include <sfx2/fcontnr.hxx>
 #include "helper.hxx"   // SfxContentHelper::Kill()
 #include "sfxpicklist.hxx"
+#include <tools/svlibrary.hxx>
 
 #ifdef UNX
 #define stricmp(a,b) strcmp(a,b)
@@ -207,10 +207,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
     {
         bDetermineFunction = true;
 
-        String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-        sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "cui" ) ) );
-
-        rtl::OUString aLibName( sLibName );
+        static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "cui" ) ) );
         oslModule handleMod = osl_loadModuleRelative(
             &thisModule, aLibName.pData, 0 );