diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-17 09:49:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-19 14:08:50 +0200 |
| commit | e3077168072452fb8f1c0a8afb2992877cb96d1c (patch) | |
| tree | 785da5126ddb052250ee3747fa221c746cc62e82 /include/sot | |
| parent | e48dd86341fff8a010f514bbcd818468f3a92815 (diff) | |
loplugin:finalclasses
improve the plugin to detect more cases.
I only apply the new final changes to classes in /include here.
Which reveals that
RoadmapWizard::getPageController( TabPage* _pCurrentPage )
will always return nullptr
Also needed to sprinkle some
SAL_DLLPUBLIC_TEMPLATE
around to workaround Visual Studio linking problems.
Change-Id: Iadb7d46a9e0e73dabce562375ca013c0fea6690c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117365
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sot')
| -rw-r--r-- | include/sot/stg.hxx | 6 | ||||
| -rw-r--r-- | include/sot/storage.hxx | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index ce4d28efbd79..1cd16ac32e89 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -201,13 +201,12 @@ public: }; class UCBStorageStream_Impl; -class UCBStorageStream : public BaseStorageStream +class UCBStorageStream final : public BaseStorageStream { friend class UCBStorage; UCBStorageStream_Impl* pImp; -protected: virtual ~UCBStorageStream() override; public: UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, bool bRepair, css::uno::Reference< css::ucb::XProgressHandler > const & xProgress ); @@ -237,11 +236,10 @@ namespace ucbhelper class UCBStorage_Impl; struct UCBStorageElement_Impl; -class SOT_DLLPUBLIC UCBStorage : public BaseStorage +class SOT_DLLPUBLIC UCBStorage final : public BaseStorage { UCBStorage_Impl* pImp; -protected: virtual ~UCBStorage() override; public: static bool IsStorageFile( SvStream* ); diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 41b57506946c..dd44b020694a 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -70,7 +70,7 @@ public: }; class BaseStorage; -class SOT_DLLPUBLIC SotStorage : virtual public SotObject +class SOT_DLLPUBLIC SotStorage final : virtual public SotObject { friend class SotStorageStream; @@ -83,7 +83,6 @@ friend class SotStorageStream; OString m_aKey; // aKey.Len != 0 -> encryption sal_Int32 m_nVersion; -protected: virtual ~SotStorage() override; void CreateStorage(bool bUCBStorage, StreamMode); public: |