diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-06 21:07:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-07 08:08:44 +0200 |
| commit | 07fd90cc7d85a89b9f74efba7ddc9ac457110ce3 (patch) | |
| tree | 87767cc5ddfdae46541cb5008d12d24470e54a2d /sfx2 | |
| parent | 908b47604bff6415adda791ea6f43e43c0b1443a (diff) | |
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>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/thumbnailviewacc.cxx | 16 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 9 |
2 files changed, 6 insertions, 19 deletions
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 8f6cfa69d866..a8cbe92d33c1 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -46,14 +46,10 @@ ThumbnailViewAcc::~ThumbnailViewAcc() { } -namespace -{ - class theSfxValueSetAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSfxValueSetAccUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 >& ThumbnailViewAcc::getUnoTunnelId() { - return theSfxValueSetAccUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSfxValueSetAccUnoTunnelId; + return theSfxValueSetAccUnoTunnelId.getSeq(); } ThumbnailViewAcc* ThumbnailViewAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) @@ -550,14 +546,10 @@ void ThumbnailViewAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOld } } -namespace -{ - class theValueItemAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theValueItemAccUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 >& ThumbnailViewItemAcc::getUnoTunnelId() { - return theValueItemAccUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theValueItemAccUnoTunnelId; + return theValueItemAccUnoTunnelId.getSeq(); } ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 8eaca3d639f2..c368755816d2 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/servicehelper.hxx> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> @@ -2064,14 +2063,10 @@ void SfxObjectShell::SignScriptingContent(weld::Window* pDialogParent) AfterSigning(bSignSuccess, true); } -namespace -{ - class theSfxObjectShellUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSfxObjectShellUnoTunnelId > {}; -} - const uno::Sequence<sal_Int8>& SfxObjectShell::getUnoTunnelId() { - return theSfxObjectShellUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSfxObjectShellUnoTunnelId; + return theSfxObjectShellUnoTunnelId.getSeq(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |