diff options
Diffstat (limited to 'dbaccess/source/ui/dlg')
23 files changed, 179 insertions, 179 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 2f80e5d3c678..e025e00eb165 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -42,7 +42,7 @@ namespace dbaui public: OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; VclPtr<FixedText> m_pFT_Connection; VclPtr<OConnectionURLEdit> m_pConnectionURL; VclPtr<PushButton> m_pPB_Connection; @@ -54,13 +54,13 @@ namespace dbaui // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& _rNEvt ) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 10d13b8aa43e..bd2f3051ac5d 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -57,11 +57,11 @@ namespace dbaui public: virtual ~OConnectionTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; /** changes the connection URL. <p>The new URL must be of the type which is currently selected, only the parts which do not @@ -74,7 +74,7 @@ namespace dbaui private: /** enables the test connection button, if allowed */ - virtual bool checkTestConnection() SAL_OVERRIDE; + virtual bool checkTestConnection() override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 7b221793f111..6b9284e65bac 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -48,21 +48,21 @@ namespace dbaui public: virtual ~OConnectionTabPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; protected: OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); - virtual bool checkTestConnection() SAL_OVERRIDE; + virtual bool checkTestConnection() override; // nControlFlags is a combination of the CBTP_xxx-constants }; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 58d2a3e2ec5b..0baf12edd62f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -39,19 +39,19 @@ namespace dbaui class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + 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 void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: VclPtr<CheckBox> m_pPasswordrequired; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; @@ -61,17 +61,17 @@ namespace dbaui public: VclPtr<OTextConnectionHelper> m_pTextConnectionHelper; - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + 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 void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual bool prepareLeave() SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - bool checkTestConnection() SAL_OVERRIDE; + virtual bool prepareLeave() override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + bool checkTestConnection() override; private: DECL_LINK_TYPED(ImplGetExtensionHdl, OTextConnectionHelper*, void); @@ -81,17 +81,17 @@ namespace dbaui class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + 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 void dispose() SAL_OVERRIDE; - virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } + virtual void dispose() override; + virtual Link<> getControlModifiedLink() override { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK(OnEditModified,Edit*); private: @@ -116,18 +116,18 @@ namespace dbaui public: MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ); virtual ~MySQLNativeSetupPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OGenericAdministrationPage> Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; - virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; + virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) override; + virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) override; - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK( this, MySQLNativeSetupPage, OnModified ); } + virtual Link<> getControlModifiedLink() override { return LINK( this, MySQLNativeSetupPage, OnModified ); } private: DECL_LINK( OnModified, Edit* ); @@ -145,16 +145,16 @@ namespace dbaui , sal_uInt16 _nHeaderTextResId , sal_uInt16 _nDriverClassId ); virtual ~OGeneralSpecialJDBCConnectionPageSetup(); - virtual void dispose() SAL_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 ); protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); } + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual Link<> getControlModifiedLink() override { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); } DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); @@ -182,16 +182,16 @@ namespace dbaui public: OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OJDBCConnectionPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual bool checkTestConnection() SAL_OVERRIDE; + virtual bool checkTestConnection() override; - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); @@ -213,17 +213,17 @@ namespace dbaui OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~OMySQLIntroPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); void SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; } protected: - virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rSet) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: VclPtr<RadioButton> m_pODBCDatabase; @@ -239,11 +239,11 @@ namespace dbaui class OAuthentificationPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + 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 void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: VclPtr<FixedText> m_pFTHelpText; @@ -253,16 +253,16 @@ namespace dbaui VclPtr<PushButton> m_pPBTestConnection; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; // OFinalDBPageSetup class OFinalDBPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet); VclPtr<FixedText> m_pFTFinalHeader; @@ -276,20 +276,20 @@ namespace dbaui OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~OFinalDBPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsDatabaseDocumentToBeRegistered(); bool IsDatabaseDocumentToBeOpened(); bool IsTableWizardToBeStarted(); void enableTableWizardCheckBox( bool _bSupportsTableCreation); /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method> - Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); } + Link<> getControlModifiedLink() override { return LINK(this, OGenericAdministrationPage, OnControlModified); } DECL_LINK_TYPED(OnOpenSelected, Button*, void); protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 89474ed541b1..d53091c5f3b9 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -49,7 +49,7 @@ namespace dbaui public: OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ); virtual ~OTextConnectionHelper(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<FixedText> m_pExtensionHeader; diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 023bccd470e9..65febc17a78c 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -63,7 +63,7 @@ class OPasswordDialog : public ModalDialog public: OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName); virtual ~OPasswordDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pUser.clear(); m_pEDOldPassword.clear(); diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 6cf91135bb7c..599a5b5632dc 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -65,17 +65,17 @@ public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); virtual ~OUserAdmin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetUser(); // subclasses must override this, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 39db714b11c9..88617c12eb55 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -38,7 +38,7 @@ namespace dbaui } // IWindowEventFilter - virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const SAL_OVERRIDE + virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const override { return ( _rEvent.GetId() == VCLEVENT_WINDOW_ENABLED ) || ( _rEvent.GetId() == VCLEVENT_WINDOW_DISABLED ) @@ -56,7 +56,7 @@ namespace dbaui } // IWindowOperator - virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const SAL_OVERRIDE; + virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const override; private: const OUString m_sDisabledText; diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index d1865751a3bf..b92b3cd56cb0 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -55,7 +55,7 @@ namespace dbaui public: MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink ); virtual ~MySQLNativeSettings(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index f046c46e2f1f..c2928216ea8e 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -47,8 +47,8 @@ namespace dbaui explicit OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } - virtual bool SaveValue() SAL_OVERRIDE { m_pSaveValue->SaveValue(); return true;} // bool return value only for stl - virtual bool Disable() SAL_OVERRIDE { m_pSaveValue->Disable(); return true;} // bool return value only for stl + virtual bool SaveValue() override { m_pSaveValue->SaveValue(); return true;} // bool return value only for stl + virtual bool Disable() override { m_pSaveValue->Disable(); return true;} // bool return value only for stl }; template < class T > class ODisableWrapper : public ISaveValueWrapper @@ -58,8 +58,8 @@ namespace dbaui explicit ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } - virtual bool SaveValue() SAL_OVERRIDE { return true;} // bool return value only for stl - virtual bool Disable() SAL_OVERRIDE { m_pSaveValue->Disable(); return true;} // bool return value only for stl + virtual bool SaveValue() override { return true;} // bool return value only for stl + virtual bool Disable() override { m_pSaveValue->Disable(); return true;} // bool return value only for stl }; // OGenericAdministrationPage @@ -116,24 +116,24 @@ namespace dbaui bool getSelectedDataSource(OUString& _sReturn, OUString& _sCurr); // svt::IWizardPageController - virtual void initializePage() SAL_OVERRIDE; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; - virtual bool canAdvance() const SAL_OVERRIDE; + virtual void initializePage() override; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; + virtual bool canAdvance() const override; void SetRoadmapStateValue( bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; } bool GetRoadmapStateValue() const { return m_abEnableRoadmap; } protected: /// default implementation: call FillItemSet, call prepareLeave, - virtual sfxpg DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet) override; using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False - virtual void Reset(const SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* _rCoreAttrs) override; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True - virtual void ActivatePage(const SfxItemSet& _rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& _rSet) override; // TabPage overridables - virtual void ActivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; protected: void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call(this); } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index d4dddc19c449..66561d890bc3 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -76,13 +76,13 @@ public: virtual ~TableListFacade(); private: - virtual void updateTableObjectList( bool _bAllowViews ) SAL_OVERRIDE; - virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE; - virtual bool isLeafSelected() const SAL_OVERRIDE; + virtual void updateTableObjectList( bool _bAllowViews ) override; + virtual OUString getSelectedName( OUString& _out_rAliasName ) const override; + virtual bool isLeafSelected() const override; // OContainerListener - virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; }; TableListFacade::~TableListFacade() @@ -236,13 +236,13 @@ public: virtual ~QueryListFacade(); private: - virtual void updateTableObjectList( bool _bAllowViews ) SAL_OVERRIDE; - virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE; - virtual bool isLeafSelected() const SAL_OVERRIDE; + virtual void updateTableObjectList( bool _bAllowViews ) override; + virtual OUString getSelectedName( OUString& _out_rAliasName ) const override; + virtual bool isLeafSelected() const override; // OContainerListener - virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; }; QueryListFacade::~QueryListFacade() diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 9d31cd4f2918..2472f8ff13f3 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -72,22 +72,22 @@ namespace dbaui bool m_bHasMaxRowScan; public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; SpecialSettingsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); protected: virtual ~SpecialSettingsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // OGenericAdministrationPage overridables - virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: void impl_initBooleanSettings(); @@ -110,23 +110,23 @@ namespace dbaui m_aControlDependencies; public: - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: // nControlFlags is a combination of the CBTP_xxx-constants virtual ~GeneratedValuesPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // subclasses must override this, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; } diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 9cf8ac1ada4c..8afac21cf89d 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -113,7 +113,7 @@ protected: public: ODbaseIndexDialog( vcl::Window * pParent, const OUString& aDataSrcName ); virtual ~ODbaseIndexDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 0b2ff3a3bbe4..3a3cb7ab054d 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -890,10 +890,10 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void doLoadAsync(); // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: DECL_LINK_TYPED( OnOpenDocument, void*, void ); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index c035af296823..b3c0a555a56a 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -65,23 +65,23 @@ namespace dbaui sal_uInt32 m_nControlFlags; public: - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; // nControlFlags is a combination of the CBTP_xxx-constants OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags); protected: virtual ~OCommonBehaviourTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // subclasses must override this, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: DECL_LINK_TYPED(CharsetSelectHdl, ListBox&, void); }; @@ -90,11 +90,11 @@ namespace dbaui class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; ODbaseDetailsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~ODbaseDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<CheckBox> m_pShowDeleted; VclPtr<FixedText> m_pFT_Message; @@ -103,7 +103,7 @@ namespace dbaui OUString m_sDsn; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: DECL_LINK_TYPED( OnButtonClicked, Button *, void ); @@ -120,13 +120,13 @@ namespace dbaui class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OOdbcDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: VclPtr<CheckBox> m_pUseCatalog; }; @@ -135,15 +135,15 @@ namespace dbaui class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OUserDriverDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: VclPtr<FixedText> m_pFTHostname; VclPtr<Edit> m_pEDHostname; @@ -169,12 +169,12 @@ namespace dbaui , bool bShowSocket = true ); virtual ~OGeneralSpecialJDBCDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); @@ -200,7 +200,7 @@ namespace dbaui MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~MySQLNativePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<FixedText> m_pSeparator1; @@ -212,23 +212,23 @@ namespace dbaui VclPtr<CheckBox> m_pPasswordRequired; protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; // OOdbcDetailsPage class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OLDAPDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: VclPtr<Edit> m_pETBaseDN; VclPtr<CheckBox> m_pCBUseSSL; @@ -251,19 +251,19 @@ namespace dbaui class OTextDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); VclPtr<OTextConnectionHelper> m_pTextConnectionHelper; protected: virtual ~OTextDetailsPage(); - virtual void dispose() SAL_OVERRIDE; - virtual bool prepareLeave() SAL_OVERRIDE; + virtual void dispose() override; + virtual bool prepareLeave() override; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: }; diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 3d65b7982b33..0fc204c6b3d9 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -40,8 +40,8 @@ namespace dbaui DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); - virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem& _rItem) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 8d8c6112c9c7..115f2b640567 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -54,11 +54,11 @@ protected: public: ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); virtual ~ODatasourceSelectDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetSelected() const { return m_pDatasource->GetSelectEntry();} void Select( const OUString& _rEntry ) { m_pDatasource->SelectEntry(_rEntry); } - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: DECL_LINK_TYPED( ListDblClickHdl, ListBox&, void ); diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index 12057275d2a3..78f9620af7f6 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -46,7 +46,7 @@ namespace dbaui protected: // XInteractionHandler - virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override; virtual ~OFilePickerInteractionHandler(); }; diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 5330cc8fab65..7869805dd4d9 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -66,7 +66,7 @@ namespace dbaui public: virtual ~OGeneralPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// set a handler which gets called every time the user selects a new type void SetTypeSelectHandler( const Link<OGeneralPage&,void>& _rHandler ) { m_aTypeSelectHandler = _rHandler; } @@ -76,16 +76,16 @@ namespace dbaui protected: // SfxTabPage overridables - virtual void Reset( const SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* _rCoreAttrs ) override; - virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) override; virtual OUString getDatasourceName( const SfxItemSet& _rSet ); virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ); // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; void onTypeSelected(const OUString& _sURLPrefix); void initializeTypeList(); @@ -107,10 +107,10 @@ namespace dbaui OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems ); protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; - virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; - virtual void setParentTitle( const OUString& _sURLPrefix ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) override; + virtual void setParentTitle( const OUString& _sURLPrefix ) override; }; // OGeneralPageWizard @@ -119,7 +119,7 @@ namespace dbaui public: OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ); virtual ~OGeneralPageWizard(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: enum CreationMode { @@ -170,13 +170,13 @@ namespace dbaui DocumentDescriptor GetSelectedDocument() const; protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; - virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; - virtual OUString getDatasourceName( const SfxItemSet& _rSet ) SAL_OVERRIDE; - virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) override; + virtual OUString getDatasourceName( const SfxItemSet& _rSet ) override; + virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) override; ::std::vector< OUString> m_aEmbeddedURLPrefixes; diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 975b96a4b090..abe080af2f0e 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -52,8 +52,8 @@ namespace dbaui void SetAdditionalModifyHdl(const Link<>& _rHdl); protected: - virtual bool WantMouseEvent() const SAL_OVERRIDE { return true; } - virtual void SetModifyHdl(const Link<>& _rHdl) SAL_OVERRIDE; + virtual bool WantMouseEvent() const override { return true; } + virtual void SetModifyHdl(const Link<>& _rHdl) override; private: void implCheckLinks(); diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index aa80fd2d3270..8b72335950d1 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -37,8 +37,8 @@ namespace dbaui explicit OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); - virtual bool operator==( const SfxPoolItem& _rItem ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& _rItem ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const override; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index ab0a577085de..3a0b31e19b32 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -84,7 +84,7 @@ namespace { } - virtual Image getImage() const SAL_OVERRIDE + virtual Image getImage() const override { if ( !m_defaultImage ) m_defaultImage = Image( ModuleRes( m_defaultImageID ) ); @@ -102,7 +102,7 @@ namespace { } - virtual OUString getLabel() const SAL_OVERRIDE + virtual OUString getLabel() const override { return m_label; } @@ -303,7 +303,7 @@ class OExceptionChainDialog : public ModalDialog public: OExceptionChainDialog( vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions ); virtual ~OExceptionChainDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pExceptionList.clear(); m_pExceptionText.clear(); diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index eb56894e750c..609967b7ff27 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -49,20 +49,20 @@ namespace dbaui VclPtr<OTableSubscriptionDialog> m_pTablesDlg; public: - virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) override; + virtual sfxpg DeactivatePage(SfxItemSet* _pSet) override; using OGenericAdministrationPage::DeactivatePage; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; OTableSubscriptionPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); virtual ~OTableSubscriptionPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); DECL_LINK( OnTreeEntryChecked, Control* ); @@ -84,7 +84,7 @@ namespace dbaui /// (un)check all entries void CheckAll( bool bCheck = true ); - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // checks the tables according to the filter given // in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ... |