sw/source/ui/dialog/swdialmgr.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a6ab8927c74d512675dcc174b0d179f02a4c64d6
Author: Tor Lillqvist <t...@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" );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
