De-duplicate aEmptyStr and pSwResMgr

Change-Id: I129754d1180ea15d815b2b4d2533f911f10116c3

De-duplicate aEmptyStr and pSwResMgr
Change-Id: I129754d1180ea15d815b2b4d2533f911f10116c3
f5ba1a09 · Tor Lillqvist · fc6fa71e · f5ba1a09
Kaydet (Commit) f5ba1a09 authored Eki 09, 2012 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

swdialmgr.cxx sw/source/ui/dialog/swdialmgr.cxx +4 -2

No files found.
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/sw/source/ui/dialog/swdialmgr.cxx
@@ -30,13 +30,15 @@
 #include "tools/string.hxx"
 #include <sfx2/app.hxx>

+#ifndef DISABLE_DYNLOADING
 //copy from core\bastyp\swtypes.cxx
 String aEmptyStr; // constant strings
-
-ResMgr* pSwResMgr=0;
+#endif

 ResMgr* SwDialogsResMgr::GetResMgr()
 {
+    static ResMgr* pSwResMgr=0;
+
    if ( !pSwResMgr )
    {
        pSwResMgr = SfxApplication::CreateResManager( "sw" );