diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/o3tl/enumarray.hxx | 2 | ||||
-rw-r--r-- | include/o3tl/lru_map.hxx | 2 | ||||
-rw-r--r-- | include/oox/core/contexthandler2.hxx | 8 | ||||
-rw-r--r-- | include/oox/core/fragmenthandler2.hxx | 8 | ||||
-rw-r--r-- | include/svl/IndexedStyleSheets.hxx | 2 | ||||
-rw-r--r-- | include/vcl/svapp.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/xmlexp.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/xmlimp.hxx | 6 |
8 files changed, 19 insertions, 19 deletions
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 |