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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 8 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 8 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index bf29a63a6670..1946da09341c 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4435,14 +4435,10 @@ sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rId return nReturn; } -namespace -{ - class theFmXFilterCellUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theFmXFilterCellUnoTunnelId > {}; -} - const Sequence<sal_Int8>& FmXFilterCell::getUnoTunnelId() { - return theFmXFilterCellUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theFmXFilterCellUnoTunnelId; + return theFmXFilterCellUnoTunnelId.getSeq(); } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index f19d86e48334..e200899ee1a8 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1925,14 +1925,10 @@ void SdrModel::dumpAsXml(xmlTextWriterPtr pWriter) const (void)xmlTextWriterEndElement(pWriter); } -namespace -{ - class theSdrModelUnoTunnelImplementationId : public rtl::Static< UnoTunnelIdInit, theSdrModelUnoTunnelImplementationId > {}; -} - const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelId() { - return theSdrModelUnoTunnelImplementationId::get().getSeq(); + static const UnoTunnelIdInit theSdrModelUnoTunnelImplementationId; + return theSdrModelUnoTunnelImplementationId.getSeq(); } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index a84795b4b06b..1e5263921fd2 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -307,14 +307,10 @@ uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) return SvxShape_UnoImplHelper::queryAggregation(rType); } -namespace -{ - class theSvxShapeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxShapeUnoTunnelId > {}; -} - const css::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() throw() { - return theSvxShapeUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSvxShapeUnoTunnelId; + return theSvxShapeUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) |