summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-10-09 09:28:09 +0300
committerTor Lillqvist <tml@iki.fi>2012-10-09 11:41:32 +0300
commitf5ba1a09408be65e6c5831c2b61bc94133d7ad13 (patch)
treec5734359eef767a082ef547b77b7bcaa54a1cf4a /sw
parentfc6fa71e8512cbca511b6a8acbf0d6f439b32dde (diff)
De-duplicate aEmptyStr and pSwResMgr
Change-Id: I129754d1180ea15d815b2b4d2533f911f10116c3
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/dialog/swdialmgr.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index d8fb185302e8..364416d510fa 100644
--- 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" );