diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-06-16 15:24:29 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-06-16 15:26:54 +0200 |
commit | ed8a2341b9631ad312ff40d23331c66d537aad20 (patch) | |
tree | d0958ffee6239ce97cb52c5a53ed1d63b82161a8 /svl/source/config/ctloptions.cxx | |
parent | f04c48a7e764775bdd98715e5d17845f1786bd44 (diff) |
properly prefix various global variables and hide them
Change-Id: I6b97e6a4c6ac4c0e26bcbb2b132b333920c16f19
Diffstat (limited to 'svl/source/config/ctloptions.cxx')
-rw-r--r-- | svl/source/config/ctloptions.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index ef2a6106bfc2..245c385846f9 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -372,21 +372,25 @@ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumer NotifyListeners(0); } } -// global -std::weak_ptr<SvtCTLOptions_Impl> pCTLOptions; -namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; } +namespace { + + // global + std::weak_ptr<SvtCTLOptions_Impl> g_pCTLOptions; + + struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; +} SvtCTLOptions::SvtCTLOptions( bool bDontLoad ) { // Global access, must be guarded (multithreading) ::osl::MutexGuard aGuard( CTLMutex::get() ); - m_pImpl = pCTLOptions.lock(); + m_pImpl = g_pCTLOptions.lock(); if ( !m_pImpl ) { m_pImpl = std::make_shared<SvtCTLOptions_Impl>(); - pCTLOptions = m_pImpl; + g_pCTLOptions = m_pImpl; ItemHolder2::holdConfigItem(E_CTLOPTIONS); } |