diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/fwi/uielement/constitemcontainer.cxx | 8 | ||||
-rw-r--r-- | framework/source/fwi/uielement/itemcontainer.cxx | 8 | ||||
-rw-r--r-- | framework/source/fwi/uielement/rootitemcontainer.cxx | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 77952563d4f2..4aaaefc5d158 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -169,14 +169,10 @@ sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 > return 0; } -namespace -{ - class theConstItemContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theConstItemContainerUnoTunnelId > {}; -} - const Sequence< sal_Int8 >& ConstItemContainer::getUnoTunnelId() throw() { - return theConstItemContainerUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theConstItemContainerUnoTunnelId; + return theConstItemContainerUnoTunnelId.getSeq(); } // XElementAccess diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index f9945deb9050..131ddf1a7cbe 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -134,14 +134,10 @@ Reference< XIndexAccess > ItemContainer::deepCopyContainer( const Reference< XIn return xReturn; } -namespace -{ - class theItemContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theItemContainerUnoTunnelId > {}; -} - const Sequence< sal_Int8 >& ItemContainer::getUnoTunnelId() throw() { - return theItemContainerUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theItemContainerUnoTunnelId; + return theItemContainerUnoTunnelId.getSeq(); } // XElementAccess diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 8c573f12dbff..6dc1f1587452 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -146,14 +146,10 @@ sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& return 0; } -namespace -{ - class theRootItemContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theRootItemContainerUnoTunnelId > {}; -} - const Sequence< sal_Int8 >& RootItemContainer::getUnoTunnelId() throw() { - return theRootItemContainerUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theRootItemContainerUnoTunnelId; + return theRootItemContainerUnoTunnelId.getSeq(); } // XElementAccess |