rtl::Static -> function local static

Change-Id: I2071c27bdf074403ec24e67f9278ac27f9491303
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113698
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 8 insertions, 20 deletions

diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx
index 525706e26748..bd0eb08bc23a 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.cxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
@@ -205,13 +205,9 @@ sal_Int64 SAL_CALL CertificateImpl::getSomething(const Sequence< sal_Int8 >& aId
 
 /* XUnoTunnel extension */
 
-namespace
-{
-    class CertificateImplUnoTunnelId : public rtl::Static< UnoTunnelIdInit, CertificateImplUnoTunnelId > {};
-}
-
 const Sequence< sal_Int8>& CertificateImpl::getUnoTunnelId() {
-    return CertificateImplUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theCertificateImplUnoTunnelId;
+    return theCertificateImplUnoTunnelId.getSeq();
 }
 
 void CertificateImpl::setCertificate(GpgME::Context* ctx, const GpgME::Key& key)
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 98db7e420a38..fac71b6ad472 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -103,11 +103,11 @@ sal_Int64 SAL_CALL SecurityEnvironmentGpg::getSomething( const Sequence< sal_Int
 
 namespace
 {
-    class theSecurityEnvironmentUnoTunnelId  : public rtl::Static< UnoTunnelIdInit, theSecurityEnvironmentUnoTunnelId > {};
 }
 
 const Sequence< sal_Int8>& SecurityEnvironmentGpg::getUnoTunnelId() {
-    return theSecurityEnvironmentUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSecurityEnvironmentUnoTunnelId;
+    return theSecurityEnvironmentUnoTunnelId.getSeq();
 }
 
 OUString SecurityEnvironmentGpg::getSecurityEnvironmentInformation()
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index f982e136f5b2..cf084c7137ad 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -162,13 +162,9 @@ sal_Int64 SAL_CALL SecurityEnvironment_NssImpl::getSomething( const Sequence< sa
 
 /* XUnoTunnel extension */
 
-namespace
-{
-    class theSecurityEnvironment_NssImplUnoTunnelId  : public rtl::Static< UnoTunnelIdInit, theSecurityEnvironment_NssImplUnoTunnelId > {};
-}
-
 const Sequence< sal_Int8>& SecurityEnvironment_NssImpl::getUnoTunnelId() {
-    return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theSecurityEnvironment_NssImplUnoTunnelId;
+    return theSecurityEnvironment_NssImplUnoTunnelId.getSeq();
 }
 
 OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation()
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 940656193e94..bd3ad0174273 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -352,13 +352,9 @@ sal_Int64 SAL_CALL X509Certificate_NssImpl::getSomething( const Sequence< sal_In
 
 /* XUnoTunnel extension */
 
-namespace
-{
-    class theX509Certificate_NssImplUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theX509Certificate_NssImplUnoTunnelId > {};
-}
-
 const Sequence< sal_Int8>& X509Certificate_NssImpl::getUnoTunnelId() {
-    return theX509Certificate_NssImplUnoTunnelId::get().getSeq();
+    static const UnoTunnelIdInit theX509Certificate_NssImplUnoTunnelId;
+    return theX509Certificate_NssImplUnoTunnelId.getSeq();
 }
 
 static OUString getAlgorithmDescription(SECAlgorithmID const *aid)