Replace "SAL_FINAL" with "final" in LIBO_INTERNAL_ONLY code

Change-Id: Ifa5ba21308e32df44571fa2941370f2f11179580

22 files changed, 43 insertions, 43 deletions

diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 039bd1cb1166..0950856667f2 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -57,7 +57,7 @@ enum AxisLabelStaggering
     , STAGGER_AUTO
 };
 
-struct AxisLabelProperties SAL_FINAL
+struct AxisLabelProperties final
 {
     AxisLabelProperties();
 
@@ -96,7 +96,7 @@ struct AxisLabelAlignment
     AxisLabelAlignment();
 };
 
-struct AxisProperties SAL_FINAL
+struct AxisProperties final
 {
     css::uno::Reference<css::chart2::XAxis> m_xAxisModel;
 
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 61ebfac60c76..05e6e16b95cc 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -56,7 +56,7 @@ public:
     mutable css::uno::Sequence<double> Doubles;
 };
 
-class VDataSeries SAL_FINAL : boost::noncopyable
+class VDataSeries final : boost::noncopyable
 {
 public:
     VDataSeries( const css::uno::Reference<css::chart2::XDataSeries>& xDataSeries );
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 47575f2f8961..d48c91d6884e 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -73,7 +73,7 @@ private:
  * A list of series that have the same CoordinateSystem. They are used to be
  * plotted maybe in a stacked manner by a plotter.
  */
-class VDataSeriesGroup SAL_FINAL
+class VDataSeriesGroup final
 {
 public:
     VDataSeriesGroup();
diff --git a/include/o3tl/enumarray.hxx b/include/o3tl/enumarray.hxx
index 648ea656d43d..d4a370548355 100644
--- a/include/o3tl/enumarray.hxx
+++ b/include/o3tl/enumarray.hxx
@@ -39,7 +39,7 @@ class enumarray_iterator;
 /// \param E the 'enum class' type.
 /// \param V the value type to be stored in the array
 template<typename E, typename V>
-class enumarray SAL_FINAL
+class enumarray final
 {
 public:
     typedef enumarray<E, V> self_type;
diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index 6d3b72521fc4..2f24d5bb7acc 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -31,7 +31,7 @@ namespace o3tl
  *
  **/
 template<typename Key, typename Value, class KeyHash = std::hash<Key>>
-class lru_map SAL_FINAL
+class lru_map final
 {
 private:
     typedef typename std::pair<Key, Value> key_value_pair_t;
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index 1e90cc06182a..c4ef4539df09 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -224,21 +224,21 @@ public:
                             sal_Int32 nElement,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL startFastElement(
                             sal_Int32 nElement,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL characters( const OUString& rChars )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL endFastElement( sal_Int32 nElement )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     // oox.core.ContextHandler interface --------------------------------------
 
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index de2857dd39eb..ac2301457a54 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -62,21 +62,21 @@ public:
                             sal_Int32 nElement,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL startFastElement(
                             sal_Int32 nElement,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL characters( const OUString& rChars )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     virtual void SAL_CALL endFastElement( sal_Int32 nElement )
                             throw(  ::com::sun::star::xml::sax::SAXException,
-                                    ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override;
+                                    ::com::sun::star::uno::RuntimeException, std::exception ) final override;
 
     // com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
 
diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx
index 7fcbfae59c9a..1067316e9efc 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -69,7 +69,7 @@ struct StyleSheetCallback {
  * Index-based access is required in several code portions. Hence we have to store the style sheets
  * in a vector as well as in a map.
  */
-class SVL_DLLPUBLIC IndexedStyleSheets SAL_FINAL
+class SVL_DLLPUBLIC IndexedStyleSheets final
 {
 public:
     IndexedStyleSheets();
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index e1d8320404bc..1755b50216cf 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1521,7 +1521,7 @@ public:
     }
 };
 
-class VCL_DLLPUBLIC SolarMutexClearableGuard SAL_FINAL
+class VCL_DLLPUBLIC SolarMutexClearableGuard final
 {
     SolarMutexClearableGuard( const SolarMutexClearableGuard& ) = delete;
     const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) = delete;
@@ -1559,7 +1559,7 @@ protected:
     comphelper::SolarMutex& m_solarMutex;
 };
 
-class VCL_DLLPUBLIC SolarMutexResettableGuard SAL_FINAL
+class VCL_DLLPUBLIC SolarMutexResettableGuard final
 {
     SolarMutexResettableGuard( const SolarMutexResettableGuard& ) = delete;
     const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) = delete;
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 5eafc351efef..3a51c24e5df8 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -317,9 +317,9 @@ public:
     virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL override;
+    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 50948da6fc03..453fe5fc6b49 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -282,11 +282,11 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL override;
+        throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL override;
+        throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL override;
+        throw(::com::sun::star::uno::RuntimeException, std::exception) final override;
 
     // may be called by certain subclasses that handle document meta-data
     // override to provide customized handling of document statistics
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index dbfeb63acb04..8ecfedfc62b1 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -136,7 +136,7 @@ const ScBreakType BREAK_PAGE   = 1;
 const ScBreakType BREAK_MANUAL = 2;
 
 // insert/delete flags - typesafe bitfield
-struct InsertDeleteFlags SAL_FINAL {
+struct InsertDeleteFlags final {
 private:
     sal_uInt16 v;
     // hidden so that it doesn't accidentally get called in constructor initialiser lists
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index ebd91432a6e1..043575e18b37 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -380,7 +380,7 @@ inline bool SfxStyleSheetIterator::IsTrivialSearch()
 
 namespace {
 
-struct DoesStyleMatchStyleSheetPredicate SAL_FINAL : public svl::StyleSheetPredicate
+struct DoesStyleMatchStyleSheetPredicate final : public svl::StyleSheetPredicate
 {
     explicit DoesStyleMatchStyleSheetPredicate(SfxStyleSheetIterator *it)
             : mIterator(it) {;}
@@ -805,7 +805,7 @@ void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
 namespace
 {
 
-struct StyleSheetDisposerFunctor SAL_FINAL : public svl::StyleSheetDisposer
+struct StyleSheetDisposerFunctor final : public svl::StyleSheetDisposer
 {
     explicit StyleSheetDisposerFunctor(SfxStyleSheetBasePool* pool)
             : mPool(pool) {;}
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index c283a96686df..f6383d0b8e70 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -65,7 +65,7 @@ template<typename E, typename S> class SwIterator;
 namespace sw
 {
     class ClientIteratorBase;
-    struct SW_DLLPUBLIC LegacyModifyHint SAL_FINAL: SfxHint
+    struct SW_DLLPUBLIC LegacyModifyHint final: SfxHint
     {
         LegacyModifyHint(const SfxPoolItem* pOld, const SfxPoolItem* pNew) : m_pOld(pOld), m_pNew(pNew) {};
         virtual ~LegacyModifyHint();
@@ -207,7 +207,7 @@ public:
 /*
  * Helper class for objects that need to depend on more than one SwClient
  */
-class SW_DLLPUBLIC SwDepend SAL_FINAL : public SwClient
+class SW_DLLPUBLIC SwDepend final : public SwClient
 {
     SwClient *m_pToTell;
 
@@ -280,7 +280,7 @@ namespace sw
     };
 }
 
-template< typename TElementType, typename TSource > class SwIterator SAL_FINAL : private sw::ClientIteratorBase
+template< typename TElementType, typename TSource > class SwIterator final : private sw::ClientIteratorBase
 {
     static_assert(std::is_base_of<SwClient,TElementType>::value, "TElementType needs to be derived from SwClient");
     static_assert(std::is_base_of<SwModify,TSource>::value, "TSource needs to be derived from SwModify");
@@ -324,7 +324,7 @@ public:
     using sw::ClientIteratorBase::IsChanged;
 };
 
-template< typename TSource > class SwIterator<SwClient, TSource> SAL_FINAL : private sw::ClientIteratorBase
+template< typename TSource > class SwIterator<SwClient, TSource> final : private sw::ClientIteratorBase
 {
     static_assert(std::is_base_of<SwModify,TSource>::value, "TSource needs to be derived from SwModify");
 public:
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 167a5af81751..5d40d86b8445 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -32,7 +32,7 @@ class SwNode;
 class SwNodes;
 
 /// Marks a node in the document model.
-class SW_DLLPUBLIC SwNodeIndex SAL_FINAL : public sw::Ring<SwNodeIndex>
+class SW_DLLPUBLIC SwNodeIndex final : public sw::Ring<SwNodeIndex>
 {
     SwNode * m_pNode;
 
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 074620c6a090..b258ec1fc155 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -336,7 +336,7 @@ public:
 };
 
 namespace sw {
-    class PageFootnoteHint SAL_FINAL : public SfxHint {};
+    class PageFootnoteHint final : public SfxHint {};
 }
 
 #endif // INCLUDED_SW_INC_PAGEDESC_HXX
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 61423d0223a6..3a57d9e19ce5 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -148,7 +148,7 @@ namespace sw
      * helper class that provides Svalue_typeL-style container iteration to the ring
      */
     template <typename value_type>
-    class RingContainer SAL_FINAL
+    class RingContainer final
     {
         private:
             /** the item in the ring where iteration starts */
@@ -192,7 +192,7 @@ namespace sw
     };
 
     template <typename value_type>
-    class RingIterator SAL_FINAL : public boost::iterator_facade<
+    class RingIterator final : public boost::iterator_facade<
           RingIterator<value_type>
         , value_type
         , boost::forward_traversal_tag
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index de8bd3756330..3cf2c2c3322f 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -24,7 +24,7 @@
 
 namespace sw
 {
-    struct SW_DLLPUBLIC DocDisposingHint SAL_FINAL : public SfxHint
+    struct SW_DLLPUBLIC DocDisposingHint final : public SfxHint
     {
         DocDisposingHint() {}
         virtual ~DocDisposingHint();
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 75793b5e536f..68ac78adc58e 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -61,7 +61,7 @@ cppu::WeakImplHelper
     ::com::sun::star::container::XEnumerationAccess
 >
 SwXCellBaseClass;
-class SwXCell SAL_FINAL : public SwXCellBaseClass,
+class SwXCell final : public SwXCellBaseClass,
     public SwXText,
     public SwClient
 {
@@ -158,7 +158,7 @@ public:
     css::uno::Any GetAny() const;
 };
 
-class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
+class SwXTextTableRow final : public cppu::WeakImplHelper
 <
     ::com::sun::star::beans::XPropertySet,
     ::com::sun::star::lang::XServiceInfo
@@ -548,7 +548,7 @@ public:
     const SwUnoCrsr* GetTableCrsr() const;
 };
 
-class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper
+class SwXTableRows final : public cppu::WeakImplHelper
 <
     ::com::sun::star::table::XTableRows,
     ::com::sun::star::lang::XServiceInfo
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index d2b516dd7439..95d99d49a5d7 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1433,7 +1433,7 @@ void SwDocTest::testIntrusiveRing()
 
 namespace
 {
-    struct TestHint SAL_FINAL : SfxHint {};
+    struct TestHint final : SfxHint {};
     struct TestModify : SwModify
     {
         TYPEINFO_OVERRIDE();
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 262f4f0806a3..8ad2a9507112 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -436,7 +436,7 @@ void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam,
     }
 }
 
-struct SwXParagraphEnumerationImpl SAL_FINAL : public SwXParagraphEnumeration
+struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration
 {
     uno::Reference< text::XText > const m_xParentText;
     const CursorType m_eCursorType;
@@ -1472,7 +1472,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     SwUnoCursorHelper::makeRedline( aPaM, rRedlineType, rRedlineProperties );
 }
 
-struct SwXTextRangesImpl SAL_FINAL : public SwXTextRanges
+struct SwXTextRangesImpl final : public SwXTextRanges
 {
 
     // XUnoTunnel
@@ -1597,7 +1597,7 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
     pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
 }
 
-struct SwXParaFrameEnumerationImpl SAL_FINAL : public SwXParaFrameEnumeration
+struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration
 {
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 12bbf0b72e3a..7eb2ed73d7d2 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -111,7 +111,7 @@ using ::editeng::SvxBorderLine;
 namespace
 {
     template<typename Tcoretype, typename Tunotype>
-    struct FindUnoInstanceHint SAL_FINAL : SfxHint
+    struct FindUnoInstanceHint final : SfxHint
     {
         FindUnoInstanceHint(Tcoretype* pCore) : m_pCore(pCore), m_pResult(nullptr) {};
         const Tcoretype* const m_pCore;