diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-18 22:13:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-19 08:22:47 +0200 |
| commit | 5d391c479ec1498dd01a96a572bb6bc3ef130b2e (patch) | |
| tree | c19f37e7060232b5ef49b68fc4d3bd34973155d0 /xmlsecurity | |
| parent | 42d0e756122ac7e341c3b8a93c7fb551f410dc90 (diff) | |
xmlsecurity: make static var local
Change-Id: Ia36941e3ec32bcc4255be523203cf65f7d7b4273
Reviewed-on: https://gerrit.libreoffice.org/38935
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index e989af368b60..00911d180cbf 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -33,7 +33,6 @@ using namespace std; namespace XmlSec { static ResMgr* pResMgr = nullptr; - static SvtSysLocale* pSysLocale = nullptr; ResMgr* GetResMgr() { @@ -44,9 +43,9 @@ namespace XmlSec const LocaleDataWrapper& GetLocaleData() { - if (!pSysLocale) - pSysLocale = new SvtSysLocale; - return pSysLocale->GetLocaleData(); + static SvtSysLocale ourSysLocale; + + return ourSysLocale.GetLocaleData(); } DateTime GetDateTime( const css::util::DateTime& _rDT ) |