summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-04-06 21:07:01 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-04-07 08:08:44 +0200
commit07fd90cc7d85a89b9f74efba7ddc9ac457110ce3 (patch)
tree87767cc5ddfdae46541cb5008d12d24470e54a2d /editeng
parent908b47604bff6415adda791ea6f43e43c0b1443a (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 'editeng')
-rw-r--r--editeng/source/uno/unofield.cxx8
-rw-r--r--editeng/source/uno/unotext.cxx16
2 files changed, 6 insertions, 18 deletions
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 081ccec809db..da56f0fcac7b 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -229,14 +229,10 @@ static tools::Time setTime( util::DateTime const & rDate )
-namespace
-{
- class theSvxUnoTextFieldUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextFieldUnoTunnelId> {};
-}
-
const css::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId() throw()
{
- return theSvxUnoTextFieldUnoTunnelId::get().getSeq();
+ static const UnoTunnelIdInit theSvxUnoTextFieldUnoTunnelId;
+ return theSvxUnoTextFieldUnoTunnelId.getSeq();
}
sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 851efc127671..3c73fc75b31e 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2161,14 +2161,10 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
std::initializer_list<std::u16string_view>{ u"com.sun.star.text.Text" });
}
-namespace
-{
- class theSvxUnoTextBaseUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextBaseUnoTunnelId > {};
-}
-
const uno::Sequence< sal_Int8 > & SvxUnoTextBase::getUnoTunnelId() throw()
{
- return theSvxUnoTextBaseUnoTunnelId::get().getSeq();
+ static const UnoTunnelIdInit theSvxUnoTextBaseUnoTunnelId;
+ return theSvxUnoTextBaseUnoTunnelId.getSeq();
}
sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId )
@@ -2239,14 +2235,10 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId( )
return css::uno::Sequence<sal_Int8>();
}
-namespace
-{
- class theSvxUnoTextUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextUnoTunnelId > {};
-}
-
const uno::Sequence< sal_Int8 > & SvxUnoText::getUnoTunnelId() throw()
{
- return theSvxUnoTextUnoTunnelId::get().getSeq();
+ static const UnoTunnelIdInit theSvxUnoTextUnoTunnelId;
+ return theSvxUnoTextUnoTunnelId.getSeq();
}
sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId )