diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-30 20:54:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-31 08:55:29 +0200 |
| commit | a943936eeff04b60ebd0b2552bc18b42606f3321 (patch) | |
| tree | e3a20ebf81feaa0914e9e5b9a0fe008e0ea61c2e /package/source/zippackage/ZipPackageFolder.cxx | |
| parent | 620f9649ae55e01700419876ce25ab4e45ed859f (diff) | |
rtl::Static -> static local
in a handful cases, like a map or a vector, we don't need init on demand
at all, the default constructor can be laid out at compile time
Change-Id: Ifa3188af7a65cd475ce0f603d15a8c26bcda7e6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119710
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package/source/zippackage/ZipPackageFolder.cxx')
| -rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 3e1deee05592..f3099c5b31f3 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -36,7 +36,6 @@ #include <rtl/digest.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <EncryptedDataHeader.hxx> -#include <rtl/instance.hxx> using namespace com::sun::star; using namespace com::sun::star::packages::zip::ZipConstants; @@ -54,8 +53,6 @@ using namespace cppu; #define THROW_WHERE "" #endif -namespace { struct lcl_CachedImplId : public rtl::Static< cppu::OImplementationId, lcl_CachedImplId > {}; } - ZipPackageFolder::ZipPackageFolder( const css::uno::Reference < css::uno::XComponentContext >& xContext, sal_Int32 nFormat, bool bAllowRemoveOnInsert ) @@ -153,7 +150,8 @@ void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair& css::uno::Sequence < sal_Int8 > ZipPackageFolder::getUnoTunnelId() { - return lcl_CachedImplId::get().getImplementationId(); + static cppu::OImplementationId lcl_CachedImplId; + return lcl_CachedImplId.getImplementationId(); } // XNameContainer |