Kaydet (Commit) a6ab8927 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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 f5ba1a09.

Change-Id: I040e05844f9438ace39cf419a9a9e757002f9719
üst bf7657fc
...@@ -33,12 +33,14 @@ ...@@ -33,12 +33,14 @@
#ifndef DISABLE_DYNLOADING #ifndef DISABLE_DYNLOADING
//copy from core\bastyp\swtypes.cxx //copy from core\bastyp\swtypes.cxx
String aEmptyStr; // constant strings String aEmptyStr; // constant strings
ResMgr* pSwResMgr=0;
#else
static ResMgr *pSwResMgr;
#endif #endif
ResMgr* SwDialogsResMgr::GetResMgr() ResMgr* SwDialogsResMgr::GetResMgr()
{ {
static ResMgr* pSwResMgr=0;
if ( !pSwResMgr ) if ( !pSwResMgr )
{ {
pSwResMgr = SfxApplication::CreateResManager( "sw" ); pSwResMgr = SfxApplication::CreateResManager( "sw" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment