diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx')
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 9f23a8e6dfa9..8961cadeaf60 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -42,7 +42,7 @@ namespace dbaui virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); - virtual ~OSpreadSheetConnectionPageSetup(); + virtual ~OSpreadSheetConnectionPageSetup() override; virtual void dispose() override; protected: @@ -64,7 +64,7 @@ namespace dbaui virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); - virtual ~OTextConnectionPageSetup(); + virtual ~OTextConnectionPageSetup() override; virtual void dispose() override; protected: virtual bool prepareLeave() override; @@ -84,7 +84,7 @@ namespace dbaui virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); - virtual ~OLDAPConnectionPageSetup(); + virtual ~OLDAPConnectionPageSetup() override; virtual void dispose() override; virtual void callModifiedHdl(void* pControl = nullptr) override; @@ -114,7 +114,7 @@ namespace dbaui public: MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ); - virtual ~MySQLNativeSetupPage(); + virtual ~MySQLNativeSetupPage() override; virtual void dispose() override; static VclPtr<OGenericAdministrationPage> Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); @@ -140,7 +140,7 @@ namespace dbaui , sal_uInt16 _nHelpTextResId , sal_uInt16 _nHeaderTextResId , sal_uInt16 _nDriverClassId ); - virtual ~OGeneralSpecialJDBCConnectionPageSetup(); + virtual ~OGeneralSpecialJDBCConnectionPageSetup() override; virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); @@ -176,7 +176,7 @@ namespace dbaui { public: OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); - virtual ~OJDBCConnectionPageSetup(); + virtual ~OJDBCConnectionPageSetup() override; virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); @@ -207,7 +207,7 @@ namespace dbaui }; OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); - virtual ~OMySQLIntroPageSetup(); + virtual ~OMySQLIntroPageSetup() override; virtual void dispose() override; static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); @@ -237,7 +237,7 @@ namespace dbaui virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); - virtual ~OAuthentificationPageSetup(); + virtual ~OAuthentificationPageSetup() override; virtual void dispose() override; protected: @@ -270,7 +270,7 @@ namespace dbaui VclPtr<FixedText> m_pFTFinalText; OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); - virtual ~OFinalDBPageSetup(); + virtual ~OFinalDBPageSetup() override; virtual void dispose() override; bool IsDatabaseDocumentToBeRegistered(); bool IsDatabaseDocumentToBeOpened(); |