diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-12 02:12:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-13 09:13:37 +0200 |
| commit | a3bedb7ae8f23476843e00380aba05002aa1e827 (patch) | |
| tree | 0eb626a63ebb5d45c7e837def5cca433b96eba56 /package | |
| parent | e272761e8fca9eccbf6fd5737df2b1aee1730947 (diff) | |
use local statics for getUnoTunnelImplementationId
replace uses of double checked locking pattern and
rtl::Static
Change-Id: I479d9d94f652b4fb4c67388405823a5f4e2b6ed4
Reviewed-on: https://gerrit.libreoffice.org/38690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index f0837489bcc3..488e927d80ae 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -63,7 +63,6 @@ #include <cppuhelper/typeprovider.hxx> #include <rtl/uri.hxx> #include <rtl/random.h> -#include <rtl/instance.hxx> #include <osl/time.h> #include <osl/diagnose.h> #include "com/sun/star/io/XAsyncOutputMonitor.hpp" @@ -1631,12 +1630,11 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno:: static_getSupportedServiceNames() ); } -namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } - Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId() { - ::cppu::OImplementationId &rId = lcl_ImplId::get(); - return rId.getImplementationId(); + static ::cppu::OImplementationId implId; + + return implId.getImplementationId(); } sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) |