diff options
30 files changed, 37 insertions, 40 deletions
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index 32bd476422f9..1d3dae861046 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -122,11 +122,11 @@ protected: static bool ValidateMode_Impl( StreamMode, StgDirEntry const * p = nullptr ); }; -class StorageStream : public BaseStorageStream, public OLEStorageBase +class StorageStream final : public BaseStorageStream, public OLEStorageBase { //friend class Storage; sal_uLong nPos; // current position -protected: + virtual ~StorageStream() override; public: StorageStream( StgIo*, StgDirEntry*, StreamMode ); @@ -146,13 +146,12 @@ public: class UCBStorageStream; -class SOT_DLLPUBLIC Storage : public BaseStorage, public OLEStorageBase +class SOT_DLLPUBLIC Storage final : public BaseStorage, public OLEStorageBase { OUString aName; bool bIsRoot; void Init( bool bCreate ); Storage( StgIo*, StgDirEntry*, StreamMode ); -protected: virtual ~Storage() override; public: Storage( const OUString &, StreamMode, bool bDirect ); diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index bea06931d089..640a04b109ef 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -35,11 +35,11 @@ enum class SotClipboardFormatId : sal_uInt32; class BaseStorageStream; -class SOT_DLLPUBLIC SotStorageStream : virtual public SotObject, public SvStream +class SOT_DLLPUBLIC SotStorageStream final : virtual public SotObject, public SvStream { friend class SotStorage; BaseStorageStream * pOwnStm; // pointer to the own stream -protected: + virtual std::size_t GetData(void* pData, std::size_t nSize) override; virtual std::size_t PutData(const void* pData, std::size_t nSize) override; virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override; diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index a15d3a5e2332..9b2c942b0066 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -26,7 +26,7 @@ #include <memory> #include <vector> -class SVL_DLLPUBLIC SfxAllEnumItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxAllEnumItem final : public SfxPoolItem { std::vector<OUString> m_Values; diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx index c479edf0a434..7b646d118e0c 100644 --- a/include/svl/cjkoptions.hxx +++ b/include/svl/cjkoptions.hxx @@ -27,7 +27,7 @@ class SvtCJKOptions_Impl; // class SvtCJKOptions -------------------------------------------------- -class SVL_DLLPUBLIC SvtCJKOptions: public utl::detail::Options +class SVL_DLLPUBLIC SvtCJKOptions final : public utl::detail::Options { private: std::shared_ptr<SvtCJKOptions_Impl> pImpl; diff --git a/include/svl/ctloptions.hxx b/include/svl/ctloptions.hxx index 0996eac4a36d..5140907ddedf 100644 --- a/include/svl/ctloptions.hxx +++ b/include/svl/ctloptions.hxx @@ -27,7 +27,7 @@ class SvtCTLOptions_Impl; // class SvtCTLOptions -------------------------------------------------------- -class SVL_DLLPUBLIC SvtCTLOptions : public utl::detail::Options +class SVL_DLLPUBLIC SvtCTLOptions final : public utl::detail::Options { private: std::shared_ptr<SvtCTLOptions_Impl> m_pImpl; diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx index e38a9af1646a..31a9edea7dee 100644 --- a/include/svl/documentlockfile.hxx +++ b/include/svl/documentlockfile.hxx @@ -51,9 +51,8 @@ protected: }; /// Class implementing reading and writing LO lockfiles. -class SVL_DLLPUBLIC DocumentLockFile : public GenDocumentLockFile +class SVL_DLLPUBLIC DocumentLockFile final : public GenDocumentLockFile { -protected: virtual void WriteEntryToStream( const LockFileEntry& aEntry, const css::uno::Reference< css::io::XOutputStream >& xStream ) override; public: diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 929780d94d63..a3ab6d3e11a6 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -23,7 +23,7 @@ #include <tools/globname.hxx> #include <svl/poolitem.hxx> -class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxGlobalNameItem final : public SfxPoolItem { SvGlobalName m_aName; diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index 77efaf84239b..3614e79a18e5 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -16,7 +16,7 @@ #include <com/sun/star/uno/Any.hxx> /// Grab bag item provides a string-any map for keys with untyped values. -class SVL_DLLPUBLIC SfxGrabBagItem : public SfxPoolItem +class SVL_DLLPUBLIC SfxGrabBagItem final : public SfxPoolItem { private: std::map<OUString, css::uno::Any> m_aMap; diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index b856222ac04a..592743d71182 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -26,7 +26,7 @@ namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } -class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem +class SVL_DLLPUBLIC SfxIntegerListItem final : public SfxPoolItem { std::vector < sal_Int32 > m_aList; diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index f8cf163e74c0..cee429ba892b 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -25,7 +25,7 @@ #include <memory> struct SfxImageItem_Impl; -class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item +class SVL_DLLPUBLIC SfxImageItem final : public SfxInt16Item { std::unique_ptr<SfxImageItem_Impl> pImpl; public: diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index f5959973a05b..eef642a2b770 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -26,7 +26,7 @@ #include <memory> class INetURLHistory_Impl; -class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster +class SVL_DLLPUBLIC INetURLHistory final : public SfxBroadcaster { struct SAL_DLLPRIVATE StaticInstance { @@ -100,7 +100,7 @@ public: }; // broadcasted from PutUrl(). -class SVL_DLLPUBLIC INetURLHistoryHint: public SfxHint +class SVL_DLLPUBLIC INetURLHistoryHint final : public SfxHint { const INetURLObject* pObj; public: diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 21e8ea6c3c2d..cc7bc8e9b619 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace io { class SvDataPipe_Impl; -class SVL_DLLPUBLIC SvInputStream: public SvStream +class SVL_DLLPUBLIC SvInputStream final : public SvStream { css::uno::Reference< css::io::XInputStream > m_xStream; css::uno::Reference< css::io::XSeekable > m_xSeekable; diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 428381b340a5..b4f30d9b3337 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -13,7 +13,7 @@ #include <svl/poolitem.hxx> #include <svl/svldllapi.h> -class SVL_DLLPUBLIC SfxInt64Item : public SfxPoolItem +class SVL_DLLPUBLIC SfxInt64Item final : public SfxPoolItem { sal_Int64 mnValue; diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx index 25fcb4413a6e..a96f993dca01 100644 --- a/include/svl/isethint.hxx +++ b/include/svl/isethint.hxx @@ -26,7 +26,7 @@ class SfxItemSet; -class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint +class SVL_DLLPUBLIC SfxItemSetHint final : public SfxHint { std::unique_ptr<SfxItemSet> _pItemSet; diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index a173fcf06955..6892f7b195f1 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -186,7 +186,7 @@ public: // workaround for incremental linking bugs in MSVC2015 class SAL_DLLPUBLIC_TEMPLATE SfxItemPropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {}; -class SVL_DLLPUBLIC SfxItemPropertySetInfo : public SfxItemPropertySetInfo_Base +class SVL_DLLPUBLIC SfxItemPropertySetInfo final : public SfxItemPropertySetInfo_Base { SfxItemPropertyMap m_aOwnMap; @@ -209,7 +209,7 @@ public: // workaround for incremental linking bugs in MSVC2015 class SAL_DLLPUBLIC_TEMPLATE SfxExtItemPropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {}; -class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public SfxExtItemPropertySetInfo_Base +class SVL_DLLPUBLIC SfxExtItemPropertySetInfo final : public SfxExtItemPropertySetInfo_Base { SfxItemPropertyMap aExtMap; public: diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index a6fb2d4c51ce..cfc3b4a56b6e 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -47,7 +47,7 @@ namespace o3tl class SvtCJKOptions; class SvtCTLOptions; -class SVL_DLLPUBLIC SvtLanguageOptions : public ::utl::detail::Options +class SVL_DLLPUBLIC SvtLanguageOptions final : public ::utl::detail::Options { private: std::unique_ptr<SvtCJKOptions> m_pCJKOptions; @@ -112,7 +112,7 @@ public: /** #i42730# Gives access to the Windows 16bit system locale */ -class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem +class SVL_DLLPUBLIC SvtSystemLanguageOptions final : public utl::ConfigItem { private: OUString m_sWin16SystemLocale; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 331854a56d9a..0e0f7dd6dd81 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -23,7 +23,7 @@ #include <svl/svldllapi.h> #include <tools/stream.hxx> -class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem +class SVL_DLLPUBLIC SfxLockBytesItem final : public SfxPoolItem { SvLockBytesRef _xVal; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index c38223c41d12..7a062f2aec47 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -108,7 +108,7 @@ public: This item describes a Macro table. */ -class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem +class SVL_DLLPUBLIC SvxMacroItem final : public SfxPoolItem { public: explicit inline SvxMacroItem ( const sal_uInt16 nId ); diff --git a/include/svl/msodocumentlockfile.hxx b/include/svl/msodocumentlockfile.hxx index ef9759b5b29b..904411cb01ac 100644 --- a/include/svl/msodocumentlockfile.hxx +++ b/include/svl/msodocumentlockfile.hxx @@ -20,7 +20,7 @@ namespace svt { /// Class implementing reading and writing MSO lockfiles. -class SVL_DLLPUBLIC MSODocumentLockFile : public GenDocumentLockFile +class SVL_DLLPUBLIC MSODocumentLockFile final : public GenDocumentLockFile { private: enum class AppType @@ -32,7 +32,6 @@ private: static AppType getAppType(const OUString& sOrigURL); AppType m_eAppType; -protected: virtual void WriteEntryToStream(const LockFileEntry& aEntry, const css::uno::Reference<css::io::XOutputStream>& xStream) override; diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index d212bfba3ccd..987dcdf796e8 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace io { } } } } -class SVL_DLLPUBLIC SvOutputStream: public SvStream +class SVL_DLLPUBLIC SvOutputStream final : public SvStream { css::uno::Reference< css::io::XOutputStream > m_xStream; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 796d6aa476c9..cc1ddabd57a3 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -301,7 +301,7 @@ public: { return *pSet; } }; -class SVL_DLLPUBLIC SfxPoolItemHint: public SfxHint +class SVL_DLLPUBLIC SfxPoolItemHint final : public SfxHint { SfxPoolItem* pObj; public: diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 348d427d763f..c98a2fe81adf 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -26,7 +26,7 @@ class SvStream; -class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxPointItem final : public SfxPoolItem { Point aVal; diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 412a695be464..5da145bb2da9 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -25,7 +25,7 @@ class SvStream; -class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxRectangleItem final : public SfxPoolItem { tools::Rectangle aVal; diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index de2d64d9c34c..5b33e3d3574d 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -26,7 +26,7 @@ class SvStream; -class SVL_DLLPUBLIC SfxRangeItem : public SfxPoolItem +class SVL_DLLPUBLIC SfxRangeItem final : public SfxPoolItem { private: sal_uInt16 nFrom; diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx index dd52d48da8f7..3395f91d5a24 100644 --- a/include/svl/sharecontrolfile.hxx +++ b/include/svl/sharecontrolfile.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace io { class XTruncate; namespace svt { -class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon +class SVL_DLLPUBLIC ShareControlFile final : public LockFileCommon { css::uno::Reference< css::io::XStream > m_xStream; css::uno::Reference< css::io::XInputStream > m_xInputStream; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 872903f3c7d8..ef2a1b83b8b5 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -27,7 +27,7 @@ namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } -class SVL_DLLPUBLIC SfxStringListItem : public SfxPoolItem +class SVL_DLLPUBLIC SfxStringListItem final : public SfxPoolItem { std::shared_ptr<std::vector<OUString>> mpList; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 00da71b1f7fe..9b46d07e26b2 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -57,7 +57,7 @@ enum class SvxSearchApp // class SvxSearchItem --------------------------------------------------- -class SVL_DLLPUBLIC SvxSearchItem : +class SVL_DLLPUBLIC SvxSearchItem final : public SfxPoolItem, public utl::ConfigItem { diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 7a695948d6c5..9ac7151f48d8 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -322,7 +322,7 @@ public: }; -class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint +class SVL_DLLPUBLIC SfxStyleSheetPoolHint final : public SfxHint { public: SfxStyleSheetPoolHint() {} @@ -338,7 +338,7 @@ public: { return pStyleSh; } }; -class SVL_DLLPUBLIC SfxStyleSheetModifiedHint: public SfxStyleSheetHint +class SVL_DLLPUBLIC SfxStyleSheetModifiedHint final : public SfxStyleSheetHint { OUString aName; diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 272139802398..1ba5e63ad4f7 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -112,7 +112,7 @@ struct SVL_DLLPUBLIC SfxUndoArray /** do not make use of these implementation details, unless you really really have to! */ -class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray +class SVL_DLLPUBLIC SfxListUndoAction final : public SfxUndoAction, public SfxUndoArray /* [Explanation] diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index f83274644fdb..457ac02f7e68 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -24,7 +24,7 @@ #include <svl/poolitem.hxx> #include <com/sun/star/frame/status/Visibility.hpp> -class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxVisibilityItem final : public SfxPoolItem { css::frame::status::Visibility m_nValue; |