[Libreoffice-commits] core.git: unotools/source

[Stephan Bergmann]

 unotools/source/config/compatibility.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit f23dd396f515b0d82b0db77d01781f28dd7b2fc8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 16 10:58:36 2016 +0200

    Local linkage for static var (and drop misleading "m_" prefix)
    
    Change-Id: Ibb66eadf4d10fa4e67dae09287e82dcc937bfea3

diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 0d2fa73..4460b5e 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -580,18 +580,22 @@ void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames(
     }
 }
 
-std::weak_ptr<SvtCompatibilityOptions_Impl>    m_pOptions;
+namespace {
+
+std::weak_ptr<SvtCompatibilityOptions_Impl> theOptions;
+
+}
 
 SvtCompatibilityOptions::SvtCompatibilityOptions()
 {
     // Global access, must be guarded (multithreading!).
     MutexGuard aGuard( GetOwnStaticMutex() );
 
-    m_pImpl = m_pOptions.lock();
+    m_pImpl = theOptions.lock();
     if( !m_pImpl )
     {
         m_pImpl = std::make_shared<SvtCompatibilityOptions_Impl>();
-        m_pOptions = m_pImpl;
+        theOptions = m_pImpl;
         ItemHolder1::holdConfigItem(E_COMPATIBILITY);
     }
 }