[Libreoffice-commits] .: Branch 'feature/android-single-dso' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/dialog/swdialmgr.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 128f12719757eec2b346068446223961f50ae496
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Oct 9 12:21:38 2012 +0300

    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

diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index 364416d..6d5861d 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" );