diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-09 12:21:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-09 12:30:08 +0300 |
| commit | a6ab8927c74d512675dcc174b0d179f02a4c64d6 (patch) | |
| tree | 347ff6e45fd5dcb14b15b22bc95edf23f198b0c4 /sw | |
| parent | bf7657fc2a91f71a8e9d380f77470ff8d07f2f8c (diff) | |
Do the de-duplication of pSwResMgr a bit differently
Let the code stay as-is for the normal (not DISABLE_DYNLOADING) case.
This partially reverts commit f5ba1a09408be65e6c5831c2b61bc94133d7ad13.
Change-Id: I040e05844f9438ace39cf419a9a9e757002f9719
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dialog/swdialmgr.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx index 364416d510fa..6d5861dadcd8 100644 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ b/sw/source/ui/dialog/swdialmgr.cxx @@ -33,12 +33,14 @@ #ifndef DISABLE_DYNLOADING //copy from core\bastyp\swtypes.cxx String aEmptyStr; // constant strings + +ResMgr* pSwResMgr=0; +#else +static ResMgr *pSwResMgr; #endif ResMgr* SwDialogsResMgr::GetResMgr() { - static ResMgr* pSwResMgr=0; - if ( !pSwResMgr ) { pSwResMgr = SfxApplication::CreateResManager( "sw" ); |