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 /sd/source/ui/unoidl | |
| 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 'sd/source/ui/unoidl')
| -rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 66ed80851852..019d00221802 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -557,14 +557,10 @@ Reference<XModuleController> SAL_CALL //===== XUnoTunnel ============================================================ -namespace -{ - class theDrawControllerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theDrawControllerUnoTunnelId> {}; -} - const Sequence<sal_Int8>& DrawController::getUnoTunnelId() { - return theDrawControllerUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theDrawControllerUnoTunnelId; + return theDrawControllerUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index c8812900cb93..662477a28367 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -332,15 +332,11 @@ void SAL_CALL SdXImpressDocument::release() throw ( ) SfxBaseModel::release(); } -namespace -{ - class theSdXImpressDocumentUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdXImpressDocumentUnoTunnelId> {}; -} - // XUnoTunnel const css::uno::Sequence< sal_Int8 > & SdXImpressDocument::getUnoTunnelId() throw() { - return theSdXImpressDocumentUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSdXImpressDocumentUnoTunnelId; + return theSdXImpressDocumentUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 0eed74c000ab..0aef28437972 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -321,14 +321,10 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin return pRet; } -namespace -{ - class theSdGenericDrawPageUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdGenericDrawPageUnoTunnelId> {}; -} - const css::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw() { - return theSdGenericDrawPageUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSdGenericDrawPageUnoTunnelId; + return theSdGenericDrawPageUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) |