From 07fd90cc7d85a89b9f74efba7ddc9ac457110ce3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 6 Apr 2021 21:07:01 +0200 Subject: rtl::Static -> function local static Change-Id: I2071c27bdf074403ec24e67f9278ac27f9491303 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113698 Tested-by: Jenkins Reviewed-by: Noel Grandin --- animations/source/animcore/animcore.cxx | 8 ++------ chart2/source/view/main/ChartView.cxx | 5 ++--- configmgr/source/childaccess.cxx | 8 ++------ editeng/source/uno/unofield.cxx | 8 ++------ editeng/source/uno/unotext.cxx | 16 ++++------------ forms/source/component/Columns.cxx | 8 ++------ .../source/fwi/uielement/constitemcontainer.cxx | 8 ++------ framework/source/fwi/uielement/itemcontainer.cxx | 8 ++------ framework/source/fwi/uielement/rootitemcontainer.cxx | 8 ++------ sc/source/ui/app/drwtrans.cxx | 8 ++------ sc/source/ui/app/transobj.cxx | 8 ++------ sc/source/ui/unoobj/dapiuno.cxx | 8 ++------ sc/source/ui/unoobj/docuno.cxx | 8 ++------ sc/source/ui/unoobj/nameuno.cxx | 8 ++------ sc/source/ui/unoobj/textuno.cxx | 8 ++------ sc/source/ui/vba/vbaworksheet.cxx | 8 ++------ sd/source/ui/app/sdxfer.cxx | 8 ++------ sd/source/ui/dlg/sdtreelb.cxx | 8 ++------ sd/source/ui/framework/factories/Pane.cxx | 8 ++------ .../ui/framework/factories/ViewShellWrapper.cxx | 8 ++------ sd/source/ui/unoidl/DrawController.cxx | 8 ++------ sd/source/ui/unoidl/unomodel.cxx | 8 ++------ sd/source/ui/unoidl/unopage.cxx | 8 ++------ sd/source/ui/view/ViewTabBar.cxx | 8 ++------ sfx2/source/control/thumbnailviewacc.cxx | 16 ++++------------ sfx2/source/doc/objserv.cxx | 9 ++------- starmath/source/mathml/mathmlexport.cxx | 10 ++-------- starmath/source/mathml/mathmlimport.cxx | 10 ++-------- starmath/source/unomodel.cxx | 8 ++------ svl/source/items/style.cxx | 8 ++------ svtools/source/control/valueacc.cxx | 16 ++++------------ svx/source/fmcomp/gridcell.cxx | 8 ++------ svx/source/svdraw/svdmodel.cxx | 8 ++------ svx/source/unodraw/unoshape.cxx | 8 ++------ sw/source/core/unocore/TextCursorHelper.cxx | 8 ++------ sw/source/core/unocore/unobkm.cxx | 8 ++------ sw/source/core/unocore/unochart.cxx | 8 ++------ sw/source/core/unocore/unodraw.cxx | 8 ++------ sw/source/core/unocore/unofield.cxx | 16 ++++------------ sw/source/core/unocore/unoflatpara.cxx | 8 ++------ sw/source/core/unocore/unoframe.cxx | 8 ++------ sw/source/core/unocore/unoftn.cxx | 8 ++------ sw/source/core/unocore/unoidx.cxx | 12 ++++-------- sw/source/core/unocore/unoobj.cxx | 8 ++------ sw/source/core/unocore/unoobj2.cxx | 16 +++++----------- sw/source/core/unocore/unoparagraph.cxx | 8 ++------ sw/source/core/unocore/unoport.cxx | 8 ++------ sw/source/core/unocore/unoportenum.cxx | 4 ++-- sw/source/core/unocore/unorefmk.cxx | 16 ++++------------ sw/source/core/unocore/unosect.cxx | 8 ++------ sw/source/core/unocore/unosett.cxx | 8 ++++---- sw/source/core/unocore/unosrch.cxx | 4 ++-- sw/source/core/unocore/unostyle.cxx | 4 ++-- sw/source/core/unocore/unotbl.cxx | 20 +++++++------------- sw/source/core/unocore/unotext.cxx | 4 ++-- sw/source/filter/xml/xmlexp.cxx | 8 ++------ sw/source/filter/xml/xmlimp.cxx | 8 ++------ sw/source/uibase/dochdl/swdtflvr.cxx | 8 ++------ sw/source/uibase/uno/unoatxt.cxx | 16 ++++------------ sw/source/uibase/uno/unodispatch.cxx | 8 ++------ sw/source/uibase/uno/unotxdoc.cxx | 8 ++------ sw/source/uibase/uno/unotxvw.cxx | 8 ++------ toolkit/source/controls/unocontrolmodel.cxx | 7 ++----- unoxml/source/dom/node.cxx | 8 ++------ vcl/source/treelist/transfer.cxx | 8 ++------ xmloff/source/core/unoatrcn.cxx | 8 ++------ xmloff/source/core/xmlimp.cxx | 8 ++------ xmloff/source/transform/MutableAttrList.cxx | 8 ++------ xmloff/source/transform/OOo2Oasis.cxx | 8 ++------ xmloff/source/transform/Oasis2OOo.cxx | 8 ++------ xmlsecurity/source/gpg/CertificateImpl.cxx | 8 ++------ xmlsecurity/source/gpg/SecurityEnvironment.cxx | 4 ++-- .../xmlsec/nss/securityenvironment_nssimpl.cxx | 8 ++------ .../source/xmlsec/nss/x509certificate_nssimpl.cxx | 8 ++------ 74 files changed, 172 insertions(+), 473 deletions(-) diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 493e1fa1d102..72853c5cdb45 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -2101,14 +2101,10 @@ void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesLis } } -namespace -{ - class theAnimationNodeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAnimationNodeUnoTunnelId > {}; -} - const css::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId() { - return theAnimationNodeUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theAnimationNodeUnoTunnelId; + return theAnimationNodeUnoTunnelId.getSeq(); } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 89e59616dab4..387fa2ae8b40 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -116,8 +116,6 @@ using ::com::sun::star::uno::Any; namespace { -class theExplicitValueProviderUnoTunnelId : public rtl::Static {}; - typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis typedef std::map< VCoordinateSystem*, tFullAxisIndex > tCoordinateSystemMap; @@ -1034,7 +1032,8 @@ struct CreateShapeParam2D const uno::Sequence& ExplicitValueProvider::getUnoTunnelId() { - return theExplicitValueProviderUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theExplicitValueProviderUnoTunnelId; + return theExplicitValueProviderUnoTunnelId.getSeq(); } ChartView::ChartView( diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index 68bc0b01351c..8d05eb8fe61a 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -55,14 +55,10 @@ namespace configmgr { -namespace -{ - class theChildAccessUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theChildAccessUnoTunnelId > {}; -} - css::uno::Sequence< sal_Int8 > const & ChildAccess::getTunnelId() { - return theChildAccessUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theChildAccessUnoTunnelId; + return theChildAccessUnoTunnelId.getSeq(); } ChildAccess::ChildAccess( 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{ 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(); } -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 ) diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 3195fde4d44e..01a662f8fbd2 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -106,14 +106,10 @@ sal_Int32 getColumnTypeByModelName(const OUString& aModelName) return nTypeId; } -namespace -{ - class theOGridColumnImplementationId : public rtl::Static< UnoTunnelIdInit, theOGridColumnImplementationId > {}; -} - const Sequence& OGridColumn::getUnoTunnelId() { - return theOGridColumnImplementationId::get().getSeq(); + static const UnoTunnelIdInit theOGridColumnImplementationId; + return theOGridColumnImplementationId.getSeq(); } 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 diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 5314f059e1f5..e575a837ec87 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -734,14 +734,10 @@ void ScDrawTransferObj::InitDocShell() pDocSh->UpdateOle(aViewData, true); } -namespace -{ - class theScDrawTransferObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScDrawTransferObjUnoTunnelId > {}; -} - const css::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId() { - return theScDrawTransferObjUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theScDrawTransferObjUnoTunnelId; + return theScDrawTransferObjUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index ad6e01df42e1..eaeb319dd1b8 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -906,14 +906,10 @@ void ScTransferObj::StripRefs( ScDocument& rDoc, } } -namespace -{ - class theScTransferUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScTransferUnoTunnelId> {}; -} - const css::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId() { - return theScTransferUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theScTransferUnoTunnelId; + return theScTransferUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 36c40bb3b60c..e65a6e8b559b 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -987,14 +987,10 @@ sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething( return 0; } -namespace -{ - class theScDataPilotDescriptorBaseUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScDataPilotDescriptorBaseUnoTunnelId> {}; -} - const Sequence& ScDataPilotDescriptorBase::getUnoTunnelId() { - return theScDataPilotDescriptorBaseUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theScDataPilotDescriptorBaseUnoTunnelId; + return theScDataPilotDescriptorBaseUnoTunnelId.getSeq(); } ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) : diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 6780821b6cab..1e531424a92c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3086,14 +3086,10 @@ sal_Int64 SAL_CALL ScModelObj::getSomething( return 0; } -namespace -{ - class theScModelObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScModelObjUnoTunnelId> {}; -} - const uno::Sequence& ScModelObj::getUnoTunnelId() { - return theScModelObjUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theScModelObjUnoTunnelId; + return theScModelObjUnoTunnelId.getSeq(); } // XChangesNotifier diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index ef322f64590d..bc15ba830316 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -433,14 +433,10 @@ sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( return 0; } -namespace -{ - class theScNamedRangeObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScNamedRangeObjUnoTunnelId> {}; -} - const uno::Sequence& ScNamedRangeObj::getUnoTunnelId() { - return theScNamedRangeObjUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theScNamedRangeObjUnoTunnelId; + return theScNamedRangeObjUnoTunnelId.getSeq(); } ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) : diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 18f40a764ce1..0d2ae5bd744e 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -142,14 +142,10 @@ sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething( return 0; } -namespace -{ - class theScHeaderFooterContentObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScHeaderFooterContentObjUnoTunnelId> {}; -} - const uno::Sequence& ScHeaderFooterContentObj::getUnoTunnelId() { - return theScHeaderFooterContentObjUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theScHeaderFooterContentObjUnoTunnelId; + return theScHeaderFooterContentObjUnoTunnelId.getSeq(); } rtl::Reference ScHeaderFooterContentObj::getImplementation( diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 6aea747b665a..f4ec5ca04e04 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -170,14 +170,10 @@ ScVbaWorksheet::~ScVbaWorksheet() { } -namespace -{ - class theScVbaWorksheetUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScVbaWorksheetUnoTunnelId > {}; -} - const uno::Sequence& ScVbaWorksheet::getUnoTunnelId() { - return theScVbaWorksheetUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theScVbaWorksheetUnoTunnelId; + return theScVbaWorksheetUnoTunnelId.getSeq(); } uno::Reference< ov::excel::XWorksheet > diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 37b6379d7904..d05aba6be19b 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -743,14 +743,10 @@ std::shared_ptr SdTransferable::GetUserData (const sal return std::shared_ptr(); } -namespace -{ - class theSdTransferableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdTransferableUnoTunnelId > {}; -} - const css::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelId() { - return theSdTransferableUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSdTransferableUnoTunnelId; + return theSdTransferableUnoTunnelId.getSeq(); } SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >& rxData ) throw() diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index e170c30f64c2..d50dd9dc83d3 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -126,14 +126,10 @@ sal_Int64 SAL_CALL SdPageObjsTLV::SdPageObjsTransferable::getSomething( const cs return nRet; } -namespace -{ - class theSdPageObjsTLBUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdPageObjsTLBUnoTunnelId > {}; -} - const css::uno::Sequence& SdPageObjsTLV::SdPageObjsTransferable::getUnoTunnelId() { - return theSdPageObjsTLBUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSdPageObjsTLBUnoTunnelId; + return theSdPageObjsTLBUnoTunnelId.getSeq(); } SdPageObjsTLV::SdPageObjsTransferable* SdPageObjsTLV::SdPageObjsTransferable::getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 631cc072edb3..25d1bcb40e29 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -138,14 +138,10 @@ sal_Bool SAL_CALL Pane::isAnchorOnly() //----- XUnoTunnel ------------------------------------------------------------ -namespace -{ - class thePaneUnoTunnelId : public rtl::Static< UnoTunnelIdInit, thePaneUnoTunnelId > {}; -} - const Sequence& Pane::getUnoTunnelId() { - return thePaneUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit thePaneUnoTunnelId; + return thePaneUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL Pane::getSomething (const Sequence& rId) diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index dc801bb90bf8..4e285eeae9cb 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -211,14 +211,10 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( //----- XUnoTunnel ------------------------------------------------------------ -namespace -{ - class theViewShellWrapperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewShellWrapperUnoTunnelId> {}; -} - const Sequence& ViewShellWrapper::getUnoTunnelId() { - return theViewShellWrapperUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theViewShellWrapperUnoTunnelId; + return theViewShellWrapperUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence& rId) 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 SAL_CALL //===== XUnoTunnel ============================================================ -namespace -{ - class theDrawControllerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theDrawControllerUnoTunnelId> {}; -} - const Sequence& DrawController::getUnoTunnelId() { - return theDrawControllerUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theDrawControllerUnoTunnelId; + return theDrawControllerUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL DrawController::getSomething (const Sequence& 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 ) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index e2a42434e6f4..cd09d77d479a 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -274,14 +274,10 @@ sal_Bool SAL_CALL ViewTabBar::isAnchorOnly() //----- XUnoTunnel ------------------------------------------------------------ -namespace -{ - class theViewTabBarUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewTabBarUnoTunnelId > {}; -} - const Sequence& ViewTabBar::getUnoTunnelId() { - return theViewTabBarUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theViewTabBarUnoTunnelId; + return theViewTabBarUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence& rId) 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 #include #include -#include #include #include @@ -2064,14 +2063,10 @@ void SfxObjectShell::SignScriptingContent(weld::Window* pDialogParent) AfterSigning(bSignSuccess, true); } -namespace -{ - class theSfxObjectShellUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSfxObjectShellUnoTunnelId > {}; -} - const uno::Sequence& SfxObjectShell::getUnoTunnelId() { - return theSfxObjectShellUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSfxObjectShellUnoTunnelId; + return theSfxObjectShellUnoTunnelId.getSeq(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/mathml/mathmlexport.cxx b/starmath/source/mathml/mathmlexport.cxx index d125e49be6a2..e6de9b285f4c 100644 --- a/starmath/source/mathml/mathmlexport.cxx +++ b/starmath/source/mathml/mathmlexport.cxx @@ -329,16 +329,10 @@ sal_Int64 SAL_CALL SmXMLExport::getSomething(const uno::Sequence& rId) return SvXMLExport::getSomething(rId); } -namespace -{ -class theSmXMLExportUnoTunnelId : public rtl::Static -{ -}; -} - const uno::Sequence& SmXMLExport::getUnoTunnelId() throw() { - return theSmXMLExportUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSmXMLExportUnoTunnelId; + return theSmXMLExportUnoTunnelId.getSeq(); } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx index 33eb25b9b8d7..6b7659074005 100644 --- a/starmath/source/mathml/mathmlimport.cxx +++ b/starmath/source/mathml/mathmlimport.cxx @@ -406,16 +406,10 @@ SmXMLImport::SmXMLImport(const css::uno::Reference& { } -namespace -{ -class theSmXMLImportUnoTunnelId : public rtl::Static -{ -}; -} - const uno::Sequence& SmXMLImport::getUnoTunnelId() throw() { - return theSmXMLImportUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSmXMLImportUnoTunnelId; + return theSmXMLImportUnoTunnelId.getSeq(); } extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index d75c96ea626d..de29e8260812 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -353,14 +353,10 @@ uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes( ) cppu::UnoType::get() }); } -namespace -{ - class theSmModelUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSmModelUnoTunnelId> {}; -} - const uno::Sequence< sal_Int8 > & SmModel::getUnoTunnelId() { - return theSmModelUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSmModelUnoTunnelId; + return theSmModelUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SmModel::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index a053044b7de9..8036c3ce4907 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -911,14 +911,10 @@ SfxStyleSheetBasePool::StoreStyleSheet(const rtl::Reference< SfxStyleSheetBase > pImpl->mxIndexedStyleSheets->AddStyleSheet(xStyle); } -namespace -{ - class theSfxUnoStyleSheetIdentifier : public rtl::Static< UnoTunnelIdInit, theSfxUnoStyleSheetIdentifier > {}; -} - const css::uno::Sequence< ::sal_Int8 >& SfxUnoStyleSheet::getUnoTunnelId() { - return theSfxUnoStyleSheetIdentifier::get().getSeq(); + static const UnoTunnelIdInit theSfxUnoStyleSheetIdentifier; + return theSfxUnoStyleSheetIdentifier.getSeq(); } void diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 5db6e920eae3..59b45df8d987 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -77,14 +77,10 @@ void ValueItemAcc::ParentDestroyed() mpParent = nullptr; } -namespace -{ - class theValueItemAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theValueItemAccUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 >& ValueItemAcc::getUnoTunnelId() { - return theValueItemAccUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theValueItemAccUnoTunnelId; + return theValueItemAccUnoTunnelId.getSeq(); } @@ -466,14 +462,10 @@ void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue } } -namespace -{ - class theValueSetAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theValueSetAccUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 >& ValueSetAcc::getUnoTunnelId() { - return theValueSetAccUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theValueSetAccUnoTunnelId; + return theValueSetAccUnoTunnelId.getSeq(); } 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& 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 ) diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx index d2c45acf49b9..a8f47e6113cd 100644 --- a/sw/source/core/unocore/TextCursorHelper.cxx +++ b/sw/source/core/unocore/TextCursorHelper.cxx @@ -22,14 +22,10 @@ using namespace ::com::sun::star; -namespace -{ - class theOTextCursorHelperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theOTextCursorHelperUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & OTextCursorHelper::getUnoTunnelId() { - return theOTextCursorHelperUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theOTextCursorHelperUnoTunnelId; + return theOTextCursorHelperUnoTunnelId.getSeq(); } //XUnoTunnel diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 99ddb365bf78..4da8866a27cd 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -196,14 +196,10 @@ uno::Reference SwXBookmark::CreateXBookmark( return nullptr; } -namespace -{ - class theSwXBookmarkUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXBookmarkUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXBookmark::getUnoTunnelId() { - return theSwXBookmarkUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXBookmarkUnoTunnelId; + return theSwXBookmarkUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXBookmark::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 6d06ad82b402..04e28ab30c4f 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -1871,14 +1871,10 @@ SwChartDataSequence::~SwChartDataSequence() { } -namespace -{ - class theSwChartDataSequenceUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwChartDataSequenceUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwChartDataSequence::getUnoTunnelId() { - return theSwChartDataSequenceUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwChartDataSequenceUnoTunnelId; + return theSwChartDataSequenceUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_Int8 > &rId ) diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 581b76455d1d..cb20c5853291 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -847,14 +847,10 @@ void SwXDrawPage::InvalidateSwDoc() m_pDoc = nullptr; } -namespace -{ - class theSwXShapeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXShapeUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXShape::getUnoTunnelId() { - return theSwXShapeUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXShapeUnoTunnelId; + return theSwXShapeUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXShape::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 5de1c6bdf11f..73d8d2e4e188 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -459,14 +459,10 @@ protected: virtual void Notify(const SfxHint& rHint) override; }; -namespace -{ - class theSwXFieldMasterUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFieldMasterUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXFieldMaster::getUnoTunnelId() { - return theSwXFieldMasterUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXFieldMasterUnoTunnelId; + return theSwXFieldMasterUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL @@ -1175,14 +1171,10 @@ public: virtual void Notify(const SfxHint&) override; }; -namespace -{ - class theSwXTextFieldUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextFieldUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXTextField::getUnoTunnelId() { - return theSwXTextFieldUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextFieldUnoTunnelId; + return theSwXTextFieldUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 5e405e9ec75c..4cf9259dc5b6 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -312,15 +312,11 @@ css::uno::Sequence< ::sal_Int32 > SAL_CALL SwXFlatParagraph::getLanguagePortions return css::uno::Sequence< ::sal_Int32>(); } -namespace -{ - class theSwXFlatParagraphUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFlatParagraphUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 >& SwXFlatParagraph::getUnoTunnelId() { - return theSwXFlatParagraphUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXFlatParagraphUnoTunnelId; + return theSwXFlatParagraphUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index ee69f96187dd..93a99f5fd973 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1159,14 +1159,10 @@ public: Impl() : m_EventListeners(m_Mutex) { } }; -namespace -{ - class theSwXFrameUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFrameUnoTunnelId > {}; -} - const ::uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId() { - return theSwXFrameUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXFrameUnoTunnelId; + return theSwXFrameUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 5d1923d799e8..1433f3046d58 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -166,14 +166,10 @@ SwXFootnote::CreateXFootnote(SwDoc & rDoc, SwFormatFootnote *const pFootnoteForm return xNote; } -namespace -{ - class theSwXFootnoteUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFootnoteUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXFootnote::getUnoTunnelId() { - return theSwXFootnoteUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXFootnoteUnoTunnelId; + return theSwXFootnoteUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 459a2b4e7b6e..c916dca531de 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -423,14 +423,10 @@ SwXDocumentIndex::CreateXDocumentIndex( return xIndex; } -namespace -{ - class theSwXDocumentIndexUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXDocumentIndexUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXDocumentIndex::getUnoTunnelId() { - return theSwXDocumentIndexUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXDocumentIndexUnoTunnelId; + return theSwXDocumentIndexUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL @@ -1654,12 +1650,12 @@ SwXDocumentIndexMark::CreateXDocumentIndexMark( namespace { - class theSwXDocumentIndexMarkUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXDocumentIndexMarkUnoTunnelId > {}; } const uno::Sequence< sal_Int8 > & SwXDocumentIndexMark::getUnoTunnelId() { - return theSwXDocumentIndexMarkUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXDocumentIndexMarkUnoTunnelId; + return theSwXDocumentIndexMarkUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index c5e67bac1ae4..0a465bb170eb 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -863,14 +863,10 @@ SwXTextCursor::getSupportedServiceNames() }; } -namespace -{ - class theSwXTextCursorUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextCursorUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXTextCursor::getUnoTunnelId() { - return theSwXTextCursorUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextCursorUnoTunnelId; + return theSwXTextCursorUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 7f5cc2c6b0ad..e56c88228a23 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -897,14 +897,10 @@ void SwXTextRange::DeleteAndInsert( m_pImpl->m_rDoc.GetIDocumentUndoRedo().EndUndo(SwUndoId::INSERT, nullptr); } -namespace -{ - class theSwXTextRangeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextRangeUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXTextRange::getUnoTunnelId() { - return theSwXTextRangeUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextRangeUnoTunnelId; + return theSwXTextRangeUnoTunnelId.getSeq(); } // XUnoTunnel @@ -1609,14 +1605,12 @@ void SwXTextRangesImpl::MakeRanges() rtl::Reference SwXTextRanges::Create(SwPaM *const pPaM) { return new SwXTextRangesImpl(pPaM); } -namespace +const uno::Sequence< sal_Int8 > & SwXTextRanges::getUnoTunnelId() { - class theSwXTextRangesUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextRangesUnoTunnelId > {}; + static const UnoTunnelIdInit theSwXTextRangesUnoTunnelId; + return theSwXTextRangesUnoTunnelId.getSeq(); } -const uno::Sequence< sal_Int8 > & SwXTextRanges::getUnoTunnelId() - { return theSwXTextRangesUnoTunnelId::get().getSeq(); } - sal_Int64 SAL_CALL SwXTextRangesImpl::getSomething(const uno::Sequence< sal_Int8 >& rId) { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 9b4b0ea77c36..4ad34f531871 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -285,14 +285,10 @@ bool SwXParagraph::SelectPaM(SwPaM & rPaM) return true; } -namespace -{ - class theSwXParagraphUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXParagraphUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXParagraph::getUnoTunnelId() { - return theSwXParagraphUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXParagraphUnoTunnelId; + return theSwXParagraphUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 84cf32fbf0b0..926d7db5b837 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -772,14 +772,10 @@ uno::Reference< container::XEnumeration > SwXTextPortion::createContentEnumerat return SwXParaFrameEnumeration::Create(rUnoCursor, PARAFRAME_PORTION_CHAR, m_pFrameFormat); } -namespace -{ - class theSwXTextPortionUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextPortionUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXTextPortion::getUnoTunnelId() { - return theSwXTextPortionUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextPortionUnoTunnelId; + return theSwXTextPortionUnoTunnelId.getSeq(); } sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index cdfe6fa9b168..9c9ef1ec44d9 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -198,7 +198,6 @@ namespace } } - class theSwXTextPortionEnumerationUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextPortionEnumerationUnoTunnelId > {}; struct SwAnnotationStartPortion_Impl { @@ -281,7 +280,8 @@ namespace const uno::Sequence< sal_Int8 > & SwXTextPortionEnumeration::getUnoTunnelId() { - return theSwXTextPortionEnumerationUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextPortionEnumerationUnoTunnelId; + return theSwXTextPortionEnumerationUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXTextPortionEnumeration::getSomething( diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index a87dc245a8e3..de031c5a9ec6 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -149,14 +149,10 @@ SwXReferenceMark::CreateXReferenceMark( return xMark; } -namespace -{ - class theSwXReferenceMarkUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXReferenceMarkUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXReferenceMark::getUnoTunnelId() { - return theSwXReferenceMarkUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXReferenceMarkUnoTunnelId; + return theSwXReferenceMarkUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL @@ -844,14 +840,10 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) return bForceExpandHints; } -namespace -{ - class theSwXMetaUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXMetaUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXMeta::getUnoTunnelId() { - return theSwXMetaUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXMetaUnoTunnelId; + return theSwXMetaUnoTunnelId.getSeq(); } // XUnoTunnel diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index ada86e6df4ca..6a3a0d8c6d9e 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -228,14 +228,10 @@ SwXTextSection::~SwXTextSection() { } -namespace -{ - class theSwXTextSectionUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextSectionUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXTextSection::getUnoTunnelId() { - return theSwXTextSectionUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextSectionUnoTunnelId; + return theSwXTextSectionUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index bc91d6474272..61d081918736 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1021,12 +1021,12 @@ bool SwXNumberingRules::isInvalidStyle(std::u16string_view rName) namespace { - class theSwXNumberingRulesUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXNumberingRulesUnoTunnelId > {}; } const uno::Sequence< sal_Int8 > & SwXNumberingRules::getUnoTunnelId() { - return theSwXNumberingRulesUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXNumberingRulesUnoTunnelId; + return theSwXNumberingRulesUnoTunnelId.getSeq(); } // return implementation specific data @@ -2429,12 +2429,12 @@ void SwXTextColumns::removeVetoableChangeListener( namespace { - class theSwXTextColumnsUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextColumnsUnoTunnelId > {}; } const uno::Sequence< sal_Int8 > & SwXTextColumns::getUnoTunnelId() { - return theSwXTextColumnsUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextColumnsUnoTunnelId; + return theSwXTextColumnsUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXTextColumns::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index a4656104af17..cb826a2b439b 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -450,12 +450,12 @@ SwXTextSearch::~SwXTextSearch() namespace { - class theSwXTextSearchUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextSearchUnoTunnelId > {}; } const uno::Sequence< sal_Int8 > & SwXTextSearch::getUnoTunnelId() { - return theSwXTextSearchUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextSearchUnoTunnelId; + return theSwXTextSearchUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index f72271018ad3..9c0e9d5ff968 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1205,12 +1205,12 @@ static SwGetPoolIdFromName lcl_GetSwEnumFromSfxEnum(SfxStyleFamily eFamily) namespace { - class theSwXStyleUnoTunnelId : public rtl::Static {}; } const uno::Sequence& SwXStyle::getUnoTunnelId() { - return theSwXStyleUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXStyleUnoTunnelId; + return theSwXStyleUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXStyle::getSomething(const uno::Sequence& rId) diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index b03f513a1e70..e78d66974702 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -752,14 +752,10 @@ SwXCell::~SwXCell() EndListeningAll(); } -namespace -{ - class theSwXCellUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXCellUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXCell::getUnoTunnelId() { - return theSwXCellUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXCellUnoTunnelId; + return theSwXCellUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXCell::getSomething( const uno::Sequence< sal_Int8 >& rId ) @@ -1975,14 +1971,12 @@ public: }; -namespace +const uno::Sequence< sal_Int8 > & SwXTextTable::getUnoTunnelId() { - class theSwXTextTableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextTableUnoTunnelId > {}; + static const UnoTunnelIdInit theSwXTextTableUnoTunnelId; + return theSwXTextTableUnoTunnelId.getSeq(); } -const uno::Sequence< sal_Int8 > & SwXTextTable::getUnoTunnelId() - { return theSwXTextTableUnoTunnelId::get().getSeq(); } - sal_Int64 SAL_CALL SwXTextTable::getSomething( const uno::Sequence< sal_Int8 >& rId ) { if(isUnoTunnelId(rId)) @@ -3182,12 +3176,12 @@ public: namespace { - class theSwXCellRangeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXCellRangeUnoTunnelId > {}; } const uno::Sequence< sal_Int8 > & SwXCellRange::getUnoTunnelId() { - return theSwXCellRangeUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXCellRangeUnoTunnelId; + return theSwXCellRangeUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 1f516d038be1..1857706ca06e 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1196,12 +1196,12 @@ SwXText::removeVetoableChangeListener( namespace { - class theSwXTextUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextUnoTunnelId > {}; } const uno::Sequence< sal_Int8 > & SwXText::getUnoTunnelId() { - return theSwXTextUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextUnoTunnelId; + return theSwXTextUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index d1751940dfb4..1e112f5a0367 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -478,14 +478,10 @@ void SwXMLExport::ExportContent_() GetTextParagraphExport()->exportText( xText, m_bShowProgress ); } -namespace -{ - class theSwXMLExportUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXMLExportUnoTunnelId > {}; -} - const Sequence< sal_Int8 > & SwXMLExport::getUnoTunnelId() throw() { - return theSwXMLExportUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXMLExportUnoTunnelId; + return theSwXMLExportUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXMLExport::getSomething( const Sequence< sal_Int8 >& rId ) diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 526402d0aa63..0b78e0755871 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -359,14 +359,10 @@ void SwXMLImport::setStyleInsertMode( SfxStyleFamily nFamilies, m_bLoadDoc = false; } -namespace -{ - class theSwXMLImportUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXMLImportUnoTunnelId > {}; -} - const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() throw() { - return theSwXMLImportUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXMLImportUnoTunnelId; + return theSwXMLImportUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXMLImport::getSomething( const Sequence< sal_Int8 >& rId ) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 6466f17af9c2..41829abbb73e 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -4197,14 +4197,10 @@ void SwTransferable::ClearSelection( SwWrtShell& rSh, } } -namespace -{ - class theSwTransferableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, SwTransferable > {}; -} - const Sequence< sal_Int8 >& SwTransferable::getUnoTunnelId() { - return theSwTransferableUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwTransferableUnoTunnelId; + return theSwTransferableUnoTunnelId.getSeq(); } sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 6e77e6de71f7..ef2087d50e1f 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -204,14 +204,10 @@ uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames() return { "com.sun.star.text.AutoTextContainer" }; } -namespace -{ - class theSwXAutoTextGroupUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXAutoTextGroupUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXAutoTextGroup::getUnoTunnelId() { - return theSwXAutoTextGroupUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXAutoTextGroupUnoTunnelId; + return theSwXAutoTextGroupUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXAutoTextGroup::getSomething( const uno::Sequence< sal_Int8 >& rId ) @@ -668,14 +664,10 @@ uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames() return aRet; } -namespace -{ - class theSwXAutoTextEntryUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXAutoTextEntryUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXAutoTextEntry::getUnoTunnelId() { - return theSwXAutoTextEntryUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXAutoTextEntryUnoTunnelId; + return theSwXAutoTextEntryUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXAutoTextEntry::getSomething( const uno::Sequence< sal_Int8 >& rId ) diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index 7184b0f2cbf9..d9b3481b4ee4 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -149,14 +149,10 @@ void SwXDispatchProviderInterceptor::disposing( const lang::EventObject& ) m_xIntercepted = nullptr; } -namespace -{ - class theSwXDispatchProviderInterceptorUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXDispatchProviderInterceptorUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXDispatchProviderInterceptor::getUnoTunnelId() { - return theSwXDispatchProviderInterceptorUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXDispatchProviderInterceptorUnoTunnelId; + return theSwXDispatchProviderInterceptorUnoTunnelId.getSeq(); } sal_Int64 SwXDispatchProviderInterceptor::getSomething( diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index ea00f9a18f25..522cb3aa8645 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -268,14 +268,10 @@ public: }; -namespace -{ - class theSwXTextDocumentUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextDocumentUnoTunnelId > {}; -} - const Sequence< sal_Int8 > & SwXTextDocument::getUnoTunnelId() { - return theSwXTextDocumentUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextDocumentUnoTunnelId; + return theSwXTextDocumentUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rId ) diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 1b805102c6d7..60fefb112594 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -1691,14 +1691,10 @@ Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames() "com.sun.star.style.ParagraphPropertiesComplex" }; } -namespace -{ - class theSwXTextViewCursorUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextViewCursorUnoTunnelId > {}; -} - const uno::Sequence< sal_Int8 > & SwXTextViewCursor::getUnoTunnelId() { - return theSwXTextViewCursorUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXTextViewCursorUnoTunnelId; + return theSwXTextViewCursorUnoTunnelId.getSeq(); } //XUnoTunnel diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index a5f7b785f06c..f771ebf02428 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -422,14 +422,11 @@ css::uno::Any UnoControlModel::queryAggregation( const css::uno::Type & rType ) } // css::lang::XUnoTunnel -namespace -{ - class theUnoControlModelUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theUnoControlModelUnoTunnelId> {}; -} const css::uno::Sequence< sal_Int8 >& UnoControlModel::getUnoTunnelId() throw() { - return theUnoControlModelUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theUnoControlModelUnoTunnelId; + return theUnoControlModelUnoTunnelId.getSeq(); } sal_Int64 UnoControlModel::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 8abe73e707b3..ce6b9e7beb54 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -48,11 +48,6 @@ using namespace css::xml::dom; using namespace css::xml::dom::events; using namespace css::xml::sax; -namespace -{ - class theCNodeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theCNodeUnoTunnelId > {}; -} - namespace DOM { void pushContext(Context& io_rContext) @@ -169,7 +164,8 @@ namespace DOM const css::uno::Sequence< sal_Int8 > & CNode::getUnoTunnelId() throw() { - return theCNodeUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theCNodeUnoTunnelId; + return theCNodeUnoTunnelId.getSeq(); } CDocument & CNode::GetOwnerDocument() diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx index ac3557d0efd5..932cdca68a18 100644 --- a/vcl/source/treelist/transfer.cxx +++ b/vcl/source/treelist/transfer.cxx @@ -1035,14 +1035,10 @@ void TransferableHelper::ClearPrimarySelection() xSelection->setContents( nullptr, nullptr ); } -namespace -{ - class theTransferableHelperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theTransferableHelperUnoTunnelId > {}; -} - const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId() { - return theTransferableHelperUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theTransferableHelperUnoTunnelId; + return theTransferableHelperUnoTunnelId.getSeq(); } namespace { diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 81ec1e93ef00..5b709d1bc588 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -86,14 +86,10 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const return USHRT_MAX; } -namespace -{ - class theSvUnoAttributeContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvUnoAttributeContainerUnoTunnelId> {}; -} - const css::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() throw() { - return theSvUnoAttributeContainerUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSvUnoAttributeContainerUnoTunnelId; + return theSvUnoAttributeContainerUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 7e904af3e7dc..af6bf27a13c9 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -465,14 +465,10 @@ bool SvXMLImport::addEmbeddedFont(const css::uno::Reference< css::io::XInputStre return mxEmbeddedFontHelper->addEmbeddedFont(stream, fontName, extra, key, eot); } -namespace -{ - class theSvXMLImportUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvXMLImportUnoTunnelId> {}; -} - const css::uno::Sequence& SvXMLImport::getUnoTunnelId() throw() { - return theSvXMLImportUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSvXMLImportUnoTunnelId; + return theSvXMLImportUnoTunnelId.getSeq(); } // XUnoTunnel diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index abf19c69a2bc..a8a55990a59c 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -57,14 +57,10 @@ XMLMutableAttributeList::~XMLMutableAttributeList() m_xAttrList = nullptr; } -namespace -{ - class theXMLMutableAttributeListUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theXMLMutableAttributeListUnoTunnelId> {}; -} - const css::uno::Sequence& XMLMutableAttributeList::getUnoTunnelId() throw() { - return theXMLMutableAttributeListUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theXMLMutableAttributeListUnoTunnelId; + return theXMLMutableAttributeListUnoTunnelId.getSeq(); } // XUnoTunnel diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index c2c5cdf0a16c..ff947c0731ef 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1944,14 +1944,10 @@ void OOo2OasisTransformer::Initialize( } } -namespace -{ - class theOOo2OasisTransformerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theOOo2OasisTransformerUnoTunnelId> {}; -} - const css::uno::Sequence& OOo2OasisTransformer::getUnoTunnelId() throw() { - return theOOo2OasisTransformerUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theOOo2OasisTransformerUnoTunnelId; + return theOOo2OasisTransformerUnoTunnelId.getSeq(); } // XUnoTunnel diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 0fda0c3b61c2..c74013307d68 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1943,14 +1943,10 @@ Oasis2OOoTransformer::~Oasis2OOoTransformer() throw() XMLEventOASISTransformerContext::FlushEventMap( m_pFormEventMap ); } -namespace -{ - class theOasis2OOoTransformerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theOasis2OOoTransformerUnoTunnelId> {}; -} - const css::uno::Sequence& Oasis2OOoTransformer::getUnoTunnelId() throw() { - return theOasis2OOoTransformerUnoTunnelId::get().getSeq(); + static const class UnoTunnelIdInit theOasis2OOoTransformerUnoTunnelId; + return theOasis2OOoTransformerUnoTunnelId.getSeq(); } // XUnoTunnel diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx index 525706e26748..bd0eb08bc23a 100644 --- a/xmlsecurity/source/gpg/CertificateImpl.cxx +++ b/xmlsecurity/source/gpg/CertificateImpl.cxx @@ -205,13 +205,9 @@ sal_Int64 SAL_CALL CertificateImpl::getSomething(const Sequence< sal_Int8 >& aId /* XUnoTunnel extension */ -namespace -{ - class CertificateImplUnoTunnelId : public rtl::Static< UnoTunnelIdInit, CertificateImplUnoTunnelId > {}; -} - const Sequence< sal_Int8>& CertificateImpl::getUnoTunnelId() { - return CertificateImplUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theCertificateImplUnoTunnelId; + return theCertificateImplUnoTunnelId.getSeq(); } void CertificateImpl::setCertificate(GpgME::Context* ctx, const GpgME::Key& key) diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx index 98db7e420a38..fac71b6ad472 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx @@ -103,11 +103,11 @@ sal_Int64 SAL_CALL SecurityEnvironmentGpg::getSomething( const Sequence< sal_Int namespace { - class theSecurityEnvironmentUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSecurityEnvironmentUnoTunnelId > {}; } const Sequence< sal_Int8>& SecurityEnvironmentGpg::getUnoTunnelId() { - return theSecurityEnvironmentUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSecurityEnvironmentUnoTunnelId; + return theSecurityEnvironmentUnoTunnelId.getSeq(); } OUString SecurityEnvironmentGpg::getSecurityEnvironmentInformation() diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index f982e136f5b2..cf084c7137ad 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -162,13 +162,9 @@ sal_Int64 SAL_CALL SecurityEnvironment_NssImpl::getSomething( const Sequence< sa /* XUnoTunnel extension */ -namespace -{ - class theSecurityEnvironment_NssImplUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSecurityEnvironment_NssImplUnoTunnelId > {}; -} - const Sequence< sal_Int8>& SecurityEnvironment_NssImpl::getUnoTunnelId() { - return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSecurityEnvironment_NssImplUnoTunnelId; + return theSecurityEnvironment_NssImplUnoTunnelId.getSeq(); } OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 940656193e94..bd3ad0174273 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -352,13 +352,9 @@ sal_Int64 SAL_CALL X509Certificate_NssImpl::getSomething( const Sequence< sal_In /* XUnoTunnel extension */ -namespace -{ - class theX509Certificate_NssImplUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theX509Certificate_NssImplUnoTunnelId > {}; -} - const Sequence< sal_Int8>& X509Certificate_NssImpl::getUnoTunnelId() { - return theX509Certificate_NssImplUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theX509Certificate_NssImplUnoTunnelId; + return theX509Certificate_NssImplUnoTunnelId.getSeq(); } static OUString getAlgorithmDescription(SECAlgorithmID const *aid) -- cgit