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 /unotools/source/config/extendedsecurityoptions.cxx | |
parent | f04c48a7e764775bdd98715e5d17845f1786bd44 (diff) |
properly prefix various global variables and hide them
Change-Id: I6b97e6a4c6ac4c0e26bcbb2b132b333920c16f19
Diffstat (limited to 'unotools/source/config/extendedsecurityoptions.cxx')
-rw-r--r-- | unotools/source/config/extendedsecurityoptions.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 1fb58bdbe773..1037d586f83e 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -239,18 +239,22 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() return seqPropertyNames; } -std::weak_ptr<SvtExtendedSecurityOptions_Impl> m_pExtendedSecurityOptions; +namespace { + +std::weak_ptr<SvtExtendedSecurityOptions_Impl> g_pExtendedSecurityOptions; + +} SvtExtendedSecurityOptions::SvtExtendedSecurityOptions() { // Global access, must be guarded (multithreading!). MutexGuard aGuard( GetInitMutex() ); - m_pImpl = m_pExtendedSecurityOptions.lock(); + m_pImpl = g_pExtendedSecurityOptions.lock(); if( !m_pImpl ) { m_pImpl = std::make_shared<SvtExtendedSecurityOptions_Impl>(); - m_pExtendedSecurityOptions = m_pImpl; + g_pExtendedSecurityOptions = m_pImpl; ItemHolder1::holdConfigItem(E_EXTENDEDSECURITYOPTIONS); } } |