diff options
Diffstat (limited to 'sw/source')
28 files changed, 74 insertions, 182 deletions
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<text::XTextContent> 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> 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<UnoTunnelIdInit, theSwXStyleUnoTunnelId> {}; } const uno::Sequence<sal_Int8>& SwXStyle::getUnoTunnelId() { - return theSwXStyleUnoTunnelId::get().getSeq(); + static const UnoTunnelIdInit theSwXStyleUnoTunnelId; + return theSwXStyleUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL SwXStyle::getSomething(const uno::Sequence<sal_Int8>& 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<SwXTextTable>(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 |